From d399df52b11d1dff3ef21e7f638e44d158bedc39 Mon Sep 17 00:00:00 2001 From: ari Date: Thu, 13 Nov 2025 10:29:24 -0500 Subject: [PATCH] stylix --- configs/niri/start-up-script.sh | 2 +- flake.lock | 88 +++++++++++++++--------- flake.nix | 2 +- hosts/hl-fwdesk.nix | 2 + modules/home/default.nix | 2 +- modules/nixos/desktop/stylix/default.nix | 27 ++++---- modules/nixos/desktop/tiler/hyprland.nix | 4 +- 7 files changed, 77 insertions(+), 50 deletions(-) diff --git a/configs/niri/start-up-script.sh b/configs/niri/start-up-script.sh index 01a5c1a..72d045a 100755 --- a/configs/niri/start-up-script.sh +++ b/configs/niri/start-up-script.sh @@ -3,7 +3,7 @@ killall -q waybar sleep 1 -waybar --config /home/ari/nixos-setup/configs/niri/waybar/bottom-bar.jsonc --style /home/ari/nixos-setup/configs/niri/waybar/bottom-bar.css & +waybar --config /home/ari/nixos-setup/configs/niri/waybar/bottom-bar.jsonc & waybar --config /home/ari/nixos-setup/configs/niri/waybar/top-bar.jsonc --style /home/ari/nixos-setup/configs/niri/waybar/top-bar.css & waypaper --restore diff --git a/flake.lock b/flake.lock index 6bb3678..47808b2 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "fromYaml": "fromYaml" }, "locked": { - "lastModified": 1755819240, - "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "lastModified": 1746562888, + "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "owner": "SenchoPens", "repo": "base16.nix", - "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", + "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "type": "github" }, "original": { @@ -38,11 +38,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -132,11 +132,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -190,11 +190,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -248,16 +248,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1748186689, - "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "lastModified": 1744584021, + "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", + "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "type": "github" }, "original": { "owner": "GNOME", - "ref": "48.2", + "ref": "48.1", "repo": "gnome-shell", "type": "github" } @@ -453,14 +453,15 @@ "nixpkgs": [ "stylix", "nixpkgs" - ] + ], + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1751320053, + "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670", "type": "github" }, "original": { @@ -503,15 +504,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1762264356, - "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", + "lastModified": 1762295027, + "narHash": "sha256-5z5cGrp9F8g8iyQrM8WkB6pAwP4AaicljKZ15gx+X9Y=", "owner": "nix-community", "repo": "stylix", - "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", + "rev": "91b9a270523361268ba6a8772152fde31103869f", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.05", "repo": "stylix", "type": "github" } @@ -582,11 +584,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1750770351, + "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a", "type": "github" }, "original": { @@ -598,11 +600,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1751159871, + "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c", "type": "github" }, "original": { @@ -614,11 +616,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1751158968, + "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "86a470d94204f7652b906ab0d378e4231a5b3384", "type": "github" }, "original": { @@ -626,6 +628,28 @@ "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" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index dd65228..6fe60fa 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ }; # Themes stylix = { - url = "github:nix-community/stylix"; + url = "github:nix-community/stylix/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; # Macos diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index 715307a..3363ed3 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -21,11 +21,13 @@ in amdgpu.enable = true; }; desktop = { + stylix.enable = true; enable = true; cosmic.enable = true; tiler = { enable = true; niri.enable = true; + hyprland.enable = false; }; }; }; diff --git a/modules/home/default.nix b/modules/home/default.nix index 503901d..0ba8a59 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -51,7 +51,7 @@ in , ... }@user: { pkgs, ... }: { fonts = fontsModule; - gtk = (import ./gtk.nix { inherit pkgs; }); + # gtk = (import ./gtk.nix { inherit pkgs; }); home = homeModule // { username = name; homeDirectory = "/home/${name}"; diff --git a/modules/nixos/desktop/stylix/default.nix b/modules/nixos/desktop/stylix/default.nix index 642ce17..c7a024a 100644 --- a/modules/nixos/desktop/stylix/default.nix +++ b/modules/nixos/desktop/stylix/default.nix @@ -1,17 +1,18 @@ -{config,lib,...}: +{ config, pkgs, lib, ... }: let - cfgName = "skyg.nixos.desktop.stylix"; - cfg = config."${cfgName}"; - in + cfg = config.skyg.nixos.desktop.stylix; +in { - options = { - "${cfgName}" = { - enable = lib.mkEnableOption + options = { + skyg.nixos.desktop.stylix = { + enable = lib.mkEnableOption "Enable Stylix"; - }; - }; - config = lib.mkIf cfg.enable { - stylix.enable = true; - stylix.polarity = "dark"; - }; + }; + }; + config = lib.mkIf cfg.enable { + stylix.enable = true; + stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + stylix.polarity = "dark"; + stylix.autoEnable = true; + }; } diff --git a/modules/nixos/desktop/tiler/hyprland.nix b/modules/nixos/desktop/tiler/hyprland.nix index 4b622ed..e404280 100644 --- a/modules/nixos/desktop/tiler/hyprland.nix +++ b/modules/nixos/desktop/tiler/hyprland.nix @@ -29,8 +29,8 @@ in hyprls ]; xdg.portal = { - enable = true; - extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ]; + enable = true; + extraPortals = with pkgs; [ xdg-desktop-portal-hyprland ]; }; # environment.sessionVariables = { # HYPR_PLUGIN_DIR = hypr-plugin-dir;