add SOPS, etc.

home-manager/shared/programs/2fa/default.nix

@@ -9,7 +9,6 @@
   services.gpg-agent = {
     enable = true;
     enableSshSupport = true;
-    pinentryFlavor = "tty";
     extraConfig = ''
       allow-loopback-pinentry
     '';

home-manager/shared/programs/dev/default.nix

@@ -10,7 +10,7 @@
     python3
     p7zip
     gnumake
-    gcc
     go
+    jq
   ];
 }

home-manager/shared/programs/shell/default.nix

@@ -1,9 +1,17 @@
-{host, ...}: {
+{
+  host,
+  pkgs,
+  ...
+}: {
   imports = [
     ./tmux.nix
     ./git.nix
-    ./direnv.nix
   ];
+  home = {
+    packages = with pkgs; [
+      tree
+    ];
+  };
   programs.bash = {
     enable = true;
     enableCompletion = true;
@@ -72,4 +80,9 @@
     historyWidgetOptions = ["--height 60% --preview ''"];
     fileWidgetCommand = "command find -L . -mindepth 1 -o -fstype 'sysfs' -o -fstype 'devfs' -o -fstype 'devtmpfs' -o -fstype 'proc' -prune";
   };
+  programs.direnv = {
+    enable = true;
+    enableBashIntegration = true;
+    nix-direnv.enable = true;
+  };
 }

home-manager/shared/programs/shell/direnv.nix

@@ -1,7 +0,0 @@
-_: {
-  programs.direnv = {
-    enable = true;
-    enableBashIntegration = true;
-    nix-direnv.enable = true;
-  };
-}

home-manager/shared/wayland/default.nix

@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   imports = [
     ./librewolf
     ./alacritty
@@ -8,6 +8,12 @@
     ./audio
   ];
 
+  home.packages = with pkgs; [
+    wdisplays
+    wl-clipboard
+    gammastep
+    sway-contrib.grimshot
+  ];
   programs.bemenu = {
     enable = true;
     settings = {

home-manager/shared/wayland/hyprland/default.nix

@@ -4,7 +4,7 @@
     package = pkgs.hyprland;
     systemd.enable = true;
     extraConfig = ''
-      monitor=,preferred,auto,1"
+      monitor=,preferred,auto,1
     '';
     settings = {
       "$mod" = "SUPER";
@@ -86,6 +86,8 @@
           ## Movement
           "$mod, p, layoutmsg, swapwithmaster"
           "$mod, e, layoutmsg, orientationnext"
+          "$mod, i, layoutmsg, addmaster"
+          "$mod, d, layoutmsg, removemaster"
           "$mod, h, movefocus, l"
           "$mod, l, movefocus, r"
           "$mod, k, movefocus, u"

home-manager/shared/wayland/sway/default.nix

@@ -5,11 +5,7 @@
   ...
 }: {
   home.packages = with pkgs; [
-    wl-clipboard
     autotiling-rs
-    gammastep
-    sway-contrib.grimshot
-    jq
   ];
   home.sessionVariables = {
     # needed for Sway and Firefox to play nice