Reshuffling stuff

Droidnix/README.org

@@ -562,62 +562,61 @@ This sets the XDG implementation
 ** =generated/modules/desktop/stylix.nix=
 This sets the stylix implementation
 #+BEGIN_SRC nix :tangle generated/modules/desktop/stylix.nix :noweb tangle :mkdirp yes :eval never-html
-{flakeRoot, ... }:
+{ flakeRoot, config, lib, pkgs, ... }:
 
-{
+let
-  flake.nixosModules.stylix = { inputs, config, lib, pkgs, ... }:
+  cfg = config.mySystem.desktop.stylix;
-  let
+in {
-    cfg = config.mySystem.desktop.stylix;
-  in {
 
-     environment.systemPackages = with pkgs; [
+  options.mySystem.desktop.stylix.enable =
-      feh      # wallpaper target
+    lib.mkEnableOption "Stylix System Theming";
-      st       # NVF / terminal target, or kitty
+
+  config = lib.mkIf cfg.enable {
+
+    environment.systemPackages = with pkgs; [
+      feh
+      st
     ];
 
-    options.mySystem.desktop.stylix.enable = lib.mkEnableOption "Stylix System Theming";
+    stylix = {
+      enable = true;
+      base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
 
-    config = lib.mkIf cfg.enable {
+      image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall1.jpg";
-      stylix = {
+      polarity = "dark";
-      	enable = true;
-        base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
 
-	image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall25.jpg";
+      cursor = {
-      	polarity = "dark";
+        package = pkgs.phinger-cursors;
+        name = "phinger-cursors-light";
+        size = 24;
+      };
 
-    cursor = {
+      fonts = {
-          package = pkgs.phinger-cursors;
+        monospace = {
-          name = "phinger-cursors-light";
+          package = pkgs.nerd-fonts.fira-code;
-          size = 24;
+          name = "Fira Code Nerd Font";
         };
 
-    fonts = {
+        sansSerif = {
-	  monospace = {
+          package = pkgs.lato;
-	    package = pkgs.nerd-fonts.fira-code;
+          name = "Lato";
-	    name = "Fira Code Nerd Font";
+        };
-	  };
-
-	 sansSerif = {
-	    package = pkgs.lato;
-	    name = "Lato";
-	  };
-	};
-
-	icons = {
-	  enable = true;
-	  package = pkgs.papirus-icon-theme;
-	  dark = "Papirus-Dark";
-	  light = "Papirus-Light";
-		};
       };
 
-      home-manager.users.henrov.home.sessionVariables = {
+      icons = {
-        XCURSOR_THEME = config.stylix.cursor.name;
+        enable = true;
-        XCURSOR_SIZE = toString config.stylix.cursor.size;
+        package = pkgs.papirus-icon-theme;
-        HYPRCURSOR_THEME = config.stylix.cursor.name;
+        dark = "Papirus-Dark";
-        HYPRCURSOR_SIZE = toString config.stylix.cursor.size;
+        light = "Papirus-Light";
       };
     };
+
+    home-manager.users.henrov.home.sessionVariables = {
+      XCURSOR_THEME = config.stylix.cursor.name;
+      XCURSOR_SIZE = toString config.stylix.cursor.size;
+      HYPRCURSOR_THEME = config.stylix.cursor.name;
+      HYPRCURSOR_SIZE = toString config.stylix.cursor.size;
+    };
   };
 }
 #+END_SRC
@@ -629,9 +628,9 @@ Sets theming for the terminal
 
 {
   # (NVF = Neovim/terminal flavor)
-  # stylix.targets.nvf.enable = true;
+  stylix.targets.nvf.enable = true;
   # feh wallpaper integration
-  # stylix.targets.feh.enable = true;
+  stylix.targets.feh.enable = true;
 }
 #+END_SRC
 
@@ -894,13 +893,11 @@ Setting up GTK
 { pkgs, user, ... }:
 {
   environment.systemPackages = with pkgs; [
-      # feh      # wallpaper target
       gtk3     # GTK target
       gtk4     # GTK target
-      #st       # NVF / terminal target, or kitty
     ];
   # Stylix GTK target
-  # stylix.targets.gtk.enable = true;
+  stylix.targets.gtk.enable = true;
 
   home-manager.users.${user.username} = {
     gtk = {

Droidnix/generated/modules/desktop/stylix.nix

@@ -1,58 +1,57 @@
-{flakeRoot, ... }:
+{ flakeRoot, config, lib, pkgs, ... }:
 
-{
+let
-  flake.nixosModules.stylix = { inputs, config, lib, pkgs, ... }:
+  cfg = config.mySystem.desktop.stylix;
-  let
+in {
-    cfg = config.mySystem.desktop.stylix;
-  in {
 
-     environment.systemPackages = with pkgs; [
+  options.mySystem.desktop.stylix.enable =
-      feh      # wallpaper target
+    lib.mkEnableOption "Stylix System Theming";
-      st       # NVF / terminal target, or kitty
+
+  config = lib.mkIf cfg.enable {
+
+    environment.systemPackages = with pkgs; [
+      feh
+      st
     ];
 
-    options.mySystem.desktop.stylix.enable = lib.mkEnableOption "Stylix System Theming";
+    stylix = {
+      enable = true;
+      base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
 
-    config = lib.mkIf cfg.enable {
+      image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall1.jpg";
-      stylix = {
+      polarity = "dark";
-      	enable = true;
-        base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
 
-	image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall25.jpg";
+      cursor = {
-      	polarity = "dark";
+        package = pkgs.phinger-cursors;
+        name = "phinger-cursors-light";
+        size = 24;
+      };
 
-    cursor = {
+      fonts = {
-          package = pkgs.phinger-cursors;
+        monospace = {
-          name = "phinger-cursors-light";
+          package = pkgs.nerd-fonts.fira-code;
-          size = 24;
+          name = "Fira Code Nerd Font";
         };
 
-    fonts = {
+        sansSerif = {
-	  monospace = {
+          package = pkgs.lato;
-	    package = pkgs.nerd-fonts.fira-code;
+          name = "Lato";
-	    name = "Fira Code Nerd Font";
+        };
-	  };
-
-	 sansSerif = {
-	    package = pkgs.lato;
-	    name = "Lato";
-	  };
-	};
-
-	icons = {
-	  enable = true;
-	  package = pkgs.papirus-icon-theme;
-	  dark = "Papirus-Dark";
-	  light = "Papirus-Light";
-		};
       };
 
-      home-manager.users.henrov.home.sessionVariables = {
+      icons = {
-        XCURSOR_THEME = config.stylix.cursor.name;
+        enable = true;
-        XCURSOR_SIZE = toString config.stylix.cursor.size;
+        package = pkgs.papirus-icon-theme;
-        HYPRCURSOR_THEME = config.stylix.cursor.name;
+        dark = "Papirus-Dark";
-        HYPRCURSOR_SIZE = toString config.stylix.cursor.size;
+        light = "Papirus-Light";
       };
     };
+
+    home-manager.users.henrov.home.sessionVariables = {
+      XCURSOR_THEME = config.stylix.cursor.name;
+      XCURSOR_SIZE = toString config.stylix.cursor.size;
+      HYPRCURSOR_THEME = config.stylix.cursor.name;
+      HYPRCURSOR_SIZE = toString config.stylix.cursor.size;
+    };
   };
 }

Droidnix/generated/modules/system/gtk.nix

@@ -1,13 +1,11 @@
 { pkgs, user, ... }:
 {
   environment.systemPackages = with pkgs; [
-      # feh      # wallpaper target
       gtk3     # GTK target
       gtk4     # GTK target
-      #st       # NVF / terminal target, or kitty
     ];
   # Stylix GTK target
-  # stylix.targets.gtk.enable = true;
+  stylix.targets.gtk.enable = true;
 
   home-manager.users.${user.username} = {
     gtk = {

Droidnix/generated/modules/system/terminal.nix

@@ -2,7 +2,7 @@
 
 {
   # (NVF = Neovim/terminal flavor)
-  # stylix.targets.nvf.enable = true;
+  stylix.targets.nvf.enable = true;
   # feh wallpaper integration
-  # stylix.targets.feh.enable = true;
+  stylix.targets.feh.enable = true;
 }