diff --git a/flake.lock b/flake.lock index 40b013a..9872da2 100644 --- a/flake.lock +++ b/flake.lock @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1695864092, - "narHash": "sha256-Hu1SkFPqO7ND95AOzBkZE2jGXSYhfZ965C03O72Kbu8=", + "lastModified": 1696266752, + "narHash": "sha256-wJnMDFM21+xXdsXSs6pXMElbv4YfqmQslcPApRuaYKs=", "owner": "nix-community", "repo": "disko", - "rev": "19b62324663b6b9859caf7f335d232cf4f1f6a32", + "rev": "646ee25c25fffee122a66282861f5f56ad3e0fd9", "type": "github" }, "original": { @@ -296,11 +296,11 @@ ] }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1696203690, + "narHash": "sha256-774XMEL7VHSTLDYVkqrbl5GCdmkVKsjMs+KLM4N4t7k=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "21928e6758af0a258002647d14363d5ffc85545b", "type": "github" }, "original": { @@ -471,11 +471,11 @@ ] }, "locked": { - "lastModified": 1696063111, - "narHash": "sha256-F2IJEbyH3xG0eqyAYn9JoV+niqNz+xb4HICYNkkviNI=", + "lastModified": 1696409884, + "narHash": "sha256-hz3i4wFJHoTIAEI19oF1fiPn6TpV+VuTSOrSHUoJMgs=", "owner": "nix-community", "repo": "home-manager", - "rev": "ae896c810f501bf0c3a2fd7fc2de094dd0addf01", + "rev": "8aef005d44ee726911e9f793495bb40f2fbf5a05", "type": "github" }, "original": { @@ -553,11 +553,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1695557304, - "narHash": "sha256-HYoJE+KE6/zGHgRI496n9E1abDFaqsl9EnEfGIEEqLo=", + "lastModified": 1696162106, + "narHash": "sha256-72gAqduG8CpBFWchiO4DxZClux5HAti4frrrYGr/5xo=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "cb8bfd550aaaf32a330c1c8870a3d9a5bfa00954", + "rev": "273cc814826475216b2a8aa008697b939e784514", "type": "github" }, "original": { @@ -573,11 +573,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1695258303, - "narHash": "sha256-5Ibd9qjkAk04y8GyweQF+ciIaPzRaet3xZAmTDOWCng=", + "lastModified": 1696208796, + "narHash": "sha256-dGhlQ0TeiJhbtEk40ddbJ9Fz4kDa/JfU22F34iYJwu8=", "owner": "nix-community", "repo": "nix-eval-jobs", - "rev": "39657d146828157ef51c4f2d8bebb96a77075fc6", + "rev": "82cede4edd01989095040b55d0212d61a65fc5fd", "type": "github" }, "original": { @@ -593,11 +593,11 @@ ] }, "locked": { - "lastModified": 1695526222, - "narHash": "sha256-/NwZz3QcVplrfiDKk1thYg1EIHLSNucVHNUi2uwO3RI=", + "lastModified": 1696131323, + "narHash": "sha256-Y47r8Jo+9rs+XUWHcDPZtkQs6wFeZ24L4CQTfVwE+vY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "25d6369c232bbea1ec1f90226fd17982e7a0a647", + "rev": "031d4b22505fdea47bd53bfafad517cd03c26a4f", "type": "github" }, "original": { @@ -644,11 +644,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1695887975, - "narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=", + "lastModified": 1696161939, + "narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "adcfd6aa860d1d129055039696bc457af7d50d0e", + "rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532", "type": "github" }, "original": { @@ -659,11 +659,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "lastModified": 1696193975, + "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", "type": "github" }, "original": { @@ -675,11 +675,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1695516402, - "narHash": "sha256-pL7m8iu1OLs/7ywhh+Q8ltPgmtwbMpi7484yr32zgYI=", + "lastModified": 1696121361, + "narHash": "sha256-sstnEW0Qwqo3MHmy1In/hJHjypfsSDlnhegNKw5eplk=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "01fc4cd75e577ac00e7c50b7e5f16cd9b6d633e8", + "rev": "56992d3dfd3b8cee5c5b5674c1a477446839b6ad", "type": "github" }, "original": { @@ -746,11 +746,11 @@ ] }, "locked": { - "lastModified": 1696040396, - "narHash": "sha256-2EOjJ5bgjCmDso2shw70AiL6wsegbEs8KlMJk2sgHek=", + "lastModified": 1696436453, + "narHash": "sha256-S/lyJ9ZrCSJML6m8jiIrYBaFhjl+Rmm4lqd1fGVYjM0=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "bedaae13271fd5cfd861698e591d6af7104174e4", + "rev": "c2621389c63551781ea31d08d20e5f11dc2ef3fd", "type": "github" }, "original": { @@ -761,11 +761,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1695256509, - "narHash": "sha256-Je+ZId+dYrx0NOZ8J6le7CwZZdVZAAP5dddxK9kZNfA=", + "lastModified": 1696207572, + "narHash": "sha256-w24NTSMrc7bMIQP5Y8BFsKbpYjbRh/+ptf/9gCEFrKo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff7daa56614b083d3a87e2872917b676e9ba62a6", + "rev": "fe0b3b663e98c85db7f08ab3a4ac318c523c0684", "type": "github" }, "original": { @@ -813,11 +813,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1695643200, - "narHash": "sha256-49SPrO9fWeIoSXS5pFFFhcC4kyfQik5B2J+GSuMopjE=", + "lastModified": 1696161600, + "narHash": "sha256-J/Xet8H6vI7iGdL1CdD/gdVRJmD7l7gTxEjpdu6g6HE=", "owner": "symphorien", "repo": "nixseparatedebuginfod", - "rev": "318ada174f6e6510a50abb69b7765a28c8009b1a", + "rev": "466110a37e11a33a3551b44d9da5e323a8924cfa", "type": "github" }, "original": { @@ -898,11 +898,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1695576016, - "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", + "lastModified": 1696158581, + "narHash": "sha256-h0vY4E7Lx95lpYQbG2w4QH4yG5wCYOvPJzK93wVQbT0=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", + "rev": "033453f85064ccac434dfd957f95d8457901ecd6", "type": "github" }, "original": { @@ -1078,11 +1078,11 @@ ] }, "locked": { - "lastModified": 1694528738, - "narHash": "sha256-aWMEjib5oTqEzF9f3WXffC1cwICo6v/4dYKjwNktV8k=", + "lastModified": 1695822946, + "narHash": "sha256-IQU3fYo0H+oGlqX5YrgZU3VRhbt2Oqe6KmslQKUO4II=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "7a49c388d7a6b63bb551b1ddedfa4efab8f400d8", + "rev": "720bd006d855b08e60664e4683ccddb7a9ff614a", "type": "github" }, "original": { diff --git a/modules/config/nix.nix b/modules/config/nix.nix index 0c55837..f584a4c 100644 --- a/modules/config/nix.nix +++ b/modules/config/nix.nix @@ -6,7 +6,7 @@ nix = { settings = { auto-optimise-store = true; - allowed-users = ["@wheel" "nixseparatedebuginfod"]; + allowed-users = ["@wheel"]; trusted-users = ["root"]; system-features = ["recursive-nix" "repl-flake" "big-parallel"]; substituters = [ diff --git a/modules/dev/default.nix b/modules/dev/default.nix index ee3faa5..1e6faa0 100644 --- a/modules/dev/default.nix +++ b/modules/dev/default.nix @@ -12,7 +12,10 @@ lib.optionalAttrs (!minimal) { enable = true; package = pkgs.wireshark; }; - services.nixseparatedebuginfod.enable = true; + services.nixseparatedebuginfod = { + enable = true; + allowUser = true; + }; environment = { enableDebugInfo = true; shellInit = '' diff --git a/users/common/graphical/sway3.nix b/users/common/graphical/sway3.nix index 8daabd1..89d6510 100644 --- a/users/common/graphical/sway3.nix +++ b/users/common/graphical/sway3.nix @@ -40,6 +40,9 @@ let "2:d" = [ {class = "^firefox$";} ]; + "3:u" = [ + {class = "^thunderbird$";} + ]; "4:a" = [ {class = "^bottles$";} {class = "^steam$";} @@ -86,6 +89,12 @@ let "${modifier}+b" = "exec firefox"; "${modifier}+m" = "exec thunderbird"; "${modifier}+q" = "kill"; + "XF86AudioPlay" = "exec ${pkgs.playerctl}/bin/playerctl play-pause"; + "XF86AudioPrev" = "exec ${pkgs.playerctl}/bin/playerctl next"; + "XF86AudioNext" = "exec ${pkgs.playerctl}/bin/playerctl previous"; + "XF86AudioMute" = "exec ${pkgs.pamixer}/bin/pamixer -t"; + "XF86AudioLowerVolume" = "exec ${pkgs.pamixer}/bin/pamixer -d 5"; + "XF86AudioRaiseVolume" = "exec ${pkgs.pamixer}/bin/pamixer -i 5"; "${modifier}+${left}" = "focus left"; "${modifier}+${down}" = "focus down"; diff --git a/users/common/graphical/themes.nix b/users/common/graphical/themes.nix index 5df36e7..f04f47d 100644 --- a/users/common/graphical/themes.nix +++ b/users/common/graphical/themes.nix @@ -17,6 +17,7 @@ }; stylix = { + inherit (nixosConfig.stylix) polarity; targets = { gtk.enable = true; bat.enable = true; @@ -53,14 +54,6 @@ package = pkgs.vimix-icon-theme; }; - theme = lib.mkForce { - # Orchis has no support for qt - #name = "Orchis-purple-solid-black"; - #package = pkgs.orchis-theme; - name = "WhiteSur-Dark-solid"; - package = pkgs.whitesur-gtk-theme; - }; - gtk2.extraConfig = "gtk-application-prefer-dark-theme = true"; gtk3.extraConfig = gtk34extraConfig; gtk4.extraConfig = gtk34extraConfig; diff --git a/users/patrick/default.nix b/users/patrick/default.nix index 7df6a0c..d2f8729 100644 --- a/users/patrick/default.nix +++ b/users/patrick/default.nix @@ -64,7 +64,7 @@ lib.optionalAttrs (!minimal) { ++ { "desktopnix" = [ ../common/graphical/Xorg - ../common/programs/streamdeck.nix + #../common/programs/streamdeck.nix ./smb.nix ]; "patricknix" = [