diff --git a/configurations/laptop-elitebook/configuration.nix b/configurations/laptop-elitebook/configuration.nix index 714c8bb8..1655021e 100644 --- a/configurations/laptop-elitebook/configuration.nix +++ b/configurations/laptop-elitebook/configuration.nix @@ -19,6 +19,8 @@ # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + # For encrypted swap + boot.initrd.luks.devices."luks-fd72f03a-6e52-47d9-a863-0c77c02f249e".device = "/dev/disk/by-uuid/fd72f03a-6e52-47d9-a863-0c77c02f249e"; networking.hostName = "cspark-nixos-elitebook"; # Define your hostname. diff --git a/configurations/laptop-elitebook/hardware-configuration.nix b/configurations/laptop-elitebook/hardware-configuration.nix index d38a3cdd..c2bb5917 100644 --- a/configurations/laptop-elitebook/hardware-configuration.nix +++ b/configurations/laptop-elitebook/hardware-configuration.nix @@ -8,26 +8,26 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ata_piix" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/502edf37-4301-4517-87dd-4b030310f869"; + { device = "/dev/disk/by-uuid/13f69aad-3256-4c44-bbbd-02a6daad8efc"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-a014fc29-65ec-4cbc-9ef2-d601c5157425".device = "/dev/disk/by-uuid/a014fc29-65ec-4cbc-9ef2-d601c5157425"; - boot.initrd.luks.devices."luks-5917f8ad-73ed-4839-ba81-be53a90685a1".device = "/dev/disk/by-uuid/5917f8ad-73ed-4839-ba81-be53a90685a1"; + boot.initrd.luks.devices."luks-0d23e4b7-411b-4904-b19d-25af0a16c541".device = "/dev/disk/by-uuid/0d23e4b7-411b-4904-b19d-25af0a16c541"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/F323-67BC"; + { device = "/dev/disk/by-uuid/11DB-A717"; fsType = "vfat"; + options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/aa1c6777-0afa-4fdf-84e8-5fead5e987d4"; } + [ { device = "/dev/disk/by-uuid/1a9fee73-d832-4d65-9b57-9da5673e2044"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -35,9 +35,8 @@ # 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.enp0s25.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/flake.lock b/flake.lock index 0314bdd7..38d48f48 100644 --- a/flake.lock +++ b/flake.lock @@ -86,11 +86,11 @@ ] }, "locked": { - "lastModified": 1764194569, - "narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=", + "lastModified": 1764998300, + "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", "owner": "nix-community", "repo": "home-manager", - "rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0", + "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", "type": "github" }, "original": { @@ -111,11 +111,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764165116, - "narHash": "sha256-DN0m9X9dFPxNTfhaUWlHoM2CFbNiWgxVHzC4j0AIiuc=", + "lastModified": 1765008770, + "narHash": "sha256-7w2Sn3Bgk91Ly+5XJ/OYvTqNVa+8+4Rqma05YM7xnVU=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "ae097a3c5ef217f9441d0da1c0bc14bbb4796b94", + "rev": "935080f54490e3e7b1eda731cbe1478744546ea8", "type": "github" }, "original": { @@ -144,11 +144,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764160906, - "narHash": "sha256-6Dud/oe0UnkgCe+JAGF+GjXl6S6ynpcAUYWCdbXjJL4=", + "lastModified": 1764966114, + "narHash": "sha256-nC0Fsu4zSdabdR4tHHMCrTgqLms612eEDy5VCdQVZFk=", "owner": "YaLTeR", "repo": "niri", - "rev": "8370c539fb584f78924b826d0ac0ad8fa068cf95", + "rev": "ba29735fbbd8cf8319c71ccb55b54a0580007c80", "type": "github" }, "original": { @@ -167,11 +167,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1763964548, - "narHash": "sha256-JTRoaEWvPsVIMFJWeS4G2isPo15wqXY/otsiHPN0zww=", + "lastModified": 1764841794, + "narHash": "sha256-TcJ2kgFn8qbbNCh7HJLadi4ZvW9CFrbLB02VS7biWlo=", "owner": "nix-community", "repo": "nixd", - "rev": "d4bf15e56540422e2acc7bc26b20b0a0934e3f5e", + "rev": "514db907c8a0b32a0bdc1678d480a5278da4b679", "type": "github" }, "original": { @@ -182,11 +182,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { @@ -210,16 +210,16 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763948260, - "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -403,11 +403,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1763704521, - "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", + "lastModified": 1764721075, + "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", + "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", "type": "github" }, "original": { @@ -424,11 +424,11 @@ ] }, "locked": { - "lastModified": 1763809017, - "narHash": "sha256-mv13dHeIA4cWHZRmFKIF11s7keVP9NhVtpaAYKX40jk=", + "lastModified": 1764745188, + "narHash": "sha256-9H1Izl1vxZVYG/6AQXfl8tyBYDx+KhB0enpjTq2tAT4=", "owner": "Benexl", "repo": "yt-x", - "rev": "efe0465cdf54d13c0606b76780046ab6ecc60a6c", + "rev": "ba700d7c647bc629ca431f4b9ea4dc48c89c6392", "type": "github" }, "original": { diff --git a/modules/nixos/cspark-desktop-niri/home.nix b/modules/nixos/cspark-desktop-niri/home.nix index e5607b71..12406467 100644 --- a/modules/nixos/cspark-desktop-niri/home.nix +++ b/modules/nixos/cspark-desktop-niri/home.nix @@ -33,7 +33,7 @@ in home.packages = with pkgs; [ (writeShellScriptBin "niri-autostart" '' - [[ $(hostname) == *"laptop"* ]] && waybar & + [[ ! $(hostname) == *"desktop"* ]] && waybar & mako & #swaybg -i $(find ${config.home.homeDirectory}/Pictures/Wallpapers/ggg/. -type f | shuf -n1) -m stretch & swaybg -i ${config.home.homeDirectory}/Pictures/Wallpapers/solarisdolphins_olive.png -m tile & diff --git a/modules/nixos/cspark-desktop-niri/module.nix b/modules/nixos/cspark-desktop-niri/module.nix index bf8a37ce..5ea00115 100644 --- a/modules/nixos/cspark-desktop-niri/module.nix +++ b/modules/nixos/cspark-desktop-niri/module.nix @@ -16,7 +16,10 @@ in config = lib.mkIf cfg.enable { # Enable the Niri Compositor and add extra system packages. - programs.niri.enable = true; + programs.niri = { + enable = true; + package = pkgs.niri; + }; environment.systemPackages = with pkgs; [ wl-clipboard swaylock # Locking