diff --git a/configuration.nix b/configuration.nix index e0ecf42..3b26fcd 100644 --- a/configuration.nix +++ b/configuration.nix @@ -6,6 +6,8 @@ }: { imports = [ + ./hardware-configuration.nix + ./easyroam.nix ./stylix.nix ./nixvim/nixvim.nix ]; diff --git a/flake.lock b/flake.lock index 99dae72..a684966 100644 --- a/flake.lock +++ b/flake.lock @@ -264,9 +264,7 @@ }, "home-manager": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1782964450, @@ -330,9 +328,7 @@ }, "nix-easyroam": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1781526487, @@ -352,7 +348,7 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { @@ -371,16 +367,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1783549019, - "narHash": "sha256-0XnckG4ZhBmAsYa9mLuEIFowBG0fDGPLHduQGsbMS4A=", + "lastModified": 1782175435, + "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74cc63f702f7d60a557e152a57b40fb1fd0f72ac", + "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-26.05", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -417,6 +413,38 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1735268880, + "narHash": "sha256-7QEFnKkzD13SPxs+UFR5bUFN2fRw+GlL0am72ZjNre4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "7cc0bff31a3a705d3ac4fdceb030a17239412210", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1781216227, + "narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1782918843, "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", @@ -432,13 +460,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_5": { "locked": { - "lastModified": 1783604885, - "narHash": "sha256-tzMgSkV7kljEkqIjlgV6F+n+xD+/a35Db8bs7a4BFAo=", + "lastModified": 1781607440, + "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "767b0d3ec98a143ad9ed7dfc0d5553510ac27133", + "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", "type": "github" }, "original": { @@ -451,7 +479,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "systems": "systems_2" }, "locked": { @@ -523,7 +551,7 @@ "late-sh": "late-sh", "nix-easyroam": "nix-easyroam", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_4", "nixvim": "nixvim", "stylix": "stylix" } diff --git a/flake.nix b/flake.nix index 010569f..5b5ea48 100644 --- a/flake.nix +++ b/flake.nix @@ -5,11 +5,9 @@ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager = { url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; }; nix-easyroam = { url = "github:0x5a4/nix-easyroam"; - inputs.nixpkgs.follows = "nixpkgs"; }; nixvim = { url = "github:nix-community/nixvim"; @@ -44,7 +42,6 @@ { nixosConfigurations.seele = nixpkgs.lib.nixosSystem { modules = [ - ./easyroam.nix ./configuration.nix ./nixvim/nixvim.nix nix-easyroam.nixosModules.nix-easyroam @@ -59,10 +56,6 @@ } ({ lib, ... }: { networking.hostName = lib.mkForce "seele"; - imports = [ - ./hardware-configuration-laptop.nix - ]; - }) ]; @@ -82,11 +75,9 @@ home-manager.useGlobalPkgs = true; home-manager.extraSpecialArgs = { inherit inputs; }; } + lanzaboote.nixosModules.lanzaboote ({ pkgs, lib, ... }: { - imports = [ - ./hardware-configuration-desktop.nix - ]; networking.hostName = lib.mkForce "nerv"; environment.systemPackages = [ # For debugging and troubleshooting Secure Boot. diff --git a/hardware-configuration-desktop.nix b/hardware-configuration-desktop.nix deleted file mode 100644 index da5f51c..0000000 --- a/hardware-configuration-desktop.nix +++ /dev/null @@ -1,50 +0,0 @@ -# Do not modify this file! It was generated by ‘nixos-generate-config’ -# and may be overwritten by future invocations. Please make changes -# to /etc/nixos/configuration.nix instead. -{ - config, - lib, - pkgs, - modulesPath, - ... -}: - -{ - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - boot.initrd.availableKernelModules = [ - "nvme" - "ahci" - "xhci_pci" - "usbhid" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/64a37727-0c5f-41d4-afac-dc26978916c1"; - fsType = "xfs"; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/F424-0E3E"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - - swapDevices = [ ]; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - services.xserver.videoDrivers = [ "nvidia" ]; - hardware.nvidia.open = true; # see the note above - boot.loader.systemd-boot.configurationLimit = 5; -} diff --git a/hardware-configuration-laptop.nix b/hardware-configuration.nix similarity index 100% rename from hardware-configuration-laptop.nix rename to hardware-configuration.nix diff --git a/nixvim/nixvim.nix b/nixvim/nixvim.nix index 8fd62cc..8cb1afe 100644 --- a/nixvim/nixvim.nix +++ b/nixvim/nixvim.nix @@ -1,5 +1,4 @@ { - inputs, config, lib, pkgs,