cleanup nvim merge and general janitorial work

home-manager/default.nix

@@ -1,11 +1,12 @@
 {
   inputs,
-  pkgs,
+  mkPkgs,
   attrs,
   ...
-}: {
-  "e" = inputs.home-manager.lib.homeManagerConfiguration {
-    inherit pkgs;
+}:
+{
+  e = inputs.home-manager.lib.homeManagerConfiguration {
+    pkgs = mkPkgs "x86_64-linux";
     extraSpecialArgs = {
       inherit inputs attrs;
       useGlobalPkgs = true;
@@ -20,6 +21,7 @@
     ];
   };
   "minimal" = inputs.home-manager.lib.homeManagerConfiguration {
+    pkgs = mkPkgs "x86_64-linux";
     extraSpecialArgs = {
       inherit inputs attrs;
       targets.genericLinux.enable = true;
@@ -29,6 +31,6 @@
         inherit (attrs) username;
       };
     };
-    modules = [./home.nix];
+    modules = [ ./home.nix ];
   };
 }

home-manager/shared/programs/pi.nix

@@ -1,11 +0,0 @@
-{ config, pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    pi
-  ];
-
-  home.file."${config.xdg.configHome}/.pi" = {
-    source = ./config;
-    recursive = true;
-  };
-}

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

@@ -4,6 +4,7 @@
     ./tmux.nix
     ./git.nix
     ./fish
+    ./pi
   ];
   home = {
     packages = with pkgs; [
@@ -12,7 +13,7 @@
       ripgrep
       fd
       jq
-      nvim-pkg
+      nvim
     ];
   };
   programs.bash = {

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

@@ -0,0 +1,31 @@
+{
+  inputs,
+  config,
+  pkgs,
+  ...
+}:
+{
+  imports = [ inputs.sops-nix.homeManagerModules.sops ];
+
+  sops = {
+    age.keyFile = "/home/e/.config/sops/age/keys.txt";
+    secrets = {
+      "pi.json" = {
+        key = "";
+        format = "json";
+        sopsFile = ../../../../../secrets/pi.json;
+        path = "${config.home.homeDirectory}/.pi/agent/auth.json";
+      };
+    };
+  };
+
+  home.packages = with pkgs; [
+    llm-agents.pi
+  ];
+
+  home.file.".pi" = {
+    source = ./config;
+    recursive = true;
+  };
+
+}

home-manager/shared/wayland/default.nix

@@ -40,6 +40,7 @@
     mako.settings = {
       default-timeout = 5;
     };
+    udiskie.enable = true;
   };
   programs = {
     wofi = {

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

@@ -4,7 +4,7 @@
     enable = true;
     systemd.enable = true;
     extraConfig = ''
-      monitor=,preferred,auto,1
+      monitor=,preferred,auto-left,1
     '';
     settings = {
       "$mod" = "SUPER";
@@ -93,6 +93,9 @@
         ",XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +1%"
         ",XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -1%"
         ",XF86AudioMute, exec,  pactl set-sink-mute @DEFAULT_SINK@ toggle"
+        "$mod SHIFT, m, exec, hyprctl keyword general:layout master"
+        "$mod SHIFT, d, exec, hyprctl keyword general:layout dwindle"
+        "$mod SHIFT, s, exec, hyprctl keyword general:layout scrolling"
 
         ## Movement
         "$mod, m, layoutmsg, swapwithmaster"
@@ -135,21 +138,22 @@
           ) 10
         )
       );
-      windowrulev2 = [
-        "workspace 9, class:^(Discord|discord)$"
-        "workspace 9, class:^(Signal|signal)$"
-        "tile, class:^(Minecraft|minecraft)$"
-        "opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$"
-        "noanim,class:^(xwaylandvideobridge)$"
-        "noinitialfocus,class:^(xwaylandvideobridge)$"
-        "maxsize 1 1,class:^(xwaylandvideobridge)$"
-        "noblur,class:^(xwaylandvideobridge)$"
-        "bordersize 0, floating:0, onworkspace:w[t1]"
-        "rounding 0, floating:0, onworkspace:w[t1]"
-        "bordersize 0, floating:0, onworkspace:w[tg1]"
-        "rounding 0, floating:0, onworkspace:w[tg1]"
-        "bordersize 0, floating:0, onworkspace:f[1]"
-        "rounding 0, floating:0, onworkspace:f[1]"
+      windowrule = [
+        "workspace 9, match:class ^(Discord|discord)$"
+        "workspace 9, match:class ^(Signal|signal)$"
+        "tile on, match:class ^(Minecraft|minecraft)$"
+        "opacity 0.0 override 0.0 override, match:class ^(xwaylandvideobridge)$"
+        "no_initial_focus on , match:class ^(xwaylandvideobridge)$"
+        "no_focus on , match:class ^(xwaylandvideobridge)$"
+        "no_anim on , match:class ^(xwaylandvideobridge)$"
+        "max_size 1 1, match:class ^(xwaylandvideobridge)$"
+        "no_blur on, match:class ^(xwaylandvideobridge)$"
+        "border_size 0, match:float 0, match:workspace w[t1]"
+        "rounding 0, match:float 0, match:workspace w[t1]"
+        "border_size 0, match:float 0, match:workspace w[tg1]"
+        "rounding 0, match:float 0, match:workspace w[tg1]"
+        "border_size 0, match:float 0, match:workspace f[1]"
+        "rounding 0, match:float 0, match:workspace f[1]"
       ];
       workspace = [
         "w[t1], gapsout:0, gapsin:0"
@@ -173,15 +177,15 @@
     enable = true;
     settings = {
       general = {
+        before_sleep_cmd = "loginctl lock-session";
         after_sleep_cmd = "hyprctl dispatch dpms on";
         ignore_dbus_inhibit = false;
-        lock_cmd = "hyprlock";
+        lock_cmd = "pidof hyprlock || hyprlock";
       };
       listener = [
         {
-          timeout = 1500;
-          on-timeout = "hyprlock; hyprctl dispatch dpms off";
-          on-resume = "hyprctl dispatch dpms on";
+          timeout = 1800;
+          on-timeout = "systemctl suspend";
         }
       ];
     };