Move wallpapers into a flake input

rake5k · Sep 28, 2024 · c8d0f08 · c8d0f08
1 parent 2fe0a91
commit c8d0f08
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 20 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -79,6 +79,15 @@
       url = "github:nix-community/nix-index-database";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
+
+    # Misc
+
+    wallpapers = {
+      type = "gitlab";
+      owner = "rake5k";
+      repo = "wallpapers";
+      flake = false;
+    };
   };
 
   outputs = { self, nixpkgs, ... } @ inputs:

diff --git a/home/roles/desktop/default.nix b/home/roles/desktop/default.nix
@@ -44,12 +44,6 @@ in
           description = "Font config";
         };
       };
-
-      wallpapersDir = mkOption {
-        type = types.path;
-        default = config.home.homeDirectory + "/Pictures/wallpapers";
-        description = "Directory containing wallpapers";
-      };
     };
   };
 

diff --git a/home/roles/desktop/xserver/default.nix b/home/roles/desktop/xserver/default.nix
@@ -51,6 +51,7 @@ in
           xserver = {
             cursors.enable = true;
             grobi.enable = true;
+            locker.enable = true;
             redshift.enable = true;
 
             xmonad = {

diff --git a/home/roles/desktop/xserver/grobi/default.nix b/home/roles/desktop/xserver/grobi/default.nix
@@ -1,12 +1,10 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, inputs, pkgs, ... }:
 
 with lib;
 
 let
 
-  desktopCfg = config.custom.roles.desktop;
-  xCfg = desktopCfg.xserver;
-  cfg = xCfg.grobi;
+  cfg = config.custom.roles.desktop.xserver.grobi;
 
 in
 
@@ -35,7 +33,7 @@ in
       inherit (cfg) rules;
       enable = true;
       executeAfter = [
-        "${lib.getExe pkgs.feh} --no-fehbg --bg-fill --randomize ${desktopCfg.wallpapersDir}"
+        "${lib.getExe pkgs.feh} --no-fehbg --bg-fill --randomize ${inputs.wallpapers}"
         "${pkgs.polybar}/bin/polybar-msg cmd restart"
       ];
     };

diff --git a/home/roles/desktop/xserver/locker/default.nix b/home/roles/desktop/xserver/locker/default.nix
@@ -1,18 +1,18 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, inputs, pkgs, ... }:
 
 with lib;
 
 let
 
-  desktopCfg = config.custom.roles.desktop;
-  xCfg = desktopCfg.xserver;
-  cfg = xCfg.locker;
+  cfg = config.custom.roles.desktop.xserver.locker;
 
 in
 
 {
   options = {
     custom.roles.desktop.xserver.locker = {
+      enable = mkEnableOption "Xorg screen locker";
+
       package = mkOption {
         type = types.package;
         default = pkgs.betterlockscreen;
@@ -27,7 +27,7 @@ in
     };
   };
 
-  config = mkIf xCfg.enable {
+  config = mkIf cfg.enable {
     home.packages = [
       cfg.package
     ] ++ (with pkgs; [
@@ -58,7 +58,7 @@ in
 
     # Update random lock image on login
     xsession.initExtra = ''
-      ${lib.getExe pkgs.betterlockscreen} --update ${desktopCfg.wallpapersDir} --fx dim &
+      ${lib.getExe pkgs.betterlockscreen} --update ${inputs.wallpapers} --fx dim &
     '';
   };
 }
diff --git a/home/roles/desktop/xserver/spectrwm/default.nix b/home/roles/desktop/xserver/spectrwm/default.nix
@@ -19,8 +19,6 @@ in
 
   config = mkIf cfg.enable {
     custom.programs.spectrwm = {
-      inherit (xCfg) locker;
-
       autoruns = {
         "alacritty" = 1;
       };