julian/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

Use stylix instead of unmaintained nix-colors

Browse Source
This commit is contained in:
Julian Mutter
2026-06-01 23:06:54 +02:00
parent 5ecb1594d1
commit f6c123e3bf
13 changed files with 391 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features-nixos/optional/greetd.nix
+7 -10
View File
@@ -1,7 +1,4 @@
{config, ...}: let {
homeCfgs = config.home-manager.users;
julianCfg = homeCfgs.julian;
in {
users.extraUsers.greeter = { users.extraUsers.greeter = {
# For caching # For caching
home = "/tmp/greeter-home"; home = "/tmp/greeter-home";
@@ -10,12 +7,12 @@ in {
programs.regreet = { programs.regreet = {
enable = true; enable = true;
iconTheme = julianCfg.gtk.iconTheme; # iconTheme = julianCfg.gtk.iconTheme;
theme = julianCfg.gtk.theme; # theme = julianCfg.gtk.theme;
# font = julianCfg.fontProfiles.regular; # TODO: do # # font = julianCfg.fontProfiles.regular; # TODO: do
cursorTheme = { # cursorTheme = {
inherit (julianCfg.gtk.cursorTheme) name package; # inherit (julianCfg.gtk.cursorTheme) name package;
}; # };
cageArgs = [ cageArgs = [
"-s" "-s"
"-m" "-m"
flake.lock
Generated
+277 -1
View File
@@ -1,5 +1,73 @@
{ {
"nodes": { "nodes": {
"base16": {
"inputs": {
"fromYaml": "fromYaml"
},
"locked": {
"lastModified": 1755819240,
"narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
"owner": "SenchoPens",
"repo": "base16.nix",
"rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "base16.nix",
"type": "github"
}
},
"base16-fish": {
"flake": false,
"locked": {
"lastModified": 1765809053,
"narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
"owner": "tomyun",
"repo": "base16-fish",
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
"type": "github"
},
"original": {
"owner": "tomyun",
"repo": "base16-fish",
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
"type": "github"
}
},
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1776754714,
"narHash": "sha256-E3OAK27smtATTmX45uoTSRsVD+Y+ZiVVfgM/tjpbtYg=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "4d508123037e7851ad36ebf7d9c48b0e9e1eb581",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-helix",
"type": "github"
}
},
"base16-vim": {
"flake": false,
"locked": {
"lastModified": 1732806396,
"narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-vim",
"rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
"type": "github"
}
},
"crane": { "crane": {
"locked": { "locked": {
"lastModified": 1736101677, "lastModified": 1736101677,
@@ -55,6 +123,22 @@
"type": "github" "type": "github"
} }
}, },
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1779670703,
"narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9",
"type": "github"
},
"original": {
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -108,6 +192,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1778716662,
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@@ -162,6 +267,39 @@
"type": "github" "type": "github"
} }
}, },
"fromYaml": {
"flake": false,
"locked": {
"lastModified": 1731966426,
"narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
"owner": "SenchoPens",
"repo": "fromYaml",
"rev": "106af9e2f715e2d828df706c386a685698f3223b",
"type": "github"
},
"original": {
"owner": "SenchoPens",
"repo": "fromYaml",
"type": "github"
}
},
"gnome-shell": {
"flake": false,
"locked": {
"lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github"
},
"original": {
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -492,6 +630,31 @@
"type": "github" "type": "github"
} }
}, },
"nur": {
"inputs": {
"flake-parts": [
"stylix",
"flake-parts"
],
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1779766384,
"narHash": "sha256-P7Ohnlq8b8b2fU+Sgkrej7LBTM60LBTkHleLuYzmLmU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "57800b7ab648725ccd33551d01484ee14952ad3f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
@@ -509,7 +672,8 @@
"nixvim": "nixvim", "nixvim": "nixvim",
"sheet-organizer": "sheet-organizer", "sheet-organizer": "sheet-organizer",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"systems": "systems_6", "stylix": "stylix",
"systems": "systems_7",
"yazi-flavors": "yazi-flavors" "yazi-flavors": "yazi-flavors"
} }
}, },
@@ -555,6 +719,39 @@
"type": "github" "type": "github"
} }
}, },
"stylix": {
"inputs": {
"base16": "base16",
"base16-fish": "base16-fish",
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-parts": "flake-parts_2",
"gnome-shell": "gnome-shell",
"nixpkgs": [
"nixpkgs"
],
"nur": "nur",
"systems": "systems_6",
"tinted-kitty": "tinted-kitty",
"tinted-schemes": "tinted-schemes",
"tinted-tmux": "tinted-tmux",
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1780256506,
"narHash": "sha256-wEXN/OoZt9HfsKBL6694p2Y9xRlwfUbdn/M107U8fVU=",
"owner": "nix-community",
"repo": "stylix",
"rev": "8ed48a41087feeb66372ff718021a9512fc552b3",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "stylix",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
@@ -631,6 +828,21 @@
} }
}, },
"systems_6": { "systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_7": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -645,6 +857,70 @@
"type": "github" "type": "github"
} }
}, },
"tinted-kitty": {
"flake": false,
"locked": {
"lastModified": 1735730497,
"narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
"owner": "tinted-theming",
"repo": "tinted-kitty",
"rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-kitty",
"type": "github"
}
},
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1777806186,
"narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "schemes",
"type": "github"
}
},
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1778379944,
"narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "fe0203a198690e71a5ff11e08812a4673de3678d",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-tmux",
"type": "github"
}
},
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1778378178,
"narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "9cd816033ff969415b190722cddf134e78a5665f",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-zed",
"type": "github"
}
},
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
flake.nix
+5
View File
@@ -9,6 +9,11 @@
impermanence.url = "github:nix-community/impermanence"; impermanence.url = "github:nix-community/impermanence";
deploy-rs.url = "github:serokell/deploy-rs"; deploy-rs.url = "github:serokell/deploy-rs";
stylix = {
url = "github:nix-community/stylix";
inputs.nixpkgs.follows = "nixpkgs";
};
nixos-generators = { nixos-generators = {
url = "github:nix-community/nixos-generators"; url = "github:nix-community/nixos-generators";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
homes/julian/features/fish/default.nix
+1 -1
View File
@@ -5,7 +5,7 @@
}: }:
with lib; { with lib; {
home.file = { home.file = {
".config/starship.toml".source = ./starship.toml; # ".config/starship.toml".source = ./starship.toml;
".config/fish/conf.d/last-working-dir.fish".source = ./last-working-dir.fish; ".config/fish/conf.d/last-working-dir.fish".source = ./last-working-dir.fish;
}; };
homes/julian/features/hyprland/default.nix
+1 -16
View File
@@ -211,9 +211,6 @@
gaps_out = 5; gaps_out = 5;
layout = "dwindle"; layout = "dwindle";
# "col.active_border" = "0xff${palette.base0C} 0xff${palette.base0D} 270deg";
# "col.inactive_border" = "0xff${palette.base00}";
}; };
decoration = { decoration = {
@@ -253,7 +250,7 @@
}; };
exec = [ exec = [
"hyprctl setcursor ${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}" # "hyprctl setcursor ${config.gtk.cursorTheme.name} ${toString config.gtk.cursorTheme.size}"
"correct-workspace-locations" "correct-workspace-locations"
]; ];
@@ -442,18 +439,6 @@
"$mod SHIFT,W,exec,${makoctl} restore" "$mod SHIFT,W,exec,${makoctl} restore"
] ]
); );
# plugin = {
# hyprbars = {
# bar_text_size = 10;
# bar_height = 16;
# bar_text_font = "Ubuntu Nerd Font";
# bar_precedence_over_border = true;
# bar_color = "rgb(${palette.base01})";
# hyprbars-button = [ "rgb(${palette.base03}), 14, 󰖭, hyprctl dispatch killactive" ];
# };
# };
}; };
}; };
} }
homes/julian/features/hyprland/hyprlock/default.nix
+2 -12
View File
@@ -1,15 +1,5 @@
{ {config, ...}: let
options, palette = config.lib.stylix.colors;
config,
lib,
pkgs,
inputs,
...
}: let
inherit
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
palette
;
in { in {
programs.hyprlock.enable = true; programs.hyprlock.enable = true;
programs.hyprlock.settings = { programs.hyprlock.settings = {
homes/julian/features/hyprland/mako/default.nix
+1 -21
View File
@@ -1,30 +1,10 @@
{ {pkgs, ...}: {
options,
config,
lib,
pkgs,
inputs,
...
}: let
inherit
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
palette
;
in {
home.packages = with pkgs; [libnotify]; home.packages = with pkgs; [libnotify];
services.mako = { services.mako = {
enable = true; enable = true;
settings = { settings = {
defaultTimeout = "5000"; # milliseconds, can be overwritten by notification sender defaultTimeout = "5000"; # milliseconds, can be overwritten by notification sender
backgroundColor = "#${palette.base00}";
textColor = "#${palette.base05}";
borderColor = "#${palette.base0D}";
progressColor = "over #${palette.base02}";
extraConfig = ''
[urgency=high]
border-color=#${palette.base09}
# '';
}; };
}; };
} }
homes/julian/features/hyprland/waybar/default.nix
+19 -26
View File
@@ -1,12 +1,5 @@
{ {config, ...}: let
options, palette = config.lib.stylix.colors;
config,
pkgs,
lib,
inputs,
...
}: let
palette = (inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name}).palette;
in { in {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
@@ -14,23 +7,23 @@ in {
settings.mainBar = builtins.fromJSON (builtins.readFile ./config.json); settings.mainBar = builtins.fromJSON (builtins.readFile ./config.json);
}; };
xdg.configFile."waybar/style.css".source = ./style.css; # xdg.configFile."waybar/style.css".source = ./style.css;
xdg.configFile."waybar/theme.css".text = '' # xdg.configFile."waybar/theme.css".text = ''
/* # /*
bg - background # bg - background
fg - foreground # fg - foreground
*/ # */
/* Main Colors */ # /* Main Colors */
@define-color background #${palette.base00}; # @define-color background #${palette.base00};
@define-color foreground #${palette.base05}; # @define-color foreground #${palette.base05};
/* Workspace Button Colors */ # /* Workspace Button Colors */
@define-color hover-bg #${palette.base01}; # @define-color hover-bg #${palette.base01};
@define-color hover-fg #${palette.base05}; # @define-color hover-fg #${palette.base05};
@define-color active-bg #${palette.base02}; # @define-color active-bg #${palette.base02};
@define-color active-fg #${palette.base0A}; # @define-color active-fg #${palette.base0A};
@define-color urgent-bg #${palette.base08}; # @define-color urgent-bg #${palette.base08};
@define-color urgent-fg #${palette.base00}; # @define-color urgent-fg #${palette.base00};
''; # '';
} }
homes/julian/features/hyprland/wlogout/default.nix
+1 -7
View File
@@ -1,15 +1,9 @@
{ {
options,
config, config,
lib,
pkgs, pkgs,
inputs,
... ...
}: let }: let
inherit palette = config.lib.stylix.colors;
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
palette
;
in { in {
home.packages = with pkgs; [wlogout]; home.packages = with pkgs; [wlogout];
homes/julian/features/hyprland/wofi/default.nix
+63 -69
View File
@@ -1,86 +1,80 @@
{ {
options,
config, config,
lib,
pkgs, pkgs,
inputs,
... ...
}: let }: let
inherit palette = config.lib.stylix.colors;
(inputs.nix-colors.colorschemes.${builtins.toString config.colorscheme.name})
palette
;
in { in {
home.packages = with pkgs; [wofi]; home.packages = with pkgs; [wofi];
xdg.configFile."wofi/config".source = ./config; xdg.configFile."wofi/config".source = ./config;
xdg.configFile."wofi/style.css".text = '' # xdg.configFile."wofi/style.css".text = ''
window { # window {
margin: 5px; # margin: 5px;
border: 5px solid #181926; # border: 5px solid #181926;
background-color: #${palette.base00}; # background-color: #${palette.base00};
border-radius: 15px; # border-radius: 15px;
font-family: "JetBrainsMono"; # font-family: "JetBrainsMono";
font-size: 14px; # font-size: 14px;
} # }
#input { # #input {
all: unset; # all: unset;
min-height: 36px; # min-height: 36px;
padding: 4px 10px; # padding: 4px 10px;
margin: 4px; # margin: 4px;
border: none; # border: none;
color: #${palette.base05}; # color: #${palette.base05};
font-weight: bold; # font-weight: bold;
background-color: #${palette.base01}; # background-color: #${palette.base01};
outline: none; # outline: none;
border-radius: 15px; # border-radius: 15px;
margin: 10px; # margin: 10px;
margin-bottom: 2px; # margin-bottom: 2px;
} # }
#inner-box { # #inner-box {
margin: 4px; # margin: 4px;
padding: 10px; # padding: 10px;
font-weight: bold; # font-weight: bold;
border-radius: 15px; # border-radius: 15px;
} # }
#outer-box { # #outer-box {
margin: 0px; # margin: 0px;
padding: 3px; # padding: 3px;
border: none; # border: none;
border-radius: 15px; # border-radius: 15px;
border: 5px solid #${palette.base01}; # border: 5px solid #${palette.base01};
} # }
#scroll { # #scroll {
margin-top: 5px; # margin-top: 5px;
border: none; # border: none;
border-radius: 15px; # border-radius: 15px;
margin-bottom: 5px; # margin-bottom: 5px;
} # }
#text:selected { # #text:selected {
color: #${palette.base01}; # color: #${palette.base01};
margin: 0px 0px; # margin: 0px 0px;
border: none; # border: none;
border-radius: 15px; # border-radius: 15px;
} # }
#entry { # #entry {
margin: 0px 0px; # margin: 0px 0px;
border: none; # border: none;
border-radius: 15px; # border-radius: 15px;
background-color: transparent; # background-color: transparent;
} # }
#entry:selected { # #entry:selected {
margin: 0px 0px; # margin: 0px 0px;
border: none; # border: none;
border-radius: 15px; # border-radius: 15px;
background: #${palette.base0D}; # background: #${palette.base0D};
background-size: 400% 400%; # background-size: 400% 400%;
} # }
''; # '';
} }
homes/julian/features/suites/desktop/default.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{pkgs, ...}: { {pkgs, ...}: {
imports = [../../gtk]; imports = [./stylix.nix];
services.blueman-applet.enable = true; services.blueman-applet.enable = true;
services.nextcloud-client.enable = true; services.nextcloud-client.enable = true;
homes/julian/features/suites/desktop/stylix.nix
+10
View File
@@ -0,0 +1,10 @@
{
pkgs,
inputs,
...
}: {
imports = [inputs.stylix.homeModules.stylix];
stylix.enable = true;
stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
}
homes/julian/features/zsh/default.nix
+3 -3
View File
@@ -3,9 +3,9 @@
pkgs, pkgs,
... ...
}: { }: {
home.file = { # home.file = {
".config/starship.toml".source = ./starship.toml; # ".config/starship.toml".source = ./starship.toml;
}; # };
home.packages = with pkgs; [starship]; home.packages = with pkgs; [starship];