From 495c661f5081c023c242e96cf99259181408e99a Mon Sep 17 00:00:00 2001 From: sils Date: Sat, 18 Mar 2023 10:12:58 +0100 Subject: Feat: Restructure and add nameservers. --- flake.lock | 12 +++--- flake.nix | 2 +- hardware/basesystem.nix | 85 ----------------------------------------- hosts/thinklappi/basesystem.nix | 85 +++++++++++++++++++++++++++++++++++++++++ hosts/thinklappi/default.nix | 3 ++ hosts/thinklappi/thinklappi.nix | 70 +++++++++++++++++++++++++++++++++ packages.nix | 1 - sysconf/thinklappi.nix | 66 -------------------------------- 8 files changed, 165 insertions(+), 159 deletions(-) delete mode 100644 hardware/basesystem.nix create mode 100644 hosts/thinklappi/basesystem.nix create mode 100644 hosts/thinklappi/default.nix create mode 100644 hosts/thinklappi/thinklappi.nix delete mode 100644 sysconf/thinklappi.nix diff --git a/flake.lock b/flake.lock index 4f5ecfa..84291b4 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1678109311, - "narHash": "sha256-Q64FoCH5rp3XHoC8u1+KyjLEFGTY7kX9YaIaYfugvfY=", + "lastModified": 1679067095, + "narHash": "sha256-G2dJQURL/CCi+8RP6jNJG8VqgtzEMCA+6mNodd3VR6E=", "owner": "nix-community", "repo": "home-manager", - "rev": "04d6cad67557512452decbfe888c68fa11338a96", + "rev": "3239e0b40f242f47bf6c0c37b2fd35ab3e76e370", "type": "github" }, "original": { @@ -24,11 +24,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677932085, - "narHash": "sha256-+AB4dYllWig8iO6vAiGGYl0NEgmMgGHpy9gzWJ3322g=", + "lastModified": 1678898370, + "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=", "owner": "NixOs", "repo": "nixpkgs", - "rev": "3c5319ad3aa51551182ac82ea17ab1c6b0f0df89", + "rev": "ac718d02867a84b42522a0ece52d841188208f2c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5775c42..746ceb6 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ nixosConfigurations.thinklappi = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; - modules = [./sysconf/thinklappi.nix]; + modules = [./hosts/thinklappi/thinklappi.nix]; }; }; } diff --git a/hardware/basesystem.nix b/hardware/basesystem.nix deleted file mode 100644 index e5bc5ba..0000000 --- a/hardware/basesystem.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - config, - lib, - pkgs, - modulesPath, - ... -}: { - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot = { - initrd = { - availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"]; - kernelModules = []; - luks.devices."cryptroot".device = "/dev/disk/by-uuid/6700d662-29a9-4ea5-8ca6-85d42550b3ab"; - }; - kernelModules = ["kvm-intel"]; - extraModulePackages = []; - kernelPackages = pkgs.linuxPackages_latest; - loader = { - systemd-boot = { - enable = true; - configurationLimit = 3; - }; - efi.canTouchEfiVariables = true; - }; - }; - - fileSystems = { - "/" = { - device = "tmpfs"; - fsType = "tmpfs"; - options = ["defaults" "size=2G" "mode=755"]; - }; - "/nix" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=nix" "compress-force=zstd"]; - }; - "/etc/NetworkManager" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=networkmanagerconfig" "compress-force=zstd"]; - }; - "/etc/nixos" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=nixconfig" "compress-force=zstd"]; - }; - "/srv" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=srv" "compress-force=zstd"]; - }; - "/home" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=home" "compress-force=zstd"]; - }; - "/srv/snapshots" = { - device = "/dev/disk/by-label/nixos-root"; - fsType = "btrfs"; - options = ["subvol=snapshots" "compress-force=zstd"]; - }; - "/boot" = { - device = "/dev/disk/by-uuid/4064-2D6C"; - fsType = "vfat"; - }; - }; - - swapDevices = []; - - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/thinklappi/basesystem.nix b/hosts/thinklappi/basesystem.nix new file mode 100644 index 0000000..e5bc5ba --- /dev/null +++ b/hosts/thinklappi/basesystem.nix @@ -0,0 +1,85 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot = { + initrd = { + availableKernelModules = ["xhci_pci" "nvme" "rtsx_pci_sdmmc"]; + kernelModules = []; + luks.devices."cryptroot".device = "/dev/disk/by-uuid/6700d662-29a9-4ea5-8ca6-85d42550b3ab"; + }; + kernelModules = ["kvm-intel"]; + extraModulePackages = []; + kernelPackages = pkgs.linuxPackages_latest; + loader = { + systemd-boot = { + enable = true; + configurationLimit = 3; + }; + efi.canTouchEfiVariables = true; + }; + }; + + fileSystems = { + "/" = { + device = "tmpfs"; + fsType = "tmpfs"; + options = ["defaults" "size=2G" "mode=755"]; + }; + "/nix" = { + device = "/dev/disk/by-label/nixos-root"; + fsType = "btrfs"; + options = ["subvol=nix" "compress-force=zstd"]; + }; + "/etc/NetworkManager" = { + device = "/dev/disk/by-label/nixos-root"; + fsType = "btrfs"; + options = ["subvol=networkmanagerconfig" "compress-force=zstd"]; + }; + "/etc/nixos" = { + device = "/dev/disk/by-label/nixos-root"; + fsType = "btrfs"; + options = ["subvol=nixconfig" "compress-force=zstd"]; + }; + "/srv" = { + device = "/dev/disk/by-label/nixos-root"; + fsType = "btrfs"; + options = ["subvol=srv" "compress-force=zstd"]; + }; + "/home" = { + device = "/dev/disk/by-label/nixos-root"; + fsType = "btrfs"; + options = ["subvol=home" "compress-force=zstd"]; + }; + "/srv/snapshots" = { + device = "/dev/disk/by-label/nixos-root"; + fsType = "btrfs"; + options = ["subvol=snapshots" "compress-force=zstd"]; + }; + "/boot" = { + device = "/dev/disk/by-uuid/4064-2D6C"; + fsType = "vfat"; + }; + }; + + swapDevices = []; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/hosts/thinklappi/default.nix b/hosts/thinklappi/default.nix new file mode 100644 index 0000000..5019f10 --- /dev/null +++ b/hosts/thinklappi/default.nix @@ -0,0 +1,3 @@ +{...}: { + thinklappi = import ./thinklappi.nix; +} diff --git a/hosts/thinklappi/thinklappi.nix b/hosts/thinklappi/thinklappi.nix new file mode 100644 index 0000000..5a3f0f6 --- /dev/null +++ b/hosts/thinklappi/thinklappi.nix @@ -0,0 +1,70 @@ +{ + config, + pkgs, + ... +}: let + compiledLayout = pkgs.runCommand "keyboard-layout" {} '' + ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../files/neoqwertz.xkb} $out + ''; +in { + imports = [ + ./basesystem.nix + ../../env.nix + ../../nix.nix + ../../packages.nix + ../../users.nix + ../../zsh.nix + ../../flatpak.nix # Mainly for minecraft + + # Desktop Environment to use + ../../desktop/gnome.nix + ]; + + services = { + printing.enable = true; + xserver = { + layout = "de"; + #xkbVariant = ",neo"; + xkbOptions = "grp:win_space_toggle"; + displayManager.sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY"; + }; + pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + jack.enable = true; + }; + }; + + hardware = { + bluetooth.enable = true; + pulseaudio.enable = false; + }; + security.rtkit.enable = true; + + environment.systemPackages = [pkgs.xorg.xkbcomp]; + + i18n.defaultLocale = "en_US.UTF-8"; + + networking = { + hostName = "thinklappi"; + nameservers = ["2620:fe::fe" "2620:fe::9" "9.9.9.9" "149.112.112.112"]; + networkmanager = { + enable = true; + dns = "none"; + }; + }; + + time.timeZone = "Europe/Berlin"; + + console = { + font = "Lat2-Terminus16"; + keyMap = "de"; + #useXkbConfig = true; # use xkbOptions in tty. + }; + + programs.ssh.startAgent = true; + + system.stateVersion = "23.05"; +} diff --git a/packages.nix b/packages.nix index 2d0ed05..918c407 100644 --- a/packages.nix +++ b/packages.nix @@ -18,7 +18,6 @@ zip _7zz - neovim # edit nix files ;) inkscape # vector graphics diff --git a/sysconf/thinklappi.nix b/sysconf/thinklappi.nix deleted file mode 100644 index b6b175c..0000000 --- a/sysconf/thinklappi.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ - config, - pkgs, - ... -}: let - compiledLayout = pkgs.runCommand "keyboard-layout" {} '' - ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../files/neoqwertz.xkb} $out - ''; -in { - imports = [ - ../hardware/basesystem.nix - ../env.nix - ../nix.nix - ../packages.nix - ../users.nix - ../zsh.nix - ../flatpak.nix # Mainly for minecraft - - # Desktop Environment to use - ../desktop/gnome.nix - ]; - - services = { - printing.enable = true; - xserver = { - layout = "de"; - #xkbVariant = ",neo"; - xkbOptions = "grp:win_space_toggle"; - displayManager.sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY"; - }; - pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - }; - }; - - hardware = { - bluetooth.enable = true; - pulseaudio.enable = false; - }; - security.rtkit.enable = true; - - environment.systemPackages = [pkgs.xorg.xkbcomp]; - - i18n.defaultLocale = "en_US.UTF-8"; - - networking = { - hostName = "thinklappi"; - networkmanager.enable = true; - }; - - time.timeZone = "Europe/Berlin"; - - console = { - font = "Lat2-Terminus16"; - keyMap = "de"; - #useXkbConfig = true; # use xkbOptions in tty. - }; - - programs.ssh.startAgent = true; - - system.stateVersion = "23.05"; -} -- cgit 1.4.1