From 5684e1b560ad058715597b82244dc833718427a8 Mon Sep 17 00:00:00 2001 From: Emmet Date: Thu, 28 Aug 2025 21:56:23 -0500 Subject: [PATCH] Updated system --- flake.lock | 82 ++++++++++++++--------------- modules/system/hyprland/default.nix | 5 +- modules/system/stylix/default.nix | 2 +- modules/user/hyprland/default.nix | 5 +- modules/user/stylix/default.nix | 8 +-- 5 files changed, 49 insertions(+), 53 deletions(-) diff --git a/flake.lock b/flake.lock index b242238..3e5c27b 100644 --- a/flake.lock +++ b/flake.lock @@ -103,11 +103,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1754667345, - "narHash": "sha256-mLorEFy4J7IQN1ggE19FeUS1IyyqCpHM9tXmp9iB0oU=", + "lastModified": 1756051903, + "narHash": "sha256-98Bn6BTV0SC0sCe6IpwRw8gsPR5T7Z8TW/gU74FbHwU=", "owner": "StevenBlack", "repo": "hosts", - "rev": "5398a10d1d31d408b10a3efa82fc8ccf26d4a4de", + "rev": "64ee012b7ec917fcf654e45d3442a9bf53901410", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1754712381, - "narHash": "sha256-LbTalQDguSZ5xpfFihCEHMjm7xYF+QLQlHFfFTHpkj8=", + "lastModified": 1756419218, + "narHash": "sha256-bD10TLSG2KljGpW/HpVPa6wIMjjwQ69IjeaRWP1QE0k=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "9c8c4ed6fab07590095105cb5bea98587955b3c4", + "rev": "cf5f934ea48b4a3048febc0132ffc628a0fde759", "type": "github" }, "original": { @@ -146,11 +146,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1754756645, - "narHash": "sha256-wqkcGq0JPuZms03cEKzFPGVb4eRqFZiafXPY6sBZRRE=", + "lastModified": 1756400986, + "narHash": "sha256-tWJrNoOk6buV4dktEOVevKZymgp/NZDNYusUyuH/WhA=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "538d8c3c8f58aaf0b843496f54ee569113466ad3", + "rev": "452a76945fd25463c5855a8eb419f0580104cef1", "type": "github" }, "original": { @@ -289,11 +289,11 @@ ] }, "locked": { - "lastModified": 1754613544, - "narHash": "sha256-ueR1mGX4I4DWfDRRxxMphbKDNisDeMPMusN72VV1+cc=", + "lastModified": 1756261190, + "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", "owner": "nix-community", "repo": "home-manager", - "rev": "cc2fa2331aebf9661d22bb507d362b39852ac73f", + "rev": "77f348da3176dc68b20a73dab94852a417daf361", "type": "github" }, "original": { @@ -309,11 +309,11 @@ ] }, "locked": { - "lastModified": 1754756528, - "narHash": "sha256-W1jYKMetZSOHP5m2Z5Wokdj/ct17swPHs+MiY2WT1HQ=", + "lastModified": 1756261190, + "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ec1cd9a0703fbd55d865b7fd2b07d08374f0355", + "rev": "77f348da3176dc68b20a73dab94852a417daf361", "type": "github" }, "original": { @@ -605,11 +605,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1754413248, - "narHash": "sha256-d2C75Ij8JCuNwy6Vgq32Fe1iSrEOOnBnOX4JZJvtAFA=", + "lastModified": 1756305651, + "narHash": "sha256-KttBtdPHDCuD+BT0da8DmBarv6k+9GA9INpeDLLgpc8=", "ref": "refs/heads/main", - "rev": "347e05a40ec3bc48b3f21f44dea551d07773e214", - "revCount": 386, + "rev": "8d0e56998e299ae42f3fd8ede5bb5c396193cdbc", + "revCount": 388, "type": "git", "url": "https://code.hyprland.org/hyprwm/hyprlock.git" }, @@ -727,11 +727,11 @@ ] }, "locked": { - "lastModified": 1754639028, - "narHash": "sha256-w1+XzPBAZPbeGLMAgAlOjIquswo6Q42PMep9KSrRzOA=", + "lastModified": 1756201372, + "narHash": "sha256-bK5j5cwJgO5AZXlDl5AgISzpOv9YV1Fcv2nDr9RW/5o=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "d49809278138d17be77ab0ef5506b26dc477fa62", + "rev": "9f6745bd704ab7f2617d41c2b02f4fd5f9ed0e89", "type": "github" }, "original": { @@ -765,11 +765,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -812,11 +812,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1754498491, - "narHash": "sha256-erbiH2agUTD0Z30xcVSFcDHzkRvkRXOQ3lb887bcVrs=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2ae88e026f9525daf89587f3cbee584b92b6134", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -952,11 +952,11 @@ ] }, "locked": { - "lastModified": 1754621349, - "narHash": "sha256-JkXUS/nBHyUqVTuL4EDCvUWauTHV78EYfk+WqiTAMQ4=", + "lastModified": 1756262090, + "narHash": "sha256-PQHSup4d0cVXxJ7mlHrrxBx1WVrmudKiNQgnNl5xRas=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c448ab42002ac39d3337da10420c414fccfb1088", + "rev": "df7ea78aded79f195a92fc5423de96af2b8a85d1", "type": "github" }, "original": { @@ -970,11 +970,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1754707163, - "narHash": "sha256-wgVgOsyJUDn2ZRpzu2gELKALoJXlBSoZJSln+Tlg5Pw=", + "lastModified": 1756348497, + "narHash": "sha256-xJp3VnoYh4kpsaKFO/7SsGbwOz7pI1ZmjbqpXEuR2cw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ac39ab4c8ed7cefe48d5ae5750f864422df58f01", + "rev": "0adf92c70d23fb4f703aea5d3ebb51ac65994f7f", "type": "github" }, "original": { @@ -990,11 +990,11 @@ ] }, "locked": { - "lastModified": 1755740692, - "narHash": "sha256-aEEDVUreWCXtgA7rtAM1llzjoRJS+jOnWKD8jP1KdiY=", + "lastModified": 1756429289, + "narHash": "sha256-yOAerEZpBOhZAk9ygSDMAXTanNaBXJLA+TlF9iUtHM4=", "ref": "refs/heads/main", - "rev": "e3d9e1103df26dfd143f75913d33de55f5d59ae1", - "revCount": 34, + "rev": "fbe2e9cfaf3e2e590a60eb785127f732492f05d2", + "revCount": 35, "type": "git", "url": "file://path:/etc/nixos.secrets" }, @@ -1022,11 +1022,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1754597531, - "narHash": "sha256-OpC9/PBIuL2WEJUkcuD/wVxI8r+3o6f5RylSIefjHo4=", + "lastModified": 1755997543, + "narHash": "sha256-/fejmCQ7AWa655YxyPxRDbhdU7c5+wYsFSjmEMXoBCM=", "owner": "danth", "repo": "stylix", - "rev": "63bb34a66ad7d1af2e95ee20dd675896b2074c32", + "rev": "f47c0edcf71e802378b1b7725fa57bb44fe85ee8", "type": "github" }, "original": { diff --git a/modules/system/hyprland/default.nix b/modules/system/hyprland/default.nix index 6cd33c6..86b7def 100644 --- a/modules/system/hyprland/default.nix +++ b/modules/system/hyprland/default.nix @@ -12,10 +12,7 @@ in config = lib.mkIf cfg.enable { # Power key should not shut off computer by defaultPower key shuts of - services.logind.extraConfig = '' - # Suspend when power button is pressed - HandlePowerKey=suspend - ''; + services.logind.powerKey = "suspend"; # Hyprland programs = { diff --git a/modules/system/stylix/default.nix b/modules/system/stylix/default.nix index 1886344..560ec61 100644 --- a/modules/system/stylix/default.nix +++ b/modules/system/stylix/default.nix @@ -50,7 +50,7 @@ in stylix.targets.console.enable = true; environment.sessionVariables = { - QT_QPA_PLATFORMTHEME = "qt5ct"; + #QT_QPA_PLATFORMTHEME = "qt5ct"; }; }; } diff --git a/modules/user/hyprland/default.nix b/modules/user/hyprland/default.nix index 29d7e53..5cc8eaf 100644 --- a/modules/user/hyprland/default.nix +++ b/modules/user/hyprland/default.nix @@ -40,7 +40,7 @@ in XDG_SESSION_TYPE = "wayland"; GDK_BACKEND = "wayland,x11,*"; QT_QPA_PLATFORM = "wayland;xcb"; - QT_QPA_PLATFORMTHEME = lib.mkForce "qt5ct"; + #QT_QPA_PLATFORMTHEME = lib.mkForce "qt5ct"; QT_AUTO_SCREEN_SCALE_FACTOR = "1.25"; QT_WAYLAND_DISABLE_WINDOWDECORATION = 1; CLUTTER_BACKEND = "wayland"; @@ -513,8 +513,7 @@ in wev grim slurp - libsForQt5.qt5.qtwayland - qt6.qtwayland + kdePackages.qtwayland xdg-utils wlsunset hyprshade diff --git a/modules/user/stylix/default.nix b/modules/user/stylix/default.nix index 22ab5e3..ac1db73 100644 --- a/modules/user/stylix/default.nix +++ b/modules/user/stylix/default.nix @@ -109,13 +109,13 @@ in ".config/qt5ct/qt5ct.conf".text = pkgs.lib.mkBefore (builtins.readFile ./qt5ct.conf); }; home.packages = with pkgs; [ - libsForQt5.qt5ct pkgs.libsForQt5.breeze-qt5 libsForQt5.breeze-icons pkgs.noto-fonts-monochrome-emoji + kdePackages.breeze kdePackages.breeze-icons pkgs.noto-fonts-monochrome-emoji ]; qt = { - enable = true; - style.package = pkgs.libsForQt5.breeze-qt5; + #enable = true; + style.package = pkgs.kdePackages.breeze; style.name = "breeze-dark"; - platformTheme = "kde"; + platformTheme.name = "kde"; }; fonts.fontconfig.defaultFonts = {