diff --git a/flake.lock b/flake.lock index b77cd8d..439db49 100644 --- a/flake.lock +++ b/flake.lock @@ -38,12 +38,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -56,19 +59,20 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ] + ], + "utils": "utils" }, "locked": { - "lastModified": 1667907331, - "narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=", + "lastModified": 1681092193, + "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=", "owner": "rycee", "repo": "home-manager", - "rev": "6639e3a837fc5deb6f99554072789724997bc8e5", + "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af", "type": "github" }, "original": { "owner": "rycee", - "ref": "release-22.05", + "ref": "release-22.11", "repo": "home-manager", "type": "github" } @@ -82,11 +86,11 @@ ] }, "locked": { - "lastModified": 1681581389, - "narHash": "sha256-+ygySqlQy0ejwE1aOF6i6Tiu63V0jxXik0aLlvmqioo=", + "lastModified": 1682982995, + "narHash": "sha256-PK0pSY48JkcLDFphafjpLqeTDs0XUqGMHjsiNuEq5s0=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "f3b6f6b04728416c64fc5ef52199fd9b9843c47d", + "rev": "c5d7db84c422be515dac8fc26420900c349374e8", "type": "github" }, "original": { @@ -97,11 +101,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1682669017, - "narHash": "sha256-Vi+p4y3wnl0/4gcwTdmCO398kKlDaUrNROtf3GOD2NY=", + "lastModified": 1683546353, + "narHash": "sha256-zEfx6q4fXK5wq+RCsyM0FyWBKNNhHTKMpCWkEpKDe2g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7449971a3ecf857b4a554cf79b1d9dcc1a4647d8", + "rev": "7629f9b0680d87c7775f3261bee746da5dac76d1", "type": "github" }, "original": { @@ -112,11 +116,11 @@ }, "nur": { "locked": { - "lastModified": 1682751794, - "narHash": "sha256-+lo+jlBp5Np2UId6CfAQZdG/yLJLZhtoluMj1NkBlDU=", + "lastModified": 1683665356, + "narHash": "sha256-upfCio5HLMNmxRl+KWYVGzB5mnz8V0186Rl5c6yiNqY=", "owner": "nix-community", "repo": "NUR", - "rev": "b3b850a6da43a794e7fab9566b529ca43e22458a", + "rev": "da61696348d0b55240f637cc8ce35f9f9bdf2f0b", "type": "github" }, "original": { @@ -133,7 +137,7 @@ "nixpkgs": "nixpkgs", "nur": "nur", "unstable": "unstable", - "utils": "utils" + "utils": "utils_2" } }, "systems": { @@ -151,13 +155,28 @@ "type": "github" } }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "unstable": { "locked": { - "lastModified": 1682692304, - "narHash": "sha256-9/lyXN2BpHw+1xE+D2ySBSLMCHWqiWu5tPHBMRDib8M=", + "lastModified": 1683408522, + "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "937a9d1ee7b1351d8c55fff6611a8edf6e7c1c37", + "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", "type": "github" }, "original": { @@ -167,8 +186,23 @@ } }, "utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, diff --git a/flake.nix b/flake.nix index b194831..8f07841 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ }; home-manager = { - url = "github:rycee/home-manager/release-22.05"; + url = "github:rycee/home-manager/release-22.11"; inputs = { nixpkgs.follows = "nixpkgs"; }; diff --git a/machines/kitchen/configuration.nix b/machines/kitchen/configuration.nix index 06f83d7..3d695fa 100644 --- a/machines/kitchen/configuration.nix +++ b/machines/kitchen/configuration.nix @@ -30,9 +30,9 @@ ]; home-manager = { - users.michael = import ../../user/environments/nixos/home.nix pkgs; - useGlobalPkgs = true; - }; + users.michael = import ../../user/environments/nixos/home.nix pkgs; + useGlobalPkgs = true; + }; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/modules/gnome.nix b/modules/gnome.nix index 04ef6e2..ce95f7c 100644 --- a/modules/gnome.nix +++ b/modules/gnome.nix @@ -5,4 +5,5 @@ services.xserver.desktopManager.gnome.enable = true; services.gnome.gnome-browser-connector.enable = true; programs.dconf.enable = true; + security.polkit.enable = true; } \ No newline at end of file diff --git a/overlays/default/paperwm.nix b/overlays/default/paperwm.nix index f380f1f..77747eb 100644 --- a/overlays/default/paperwm.nix +++ b/overlays/default/paperwm.nix @@ -1,13 +1,13 @@ self: super: { gnomeExtensions = super.gnomeExtensions // { paperwm = super.gnomeExtensions.paperwm.overrideDerivation (old: { - version = "42.0"; + version = "43.0"; src = super.fetchFromGitHub { - owner = "ccope"; + owner = "paperwm"; repo = "PaperWM"; - rev = "1e9004dc2cd1416cde86585056053853a8b86817"; + rev = "64960df6cde10bcf47c33ce56a2d35e99d8d02bf"; sha256 = "sha256-ejyWIa4HX1lEIHc9qax8jgrgi992W6rkTK60FGzKI/E="; }; }); }; -} \ No newline at end of file +} diff --git a/user/modules/gnome.nix b/user/modules/gnome.nix index aed7f8f..eb0f844 100644 --- a/user/modules/gnome.nix +++ b/user/modules/gnome.nix @@ -2,10 +2,11 @@ { home.packages = with pkgs; [ gnomeExtensions.caffeine - gnomeExtensions.paperwm + unstable.gnomeExtensions.paperwm gnomeExtensions.cleaner-overview unstable.gnomeExtensions.vertical-overview gnomeExtensions.disable-workspace-switch-animation-for-gnome-40 + gnomeExtensions.blur-my-shell ]; gtk = {