From 194090cbde348f42df0bcc0acda1558f4134b14d Mon Sep 17 00:00:00 2001 From: "info@data-pro.nu" Date: Wed, 18 Mar 2026 17:47:20 +0000 Subject: [PATCH] Reshuffling stuff --- Droidnix/README.org | 93 +++++++++---------- Droidnix/generated/modules/desktop/stylix.nix | 85 +++++++++-------- Droidnix/generated/modules/system/gtk.nix | 4 +- .../generated/modules/system/terminal.nix | 4 +- 4 files changed, 90 insertions(+), 96 deletions(-) diff --git a/Droidnix/README.org b/Droidnix/README.org index af3b67355..5bb148377 100644 --- a/Droidnix/README.org +++ b/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, ... }: -{ - flake.nixosModules.stylix = { inputs, config, lib, pkgs, ... }: - let - cfg = config.mySystem.desktop.stylix; - in { +let + cfg = config.mySystem.desktop.stylix; +in { - environment.systemPackages = with pkgs; [ - feh # wallpaper target - st # NVF / terminal target, or kitty + options.mySystem.desktop.stylix.enable = + lib.mkEnableOption "Stylix System Theming"; + + 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 { - stylix = { - enable = true; - base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml"; + image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall1.jpg"; + polarity = "dark"; - image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall25.jpg"; - polarity = "dark"; + cursor = { + package = pkgs.phinger-cursors; + name = "phinger-cursors-light"; + size = 24; + }; - cursor = { - package = pkgs.phinger-cursors; - name = "phinger-cursors-light"; - size = 24; + fonts = { + monospace = { + package = pkgs.nerd-fonts.fira-code; + name = "Fira Code Nerd Font"; }; - fonts = { - monospace = { - package = pkgs.nerd-fonts.fira-code; - 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"; - }; + sansSerif = { + package = pkgs.lato; + name = "Lato"; + }; }; - 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; + icons = { + enable = true; + package = pkgs.papirus-icon-theme; + dark = "Papirus-Dark"; + 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 = { diff --git a/Droidnix/generated/modules/desktop/stylix.nix b/Droidnix/generated/modules/desktop/stylix.nix index 3ffab1f48..727e773fd 100644 --- a/Droidnix/generated/modules/desktop/stylix.nix +++ b/Droidnix/generated/modules/desktop/stylix.nix @@ -1,58 +1,57 @@ -{flakeRoot, ... }: +{ flakeRoot, config, lib, pkgs, ... }: -{ - flake.nixosModules.stylix = { inputs, config, lib, pkgs, ... }: - let - cfg = config.mySystem.desktop.stylix; - in { +let + cfg = config.mySystem.desktop.stylix; +in { - environment.systemPackages = with pkgs; [ - feh # wallpaper target - st # NVF / terminal target, or kitty + options.mySystem.desktop.stylix.enable = + lib.mkEnableOption "Stylix System Theming"; + + 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 { - stylix = { - enable = true; - base16Scheme = "${flakeRoot}/assets/system/theming/stylix/catppuccin-mocha.yaml"; + image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall1.jpg"; + polarity = "dark"; - image = "${flakeRoot}/assets/hyprland/wallpaperstuff/pictures/wall25.jpg"; - polarity = "dark"; + cursor = { + package = pkgs.phinger-cursors; + name = "phinger-cursors-light"; + size = 24; + }; - cursor = { - package = pkgs.phinger-cursors; - name = "phinger-cursors-light"; - size = 24; + fonts = { + monospace = { + package = pkgs.nerd-fonts.fira-code; + name = "Fira Code Nerd Font"; }; - fonts = { - monospace = { - package = pkgs.nerd-fonts.fira-code; - 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"; - }; + sansSerif = { + package = pkgs.lato; + name = "Lato"; + }; }; - 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; + icons = { + enable = true; + package = pkgs.papirus-icon-theme; + dark = "Papirus-Dark"; + 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; + }; }; } diff --git a/Droidnix/generated/modules/system/gtk.nix b/Droidnix/generated/modules/system/gtk.nix index 0f4aea9a9..fe8171681 100644 --- a/Droidnix/generated/modules/system/gtk.nix +++ b/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 = { diff --git a/Droidnix/generated/modules/system/terminal.nix b/Droidnix/generated/modules/system/terminal.nix index fb8cb61eb..3c37aa911 100644 --- a/Droidnix/generated/modules/system/terminal.nix +++ b/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; }