From f5b429f704c274cbe5585a870179c6f898cf3f89 Mon Sep 17 00:00:00 2001 From: GarandPLG Date: Thu, 4 Jun 2026 13:56:14 +0200 Subject: [PATCH] Update flake.lock and refine module settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump revisions, hashes and timestamps in flake.lock for several inputs. Simplify greetd configuration by using a direct default_session assignment. Restructure core stylix targets, adding a kmscon placeholder and reorganizing limine options. Remove empty GTK4 theme block, keeping only the dark‑theme flag in extra config. Extend home stylix: enable librewolf with extra options and add a GTK target with colors, fonts, and flatpak support. --- flake.lock | 90 ++++++++++++++++++++--------------------- modules/core/greetd.nix | 8 ++-- modules/core/stylix.nix | 19 ++++++--- modules/home/gtk.nix | 7 +--- modules/home/stylix.nix | 15 ++++++- 5 files changed, 76 insertions(+), 63 deletions(-) diff --git a/flake.lock b/flake.lock index 0dee6eb..85e32ae 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1779522232, - "narHash": "sha256-43PUS3kPWEWVArFV9h1m4mrWIdHeeVXv7kdteYhobOs=", + "lastModified": 1780195983, + "narHash": "sha256-9R7KKAB1BNX/Tg83K6uEyJ1y3Rd/msw1/h62uinDL0M=", "owner": "mrshmllow", "repo": "affinity-nix", - "rev": "328f8f66e375c64255dc3cb3453271aab4d4c273", + "rev": "84994addd36ea35740d2cf2f9de58ed73319aad4", "type": "github" }, "original": { @@ -138,11 +138,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1779270500, - "narHash": "sha256-r60KTphdevmdIDz1iJ529HvcpOq082ZZ1OnN3jDnrqk=", + "lastModified": 1779876442, + "narHash": "sha256-O25HomVNmdROO13PEQ3Ran8Hq5EsyLmVn8Gb8JvJtJE=", "owner": "nix-community", "repo": "fenix", - "rev": "848395a91def85c11694587636151d89555f1ddb", + "rev": "2eff81fc84390a35e1565395ae945d9394856824", "type": "github" }, "original": { @@ -181,11 +181,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1779681769, - "narHash": "sha256-GJEtd8O8wDePHsTESQ+bk2Z8vnbPdJSyXcWrEd3eQss=", + "lastModified": 1780545772, + "narHash": "sha256-U+9vHXr8IitVuQ78yhZclUGgmwLnaBIRAPQlw44y8bU=", "owner": "rycee", "repo": "nur-expressions", - "rev": "55e2ec35f212e5740b0e6593fd6a3d859dc923ac", + "rev": "89c5264d8ee0d69abc87723ae238563e5c3355c0", "type": "gitlab" }, "original": { @@ -198,11 +198,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1776136500, - "narHash": "sha256-r0gN2brVWA351zwMV0Flmlcd6SGMvYqFbvC3DfKFM8Y=", + "lastModified": 1779670703, + "narHash": "sha256-UdfMivNMwCCqQsYDg5pSz8X2IOaOrIZLIIy+Bg3CO2o=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0f8ba203d475587f477e7ae12661bd8459e225b7", + "rev": "942159e73e40bf785816f7f1f5feed9ef3d7c8f9", "type": "github" }, "original": { @@ -265,11 +265,11 @@ ] }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -383,11 +383,11 @@ ] }, "locked": { - "lastModified": 1779726696, - "narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=", + "lastModified": 1780515920, + "narHash": "sha256-8KX2hEeOX6KP3hBBJJI8dGWVrzbOOf1rBPmg/GUG24U=", "owner": "nix-community", "repo": "home-manager", - "rev": "1a95e2efb477959b70b4a14c51035975c0481df6", + "rev": "4c5c1e8ba14f1c7475fa31ff11bc1c19cd220974", "type": "github" }, "original": { @@ -456,11 +456,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "lastModified": 1780243769, + "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c", "type": "github" }, "original": { @@ -509,11 +509,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1779591140, - "narHash": "sha256-G54zkslNueiiYDtg8QbAkPTv0/vfLzdjDsaUljlRQAE=", + "lastModified": 1780371321, + "narHash": "sha256-WCaU6npdMdjZSZHe3XATNDFijmzRnsV8V+iR80e5deg=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "052f533186e6ad8e60541760cfe3123f14108c1e", + "rev": "3aab45a2f34fd47666b05892b95054952e788de1", "type": "github" }, "original": { @@ -532,11 +532,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1779588472, - "narHash": "sha256-CVonDVo41DqdqS/kNeXFatwEuTltyXcppm9zkVOnrsM=", + "lastModified": 1780194487, + "narHash": "sha256-M+YtjKCTkHrkplNaKVyaxfa8hAWjRF6wFOUBAZvxQ4U=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "70fea8a39a908e395de63024a4dfdb829bff1ffe", + "rev": "07398e12b54f194e3a2d47c87e3fd10b8eeaa27d", "type": "github" }, "original": { @@ -556,11 +556,11 @@ ] }, "locked": { - "lastModified": 1777598946, - "narHash": "sha256-X239dAGaU1+gfDj8jKH8GzlqKMcxaVfXOio+uzBOkeE=", + "lastModified": 1780281641, + "narHash": "sha256-M/+hUKoKbHXpV0xGVfELbN1Ds1aoe3pL5p5/t46YhVo=", "owner": "nix-community", "repo": "NUR", - "rev": "5d55af01c0f86be583931fe99207fc56c14134b3", + "rev": "30f9ae2f04174de63ba8bcf3580ca90843b28a01", "type": "github" }, "original": { @@ -639,11 +639,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1779221047, - "narHash": "sha256-HkOWI9C4kxA6xkS9GXhe4hAAme7ekOWje3b1U7rLSIo=", + "lastModified": 1779827300, + "narHash": "sha256-J6pHxKoZzWCrAvOVInwBcYYWix/NWwM10Ad+i29Qc5s=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "f4bd646a7867c7814770168e0d4b9bd3418c1066", + "rev": "c3af07ad84d68adc5e652e86f0c20009caa29014", "type": "github" }, "original": { @@ -690,11 +690,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1779378391, - "narHash": "sha256-IsDb9erotvx9npI94UDosvMeYQK17p7/vmU2v9batrY=", + "lastModified": 1780498403, + "narHash": "sha256-ptk4OrUyr3ubnjZcuqM1qL97L3q7wgnL24oudQEYUno=", "owner": "danth", "repo": "stylix", - "rev": "c1456cc4ba3c9485e7b4158c909eeca5a752cd59", + "rev": "525965744b770af79c985ae5c43c65e441dc8b29", "type": "github" }, "original": { @@ -752,11 +752,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1777041405, - "narHash": "sha256-BAGZ7ObFV/9Z61OJZun7ifPyhkuHqNuW1QIhQ8LuzCo=", + "lastModified": 1777806186, + "narHash": "sha256-PDF0/wObw4nIsSBeXVYLsloXOiphXCgIdsrNcVXguKs=", "owner": "tinted-theming", "repo": "schemes", - "rev": "5f868b3a338b6904c47f3833b9c411be641983a8", + "rev": "0c94645546f4f3ddac77a1a5fce54eb95bf50795", "type": "github" }, "original": { @@ -768,11 +768,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1777169200, - "narHash": "sha256-h7dDbIzP5hDr9v97w9PL6jdAgXawmj6krcH+959rqpU=", + "lastModified": 1778379944, + "narHash": "sha256-wPDFzMGSlARlw0Sfsn48Q2+jPSfk6N0Ng6BC/d+7Q24=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "f798c2dce44ef815bb6b8f05a82135c7942d35ac", + "rev": "fe0203a198690e71a5ff11e08812a4673de3678d", "type": "github" }, "original": { @@ -784,11 +784,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1777463218, - "narHash": "sha256-Bhkozqtq3BKLqWTlmKm8uAptfX4aRGI8QX3eEL54Vpc=", + "lastModified": 1778378178, + "narHash": "sha256-OXPXRIQgGwV77HjYRryOHguh4ALX96jkg+tseLkGgHA=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "5768d08ed2e7944a26a958868cdb073cb8856dae", + "rev": "9cd816033ff969415b190722cddf134e78a5665f", "type": "github" }, "original": { diff --git a/modules/core/greetd.nix b/modules/core/greetd.nix index d44b7ba..4be00a5 100644 --- a/modules/core/greetd.nix +++ b/modules/core/greetd.nix @@ -6,11 +6,9 @@ services.greetd = { enable = true; #vt = 3; - settings = { - default_session = { - user = username; - command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager - }; + settings.default_session = { + user = username; + command = "${pkgs.tuigreet}/bin/tuigreet --time --cmd Hyprland"; # start Hyprland with a TUI login manager }; }; } diff --git a/modules/core/stylix.nix b/modules/core/stylix.nix index 3c91afb..83a182d 100644 --- a/modules/core/stylix.nix +++ b/modules/core/stylix.nix @@ -34,13 +34,20 @@ popups = 12; }; }; - targets.limine = { - enable = true; - colors.enable = true; - image.enable = true; - imageScalingMode = { + targets = { + limine = { enable = true; - override = "tile"; + colors.enable = true; + image.enable = true; + imageScalingMode = { + enable = true; + override = "tile"; + }; + }; + kmscon = { + enable = false; + colors.enable = true; + fonts.enable = true; }; }; }; diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix index 471631a..badf8e6 100644 --- a/modules/home/gtk.nix +++ b/modules/home/gtk.nix @@ -5,11 +5,6 @@ package = pkgs.papirus-icon-theme; }; gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; - gtk4 = { - theme = null; - extraConfig = { - gtk-application-prefer-dark-theme = 1; - }; - }; + gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; }; } diff --git a/modules/home/stylix.nix b/modules/home/stylix.nix index c87f016..48cbba6 100644 --- a/modules/home/stylix.nix +++ b/modules/home/stylix.nix @@ -4,7 +4,13 @@ ... }: { stylix.targets = { - librewolf.profileNames = ["${host}"]; + librewolf = { + profileNames = ["${host}"]; + enable = true; + firefoxGnomeTheme.enable = true; + fonts.enable = true; + inputs.enable = true; + }; hyprland = { enable = true; @@ -25,6 +31,13 @@ noctalia-shell.enable = true; + gtk = { + enable = true; + colors.enable = true; + flatpakSupport.enable = true; + fonts.enable = true; + }; + qt = { enable = true; platform = "qtct";