Update i3 config

2 files changed, 47 insertions, 2 deletions

diff --git a/home/nipsy/common/optional/desktops/i3/default.nix b/home/nipsy/common/optional/desktops/i3/default.nix
index 4eb0170..5e40312 100644
--- a/home/nipsy/common/optional/desktops/i3/default.nix
+++ b/home/nipsy/common/optional/desktops/i3/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ lib, pkgs, ... }:
 {
   home.packages = [
     pkgs.dmenu
@@ -9,9 +9,53 @@
     enable = true;
   };
 
-  services.network-manager-applet.enable = true;
+  services = {
+    network-manager-applet.enable = true;
+    xscreensaver.enable = true;
+  };
+
+  xsession = {
+    enable = true;
+    initExtra = ''
+      xrandr --output eDP --primary --scale 0.5
+      xinput set-prop "ELAN06FA:00 04F3:3202 Touchpad" "libinput Middle Emulation Enabled" 0
+      xset b off
+      xset r on
+    '';
+  };
 
   xsession.windowManager.i3 = {
+    config = rec {
+      defaultWorkspace = "workspace number 1";
+      modifier = "Mod4";
+      keybindings = lib.mkOptionDefault {
+        "${modifier}+Return" = "exec ${pkgs.st}/bin/st";
+        "${modifier}+Shift+e" = "exec ${pkgs.i3}/bin/i3-msg exit";
+      };
+      startup = [
+        {
+          command = "${pkgs.feh}/bin/feh --no-fehbg --bg-center ~/bg/StarWarsRetro-BrentCheshire.jpg";
+          always = true;
+          notification = false;
+        }
+      ];
+      window.border = 0;
+      window.commands = [
+        {
+          command = "floating enable";
+          criteria = {
+            class = "Steam";
+            title = "Friends List";
+          };
+        }
+        {
+          command = "border none";
+          criteria = {
+            all = true;
+          };
+        }
+      ];
+    };
     enable = true;
     #extraConfig = (builtins.readFile ./config);
   };
diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index d7edaaf..f94a4a2 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -84,6 +84,7 @@
   hardware.enableRedistributableFirmware = true;
 
   programs.atop.enable = true;
+  programs.gnupg.agent.enable = true;
   programs.iftop.enable = true;
   programs.mtr.enable = true;
   programs.tmux.enable = true;