diff --git a/flake.lock b/flake.lock index d93b286..c8a1d8c 100644 --- a/flake.lock +++ b/flake.lock @@ -109,11 +109,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1747571627, - "narHash": "sha256-sP3IaLeTUXqEfeszv1k1Y5w9JIfuJdEscvZm7diEjnE=", + "lastModified": 1747740782, + "narHash": "sha256-X6u53btY/If5LR3Ua/QutvVCN58Y5jx+PO+4QH55EL4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "14b47e6122c95d7c9cab930ecf0487533066c1e1", + "rev": "4ab9c2b6da152b874a35ca7dbd9227254f964d82", "type": "github" }, "original": { @@ -126,17 +126,17 @@ "cpu-microcodes": { "flake": false, "locked": { - "lastModified": 1746370478, - "narHash": "sha256-3mpvHkDiQcpXrAS1lNJe2oYbKLTQnCbAkSmIWNF5l98=", + "lastModified": 1747081695, + "narHash": "sha256-nnim3432n3+iwD2alY1cigQE7GKnI8BkyZDJTzood+E=", "owner": "platomav", "repo": "CPUMicrocodes", - "rev": "71092548b863438bf630ba54290002694da05655", + "rev": "2bcc2d8cb648c3397ea7381ca6887a9e3fdd6164", "type": "github" }, "original": { "owner": "platomav", "repo": "CPUMicrocodes", - "rev": "71092548b863438bf630ba54290002694da05655", + "rev": "2bcc2d8cb648c3397ea7381ca6887a9e3fdd6164", "type": "github" } }, @@ -148,11 +148,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1747557510, - "narHash": "sha256-zvud8RidfYDdcaczqRE6sueJBtR0X1rRbsI9sCk7l/M=", + "lastModified": 1747730658, + "narHash": "sha256-zOGCeg7M2xHfsHCrGlFnxwqakTl5fwYta5wtn9/B6Po=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "48a3ef75a0013b8bae57161a323aa661da6d4bc4", + "rev": "49593b3d9f8c39d88f9ead1a308b0df2b61d7f33", "type": "github" }, "original": { @@ -187,11 +187,11 @@ ] }, "locked": { - "lastModified": 1747535798, - "narHash": "sha256-eRPjz79+jDLlrj1ouGjUiZT4EVLjkLAy+vH5iVu/t8c=", + "lastModified": 1747715157, + "narHash": "sha256-8I9ZZBiYL+nAzPB7wb9lz5GgS8D8c0Pf0+VhJcME23I=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ed6c0f95acb68734d4419d1912860b697f4c5ea6", + "rev": "3cc961f94c5db4e2cdfb498f2d6f02e3511b4991", "type": "github" }, "original": { @@ -471,11 +471,11 @@ ] }, "locked": { - "lastModified": 1747439237, - "narHash": "sha256-5rCGrnkglKKj4cav1U3HC+SIUNJh08pqOK4spQv9RjA=", + "lastModified": 1747565775, + "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae755329092c87369b9e9a1510a8cf1ce2b1c708", + "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", "type": "github" }, "original": { @@ -513,15 +513,16 @@ ] }, "locked": { - "lastModified": 1747279714, - "narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=", + "lastModified": 1747556831, + "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=", "owner": "nix-community", "repo": "home-manager", - "rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2", + "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -602,11 +603,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1747503792, - "narHash": "sha256-Okd5cu0jxGa+x4xpfMX9S8QH/zddaFUQvw97V6H2W3E=", + "lastModified": 1747610850, + "narHash": "sha256-b41pc9J8b9fxRFHBQRKoTXZHpAsKW5eJbNsTMris2Mo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "705b97c4ac93148820012c701fe39445cf76a590", + "rev": "eb3b38d40baca5c05ddbc1507b3d3f02a0ccb164", "type": "github" }, "original": { @@ -794,11 +795,11 @@ ] }, "locked": { - "lastModified": 1747324405, - "narHash": "sha256-/gi2uBFuUS0Uk3HQaHnT5cqUGV128ltbQTnNj7EGFRM=", + "lastModified": 1747616667, + "narHash": "sha256-PxQoNsQGd/wrEl+UClAOMeM2zUDALnqFpq32oU6p2IM=", "ref": "refs/heads/master", - "rev": "eae7374b9b652e00a89b54e66fedb275028034a2", - "revCount": 92, + "rev": "b8549ca18700e90ef315fd04978a0edd699a770a", + "revCount": 93, "type": "git", "url": "ssh://git@gitlab.com/CaptainJawZ/scripts-flake.git" }, @@ -837,11 +838,11 @@ ] }, "locked": { - "lastModified": 1747573429, - "narHash": "sha256-zFM+gjaF2eEZ/nyh/PWOBr34tsp+PYaKRev98w4269Q=", + "lastModified": 1747770728, + "narHash": "sha256-fJfRymPcAoAz8A/z4Vmlu9g/AN9Wyotep7DsR1m5OGA=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "754864d9f20adc084faa32cd47b0979d88134d22", + "rev": "29ba418c6449f123b0d4319d4226e06bd2038150", "type": "github" }, "original": { @@ -875,11 +876,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747327360, - "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -924,11 +925,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1747428706, - "narHash": "sha256-XVds9FkRrY59xRNNq14FNsFGqDiexXX/mlHcX4hPyyk=", + "lastModified": 1747758731, + "narHash": "sha256-w0E9e+SUs49YYNUv+FoXAOVXE7zQz+lWoedZ9tUzkao=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2", + "rev": "8746d3bd232554937178b6f23a6355b9d6f70468", "type": "github" }, "original": { @@ -940,11 +941,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747428706, - "narHash": "sha256-XVds9FkRrY59xRNNq14FNsFGqDiexXX/mlHcX4hPyyk=", + "lastModified": 1747610100, + "narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2", + "rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "type": "github" }, "original": { @@ -984,11 +985,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747571687, - "narHash": "sha256-HaoIJVxW1H37kvMiDcCx97el0R5B9yIBY5DJ+5eQylU=", + "lastModified": 1747781332, + "narHash": "sha256-x+RRe+fdXSJVyLuH973rtnRKH6CjDtp2NQs9LaONXeg=", "owner": "nix-community", "repo": "nur", - "rev": "2c785032f3567da0c209858290431d5692c6269a", + "rev": "866a588df5ac8a9d7dd0c06a7c2d8e3e73b0f723", "type": "github" }, "original": { @@ -1087,11 +1088,11 @@ ] }, "locked": { - "lastModified": 1746485181, - "narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", + "lastModified": 1747603214, + "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e93ee1d900ad264d65e9701a5c6f895683433386", + "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", "type": "github" }, "original": { @@ -1124,15 +1125,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1747573790, - "narHash": "sha256-GGCvuftfpt1q+P2V70wySRPGcED2Jc37rWEcyMC7pFI=", + "lastModified": 1747768578, + "narHash": "sha256-OR+XE+Js/kc7/tUxrjUSoDkAEbQXZ3QTEsyC5sgWzzw=", "owner": "danth", "repo": "stylix", - "rev": "e2fe2df9b00bf5d65bf17f3d4e77c1a27ad20db8", + "rev": "0aef18c27d67ca241df888ed8abc36ee6fbb5a47", "type": "github" }, "original": { "owner": "danth", + "ref": "release-25.05", "repo": "stylix", "type": "github" } @@ -1202,17 +1204,16 @@ "tinted-kitty": { "flake": false, "locked": { - "lastModified": 1716423189, - "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "tinted-kitty", - "rev": "eb39e141db14baef052893285df9f266df041ff8", "type": "github" } }, @@ -1312,11 +1313,11 @@ "cpu-microcodes": "cpu-microcodes" }, "locked": { - "lastModified": 1746447632, - "narHash": "sha256-h/9skHfT2+bHBUXX0CGZROknobw7/+X8bAa+kDv0rkE=", + "lastModified": 1747656938, + "narHash": "sha256-LE5jjWIN3xzL24ph8U2CwzTPrCxS+uGzXCpSh6b+UPk=", "owner": "e-tho", "repo": "ucodenix", - "rev": "355238cbd87e5bf9cbc23ae65b90740eb10e8d56", + "rev": "86d47e4b5790cc68b3af14ec9969ef8128524d43", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ef34771..497e1be 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; stylix = { - url = "github:danth/stylix"; + url = "github:danth/stylix/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; nixtendo-switch = { diff --git a/overlay.nix b/overlay.nix index 543ddc6..019e57e 100644 --- a/overlay.nix +++ b/overlay.nix @@ -46,7 +46,6 @@ _final: prev: { }; handbrake = prev.handbrake.override { useGtk = true; }; ripgrep = prev.ripgrep.override { withPCRE2 = true; }; - papirus-icon-theme = prev.papirus-icon-theme.override { color = "orange"; }; discord = prev.discord.override { withVencord = true; withOpenASAR = true; diff --git a/stylix.nix b/stylix.nix index d1e8e4c..ff548b1 100644 --- a/stylix.nix +++ b/stylix.nix @@ -6,34 +6,34 @@ }: let cfg = config.my.stylix; - iconTheme = pkgs.papirus-icon-theme; + iconTheme = pkgs.papirus-icon-theme.override { color = "green"; }; in { options.my.stylix.enable = lib.mkEnableOption "enable"; config = { stylix = { enable = cfg.enable; - image = ./wallpapers/la_fragua_de_vulcano.jpg; - cursor = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Ice"; - size = 30; - }; - fonts = { - monospace = { - package = pkgs.nerd-fonts.comic-shanns-mono; - name = "ComicShansMono Nerd Font Mono"; - }; - sansSerif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Sans"; - }; - serif = { - package = pkgs.dejavu_fonts; - name = "DejaVu Serif"; - }; - }; + image = ./wallpapers/paul1.jpg; targets.qt.platform = lib.mkForce "qtct"; + polarity = "light"; + base16Scheme = { + base00 = "ffffff"; # background + base01 = "f4f1ec"; # light surface + base02 = "e3dacb"; # selection bg + base03 = "c8b89f"; # comments/dim fg + base04 = "5c513f"; # status bar bg + base05 = "3b332a"; # main text + base06 = "2c241b"; # headings/bold + base07 = "1e1a14"; # dark accents + base08 = "d9903d"; # orange (highlight/accent) + base09 = "d0b553"; # yellow-gold (buttons/alerts) + base0A = "83a24d"; # soft green (secondary) + base0B = "729765"; # jungle green (success) + base0C = "90bca1"; # teal (info) + base0D = "659589"; # muted cyan (links) + base0E = "a28a65"; # brown-gold (keywords) + base0F = "a35a3a"; # deep clay red (deprecated/error) + }; }; home-manager.users.jawz = { gtk = lib.mkIf (!cfg.enable) {