Merge remote-tracking branch 'origin/nixos' into nixos-work

modules/profiles/desktop.nix

@@ -81,6 +81,10 @@ with lib; {
       logseq.enable = true;
       python.enable = true;
       rofi.enable = true;
+      ssh = {
+        enable = true;
+        includeSecrets = [ ../../secrets/ssh-home.age ];
+      };
       spotify.enable = true;
       thunar.enable = true;
       zathura.enable = true;
@@ -106,7 +110,7 @@ with lib; {
     # ripping
     abcde
     handbrake
-    picard
+    stable.picard # HACK to fix broken picard 2.8.3
 
     # other
     anki

modules/programs/bspwm/sxhkdrc

@@ -30,7 +30,7 @@ alt + shift + c
 alt + {t,shift + t,s,f}
 	bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
 
-# switch layout
+# switch window layout
 alt + space
 	bsp-layout next --layouts wide,tall,tiled
 
@@ -107,6 +107,10 @@ super + h
 super + s
     share
 
+# switch keyboard layout
+super + l
+    setxkbmap -query | grep -Eq "layout:\s+de" && setxkbmap us && dunstify "Layout US"|| (setxkbmap de && dunstify "Layout DE")
+
 # Apps
 # start firefox
 super + {_,shift} + f

modules/programs/default.nix

@@ -25,6 +25,7 @@
     ./python.nix
     ./rofi
     ./spotify.nix
+    ./ssh.nix
     ./sway.nix
     ./thunar.nix
     ./vim.nix

modules/programs/kitty.nix

@@ -12,7 +12,7 @@ in
   options.my.programs.kitty.enable = mkEnableOption "kitty";
 
   config = mkIf cfg.enable {
-    my.shell.aliases.ssh = "kitty +kitten ssh";
+    my.shell.aliases.ssh = "TERM=xterm-256color command ssh";
     home-manager.users.moritz = {
       programs.kitty = {
         enable = true;
@@ -32,11 +32,6 @@ in
           size = 10;
         };
       };
-      xdg.configFile."kitty/ssh.conf" = {
-        text = ''
-          env TERM=xterm-color
-        '';
-      };
     };
   };
 }

modules/programs/ssh.nix

@@ -0,0 +1,39 @@
+{ config
+, lib
+, pkgs
+, ...
+}:
+
+with lib;
+let
+  cfg = config.my.programs.ssh;
+
+  baseName = path: removeSuffix ".age" (baseNameOf path);
+in
+{
+  options.my.programs.ssh = {
+    enable = mkEnableOption "ssh";
+    includeSecrets = mkOption {
+      default = [ ];
+      type = with types; listOf path;
+    };
+  };
+
+  config =
+    mkIf cfg.enable
+      {
+        age.secrets = listToAttrs (map
+          (path: {
+            name = baseName path;
+            value = {
+              file = path;
+              owner = "1000";
+            };
+          })
+          cfg.includeSecrets);
+        home-manager.users.moritz.programs.ssh = {
+          enable = true;
+          includes = map (path: "/run/agenix/" + baseName path) cfg.includeSecrets;
+        };
+      };
+}