diff --git a/machines/macintosh/default.nix b/machines/macintosh/default.nix deleted file mode 100644 index e80358e..0000000 --- a/machines/macintosh/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ config, pkgs, lib, modulesPath, inputs, ... }: - -{ - - imports = - [ - (modulesPath + "/installer/scan/not-detected.nix") - ./hardware.nix - ./home-julien.nix - ../../users/julien.nix - ../../users/default.nix - ]; - - - networking.hostName = "macintosh"; - networking.networkmanager.enable = true; - - - sound.enable = true; - hardware.pulseaudio.enable = true; - hardware.pulseaudio.support32Bit = true; - - networking.interfaces.enp2s0f0.useDHCP = true; - networking.interfaces.enp5s0.useDHCP = true; - networking.interfaces.wlp3s0.useDHCP = true; - - hardware.trackpoint = { - enable = true; - speed = 80; - sensitivity = 220; - emulateWheel = true; - device = "TPPS/2 Elan TrackPoint"; - }; - - - services.tlp.enable = true; - services.xserver = { - videoDrivers = [ "amdgpu" ]; - enable = true; - layout = "fr"; - libinput.enable = false; - libinput.touchpad.tapping = false; - displayManager.sddm.enable = true; - desktopManager.xterm.enable = true; - }; - - - programs.dconf.enable = true; - - system.stateVersion = "21.11"; - networking.firewall.allowedUDPPorts = [ 51820 ]; - - networking.nameservers = lib.mkForce [ "10.100.0.2" ]; - networking.networkmanager.insertNameservers = [ "10.100.0.2" ]; - networking.resolvconf.dnsExtensionMechanism = false; - environment.etc."resolv.conf" = with lib; with pkgs; { - source = writeText "resolv.conf" '' - ${concatStringsSep "\n" (map (ns: "nameserver ${ns}") config.networking.nameservers)} - options edns0 - ''; - }; - - networking.wireguard.interfaces = { - wg0 = { - ips = [ "10.100.0.9/24" ]; - listenPort = 51820; - privateKeyFile = "/root/wireguard-keys/private"; - - peers = [ - { - allowedIPs = [ "10.100.0.0/24" ]; - publicKey = "hz+h9Oque5h+Y/WzOUnai3e9UfIfDsvtqmQH0xycIzs="; - endpoint = "212.129.40.11:51820"; - persistentKeepalive = 25; - } - ]; - }; - }; - - -} - diff --git a/machines/macintosh/hardware.nix b/machines/macintosh/hardware.nix deleted file mode 100644 index 718ab3e..0000000 --- a/machines/macintosh/hardware.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - - boot = { - initrd = { - kernelModules = [ "amdgpu" ]; - availableKernelModules = [ "nvme" "ehci_pci" "xhci_pci" "sdhci_pci" ]; - }; - kernelParams = [ "acpi_backlight=native" ]; - kernelPackages = pkgs.linuxPackages_latest; - kernelModules = [ "acpi_call" "kvm-amd" "amdgpu" ]; - extraModulePackages = with config.boot.kernelPackages; [ acpi_call ]; - loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; - }; - }; - - hardware = { - cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableAllFirmware; - opengl = { - driSupport = lib.mkDefault true; - driSupport32Bit = lib.mkDefault true; - extraPackages = with pkgs; [ - rocm-opencl-icd - rocm-opencl-runtime - amdvlk - ]; - }; - }; - - - - fileSystems."/" = - { - device = "/dev/disk/by-uuid/3e01f61b-c580-4078-94be-192f7aed5c5a"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { - device = "/dev/disk/by-uuid/2799-DF20"; - fsType = "vfat"; - }; - - swapDevices = - [{ device = "/dev/disk/by-uuid/44dadc95-a61e-40db-93d7-ada237f1e53b"; }]; - - - -} diff --git a/machines/macintosh/home-julien.nix b/machines/macintosh/home-julien.nix deleted file mode 100644 index da2bcc5..0000000 --- a/machines/macintosh/home-julien.nix +++ /dev/null @@ -1,71 +0,0 @@ -{ config, pkgs, lib, ... }: -{ - - sops.secrets.ssh-macintosh-pub = { - owner = "julien"; - path = "/home/julien/.ssh/id_ed25519.pub"; - mode = "0644"; - format = "binary"; - sopsFile = ../../secrets/ssh-macintosh-pub; - }; - - sops.secrets.ssh-macintosh-priv = { - owner = "julien"; - path = "/home/julien/.ssh/id_ed25519"; - mode = "0600"; - format = "binary"; - sopsFile = ../../secrets/ssh-macintosh-priv; - }; - - - luj.hmgr.julien = { - luj.programs.neovim.enable = true; - luj.programs.git.enable = true; - luj.programs.ssh-client.enable = true; - luj.programs.gtk.enable = true; - luj.i3.enable = true; - luj.polybar.enable = true; - home.packages = with pkgs; [ - unstable.rofi - unstable.firefox - feh - meld - vlc - nerdfonts - font-awesome - python3 - texlive.combined.scheme-full - nodejs - fira-code - neomutt - htop - evince - brightnessctl - mosh - signal-desktop - flameshot - ctags - ungoogled-chromium - networkmanagerapplet - sops - jftui - ]; - - - home.keyboard = { - layout = "fr"; - }; - - - - xsession.enable = true; - - home.stateVersion = "21.11"; - - - - }; - - - -}