Home: Disable HM ssh management (wrong config perms)

flake.lock

@@ -6,11 +6,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1731689198,
+        "lastModified": 1732307740,
-        "narHash": "sha256-XMFaDht3RHtlwZ7NQKbz2Cd0e4oDMB7syyOd9ifbn98=",
+        "narHash": "sha256-ZDsYdZOtg5qkK/wfLLB83B3SI+fE32S+/6Ey0ggHODM=",
         "owner": "Aylur",
         "repo": "ags",
-        "rev": "3e270c8172ae7b61c5e5f24aea69985f792aa000",
+        "rev": "81159966eb8b39b66c3efc133982fd76920c9605",
         "type": "github"
       },
       "original": {
@@ -27,11 +27,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731533099,
+        "lastModified": 1731952585,
-        "narHash": "sha256-q0JcigMAoz3bJqCJwms5mR2de5J1Cw5NgjCev+2ylDA=",
+        "narHash": "sha256-Sh1E7sJd8JJM3PCU1ZOei/QWz97OLCENIi2rTRoaniw=",
         "owner": "aylur",
         "repo": "astal",
-        "rev": "f7cfc8eb77a395373bf40f83b0d779ece34a6108",
+        "rev": "664c7a4ddfcf48c6e8accd3c33bb94424b0e8609",
         "type": "github"
       },
       "original": {
@@ -85,11 +85,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1731833919,
+        "lastModified": 1733043608,
-        "narHash": "sha256-2af+JDANaveslnovOfqIo91uUvanYFEFHqsoZMW/wXY=",
+        "narHash": "sha256-00uyKJEgix+TuIvEwH18SCXYXU9VDhRh3Kjxf9xrWgA=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "5ea724c6d8d0ee672b613c27db6a8022e1ba468d",
+        "rev": "4ebaf4d0b6b8ab9bacd57f5db199da2d76eea8da",
         "type": "github"
       },
       "original": {
@@ -201,11 +201,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731363552,
+        "lastModified": 1732021966,
-        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+        "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
         "type": "github"
       },
       "original": {
@@ -238,11 +238,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1731797098,
+        "lastModified": 1732483221,
-        "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
+        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
+        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731832479,
+        "lastModified": 1733045511,
-        "narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=",
+        "narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111",
+        "rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e",
         "type": "github"
       },
       "original": {
@@ -279,11 +279,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731604581,
+        "lastModified": 1732884235,
-        "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
+        "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
+        "rev": "819f682269f4e002884702b87e445c82840c68f2",
         "type": "github"
       },
       "original": {
@@ -350,11 +350,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731642829,
+        "lastModified": 1732603785,
-        "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=",
+        "narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a",
+        "rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
         "type": "github"
       },
       "original": {
@@ -417,11 +417,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731139594,
+        "lastModified": 1731676054,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
         "type": "github"
       },
       "original": {
@@ -433,16 +433,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1731652201,
+        "lastModified": 1732824227,
-        "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=",
+        "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d",
+        "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -465,11 +465,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1731676054,
+        "lastModified": 1732837521,
-        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
         "type": "github"
       },
       "original": {
@@ -497,11 +497,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1731676054,
+        "lastModified": 1732837521,
-        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
         "type": "github"
       },
       "original": {
@@ -526,11 +526,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1731780782,
+        "lastModified": 1733010437,
-        "narHash": "sha256-CG3rcxcZEViYEUTAXatqXrW0Gn9tQvydF+lLYH+0VPA=",
+        "narHash": "sha256-xPf3jjDBDA9oMVnWU5DJ8gINCq2EPiupvF/4rD/0eEI=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "9d99d7cfdbd7f94da9571a4d7bbb9de185241935",
+        "rev": "80e49e7fd3fa720b93d18e6d859d9b9e7aad4a62",
         "type": "github"
       },
       "original": {
@@ -541,11 +541,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1731840438,
+        "lastModified": 1733058400,
-        "narHash": "sha256-tEVbT7JSMqebBvTyFolN7gkxdX/qtfMuT0uZFNLQvt4=",
+        "narHash": "sha256-5K8V/4sKnALihvxf8oEOl0k0fFGwIxbT47nGIkbeTko=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "044a4b96cdc20eb6aad109d432a239e7048f1a84",
+        "rev": "9d1010316997b38f36f28824d95821e63b305657",
         "type": "github"
       },
       "original": {
@@ -564,11 +564,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1731582522,
+        "lastModified": 1731936508,
-        "narHash": "sha256-1w6aM4bG5cl2E4jHLPnMKkrUO4tY1jUX1NI6/RwJN7Y=",
+        "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "13300b2297c51368e0892c3ebe220f688014fe15",
+        "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
         "type": "github"
       },
       "original": {
@@ -629,11 +629,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730321837,
+        "lastModified": 1732894027,
-        "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
+        "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
+        "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
         "type": "github"
       },
       "original": {

home/christoph/default.nix

@@ -218,6 +218,9 @@ rec {
       NIXOS_OZONE_WL = "1";
       SDL_VIDEODRIVER = "wayland";
 
+      # Run SSH_ASKPASS as GUI, not TTY for Obsidian git
+      SSH_ASKPASS_REQUIRE = "prefer";
+
       # GTK_IM_MODULE, QT_IM_MODULE, XMODIFIERS are set by HomeManager fcitx5 module
     };
 
@@ -436,7 +439,7 @@ rec {
     };
 
     nushell.enable = false;
-    ssh.enable = true;
+    ssh.enable = false; # NOTE: Do NOT generate .ssh/config using HM, as it will have invalid permissions!
 
     tmux = {
       enable = false;

home/modules/hyprland/default.nix

@@ -468,7 +468,10 @@ in {
 
         decoration = {
           rounding = 5;
-          drop_shadow = false;
+
+          shadow = {
+            enabled = false;
+          };
 
           blur = {
             enabled = true;

home/modules/neovim/default.nix

@@ -388,19 +388,7 @@ in {
 
             opts = {
               keymap = {
-                show = "<C-space>";
+                preset = "enter";
-                hide = "<C-e>";
-                accept = "<cr>";
-                select_prev = ["<Up>" "<C-p>"];
-                select_next = ["<Down>" "<C-n>"];
-
-                show_documentation = "<C-space>";
-                hide_documentation = "<C-space>";
-                scroll_documentation_up = "<C-b>";
-                scroll_documentation_down = "<C-f>";
-
-                snippet_forward = "<Tab>";
-                snippet_backward = "<S-Tab>";
               };
 
               accept = {

lib/networking.nix

@@ -87,32 +87,32 @@
   };
 
   mkNetworkNamespace = name: ''
-    ${pkgs.iproute}/bin/ip netns add ${name} # Create the Namespace
+    ${pkgs.iproute2}/bin/ip netns add ${name} # Create the Namespace
-    ${pkgs.iproute}/bin/ip -n ${name} link set lo up # Enable the Loopback device
+    ${pkgs.iproute2}/bin/ip -n ${name} link set lo up # Enable the Loopback device
   '';
 
   killNetworkNamespace = name: ''
-    ${pkgs.iproute}/bin/ip netns del ${name} # Delete the Namespace
+    ${pkgs.iproute2}/bin/ip netns del ${name} # Delete the Namespace
   '';
 
   # VPN stuff
   mkWireguardService = let
     # NOTE: The interface and netns have the same name, so it's a bit confusing
     mkWireguardTunnel = name: privatekey: publickey: endpoint: ''
-      ${pkgs.iproute}/bin/ip link add ${name} type wireguard
+      ${pkgs.iproute2}/bin/ip link add ${name} type wireguard
-      ${pkgs.iproute}/bin/ip link set ${name} netns ${name}
+      ${pkgs.iproute2}/bin/ip link set ${name} netns ${name}
-      ${pkgs.iproute}/bin/ip netns exec ${name} ${pkgs.wireguard-tools}/bin/wg set ${name} \
+      ${pkgs.iproute2}/bin/ip netns exec ${name} ${pkgs.wireguard-tools}/bin/wg set ${name} \
         private-key /home/christoph/.secrets/wireguard/${privatekey} \
         peer ${publickey} \
         allowed-ips 0.0.0.0/0 \
         endpoint ${endpoint}:51820
-      ${pkgs.iproute}/bin/ip -n ${name} addr add 10.2.0.2/32 dev ${name}
+      ${pkgs.iproute2}/bin/ip -n ${name} addr add 10.2.0.2/32 dev ${name}
-      ${pkgs.iproute}/bin/ip -n ${name} link set ${name} up
+      ${pkgs.iproute2}/bin/ip -n ${name} link set ${name} up
-      ${pkgs.iproute}/bin/ip -n ${name} route add default dev ${name}
+      ${pkgs.iproute2}/bin/ip -n ${name} route add default dev ${name}
     '';
 
     killWireguardTunnel = name: ''
-      ${pkgs.iproute}/bin/ip -n ${name} link del ${name}
+      ${pkgs.iproute2}/bin/ip -n ${name} link del ${name}
     '';
   in
     name: privatekey: publickey: endpoint: {

system/default.nix

@@ -151,8 +151,10 @@ with mylib.networking; {
     enable = true;
     wlr.enable = false; # I think hyprland has its own portal automatically enabled...
     extraPortals = with pkgs; [
-      xdg-desktop-portal-kde
+      # TODO: Needed?
-      xdg-desktop-portal-gtk
+      # xdg-desktop-portal-kde
+      # xdg-desktop-portal-gtk
+
       # xdg-desktop-portal-hyprland # Already enabled by hyprland system module
       # xdg-desktop-portal-termfilechooser # Filepicker using nnn
     ];
@@ -211,11 +213,7 @@ with mylib.networking; {
     # this is required for flatpak to find them.
     packages = with pkgs; [
       # Monospace fonts
-      (nerdfonts.override {
+      nerd-fonts.jetbrains-mono
-        fonts = [
-          "JetBrainsMono"
-        ];
-      })
 
       # Sans/Serif fonts
       noto-fonts
@@ -320,6 +318,12 @@ with mylib.networking; {
       flake = "/home/christoph/NixFlake";
     };
 
+    ssh = {
+      startAgent = true;
+      # enableAskPassword = true;
+      # askPassword = lib.mkForce "${pkgs.kdePackages.ksshaskpass}/bin/ksshaskpass";
+    };
+
     fuse.userAllowOther = true; # Allow users to mount e.g. samba shares (cifs)
     # ausweisapp.openFirewall = true; # Directly set port in firewall
   };
@@ -382,12 +386,7 @@ with mylib.networking; {
     fwupd.enable = true; # Device firmware (I don't think I have any supported devices)
     # locate.enable = true; # Periodically update index
     ntp.enable = true; # Clock sync
-    gvfs = {
+    gvfs.enable = false; # Network shares TODO: Only gnome? Needed?
-      # Network shares
-      enable = true;
-      package = lib.mkForce pkgs.gnome3.gvfs;
-    };
-
     udev = {
       packages = with pkgs; [
         usb-blaster-udev-rules # For Intel Quartus