From e18f3b4397add3f343aa84859d6b98c7f59e2d5b Mon Sep 17 00:00:00 2001 From: Patrick Date: Mon, 11 Sep 2023 00:21:02 +0200 Subject: [PATCH] WIP --- flake.lock | 66 ++++++++++++++++---------------- modules/config/boot.nix | 23 +++++++++++ modules/config/default.nix | 1 + modules/config/system.nix | 9 ----- users/common/default.nix | 1 + users/common/shells/nushell.nix | 4 ++ users/common/shells/starfish.nix | 1 + 7 files changed, 63 insertions(+), 42 deletions(-) create mode 100644 modules/config/boot.nix create mode 100644 users/common/shells/nushell.nix diff --git a/flake.lock b/flake.lock index 9eb8133..d5bc693 100644 --- a/flake.lock +++ b/flake.lock @@ -101,11 +101,11 @@ ] }, "locked": { - "lastModified": 1692793255, - "narHash": "sha256-yVyj0AE280JkccDHuG1XO9oGxN6bW8ksr/xttXcXzK0=", + "lastModified": 1693833206, + "narHash": "sha256-wHOY0nnD6gWj8u9uI85/YlsganYyWRK1hLFZulZwfmY=", "owner": "numtide", "repo": "devshell", - "rev": "2aa26972b951bc05c3632d4e5ae683cb6771a7c6", + "rev": "65114ea495a8d3cc1352368bf170d67ef005aa5a", "type": "github" }, "original": { @@ -121,11 +121,11 @@ ] }, "locked": { - "lastModified": 1693649688, - "narHash": "sha256-V5VDH693G7dXDHEwY82Fq6JrBZCdPpFk4erCK0SwjX0=", + "lastModified": 1694069327, + "narHash": "sha256-Si2otUNjCe8kY5nsV7tILi4PsI0odBFrdSu8cCjn/eQ=", "owner": "nix-community", "repo": "disko", - "rev": "dd5cdd852cc25092ebb29b598f7af037aab393f3", + "rev": "7bee8de8e6755506c70323b864a884f9624cc23a", "type": "github" }, "original": { @@ -269,11 +269,11 @@ ] }, "locked": { - "lastModified": 1693646047, - "narHash": "sha256-VsuXtCGOhrzp1qb1CSoV/cO+5f+GPtA4J/SFYqqLyfo=", + "lastModified": 1694134858, + "narHash": "sha256-fG/ESauOGmiojKlpJG8gB62dJa5Wd+ZIuiDMKK/HD3g=", "owner": "nix-community", "repo": "home-manager", - "rev": "fae8af43e201a8929ce45a5ea46192bbd1ffff18", + "rev": "19c6a4081b14443420358262f8416149bd79561a", "type": "github" }, "original": { @@ -323,11 +323,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1693869646, - "narHash": "sha256-OJ29WUwSr1tcNSkf+L3dJYIHdcFtYPkKIGSUY3aFJYg=", + "lastModified": 1694051403, + "narHash": "sha256-TbCcylrAPLhKu7s7mnjwQjkrqBMjI9/ysiysfKn5XHs=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "ff16969e651bc8ccf3d21c16f249368bc63817df", + "rev": "9cc7944c28c2bc5de3c96c253b3fd814c1cb85dd", "type": "github" }, "original": { @@ -338,11 +338,11 @@ }, "nixlib": { "locked": { - "lastModified": 1689469483, - "narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=", + "lastModified": 1693701915, + "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c", + "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", "type": "github" }, "original": { @@ -359,11 +359,11 @@ ] }, "locked": { - "lastModified": 1690133435, - "narHash": "sha256-YNZiefETggroaTLsLJG2M+wpF0pJPwiauKG4q48ddNU=", + "lastModified": 1693791338, + "narHash": "sha256-wHmtB5H8AJTUaeGHw+0hsQ6nU4VyvVrP2P4NeCocRzY=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "b1171de4d362c022130c92d7c8adc4bf2b83d586", + "rev": "8ee78470029e641cddbd8721496da1316b47d3b4", "type": "github" }, "original": { @@ -374,11 +374,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1693588489, - "narHash": "sha256-hUGiONyurfBxmTtRUttdlkdq+ml16L1MiKKAS1047OE=", + "lastModified": 1693718952, + "narHash": "sha256-+nGdJlgTk0MPN7NygopipmyylVuAVi7OItIwTlwtGnw=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "fe0ea731b84b10143fc68cd557368ac70f0fb65c", + "rev": "793de77d9f83418b428e8ba70d1e42c6507d0d35", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1693565476, - "narHash": "sha256-ya00zHt7YbPo3ve/wNZ/6nts61xt7wK/APa6aZAfey0=", + "lastModified": 1693985761, + "narHash": "sha256-K5b+7j7Tt3+AqbWkcw+wMeqOAWyCD1MH26FPZyWXpdo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "aa8aa7e2ea35ce655297e8322dc82bf77a31d04b", + "rev": "0bffda19b8af722f8069d09d8b6a24594c80b352", "type": "github" }, "original": { @@ -444,11 +444,11 @@ ] }, "locked": { - "lastModified": 1693930781, - "narHash": "sha256-EmW1yeitBJBzBLxoUE1Od5KEt5C+YbXshP0KT2+ldxg=", + "lastModified": 1694182450, + "narHash": "sha256-Eivl9r8Y5RKn3z4N1hAUAl6///bJhpzyHCVk7Q8u6Dw=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "fe49408835c7f426097311ae7b9cbbae4af03074", + "rev": "1372a7ab8f8d1a4c12f4cf522cbe553c91043656", "type": "github" }, "original": { @@ -459,11 +459,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1693785888, - "narHash": "sha256-RTJnFrFaLsQGzg0VwiGfR+aNbhcIaP267C92YC2i3mE=", + "lastModified": 1694048283, + "narHash": "sha256-QexXMDukc4fmXq5SJsDg8WRA6+FiEOt+PB3hx+fbc8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f53ec4f6d815f80f7ee6a490a946b1b2b4f9cb09", + "rev": "308e5f73e17dc2fe43ba95ec83697999b5dd544d", "type": "github" }, "original": { @@ -588,11 +588,11 @@ ] }, "locked": { - "lastModified": 1693689099, - "narHash": "sha256-NuilTRYMH+DDR/uBWQjDbX5mWCA05lwo2Sg9iTkkEs4=", + "lastModified": 1693817438, + "narHash": "sha256-fg3+n4Ky1gCzDtPm0MomMTFw0YkH05Y8ojy5t7bkfHg=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "e3e0f9f6d47f8fc68aff15150eda1224fb46f4d4", + "rev": "b8d3a059f5487d6767d07c3716386753e3132d9f", "type": "github" }, "original": { diff --git a/modules/config/boot.nix b/modules/config/boot.nix new file mode 100644 index 0000000..9e147f4 --- /dev/null +++ b/modules/config/boot.nix @@ -0,0 +1,23 @@ +{ + config, + lib, + ... +}: { + boot = { + initrd.systemd = { + enable = true; + emergencyAccess = config.secrets.secrets.global.users.root.passwordHash; + }; + + initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" "ahci" "uas"]; + supportedFilesystems = ["ntfs"]; + kernelModules = ["kvm-intel"]; + kernelParams = [ + "rd.luks.options=timeout=0" + "rootflags=x-systemd.device-timeout=0" + ]; + + tmp.useTmpfs = true; + loader.timeout = lib.mkDefault 2; + }; +} diff --git a/modules/config/default.nix b/modules/config/default.nix index 9e3baa6..bdc1a24 100644 --- a/modules/config/default.nix +++ b/modules/config/default.nix @@ -1,5 +1,6 @@ {inputs, ...}: { imports = [ + ./boot.nix ./efi.nix ./fonts.nix ./home-manager.nix diff --git a/modules/config/system.nix b/modules/config/system.nix index 1bf5e72..a6c6dc7 100644 --- a/modules/config/system.nix +++ b/modules/config/system.nix @@ -19,15 +19,6 @@ lib.mkIf (lib.pathExists pubkeyPath || lib.trace "Missing pubkey for ${config.node.name}: ${toString pubkeyPath} not found, using dummy replacement key for now." false) pubkeyPath; }; - boot = { - initrd.systemd.enable = true; - initrd.systemd.emergencyAccess = true; - initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "usbhid" "sd_mod" "rtsx_pci_sdmmc" "ahci" "uas"]; - supportedFilesystems = ["ntfs"]; - kernelModules = ["kvm-intel"]; - tmp.useTmpfs = true; - }; - security.sudo.enable = false; time.timeZone = lib.mkDefault "Europe/Berlin"; diff --git a/users/common/default.nix b/users/common/default.nix index a52be2d..de6b996 100644 --- a/users/common/default.nix +++ b/users/common/default.nix @@ -2,6 +2,7 @@ imports = [ ./shells/alias.nix ./shells/zsh + ./shells/nushell.nix ./programs/gpg ]; diff --git a/users/common/shells/nushell.nix b/users/common/shells/nushell.nix new file mode 100644 index 0000000..396fb79 --- /dev/null +++ b/users/common/shells/nushell.nix @@ -0,0 +1,4 @@ +{ + programs.nushell.enable = true; + programs.atuin.enableNushellIntegration = false; +} diff --git a/users/common/shells/starfish.nix b/users/common/shells/starfish.nix index 29f6ae2..8929308 100644 --- a/users/common/shells/starfish.nix +++ b/users/common/shells/starfish.nix @@ -1,6 +1,7 @@ {lib, ...}: { programs.starship = { enable = true; + enableNushellIntegration = false; settings = { add_newline = false; format = lib.concatStrings [