Import and modularise i3 config

3 files changed, 158 insertions, 270 deletions

diff --git a/user/i3/.config/i3/config b/user/i3/.config/i3/config
deleted file mode 100644
index ff55cc42..00000000
--- a/user/i3/.config/i3/config
+++ /dev/null
@@ -1,265 +0,0 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-
-set $mod Mod4
-
-# Base16 colours: https://github.com/khamer/base16-i3
-
-set $base00 #1d1f21
-set $base01 #282a2e
-set $base02 #373b41
-set $base03 #969896
-set $base04 #b4b7b4
-set $base05 #c5c8c6
-set $base06 #e0e0e0
-set $base07 #ffffff
-set $base08 #cc6666
-set $base09 #de935f
-set $base0A #f0c674
-set $base0B #b5bd68
-set $base0C #8abeb7
-set $base0D #81a2be
-set $base0E #b294bb
-set $base0F #a3685a
-
-# set_from_resource $base00 i3wm.color00 #f8f8f8
-# set_from_resource $base01 i3wm.color01 #e8e8e8
-# set_from_resource $base02 i3wm.color02 #d8d8d8
-# set_from_resource $base03 i3wm.color03 #b8b8b8
-# set_from_resource $base04 i3wm.color04 #585858
-# set_from_resource $base05 i3wm.color05 #383838
-# set_from_resource $base06 i3wm.color06 #282828
-# set_from_resource $base07 i3wm.color07 #181818
-# set_from_resource $base08 i3wm.color08 #ab4642
-# set_from_resource $base09 i3wm.color09 #dc9656
-# set_from_resource $base0A i3wm.color0A #f79a0e
-# set_from_resource $base0B i3wm.color0B #538947
-# set_from_resource $base0C i3wm.color0C #4b8093
-# set_from_resource $base0D i3wm.color0D #7cafc2
-# set_from_resource $base0E i3wm.color0E #96609e
-# set_from_resource $base0F i3wm.color0F #a16946
-
-set $Locker xautolock -locknow
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-# font pango:Monospace, Font Awesome 7
-
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-# font pango:Liberation Mono, Font Awesome 8
-
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
-
-font -xos4-terminus-medium-r-normal-*-12-*-*-*-*-*-*-*
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-mouse_warping none
-
-workspace 1 output primary
-workspace 2 output primary
-workspace 3 output primary
-workspace 4 output primary
-workspace 5 output primary
-workspace 6 output secondary
-workspace 7 output secondary
-workspace 8 output secondary
-workspace 9 output secondary
-workspace 10 output secondary
-
-# start a terminal
-bindsym $mod+Return exec --no-startup-id xst
-
-# kill focused window
-bindsym $mod+w kill
-bindsym $mod+Shift+w kill
-
-bindsym --release $mod+Mod1+r exec rofi -show run
-bindsym --release $mod+Shift+semicolon exec rofi-pass
-bindsym --release $mod+space exec "rofi -show combi -combi-modi drun,window"
-
-# change focus
-bindsym $mod+h focus left
-bindsym $mod+j focus down
-bindsym $mod+k focus up
-bindsym $mod+l focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# move focused window
-bindsym $mod+Shift+h move left
-bindsym $mod+Shift+j move down
-bindsym $mod+Shift+k move up
-bindsym $mod+Shift+l move right
-
-# move workspace
-bindsym $mod+Mod1+h move workspace to output left
-bindsym $mod+Mod1+j move workspace to output down
-bindsym $mod+Mod1+k move workspace to output up
-bindsym $mod+Mod1+l move workspace to output right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# split in horizontal orientation
-bindsym $mod+b split h
-
-# split in vertical orientation
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+F11 fullscreen toggle
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+Shift+s layout stacking
-bindsym $mod+Shift+t layout tabbed
-bindsym $mod+Shift+v layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+f floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+t focus mode_toggle
-
-# focus the parent container
-bindsym $mod+a focus parent
-
-# focus the child container
-bindsym $mod+d focus child
-
-# switch to workspace
-bindsym $mod+1 workspace 1
-bindsym $mod+2 workspace 2
-bindsym $mod+3 workspace 3
-bindsym $mod+4 workspace 4
-bindsym $mod+5 workspace 5
-bindsym $mod+6 workspace 6
-bindsym $mod+7 workspace 7
-bindsym $mod+8 workspace 8
-bindsym $mod+9 workspace 9
-bindsym $mod+0 workspace 10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace 1
-bindsym $mod+Shift+2 move container to workspace 2
-bindsym $mod+Shift+3 move container to workspace 3
-bindsym $mod+Shift+4 move container to workspace 4
-bindsym $mod+Shift+5 move container to workspace 5
-bindsym $mod+Shift+6 move container to workspace 6
-bindsym $mod+Shift+7 move container to workspace 7
-bindsym $mod+Shift+8 move container to workspace 8
-bindsym $mod+Shift+9 move container to workspace 9
-bindsym $mod+Shift+0 move container to workspace 10
-
-bindsym $mod+Shift+o exec --no-startup-id "$Locker"
-# reload the configuration file
-bindsym $mod+Shift+c reload
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+p restart
-
-# resize window (you can also use the mouse for that)
-mode "resize" {
-        # These bindings trigger as soon as you enter the resize mode
-
-        # Pressing left will shrink the window’s width.
-        # Pressing right will grow the window’s width.
-        # Pressing up will shrink the window’s height.
-        # Pressing down will grow the window’s height.
-        bindsym h resize shrink width 10 px or 10 ppt
-        bindsym j resize grow height 10 px or 10 ppt
-        bindsym k resize shrink height 10 px or 10 ppt
-        bindsym l resize grow width 10 px or 10 ppt
-
-        # same bindings, but for the arrow keys
-        bindsym Left resize shrink width 10 px or 10 ppt
-        bindsym Down resize grow height 10 px or 10 ppt
-        bindsym Up resize shrink height 10 px or 10 ppt
-        bindsym Right resize grow width 10 px or 10 ppt
-
-        # back to normal: Enter or Escape
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-
-bindsym $mod+Shift+r mode "resize"
-
-set $mode_system System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
-mode "$mode_system" {
-    bindsym l exec --no-startup-id $Locker, mode "default"
-    bindsym e exec --no-startup-id i3-msg exit, mode "default"
-    bindsym s exec --no-startup-id systemctl suspend, mode "default"
-    bindsym h exec --no-startup-id systemctl hibernate, mode "default"
-    bindsym r exec --no-startup-id systemctl reboot, mode "default"
-    bindsym Shift+s exec --no-startup-id systemctl poweroff -i, mode "default"
-
-    # back to normal: Enter or Escape
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-
-bindsym $mod+Pause mode "$mode_system"
-bindsym $mod+Escape mode "$mode_system"
-bindsym $mod+Shift+q mode "$mode_system"
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-bar {
-  position top
-  status_command /run/current-system/sw/bin/i3status -c ~/.config/i3status/config
-  colors {
-    background $base00
-    separator  $base01
-    statusline $base04
-
-    # State             Border  BG      Text
-    focused_workspace   $base0D $base02 $base07
-    active_workspace    $base02 $base03 $base00
-    inactive_workspace  $base02 $base01 $base04
-    urgent_workspace    $base08 $base02 $base00
-    binding_mode        $base00 $base0A $base00
-  }
-}
-
-# Basic color configuration using the Base16 variables for windows and borders.
-# Property Name         Border  BG      Text    Indicator Child Border
-client.focused          $base05 $base0D $base00 $base0D $base0D
-client.focused_inactive $base01 $base01 $base05 $base03 $base01
-client.unfocused        $base01 $base00 $base05 $base01 $base01
-client.urgent           $base08 $base08 $base00 $base08 $base08
-client.placeholder      $base00 $base00 $base05 $base00 $base00
-client.background       $base07
-
-new_window pixel 2
-new_float normal
-
-for_window [class="Pinentry$"] floating enable
-
-assign [class="^Slack$"] 1
-assign [window_role="^browser$"] 2
-assign [class="^Emacs$"] 6
-
-exec slack
-exec firefox-devedition
-exec emacs
\ No newline at end of file
diff --git a/user/modules/i3.nix b/user/modules/i3.nix
index a6acf92f..69ea71a9 100644
--- a/user/modules/i3.nix
+++ b/user/modules/i3.nix
@@ -1,12 +1,138 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
-  xdg.configFile.i3 = {
-    recursive = true;
-    source = ../i3/.config/i3;
-  };
   xdg.configFile.i3status = {
     recursive = true;
     source = ../i3/.config/i3status;
   };
+  xsession.windowManager.i3 = let
+    mod = "Mod4";
+    mode_system = "System (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown";
+    locker = "${pkgs.xautolock}/bin/xautolock -locknow";
+  in
+  {
+    enable = true;
+    config = {
+      modifier = mod;
+      fonts = [ "Terminus 12px" ];
+      floating = {
+        criteria = [
+          { class = "Pinentry$"; }
+        ];
+      };
+      window = {
+        titlebar = false;
+      };
+      keybindings = {
+        "${mod}+Return" = "exec --no-startup-id xst";
+        # kill focused window
+        "${mod}+w" = "kill";
+        "${mod}+Shift+w" = "kill";
+
+        "--release ${mod}+Mod1+r" = "exec rofi -show run";
+        "--release ${mod}+Shift+semicolon" = "exec rofi-pass";
+        "--release ${mod}+space" = "exec \"rofi -show combi -combi-modi drun,window\"";
+
+        # change focus
+        "${mod}+h" = "focus left";
+        "${mod}+j" = "focus down";
+        "${mod}+k" = "focus up";
+        "${mod}+l" = "focus right";
+
+        # move focused window
+        "${mod}+Shift+h" = "move left";
+        "${mod}+Shift+j" = "move down";
+        "${mod}+Shift+k" = "move up";
+        "${mod}+Shift+l" = "move right";
+
+        "${mod}+Shift+1" = "move container to workspace 1";
+        "${mod}+Shift+2" = "move container to workspace 2";
+        "${mod}+Shift+3" = "move container to workspace 3";
+        "${mod}+Shift+4" = "move container to workspace 4";
+        "${mod}+Shift+5" = "move container to workspace 5";
+        "${mod}+Shift+6" = "move container to workspace 6";
+        "${mod}+Shift+7" = "move container to workspace 7";
+        "${mod}+Shift+8" = "move container to workspace 8";
+        "${mod}+Shift+9" = "move container to workspace 9";
+
+
+        # move workspace
+        "${mod}+Mod1+h" = "move workspace to output left";
+        "${mod}+Mod1+j" = "move workspace to output down";
+        "${mod}+Mod1+k" = "move workspace to output up";
+        "${mod}+Mod1+l" = "move workspace to output right";
+
+        # split in horizontal orientation
+        "${mod}+b" = "split h";
+
+        # split in vertical orientation
+        "${mod}+v" = "split v";
+
+        "${mod}+F11" = "fullscreen toggle";
+        "${mod}+f" = "fullscreen toggle";
+
+        # change container layout (stacked, tabbed, toggle split)
+        "${mod}+Shift+s" = "layout stacking";
+        "${mod}+Shift+t" = "layout tabbed";
+        "${mod}+Shift+v" = "layout toggle split";
+
+        # toggle tiling / floating
+        "${mod}+Shift+f" = "floating toggle";
+
+        # change focus between tiling / floating windows
+        "${mod}+Tab" = "focus mode_toggle";
+
+        # focus the parent container
+        "${mod}+a" = "focus parent";
+
+        # focus the child container
+        "${mod}+d" = "focus child";
+
+        "${mod}+Shift+c" = "reload";
+        "${mod}+Shift+p" = "restart";
+
+        "${mod}+Shift+r" = "mode resize";
+        "${mod}+Shift+o" = "${locker}";
+        "${mod}+Pause" = "mode \"${mode_system}\"";
+        "${mod}+Escape" = "mode \"${mode_system}\"";
+        "${mod}+Shift+q" = "mode \"${mode_system}\"";
+      };
+
+      modes = {
+        resize = {
+          "h" = "resize shrink width 10 px or 10 ppt";
+          "j" = "resize grow height 10 px or 10 ppt";
+          "k" = "resize shrink height 10 px or 10 ppt";
+          "l" = "resize grow width 10 px or 10 ppt";
+
+          "Left" = "resize shrink width 10 px or 10 ppt";
+          "Down" = "resize grow height 10 px or 10 ppt";
+          "Up" = "resize shrink height 10 px or 10 ppt";
+          "Right" = "resize grow width 10 px or 10 ppt";
+
+          "Return" = "mode default";
+          "Escape" = "mode default";
+        };
+        "${mode_system}" = {
+          "l" = "exec --no-startup-id ${locker}, mode default";
+          "e" = "exec --no-startup-id i3-msg exit, mode default";
+          "s" = "exec --no-startup-id systemctl suspend, mode default";
+          "h" = "exec --no-startup-id systemctl hibernate, mode default";
+          "r" = "exec --no-startup-id systemctl reboot, mode default";
+          "Shift+s" = "exec --no-startup-id systemctl poweroff -i, mode default";
+          "Return" = "mode default";
+          "Escape" = "mode default";
+        };
+      };
+
+      bars = [
+        {
+          fonts = [ "Terminus 12px" ];
+          position = "top";
+          hiddenState = "show";
+          statusCommand = "${pkgs.i3status}/bin/i3status -c ~/.config/i3status/config";
+        }
+      ];
+    };
+  };
 }
diff --git a/user/satoshipad.nix b/user/satoshipad.nix
index a7f2e480..84ea8796 100644
--- a/user/satoshipad.nix
+++ b/user/satoshipad.nix
@@ -24,4 +24,31 @@
     ./modules/xresources.nix
     ./modules/zsh.nix
   ];
+
+  xsession.windowManager.i3 = {
+    config = {
+      assigns = {
+        "1" = [{ class = "^Slack"; }];
+        "6" = [{ class = "^Emacs$"; }];
+      };
+      startup = [
+        { command = "slack"; };
+        { command = "firefox-devedition"; workspace = 2; };
+        { command = "emacs"; };
+      ];
+    };
+    extraConfig = ''
+      workspace 1 output primary
+      workspace 2 output primary
+      workspace 3 output primary
+      workspace 4 output primary
+      workspace 5 output primary
+      workspace 6 output secondary
+      workspace 7 output secondary
+      workspace 8 output secondary
+      workspace 9 output secondary
+      workspace 10 output secondary
+
+    '';
+  };
 }