Merge pull request #26 from tomasriveral/laptop

Weekly sync: laptop → main

flake.lock

@@ -179,36 +179,18 @@
         "type": "github"
       }
     },
-    "nixos-grub-themes": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1769794759,
-        "narHash": "sha256-1doG74WkbtUpawduk9f8szyzWsw3Liblrh2z+2jQnw4=",
-        "owner": "jeslie0",
-        "repo": "nixos-grub-themes",
-        "rev": "5e75f9b3ea9061dca6c53d34e166e08bf9ebc7c7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jeslie0",
-        "repo": "nixos-grub-themes",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702151865,
-        "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
+        "lastModified": 1780734595,
+        "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
+        "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixos-26.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -376,8 +358,7 @@
         "home-manager": "home-manager",
         "import-tree": "import-tree",
         "nix-git-cherry-picker": "nix-git-cherry-picker",
-        "nixos-grub-themes": "nixos-grub-themes",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",
         "nixpkgs-notifier": "nixpkgs-notifier",
         "nixpkgs-unstable": "nixpkgs-unstable",

flake.nix

@@ -4,7 +4,6 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # used for some packages
-    nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes";
     nixpkgs-master.url = "github:nixos/nixpkgs/master"; # used with precaution as they are untested and not cached
 
     # This one is only used when testing some packaging. You must change the path to the correct nixpkgs clone

modules/hardware/bootloader.nix

@@ -1,30 +1,31 @@
-_: {
-  flake.nixosModules.bootloader-laptop = {
-    inputs,
-    pkgs,
-    ...
-  }: {
-    # grub theme
-    boot.loader.grub = {
-      theme = inputs.nixos-grub-themes.packages.${pkgs.system}.nixos; # if you want to use nixos grub theme
+_: let
+  wallpaper1 = ../../assets/wallpaper1.jpg;
+  wallpaper2 = ../../assets/wallpaper2.jpg;
+  wallpaper3 = ../../assets/wallpaper3.jpg;
+  wallpaper4 = ../../assets/wallpaper4.jpg;
+  wallpaper5 = ../../assets/wallpaper5.jpg;
+in {
+  flake.nixosModules.bootloader = _: {
+    # disable other bootloaders
+    boot.loader.systemd-boot.enable = false;
+    boot.loader.grub.enable = false;
+
+    boot.loader.limine = {
+      enable = true;
+      efiSupport = true;
+      maxGenerations = 128;
+      style = {
+        wallpaperStyle = "centered";
+        wallpapers = [
+          wallpaper1
+          wallpaper2
+          wallpaper3
+          wallpaper4
+          wallpaper5
+        ];
+      };
     };
 
-    # Bootloader.
-    boot.loader.systemd-boot.enable = true;
-    boot.loader.efi.canTouchEfiVariables = true;
-  };
-  flake.nixosModules.bootloader-desktop = {
-    inputs,
-    pkgs,
-    ...
-  }: {
-    # grub theme
-    boot.loader.grub = {
-      theme = inputs.nixos-grub-themes.packages.${pkgs.system}.nixos; # if you want to use nixos grub theme
-    };
-
-    # Bootloader.
-    boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
   };
 }

modules/hosts/desktop.nix

@@ -20,7 +20,7 @@
       autoCleanup-desktop
       autoUpdate-desktop
       bluetooth
-      bootloader-desktop
+      bootloader
       browsers
       caelestia
       development
@@ -38,6 +38,7 @@
       mathematics
       mullvad
       networking
+      nixUtils
       notifications
       nvidia
       office

modules/hosts/laptop.nix

@@ -20,7 +20,7 @@
       autoUpdate-laptop
       #battery-laptop
       bluetooth
-      bootloader-laptop
+      bootloader
       browsers
       caelestia
       development
@@ -39,6 +39,8 @@
       mathematics
       mullvad
       networking
+      nixUtils-laptop
+      nixUtils
       notifications
       office
       #ollama

modules/utilities/nixUtils.nix

@@ -1,4 +1,4 @@
-{inputs, ...}: {
+{inputs, self, ...}: {
   flake.nixosModules.nixUtils-laptop = _: {
     # nixpkgs-review crashed my laptop multiple times. We must reduce how much ressources it can take.
     # for reference, my laptop is a 12 core ryzen 7
@@ -10,7 +10,7 @@
     nix.optimise = {
       automatic = true;
       persistent = true;
-      randomDelaySec = "30min";
+      randomizedDelaySec = "30min";
       dates = "Thu *-*-* 16:00:00";
     };
     # Garbage collector of generations
@@ -40,6 +40,7 @@
       vimPluginsUpdater # used for building plugins
       nix-index
       statix
+      self.packages.${pkgs-unstable.system}.custom-trimmer
     ];
   };
   perSystem = {pkgs, ...}: {