diff --git a/flake.lock b/flake.lock index 6506ce3..36affc7 100644 --- a/flake.lock +++ b/flake.lock @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -194,11 +194,11 @@ ] }, "locked": { - "lastModified": 1685189510, - "narHash": "sha256-Hq5WF7zIixojPgvhgcd6MBvywwycVZ9wpK/8ogOyoaA=", + "lastModified": 1685721552, + "narHash": "sha256-ifvq/zlO7lck8q+YkC5uom/h8/MVdMcQEldOL3cDQW0=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d963854ae2499193c0c72fd67435fee34d3e4fd", + "rev": "29519461834c08395b35f840811faf8c23e3b61c", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1685346756, - "narHash": "sha256-pZNHeNkBBgi5o2DOT1T8MPHnrpJN+eEfYeqdg2ASjZA=", + "lastModified": 1685790092, + "narHash": "sha256-pnLdV2Q91HjHBupuPtHGqknFDodXqp4hTwZ+NRPJ02g=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "b3a86952cf14b6f556159eb898eaa7b6ceac4335", + "rev": "c5a7202cd9a49a0ee28e6af07a30d3702d170211", "type": "github" }, "original": { @@ -238,11 +238,11 @@ ] }, "locked": { - "lastModified": 1681065697, - "narHash": "sha256-QPzwwlGKX95tl6ZEshboZbEwwAXww6lNLdVYd6T9Mrc=", + "lastModified": 1684265364, + "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4d29e48433270a2af06b8bc711ca1fe5109746cd", + "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530", "type": "github" }, "original": { @@ -283,11 +283,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1685290091, - "narHash": "sha256-GGQYNZ7POoqPTtXgPOLUuSiHkOKFRWYpCoWUOSeSRoU=", + "lastModified": 1685655444, + "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4e37b4e55b60fb7d43d2b62deb51032a489bcbe8", + "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1684842236, - "narHash": "sha256-rYWsIXHvNhVQ15RQlBUv67W3YnM+Pd+DuXGMvCBq2IE=", + "lastModified": 1685361114, + "narHash": "sha256-4RjrlSb+OO+e1nzTExKW58o3WRwVGpXwj97iCta8aj4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "61e567d6497bc9556f391faebe5e410e6623217f", + "rev": "ca2fdbf3edda2a38140184da6381d49f8206eaf4", "type": "github" }, "original": { @@ -389,11 +389,11 @@ }, "templates": { "locked": { - "lastModified": 1685084572, - "narHash": "sha256-iG1ziyju0JfP2GNQ5hz0+lJq4wZOvl22k82IeLKyOQM=", + "lastModified": 1685790891, + "narHash": "sha256-ch0Q6JVV0Dfsd7FMGVrxR+r657pnI535jEuHfO6S1Go=", "ref": "refs/heads/main", - "rev": "8b8ae5a73f22d1875b07b9413367049b51e55307", - "revCount": 5, + "rev": "6702d07d398f1fd676a15b8f727845fb8fe45cfb", + "revCount": 6, "type": "git", "url": "https://git.lel.lol/patrick/nix-templates.git" }, @@ -406,11 +406,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1682436395, - "narHash": "sha256-GGEjkQO9m7YLYIXIXM76HWdhjg4Ye+oafOtyaFAYKI4=", + "lastModified": 1685745220, + "narHash": "sha256-6UY4E0naSxRQv4fcFImV4KcmVm1H+w7oTEKzK489hG4=", "owner": "wlroots", "repo": "wlroots", - "rev": "6830bfc17fd94709e2cdd4da0af989f102a26e59", + "rev": "52b93f7eb41bd96870c935013fe6d1e36facba5c", "type": "gitlab" }, "original": { @@ -432,11 +432,11 @@ ] }, "locked": { - "lastModified": 1682439384, - "narHash": "sha256-zHDa8LCZs05TZHQSIZ3ucwyMPglBGHcqTBzfkLjYXTM=", + "lastModified": 1685385764, + "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "c0e233955568fbea4e859336f6d3d14d51294d7c", + "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1", "type": "github" }, "original": { diff --git a/users/common/graphical.nix b/users/common/graphical.nix index bd3081e..445a8d1 100644 --- a/users/common/graphical.nix +++ b/users/common/graphical.nix @@ -8,7 +8,6 @@ home = { packages = with pkgs; [ thunderbird - bitwarden signal-desktop chromium xdragon diff --git a/users/common/graphical/hyprland/default.nix b/users/common/graphical/hyprland/default.nix index eb3c472..17983bc 100644 --- a/users/common/graphical/hyprland/default.nix +++ b/users/common/graphical/hyprland/default.nix @@ -12,7 +12,7 @@ in { name = x; value = []; }) - ["42" "43" "44"]); + TAGS); home.packages = with pkgs; [ qt6.qtwayland diff --git a/users/common/graphical/hyprland/hyprland.conf.nix b/users/common/graphical/hyprland/hyprland.conf.nix index 03aa428..6895dc5 100644 --- a/users/common/graphical/hyprland/hyprland.conf.nix +++ b/users/common/graphical/hyprland/hyprland.conf.nix @@ -75,7 +75,7 @@ MOD: TAGS: pkgs: bind=${MOD} + SHIFT,l,exec,systemctl suspend -i bind=${MOD} + SHIFT,Escape,exit #fix xwayland hidpi - exec-once = xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE 2 + exec-once = ${pkgs.xorg.xprop}/bin/xprop -root -f _XWAYLAND_GLOBAL_OUTPUT_SCALE 32c -set _XWAYLAND_GLOBAL_OUTPUT_SCALE 2 env = GDK_SCALE,2 env = XCURSOR_SIZE,48 diff --git a/users/common/impermanence.nix b/users/common/impermanence.nix index 9b886a6..2d83ac2 100644 --- a/users/common/impermanence.nix +++ b/users/common/impermanence.nix @@ -1,4 +1,5 @@ { + pkgs, config, lib, nixosConfig, @@ -27,12 +28,17 @@ ".local/state/nvim" ".cache/nvim" ] + ++ optionals (builtins.elem pkgs.heroic config.home.packages) [ + ".config/heroic" + "Games/Heroic" + ] # root should never use interactive programs ++ optionals nixosConfig.users.users.${config.home.username}.isNormalUser ( optionals nixosConfig.services.pipewire.enable [ # persist sound config ".local/state/wireplumber" ] + # Folders for steam ++ optionals nixosConfig.programs.steam.enable [ ".local/share/Steam" diff --git a/users/patrick/patrick.nix b/users/patrick/patrick.nix index b837ae1..d0358ab 100644 --- a/users/patrick/patrick.nix +++ b/users/patrick/patrick.nix @@ -1,7 +1,8 @@ {pkgs, ...}: { home = { - packages = [ - pkgs.nextcloud-client + packages = with pkgs; [ + nextcloud-client + heroic ]; }; }