home/jacob.nix

@@ -88,7 +88,9 @@
   };
 
   programs = {
-    bat.enable = true;
+    bat = {
+      enable = true;
+    };
     direnv = {
       enable = true;
       enableZshIntegration = true;
@@ -107,12 +109,10 @@
       userEmail = "jacob.hinkle@jhink.org";
       lfs.enable = true;
       delta.enable = true;
-      aliases = {
-        s = "status";
-        ci = "commit";
-      };
     };
-    htop.enable = true;
+    htop = {
+      enable = true;
+    };
     kitty = {
       enable = true;
       font = {
@@ -120,8 +120,9 @@
         size = 16;
       };
     };
-    lazygit.enable = true;
-    mbsync.enable = true;
+    mbsync = {
+      enable = true;
+    };
     neovim = {
       enable = true;
       plugins = with pkgs.vimPlugins; [
@@ -161,7 +162,6 @@
       enable = true;
       enableSyntaxHighlighting = true;
       shellAliases = {
-        lg = "lazygit";
         vim = "nvim";
       };
       sessionVariables = {

home/xmonad.hs

@@ -1,7 +1,6 @@
 -- See https://xmonad.org/TUTORIAL.html
 import XMonad
 
-import XMonad.Actions.CycleWS (toggleWS)
 import XMonad.Actions.RotSlaves
 
 import XMonad.Hooks.DynamicLog
@@ -9,8 +8,6 @@ import XMonad.Hooks.EwmhDesktops
 import XMonad.Hooks.StatusBar
 import XMonad.Hooks.StatusBar.PP
 
-import qualified XMonad.StackSet as W
-
 import XMonad.Util.EZConfig (additionalKeysP)
 import XMonad.Util.Loggers
 
@@ -29,28 +26,16 @@ myConfig = def
     { terminal = "kitty tmux new"
     , modMask = mod1Mask
     , borderWidth = 1
-    , workspaces = myWorkspaces
+--    , workspaces = myWorkspaces
     , layoutHook = myLayout
     }
    `additionalKeysP`
-   ([
-   -- launch programs
-     ("M-'", spawn "qutebrowser")
+   [ ("M-'", spawn "qutebrowser")
    , ("M-s", spawn "scrot -s")
-   -- cycle windows within a workspace
    , ("M-a", rotAllUp)
    , ("M-f", rotAllDown)
-   -- switch to previous workspace
-   , ("M-;", toggleWS)
-   -- Warn (disable shutting down xmonad since we can do that in other ways from a terminal...
    , ("M-S-q", spawn "kitty --hold echo M-S-q quits XMonad\\! You probably meant to use M-S-c to close the current window.")
    ]
-   ++
-   -- access additional workspaces
-   [("M-" ++ w, windows $ W.greedyView w) | w <- addlWorkspaces]
-   ++
-   [("M-S-" ++ w, windows $ W.shift w) | w <- addlWorkspaces]
-   )
 
 myLayout = tiled ||| Mirror tiled ||| Full ||| threeCol
   where
@@ -89,8 +74,4 @@ myXmobarPP = def
     red      = xmobarColor "#ff5555" ""
     lowWhite = xmobarColor "#bbbbbb" ""
 
-addlWorkspaces :: [String]
-addlWorkspaces = ["0", "-", "=", "i"]
-
-myWorkspaces :: [String]
-myWorkspaces = ["1", "2", "3", "4", "5", "6", "7", "8", "9"] ++ addlWorkspaces
+--myWorkspaces = [ "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "-", "=" ]