From 9e6394fb644328ee4bc2d5e78b69dcb5aa47e2e7 Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 10 Jul 2026 17:36:19 +0200 Subject: [PATCH 1/6] split config between laptop and pc --- configuration.nix | 1 - flake.nix | 8 +++++ hardware-configuration-desktop.nix | 31 +++++++++++++++++++ ...n.nix => hardware-configuration-laptop.nix | 0 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 hardware-configuration-desktop.nix rename hardware-configuration.nix => hardware-configuration-laptop.nix (100%) diff --git a/configuration.nix b/configuration.nix index 3b26fcd..78a1738 100644 --- a/configuration.nix +++ b/configuration.nix @@ -6,7 +6,6 @@ }: { imports = [ - ./hardware-configuration.nix ./easyroam.nix ./stylix.nix ./nixvim/nixvim.nix diff --git a/flake.nix b/flake.nix index 5b5ea48..dd70ec5 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,7 @@ { nixosConfigurations.seele = nixpkgs.lib.nixosSystem { modules = [ + ./configuration.nix ./nixvim/nixvim.nix nix-easyroam.nixosModules.nix-easyroam @@ -56,6 +57,10 @@ } ({ lib, ... }: { networking.hostName = lib.mkForce "seele"; + imports = [ + ./hardware-configuration-laptop.nix + ]; + }) ]; @@ -78,6 +83,9 @@ 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 new file mode 100644 index 0000000..64df67f --- /dev/null +++ b/hardware-configuration-desktop.nix @@ -0,0 +1,31 @@ +# 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; +} diff --git a/hardware-configuration.nix b/hardware-configuration-laptop.nix similarity index 100% rename from hardware-configuration.nix rename to hardware-configuration-laptop.nix From 46bfe9c7cf43a73ea1c380abdd063a4dcddc4120 Mon Sep 17 00:00:00 2001 From: lucy Date: Fri, 10 Jul 2026 18:00:44 +0200 Subject: [PATCH 2/6] do shit --- configuration.nix | 1 - flake.nix | 15 +++++----- hardware-configuration-desktop.nix | 47 +++++++++++++++++++++--------- 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/configuration.nix b/configuration.nix index 78a1738..e0ecf42 100644 --- a/configuration.nix +++ b/configuration.nix @@ -6,7 +6,6 @@ }: { imports = [ - ./easyroam.nix ./stylix.nix ./nixvim/nixvim.nix ]; diff --git a/flake.nix b/flake.nix index dd70ec5..a3f50d5 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,7 @@ { nixosConfigurations.seele = nixpkgs.lib.nixosSystem { modules = [ - + ./easyroam.nix ./configuration.nix ./nixvim/nixvim.nix nix-easyroam.nixosModules.nix-easyroam @@ -57,9 +57,9 @@ } ({ lib, ... }: { networking.hostName = lib.mkForce "seele"; - imports = [ - ./hardware-configuration-laptop.nix - ]; + imports = [ + ./hardware-configuration-laptop.nix + ]; }) @@ -80,12 +80,11 @@ home-manager.useGlobalPkgs = true; home-manager.extraSpecialArgs = { inherit inputs; }; } - lanzaboote.nixosModules.lanzaboote ({ pkgs, lib, ... }: { - imports = [ - ./hardware-configuration-desktop.nix - ]; + 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 index 64df67f..da5f51c 100644 --- a/hardware-configuration-desktop.nix +++ b/hardware-configuration-desktop.nix @@ -1,31 +1,50 @@ # 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, ... }: +{ + config, + lib, + pkgs, + modulesPath, + ... +}: { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "nvme" "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" ]; + 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."/" = { + 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" ]; - }; + 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; } From 132895b36c1785cc53816c86557ae8185cb53e0d Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 11 Jul 2026 11:39:08 +0200 Subject: [PATCH 3/6] fix issues in flake regarding nixpkgs --- flake.lock | 92 ++++++++++------------------------------------- flake.nix | 3 ++ nixvim/nixvim.nix | 1 + 3 files changed, 22 insertions(+), 74 deletions(-) diff --git a/flake.lock b/flake.lock index a684966..448e699 100644 --- a/flake.lock +++ b/flake.lock @@ -264,7 +264,9 @@ }, "home-manager": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1782964450, @@ -328,7 +330,9 @@ }, "nix-easyroam": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1781526487, @@ -348,7 +352,9 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { @@ -367,15 +373,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782175435, - "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", - "owner": "NixOS", + "lastModified": 1782918843, + "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", + "rev": "e8273b29fe1390ec8d4603f2477357555291432e", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" @@ -412,74 +418,12 @@ "type": "github" } }, - "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=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e8273b29fe1390ec8d4603f2477357555291432e", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1781607440, - "narHash": "sha256-rxO+uc/KFbSJp+pgyXRuAX6QlG9hJdnt0BXpEQRXY+U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3e41b24abd260e8f71dbe2f5737d24122f972158", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_5", + "nixpkgs": [ + "nixpkgs" + ], "systems": "systems_2" }, "locked": { @@ -551,7 +495,7 @@ "late-sh": "late-sh", "nix-easyroam": "nix-easyroam", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs", "nixvim": "nixvim", "stylix": "stylix" } diff --git a/flake.nix b/flake.nix index a3f50d5..b4a8b4d 100644 --- a/flake.nix +++ b/flake.nix @@ -5,12 +5,15 @@ 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"; + inputs.nixpkgs.follows = "nixpkgs"; }; nixcord = { url = "github:FlameFlag/nixcord"; diff --git a/nixvim/nixvim.nix b/nixvim/nixvim.nix index 8cb1afe..8fd62cc 100644 --- a/nixvim/nixvim.nix +++ b/nixvim/nixvim.nix @@ -1,4 +1,5 @@ { + inputs, config, lib, pkgs, From ee2f468d6694e34fc6a22c67625484054e923540 Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 11 Jul 2026 11:42:01 +0200 Subject: [PATCH 4/6] forgot some changes?? --- flake.lock | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 448e699..118a6dc 100644 --- a/flake.lock +++ b/flake.lock @@ -352,9 +352,7 @@ "inputs": { "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs", "nixpkgs-nixcord": "nixpkgs-nixcord" }, "locked": { @@ -373,16 +371,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782918843, - "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", - "owner": "nixos", + "lastModified": 1783549019, + "narHash": "sha256-0XnckG4ZhBmAsYa9mLuEIFowBG0fDGPLHduQGsbMS4A=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8273b29fe1390ec8d4603f2477357555291432e", + "rev": "74cc63f702f7d60a557e152a57b40fb1fd0f72ac", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", + "owner": "NixOS", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -418,6 +416,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1782918843, + "narHash": "sha256-ETYnV9U7Sr+A45dohzZdfCZKOss4qrTkO+wgNZNvEc0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e8273b29fe1390ec8d4603f2477357555291432e", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", @@ -495,7 +509,7 @@ "late-sh": "late-sh", "nix-easyroam": "nix-easyroam", "nixcord": "nixcord", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "stylix": "stylix" } From f2389c8d8a5280ef6426a00d0d2b2e5526b0dbc1 Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 11 Jul 2026 11:42:34 +0200 Subject: [PATCH 5/6] forgot some changes?? --- flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake.nix b/flake.nix index b4a8b4d..010569f 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,6 @@ }; nixvim = { url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; }; nixcord = { url = "github:FlameFlag/nixcord"; From 58ce29a50a72a68b30975bd576827eddc00e0a28 Mon Sep 17 00:00:00 2001 From: lucy Date: Sat, 11 Jul 2026 11:45:59 +0200 Subject: [PATCH 6/6] add lockfile changes --- flake.lock | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 118a6dc..99dae72 100644 --- a/flake.lock +++ b/flake.lock @@ -432,12 +432,26 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1783604885, + "narHash": "sha256-tzMgSkV7kljEkqIjlgV6F+n+xD+/a35Db8bs7a4BFAo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "767b0d3ec98a143ad9ed7dfc0d5553510ac27133", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ], + "nixpkgs": "nixpkgs_3", "systems": "systems_2" }, "locked": {