henrov/nixos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reshuffling stuff

Browse Source
This commit is contained in:
Henro Veijer
2026-03-18 17:47:20 +00:00
parent 0d4ebaa71f
commit 194090cbde
4 changed files with 90 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droidnix/README.org
+45 -48
View File
@@ -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 = {
Droidnix/generated/modules/desktop/stylix.nix
+42 -43
View File
@@ -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;
};
};
}
Droidnix/generated/modules/system/gtk.nix
+1 -3
View File
@@ -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 -2
View File
@@ -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;
}