home/programs/git/default.nix

@@ -262,14 +262,6 @@ in
       runtimeInputs = with pkgs; [ cfg.package coreutils ];
       text = lib.fileContents ./scripts/git-tcommit.sh;
     })
-    (pkgs.writeShellApplication {
-      name = "git-tmcommit";
-      runtimeInputs = with pkgs; [ cfg.package coreutils ];
-      text = lib.pipe ./scripts/git-tcommit.sh [
-        lib.fileContents
-        (builtins.replaceStrings ["hours" "tcommit"] ["minutes" "tmcommit"])
-      ];
-    })
     (pkgs.writeShellApplication {
       name = "git-switch-interactive";
       runtimeInputs = with pkgs; [ cfg.package fzf gnused coreutils ];

home/programs/git/scripts/git-tcommit.sh

@@ -1,10 +1,5 @@
 set -euo pipefail
 
-if [[ $# -lt 1 ]]; then
-  echo "Usage: git tcommit [-]<hours>"
-  exit 1
-fi
-
 HOUR_SHIFT="$1"
 shift
 

home/programs/xmonad/xmonad.hs

@@ -86,7 +86,6 @@ myScratchpads = [ NS "ncmpcpp"     spawnNC findNC layoutA
   where
     spawnNC = myTerminal ++ " --title ncmpcppScratchpad -e ncmpcpp"
     spawnTM = myTerminal ++ " --class floatingTerminal -e tmux new-session -A -s f"
-    spawnTW = myTerminal ++ " --class taskWarriorTerminal -e taskwarrior-tui"
     -- spawnMX = "element"
     spawnFB = "thunar --class=floatingThunar"
     spawnEX = "emacs --name=floatingEmacs"
@@ -95,7 +94,6 @@ myScratchpads = [ NS "ncmpcpp"     spawnNC findNC layoutA
 
     findNC = title =? "ncmpcppScratchpad"
     findTM = className =? "floatingTerminal"
-    findTW = className =? "taskWarriorTerminal"
     findSC = className =? "floatingSchedule"
     -- findMX = className =? "element"
     findFB = className =? "floatingThunar"
@@ -170,7 +168,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
     , ((modm .|. shiftMask , xK_space ),    spawn $ myTerminal ++ " -e tmux")
 
     -- , ((modm               , xK_v ),        spawn "rofi -modi lpass:$HOME/.scripts/rofi/lpass//rofi-lpass -show lpass")
-    -- , ((modm .|. shiftMask, xK_d     ), viewDropboxStatus)
+    , ((modm .|. shiftMask, xK_d     ), viewDropboxStatus)
     ]
 
 termIsOpen :: X Bool

home/services/polybar.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, machineVars, ... }: let
+{ pkgs, config, machineVars, ... }: let
   colors = config.colors.defaultColorSet;
 in {
   services.polybar = {
@@ -11,23 +11,13 @@ in {
     package = pkgs.polybar.override {
       githubSupport = true;
       mpdSupport = true;
-      pulseSupport = true;
     };
 
     settings = {
-      "module/tray" = {
-        type = "internal/tray";
-
-        # padding = 4;
-        tray-spacing = "8px";
-        tray-maxsize = "25px";
-        # tray-background = colors.background;
-      };
-
       "bar/top" = {
         bottom = false;
         # monitor =
-        # tray.position = "right";
+        tray.position = "right";
 
         background = colors.background;
         foreground = colors.foreground;
@@ -51,20 +41,19 @@ in {
           left = "xmonad";
           center = "date";
           right = builtins.concatStringsSep " " [
-            "filesystem"
+            "filesystem "
-            (lib.optionalString (machineVars.wlanInterface != null) "wlan")
+            (if machineVars.wlanInterface != null then "wlan " else "")
-            (lib.optionalString (machineVars.battery != null) "batt")
+            (if machineVars.battery != null then "batt " else "")
-            "pulseaudio"
+            "vol"
             "mpd"
-            "tray"
           ];
         };
 
-        # tray = {
+        tray = {
-        #   padding = 4;
+          padding = 4;
-        #   maxsize = 25;
+          maxsize = 25;
-        #   background = colors.background;
+          background = colors.background;
-        # };
+        };
       };
 
       "module/xmonad" = {
@@ -166,15 +155,15 @@ in {
         };
       };
 
-      "module/pulseaudio" = {
+      "module/vol" = {
-        type = "internal/pulseaudio";
+        type = "internal/alsa";
         # format-volume = "<bar-volume>}"
         # format-volume = "%{A1:bash -c '~/.scripts/get-volume' &:}<bar-volume>%{A}"
         # format-volume = <label-volume> <bar-volume>
 
         # format-volume-padding = 1
         # format-muted-padding = 1
-        format-volume = "  <label-volume> <bar-volume>";
+        format-volume = "%{T3}%{T-} <label-volume> <bar-volume>";
         # label-volume = 
         label-volume-foreground = colors.magenta;
         # format-muted-foreground = "${colors.foreground-alt}";
@@ -284,11 +273,9 @@ in {
         # Default: false
         fixed-values = true;
 
-        # Margin (number of spaces, pixels, or points) to add before/after each module
+        # Spacing (number of spaces, pixels, points) between entries
-        # Individual side values can be defined using:
+        # Default: 2
-        #   module-margin-{left,right}
+        spacing = 4;
-        module-margin = "16px";
-        # spacing = "16px";
 
         # Default: 90
         # New in version 3.6.0

hosts/kasei/configuration.nix

@@ -11,16 +11,12 @@
     ./services/tailscale.nix
     ./services/keybase.nix
 
-    ./nspawn-containers/arch.nix
-  ];
-
   system.stateVersion = "22.05";
 
   boot.binfmt.emulatedSystems = [
     "x86_64-windows"
     "aarch64-linux"
     "armv7l-linux"
-    "i686-linux"
   ];
 
   nix.settings.system-features = [

hosts/kasei/nspawn-containers/arch.nix

@@ -1,28 +0,0 @@
-{ ... }:
-{
-  systemd.targets.machines.enable = true;
-
-  systemd.nspawn."arch" = {
-    enable = true;
-    execConfig.Boot = true;
-
-    filesConfig = {
-      BindReadOnly = [
-        "/nix/store"
-        # "/etc/resolv.conf:/etc/resolv.conf"
-      ];
-      Bind = [
-        "/home/h7x4/git"
-        "/home/h7x4/pico"
-        "/home/h7x4/Downloads"
-      ];
-    };
-    networkConfig.Private = false;
-  };
-
-  systemd.services."systemd-nspawn@arch" = {
-    enable = true;
-    requiredBy = [ "machines.target" ];
-    overrideStrategy = "asDropin";
-  };
-}