Add ssh config, xdg userdirs

flake.lock

@@ -49,11 +49,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1639891275,
+        "lastModified": 1640037534,
-        "narHash": "sha256-2IMLVTtOHV9kBsirGPRpo8NE48Mjq20iXN7l7uy0YjE=",
+        "narHash": "sha256-lbD5EEqu2tXq3qo6UN3cZkWZA0hEWQkhluctivMtLZY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3db603677509eb0b8c396a3234b1d4b70d023894",
+        "rev": "aef97988dac0541747de8bcc85c7e27726eea4af",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1639876010,
+        "lastModified": 1640053112,
-        "narHash": "sha256-naGsoUfsY92NaIGiFI8XFXBnesw8BQGe694xcfaLMDI=",
+        "narHash": "sha256-7C0UQssCdAMyCNSv8szLJfZ5xYMBr9mh27zYUmo8wHQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "395879c28386e1abf20c7ecacd45880759548391",
+        "rev": "c478eaf416411a7dedf773185b6d5bfc966a80ae",
         "type": "github"
       },
       "original": {

home-manager/modules/ssh/default.nix

@@ -0,0 +1,66 @@
+{ pkgs, config, lib, ... }:
+with lib;
+let
+  cfg = config.eboskma.programs.ssh;
+in
+{
+  options.eboskma.programs.ssh = { enable = mkEnableOption "activate ssh"; };
+
+  config = mkIf (cfg.enable) {
+    programs.ssh = {
+      enable = true;
+      hashKnownHosts = true;
+      matchBlocks = {
+        "*" = {
+          identityFile = "~/.ssh/id_ed25519";
+          identitiesOnly = true;
+          extraOptions = {
+            Ciphers = "chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr";
+            KexAlgorithms = "curve25519-sha256,curve25519-sha256@libssh.org,diffie-hellman-group16-sha512,diffie-hellman-group18-sha512,diffie-hellman-group-exchange-sha256";
+            MACs = "hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,umac-128-etm@openssh.com";
+            HostKeyAlgorithms = "ssh-ed25519,ssh-ed25519-cert-v01@openssh.com,sk-ssh-ed25519@openssh.com,sk-ssh-ed25519-cert-v01@openssh.com,rsa-sha2-256,rsa-sha2-256-cert-v01@openssh.com,rsa-sha2-512,rsa-sha2-512-cert-v01@openssh.com";
+          };
+        };
+        home = {
+          host = "home";
+          hostname = "10.0.0.2";
+          extraOptions = {
+            ControlMaster = "auto";
+            ControlPersist = "5m";
+          };
+        };
+
+        horus = {
+          host = "horus";
+          hostname = "10.1.0.2";
+          proxyJump = "home";
+          extraOptions = {
+            ControlMaster = "auto";
+            ControlPersist = "5m";
+          };
+        };
+
+        proxy = {
+          hostname = "10.0.0.251";
+        };
+
+        "git.datarift.nl" = {
+          hostname = "10.0.0.201";
+        };
+
+        fluiddpi = {
+          hostname = "10.0.0.120";
+          user = "pi";
+        };
+
+        horus-vpn = {
+          hostname = "192.168.4.202";
+        };
+
+        "repohost.bedum.horus.nu" = {
+          forwardAgent = true;
+        };
+      };
+    };
+  };
+}

modules/desktop/default.nix

@@ -64,6 +64,7 @@ in
           obs-studio.enable = true;
           rofi.enable = true;
           vscode.enable = true;
+          ssh.enable = true;
           sway.enable = true;
           tmux.enable = true;
           waybar.enable = true;
@@ -99,6 +100,11 @@ in
 
       xdg = {
         enable = true;
+        mime.enable = true;
+        userDirs = {
+          enable = true;
+          createDirectories = true;
+        };
       };
 
       gtk = {
@@ -113,9 +119,14 @@ in
           package = pkgs.papirus-icon-theme;
         };
 
-        gtk3.extraConfig = {
+        gtk3 = {
-          gtk-application-prefer-dark-theme = true;
+          bookmarks = [
-          gtk-cursor-theme-name = "Quintom_Ink";
+            "file:///home/erwin/workspace"
+          ];
+          extraConfig = {
+            gtk-application-prefer-dark-theme = true;
+            gtk-cursor-theme-name = "Quintom_Ink";
+          };
         };
       };
 
@@ -141,6 +152,7 @@ in
         ../../home-manager/modules/obs-studio
         ../../home-manager/modules/rofi
         ../../home-manager/modules/vscode
+        ../../home-manager/modules/ssh
         ../../home-manager/modules/sway
         ../../home-manager/modules/tmux
         ../../home-manager/modules/waybar

modules/nix-common/default.nix

@@ -16,7 +16,7 @@ in
     nix = {
       package = pkgs.nixFlakes;
       extraOptions = ''
-        experimental-features = nix-command flakes ca-references
+        experimental-features = nix-command flakes 
       '';
 
       autoOptimiseStore = true;