fixed ssh ownership issue & removed hypr swapescape

flake.lock

@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717032306,
-        "narHash": "sha256-s3Sis+M1qTSVIehHrEKBzHBpqprIFJli5V6WojkJnYE=",
+        "lastModified": 1717177033,
+        "narHash": "sha256-G3CZJafCO8WDy3dyA2EhpUJEmzd5gMJ2IdItAg0Hijw=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "8ea5bcccc03111bdedaeaae9380dfab61e9deb33",
+        "rev": "0274af4c92531ebfba4a5bd493251a143bc51f3c",
         "type": "github"
       },
       "original": {
@@ -182,11 +182,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717052710,
-        "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=",
+        "lastModified": 1717097707,
+        "narHash": "sha256-HC5vJ3oYsjwsCaSbkIPv80e4ebJpNvFKQTBOGlHvjLs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae",
+        "rev": "0eb314b4f0ba337e88123e0b1e57ef58346aafd9",
         "type": "github"
       },
       "original": {
@@ -255,11 +255,11 @@
     "nix-secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1717081517,
-        "narHash": "sha256-Pvennf20SmdaJ7mZK4I3jjQX8jQy9Hd/KeE64e2uqHU=",
+        "lastModified": 1717190678,
+        "narHash": "sha256-Dz7bJS76gW/yhTBx6n96d/ZN03gsTNY+GCwZXaMlKTg=",
         "ref": "refs/heads/master",
-        "rev": "c9a84172f898001d8e1732e7b6872be9d9352cef",
-        "revCount": 80,
+        "rev": "6e50c8300596629cee6aa72cbb3ab606e68660e8",
+        "revCount": 83,
         "type": "git",
         "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
       },
@@ -270,11 +270,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1716977081,
-        "narHash": "sha256-pFe5jLeIPlKEln5n2h998d7cpzXFdbrBMRe3suz4K1o=",
+        "lastModified": 1717112898,
+        "narHash": "sha256-7R2ZvOnvd9h8fDd65p0JnB7wXfUvreox3xFdYWd1BnY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ac82a513e55582291805d6f09d35b6d8b60637a1",
+        "rev": "6132b0f6e344ce2fe34fc051b72fb46e34f668e0",
         "type": "github"
       },
       "original": {
@@ -329,11 +329,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1717081007,
-        "narHash": "sha256-GNr1i6itjFKGXSco3lcdKe8GxEwrmSYFDUpZyXsXWp4=",
+        "lastModified": 1717188043,
+        "narHash": "sha256-qg8Tq7OcKtc0BS4RVUYrMZ+KofgMv6DiXOnqz7TN8CA=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "da9bd1f2e8fc8cd8553a76a9e22afd386c18f205",
+        "rev": "1bbd58b6b293840716355e63fb3d5aa5af00d389",
         "type": "github"
       },
       "original": {

home/common/optional/desktop/hyprland/default.nix

@@ -36,7 +36,6 @@
           kb_layout = gb
           kb_variant =
           kb_model =
-          kb_options = caps:swapescape
           kb_rules =
 
           follow_mouse = 1

hosts/common/users/media/default.nix

@@ -61,6 +61,18 @@ in
     };
   };
 
+  # The containing ssh folders are created as root and if this is the first ~/.ssh/ entry when writing keys,
+  # the ownership is busted and home-manager can't target because it can't write into .ssh...
+  # FIXME: We might not need this depending on how https://github.com/Mic92/sops-nix/issues/381 is fixed
+  system.activationScripts.sopsSetSshOwnwership = let
+    sshFolder = "/home/${username}/.ssh";
+    user = config.users.users.${username}.name;
+    group = config.users.users.${username}.group;
+  in ''
+    mkdir -p ${sshFolder} || true
+    chown -R ${user}:${group} /home/${username}/.ssh
+  '';
+
   services.flatpak.enable = true;
 
   programs.zsh.enable = true;

hosts/common/users/sam/default.nix

@@ -37,6 +37,18 @@ in
     };
   };
 
+  # The containing ssh folders are created as root and if this is the first ~/.ssh/ entry when writing keys,
+  # the ownership is busted and home-manager can't target because it can't write into .ssh...
+  # FIXME: We might not need this depending on how https://github.com/Mic92/sops-nix/issues/381 is fixed
+  system.activationScripts.sopsSetSshOwnwership = let
+    sshFolder = "/home/${username}/.ssh";
+    user = config.users.users.${username}.name;
+    group = config.users.users.${username}.group;
+  in ''
+    mkdir -p ${sshFolder} || true
+    chown -R ${user}:${group} /home/${username}/.ssh
+  '';
+
   programs.zsh.enable = true;
 
   home-manager = {