Sync Noweb sources

config/dunst.nix

@@ -43,6 +43,12 @@
         frame_width = 0;
         frame_color = "#8EC07C";
       };
+      shortcuts = {
+        close = "mod4+space";
+        close_all = "mod4+mod1+space";
+        # context = "ctrl+shift+period";
+        history = "ctrl+grave";
+      };
       urgency_low = {
         frame_color = "#3B7C87";
         foreground = "#3B7C87";

config/git/config.nix

@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
 

config/xmonad/default.nix

@@ -6,16 +6,24 @@
     ../dunst.nix
     ../fonts.nix
     ../rofi.nix
+    # FIXME: ../screen-locker.nix
   ];
 
   home.packages = with pkgs; [
     flameshot
     # font-awesome_4
     haskellPackages.xmobar
     playerctl
-    xorg.xbacklight
+    # FIXME: xorg.xbacklight
   ];
 
+  home.pointerCursor = {
+    package = pkgs.vanilla-dmz;
+    name = "Vanilla-DMZ-AA";
+    size = 36;
+    x11.enable = true;
+  };
+
   xdg.configFile."xmobar/xmobarrc" = {
     source = ../xmobar/xmobarrc;
     # NOTE: https://github.com/nix-community/home-manager/issues/1399
@@ -27,13 +35,6 @@
     '';
   };
 
-  home.pointerCursor = {
-    package = pkgs.vanilla-dmz;
-    name = "Vanilla-DMZ-AA";
-    size = 36;
-    x11.enable = true;
-  };
-
   xsession = {
     enable = true;
     scriptPath = ".hm-xsession";

config/xmonad/xmonad.hs

@@ -131,8 +131,8 @@ myKeys cfg =
       ("<XF86AudioPrev>", spawn "playerctl previous"),
       ("<XF86AudioPlay>", spawn "playerctl play-pause"),
       ("<XF86AudioNext>", spawn "playerctl next"),
-      ("<XF86MonBrightnessDown>", spawn "xbacklight -10"),
-      ("<XF86MonBrightnessUp>", spawn "xbacklight +10"),
+      -- FIXME: ("<XF86MonBrightnessDown>", spawn "xbacklight -10"),
+      -- FIXME: ("<XF86MonBrightnessUp>", spawn "xbacklight +10"),
       ("<Print>", spawn "flameshot gui"),
       ("M-S--", namedScratchpadAction scratchpads "emacs"),
       ("M--", namedScratchpadAction scratchpads "kitty"),

flake.nix

@@ -144,11 +144,8 @@
       defaultPackage.x86_64-linux = self.packages.x86_64-linux.yurrriq-dotfiles;
       nixosModules = {
         bootyjams = import ./modules/bootyjams.nix;
-
         location = import ./modules/location.nix;
-
         nix = import ./modules/nix.nix;
-
         nixPath = {
           nix.nixPath = lib.mapAttrsToList (n: v: "${n}=${v}")
             (lib.filterAttrs (n: _: n != "self") inputs) ++ [
@@ -176,8 +173,8 @@
             self.overlay
             inputs.deadnix.overlays.default
             inputs.emacs-overlay.overlay
-            inputs.nur.overlay
             inputs.nixgl.overlay
+            inputs.nur.overlay
           ];
         };
         virtualisation = import ./modules/virtualisation.nix;

machines/sruxps/home.nix

@@ -23,7 +23,6 @@
     ../../config/nix.nix
     ../../config/password-store.nix
     ../../config/rebar3.nix
-    # FIXME ../../config/screen-locker.nix
     ../../config/starship.nix
     # ../../config/taskwarrior
     ../../config/xmonad
@@ -34,7 +33,6 @@
     primary = true;
     realName = "Eric Bailey";
   };
-
   home.file.".docker/config.json".text = ''
     {
         "credHelpers": {
@@ -74,12 +72,12 @@
     python3Packages.ec2instanceconnectcli
     bpytop
     fd
+    gomplate
     powertop
     progress
-    gomplate
     scc
     docker-credential-helpers
-    # TODO podman-compose
+    # TODO: podman-compose
     krew
     kubectl
     kubectx
@@ -90,9 +88,6 @@
     vault
     fortune
     prometheus-alertmanager
-    # FIXME
-    # zoom-us
-    super-productivity
     bind
     curl
     httpie
@@ -102,29 +97,26 @@
     nixgl.auto.nixGLDefault
     networkmanager
   ];
-
-  home.sessionPath = [
-    "${config.home.homeDirectory}/bin"
-  ];
-
-  programs.kitty.settings.font_size = 12;
-
   services.picom = {
     experimentalBackends = true;
     settings = {
       unredir-if-possible = true;
     };
     vSync = true;
   };
+  home.sessionPath = [
+    "${config.home.homeDirectory}/bin"
+  ];
 
-  xresources.properties = {
-    "Xft.dpi" = 220;
-  };
+  programs.kitty.settings.font_size = 12;
 
   services.random-background = {
     enable = true;
     imageDirectory = "/usr/share/backgrounds/";
     display = "scale";
   };
 
+  xresources.properties = {
+    "Xft.dpi" = 220;
+  };
 }

src/config/dunst.nw

@@ -31,7 +31,7 @@ iconTheme = {
 font = "Iosevka Term 10";
 markup = "yes";
 plain_text = "no";
-format = "<b>%s</b>\n%b";
+format = "<b>%s</b>\\n%b";
 sort = "yes";
 indicate_hidden = "yes";
 alignment = "center";
@@ -66,6 +66,7 @@ frame_color = "#8EC07C";
 shortcuts = {
   close = "mod4+space";
   close_all = "mod4+mod1+space";
+  # context = "ctrl+shift+period";
   history = "ctrl+grave";
 };
 @

src/config/fish/abbrs.nw

@@ -16,7 +16,6 @@
 {
 
   programs.fish.shellAbbrs = {
-    <<AWS Azure login abbreviation>>
     <<Direnv fish abbreviations>>
     <<Kubernetes fish abbreviations>>
     <<Nix fish abbreviations>>
@@ -26,15 +25,6 @@
 }
 @
 
-\newthought{\hrefootnote{https://github.com/yurrriq/naal}{naal} is cool and all, but...}
-
-... it's a bad habit too. the \fish{aal} abbeviation makes being not so sneaky a
-bit less annoying.
-
-<<AWS Azure login abbreviation>>=
-aal = "aws-azure-login --no-prompt";
-@
-
 \newthought{\hrefootnote{https://direnv.net/}{direnv} is great} for
 directory-specific environments, and saving keystrokes is great, too.
 
@@ -51,6 +41,7 @@ It's definitely \href{https://xkcd.com/1205/}{worth the time}.
 <<Kubernetes fish abbreviations>>=
 kc = "kubectl";
 kcd = "kubectl drain --delete-emptydir-data --ignore-daemonsets";
+kcn = "kubectl --namespace";
 kcnp = "kubectl get pods --field-selector=spec.nodeName=";
 kcx = "kubectl --context";
 kg = "kubectl get";