Reshuffling stuff

Droidnix/README.org

@@ -562,27 +562,27 @@ 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, ... }:
 
-{
-  flake.nixosModules.stylix = { inputs, config, lib, pkgs, ... }:
-  let
+let
   cfg = config.mySystem.desktop.stylix;
-  in {
+in {
 
-     environment.systemPackages = with pkgs; [
-      feh      # wallpaper target
-      st       # NVF / terminal target, or kitty
-    ];
-
-    options.mySystem.desktop.stylix.enable = lib.mkEnableOption "Stylix System Theming";
+  options.mySystem.desktop.stylix.enable =
+    lib.mkEnableOption "Stylix System Theming";
 
   config = lib.mkIf cfg.enable {
+
+    environment.systemPackages = with pkgs; [
+      feh
+      st
+    ];
+
     stylix = {
       enable = true;
       base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
 
-	image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall25.jpg";
+      image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall1.jpg";
       polarity = "dark";
 
       cursor = {
@@ -618,7 +618,6 @@ This sets the stylix implementation
       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,24 +1,24 @@
-{flakeRoot, ... }:
+{ flakeRoot, config, lib, pkgs, ... }:
 
-{
-  flake.nixosModules.stylix = { inputs, config, lib, pkgs, ... }:
-  let
+let
   cfg = config.mySystem.desktop.stylix;
-  in {
+in {
 
-     environment.systemPackages = with pkgs; [
-      feh      # wallpaper target
-      st       # NVF / terminal target, or kitty
-    ];
-
-    options.mySystem.desktop.stylix.enable = lib.mkEnableOption "Stylix System Theming";
+  options.mySystem.desktop.stylix.enable =
+    lib.mkEnableOption "Stylix System Theming";
 
   config = lib.mkIf cfg.enable {
+
+    environment.systemPackages = with pkgs; [
+      feh
+      st
+    ];
+
     stylix = {
       enable = true;
       base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml";
 
-	image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall25.jpg";
+      image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall1.jpg";
       polarity = "dark";
 
       cursor = {
@@ -54,5 +54,4 @@
       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;
 }