diff --git a/flake.lock b/flake.lock index be42a05..81b1fc3 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,72 @@ { "nodes": { + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1732200724, + "narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "153d52373b0fb2d343592871009a286ec8837aec", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1622559957, + "narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1736852337, + "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "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": { "locked": { "lastModified": 1742394900, @@ -73,7 +140,60 @@ "type": "github" } }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1741628778, + "narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, + "flake-compat": { + "locked": { + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -109,6 +229,27 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -124,6 +265,87 @@ "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" + } + }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "stylix", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "stylix", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1732369855, + "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "dadd58f630eeea41d645ee225a63f719390829dc", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "47.2", + "repo": "gnome-shell", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -144,6 +366,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741635347, + "narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "7fb8678716c158642ac42f9ff7a18c0800fea551", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, "lix": { "flake": false, "locked": { @@ -356,6 +599,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1726937504, "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", @@ -371,6 +630,29 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1741693509, + "narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=", + "owner": "nix-community", + "repo": "NUR", + "rev": "5479646b2574837f1899da78bdf9a48b75a9fb27", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "crane": "crane", @@ -383,6 +665,7 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable-small": "nixpkgs-unstable-small", + "stylix": "stylix", "typst-within": "typst-within" } }, @@ -432,6 +715,41 @@ "url": "https://static.rust-lang.org/dist/channel-rust-1.83.0.toml" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "git-hooks": "git-hooks", + "gnome-shell": "gnome-shell", + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_3", + "nur": "nur", + "systems": "systems_2", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1743075971, + "narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=", + "owner": "danth", + "repo": "stylix", + "rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a", + "type": "github" + }, + "original": { + "owner": "danth", + "repo": "stylix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -462,14 +780,133 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1716423189, + "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "eb39e141db14baef052893285df9f266df041ff8", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1741468895, + "narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1740877430, + "narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "d48ee86394cbe45b112ba23ab63e33656090edb4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1725758778, + "narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "typst-within": { "inputs": { "crane": "crane_2", "fenix": "fenix_2", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_4", "rust-manifest": "rust-manifest", - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1739736913, diff --git a/flake.nix b/flake.nix index e5c7897..d9bca2e 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ nixpkgs-stable.url = "nixpkgs/nixos-24.11"; nixpkgs-unstable-small.url = "nixpkgs/nixos-unstable-small"; niri.url = "github:sodiboo/niri-flake"; + stylix.url = "github:danth/stylix"; typst-within = { url = "github:schrottkatze/typst"; }; @@ -42,6 +43,7 @@ nixos-hardware, mac-brcm-fw, niri, + stylix, fenix, crane, ... @@ -78,6 +80,7 @@ system = "x86_64-linux"; modules = [ inputs.niri.nixosModules.niri + stylix.nixosModules.stylix ./hosts/monosodium-glutamate-g/configuration.nix home-manager.nixosModules.home-manager { @@ -104,6 +107,7 @@ system = "x86_64-linux"; modules = [ inputs.niri.nixosModules.niri + stylix.nixosModules.stylix ./hosts/denkbrett/configuration.nix home-manager.nixosModules.home-manager { @@ -130,6 +134,7 @@ system = "x86_64-linux"; modules = [ inputs.niri.nixosModules.niri + stylix.nixosModules.stylix "${mac-brcm-fw}" ./hosts/potatobook-g/configuration.nix home-manager.nixosModules.home-manager diff --git a/modules/desktop-environment/default.nix b/modules/desktop-environment/default.nix index bfd7fde..4dc7928 100644 --- a/modules/desktop-environment/default.nix +++ b/modules/desktop-environment/default.nix @@ -8,6 +8,7 @@ ./tlp.nix ./locale.nix ./printing.nix + ./stylix.nix ]; services.flatpak.enable = true; security.polkit.enable = true; diff --git a/modules/desktop-environment/home/terminal.nix b/modules/desktop-environment/home/terminal.nix index 5b6427b..e050429 100644 --- a/modules/desktop-environment/home/terminal.nix +++ b/modules/desktop-environment/home/terminal.nix @@ -11,24 +11,24 @@ }; settings = rec { #adjust_column_width = "70%"; - color0 = "#282828"; - color8 = "#928374"; - color1 = "#cc241d"; - color9 = "#fb4934"; - color2 = "#98971a"; - color10 = "#b8bb26"; - color3 = "#d79921"; - color11 = "#fabd2f"; - color4 = "#458588"; - color12 = "#83a598"; - color5 = "#b16286"; - color13 = "#d3869b"; - color6 = "#689d6a"; - color14 = "#8ec07c"; - color7 = "#a89984"; - color15 = "#ebdbb2"; - foreground = color15; - background = "#1d2021"; + # color0 = "#282828"; + # color8 = "#928374"; + # color1 = "#cc241d"; + # color9 = "#fb4934"; + # color2 = "#98971a"; + # color10 = "#b8bb26"; + # color3 = "#d79921"; + # color11 = "#fabd2f"; + # color4 = "#458588"; + # color12 = "#83a598"; + # color5 = "#b16286"; + # color13 = "#d3869b"; + # color6 = "#689d6a"; + # color14 = "#8ec07c"; + # color7 = "#a89984"; + # color15 = "#ebdbb2"; + # foreground = color15; + # background = "#1d2021"; confirm_os_window_close = 0; hide_window_decorations = true; }; diff --git a/modules/desktop-environment/stylix.nix b/modules/desktop-environment/stylix.nix new file mode 100644 index 0000000..99ee80e --- /dev/null +++ b/modules/desktop-environment/stylix.nix @@ -0,0 +1,27 @@ +{pkgs, ...}: { + stylix = { + enable = true; + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + fonts = { + serif = { + package = pkgs.libertine; + name = "Linux Libertine O"; + }; + + sansSerif = { + package = pkgs.b612; + name = "B612"; + }; + + monospace = { + package = pkgs.departure-mono; + name = "Departure Mono"; + }; + + emoji = { + package = pkgs.noto-fonts-emoji; + name = "Noto Color Emoji"; + }; + }; + }; +} diff --git a/modules/desktop/themeing.nix b/modules/desktop/themeing.nix index c5eb7d8..1803dc4 100644 --- a/modules/desktop/themeing.nix +++ b/modules/desktop/themeing.nix @@ -5,40 +5,41 @@ ... }: { config = { - fonts.packages = with pkgs; [ - atkinson-hyperlegible - ]; + # fonts.packages = with pkgs; [ + # atkinson-hyperlegible + # ]; home-manager.users.jade = {pkgs, ...}: { home.packages = with pkgs; [ - gtk-engine-murrine - gruvbox-dark-gtk + # gtk-engine-murrine + # gruvbox-dark-gtk gruvbox-dark-icons-gtk ]; gtk = { - enable = true; + # enable = true; cursorTheme = { package = pkgs.phinger-cursors; name = "phinger-cursors"; size = 30; }; - font = { - package = pkgs.atkinson-hyperlegible; - name = "Atkinson Hyperlegible"; - size = 11.5; - }; + # font = { + # package = pkgs.atkinson-hyperlegible; + # name = "Atkinson Hyperlegible"; + # size = 11.5; + # }; iconTheme = { package = pkgs.gruvbox-dark-icons-gtk; name = "gruvbox-dark-icons"; }; - theme = { - package = pkgs.gruvbox-dark-gtk; - name = "gruvbox-dark"; - }; - }; - qt = { - enable = true; - platformTheme.name = "gtk"; }; + # theme = { + # package = pkgs.gruvbox-dark-gtk; + # name = "gruvbox-dark"; + # }; + # }; + # qt = { + # enable = true; + # platformTheme.name = "gtk"; + # }; }; }; } diff --git a/modules/shell/helix.nix b/modules/shell/helix.nix index adfda34..90db752 100644 --- a/modules/shell/helix.nix +++ b/modules/shell/helix.nix @@ -21,7 +21,7 @@ enable = true; defaultEditor = true; settings = { - theme = "gruvbox_dark_hard"; + # theme = "gruvbox_dark_hard"; editor = { line-number = "relative"; bufferline = "multiple"; diff --git a/modules/shell/tty.nix b/modules/shell/tty.nix index ee05300..764d905 100644 --- a/modules/shell/tty.nix +++ b/modules/shell/tty.nix @@ -56,37 +56,37 @@ in { services.kmscon = { enable = true; - fonts = [ - { - name = "Departure Mono Nerd Font"; - package = pkgs.nerd-fonts.departure-mono; - } - ]; + # fonts = [ + # { + # name = "Departure Mono Nerd Font"; + # package = pkgs.nerd-fonts.departure-mono; + # } + # ]; extraConfig = "font-size=14"; # extraOptions = "--term xterm-256color"; extraOptions = generateOptions { xkb-layout = config.services.xserver.xkb.layout; xkb-variant = config.services.xserver.xkb.variant; - palette = "custom"; - palette-foreground = hexToOpt "#ebdbb2"; - palette-background = hexToOpt "#282828"; - palette-black = hexToOpt "#282828"; - palette-red = hexToOpt "#cc241d"; - palette-green = hexToOpt "#98971a"; - palette-yellow = hexToOpt "#d79921"; - palette-blue = hexToOpt "#458588"; - palette-magenta = hexToOpt "#b16286"; - palette-cyan = hexToOpt "#689d6a"; - palette-light-grey = hexToOpt "#a89984"; - palette-dark-grey = hexToOpt "#928374"; - palette-light-red = hexToOpt "#fb4934"; - palette-light-green = hexToOpt "#b8bb26"; - palette-light-yellow = hexToOpt "#fabd2f"; - palette-light-blue = hexToOpt "#83a598"; - palette-light-magenta = hexToOpt "#d3869b"; - palette-light-cyan = hexToOpt "#8ec07c"; - palette-white = hexToOpt "#ebdbb2"; + # palette = "custom"; + # palette-foreground = hexToOpt "#ebdbb2"; + # palette-background = hexToOpt "#282828"; + # palette-black = hexToOpt "#282828"; + # palette-red = hexToOpt "#cc241d"; + # palette-green = hexToOpt "#98971a"; + # palette-yellow = hexToOpt "#d79921"; + # palette-blue = hexToOpt "#458588"; + # palette-magenta = hexToOpt "#b16286"; + # palette-cyan = hexToOpt "#689d6a"; + # palette-light-grey = hexToOpt "#a89984"; + # palette-dark-grey = hexToOpt "#928374"; + # palette-light-red = hexToOpt "#fb4934"; + # palette-light-green = hexToOpt "#b8bb26"; + # palette-light-yellow = hexToOpt "#fabd2f"; + # palette-light-blue = hexToOpt "#83a598"; + # palette-light-magenta = hexToOpt "#d3869b"; + # palette-light-cyan = hexToOpt "#8ec07c"; + # palette-white = hexToOpt "#ebdbb2"; }; hwRender = true; };