plumjam/nixos - Change HHAJDWY4G7SNS2FS72UGNFGLJ5OPHERB3V2SOSLP7HRWKSWUWC4QC

{git,status-bar}: Move to nixos/darwin classes.

Created by PlumJam on February 5, 2026

HHAJDWY4G7SNS2FS72UGNFGLJ5OPHERB3V2SOSLP7HRWKSWUWC4QC

Dependencies

In channels

main

Change contents

Replacement in modules/status-bar.nix at line 1 [10.3517]
B:BD[10.3517] → [10.3518:3520]
B:BD[10.3520] → [7.144:274]
∅:D[7.274] → [11.1249:1282]
B:BD[10.3520] → [11.1249:1282]
∅:D[11.1282] → [12.208:249]
B:BD[12.208] → [12.208:249]
B:BD[12.249] → [11.1283:1313]
```
{
  flake-file.inputs = {
    ashell = {
      url = "github:malpenzibo/ashell";
      inputs.nixpkgs.follows = "os";
    };
  };
  flake.modules.nixos.waybar = {
    programs.waybar.enable = true;
  };
  flake.modules.hjem.waybar =
```
[10.3517]
[13.3606]
```
let
  waybarBase =
```
Replacement in modules/status-bar.nix at line 6 [10.3517]
B:BD[13.3623] → [13.3623:3668]
```
      theme,
      isDesktop,
      isLinux,
```
[13.3623]
[13.3668]
```
      config,
```
Deletion in modules/status-bar.nix at line 10 [10.3517]
B:BD[12.258] → [13.3686:3720]
```
      inherit (lib.modules) mkIf;
```
Insertion in modules/status-bar.nix at line 11 [10.3517]
[14.139]
[12.258]
```
      inherit (lib.lists) singleton;
```
Insertion in modules/status-bar.nix at line 13 [10.3517]
[12.314]
[14.140]
```
      inherit (config) theme;
```
Deletion in modules/status-bar.nix at line 19 [10.3517]
∅:D[14.257] → [13.3721:3743]
B:BD[12.314] → [13.3721:3743]
```
      enable = true;
```

Replacement in modules/status-bar.nix at line 20 [10.3517]

B:BD[12.321] → [13.3744:3788]

∅:D[13.3788] → [15.134:186]

B:BD[10.3723] → [15.134:186]

∅:D[16.114] → [10.3775:3802]

∅:D[15.186] → [10.3775:3802]

B:BD[10.3775] → [10.3775:3802]

B:BD[10.3802] → [17.373:413]

B:BD[17.413] → [6.1600:1626]

∅:D[6.1626] → [18.272:449]

B:BD[17.465] → [18.272:449]

B:BD[18.449] → [19.84:116]

    mkIf (isDesktop && isLinux && enable) {
      xdg.config.files."waybar/config.jsonc".text =
        # jsonc
        ''
          {
            "layer": "top",
            "height": 32,
            "margin-top": ${toString theme.margin.small},
            "margin-left": ${toString theme.margin.small},
            "margin-right": ${toString theme.margin.small},
            "margin-bottom": 0,

[12.321]

[10.4062]

    {
      programs.waybar.enable = true;

Replacement in modules/status-bar.nix at line 23 [10.3517]

B:BD[10.4063] → [17.646:980]

            "modules-left": ["niri/workspaces"],
            "modules-center": ["niri/window"],
            "modules-right": [
              "tray",
              "pulseaudio",
              "cpu",
              "memory",
              "disk",
              "custom/gpu",
              "battery",
              "clock"
            ],

[10.4063]

[10.4373]

      hjem.extraModules = singleton {
        xdg.config.files."waybar/config.jsonc".text =
          # jsonc
          ''
            {
              "layer": "top",
              "height": 32,
              "margin-top": ${toString theme.margin.small},
              "margin-left": ${toString theme.margin.small},
              "margin-right": ${toString theme.margin.small},
              "margin-bottom": 0,
              "modules-left": ["niri/workspaces"],
              "modules-center": ["niri/window"],
              "modules-right": [
                "tray",
                "pulseaudio",
                "cpu",
                "memory",
                "disk",
                "custom/gpu",
                "battery",
                "clock"
              ],
              "niri/workspaces": {
                "current-only": true,
                "format": "{index}"
              },

Replacement in modules/status-bar.nix at line 53 [10.3517]

B:BD[10.4374] → [17.981:1099]

            "niri/workspaces": {
              "current-only": true,
              "format": "{index}"
            },

[10.4374]

[10.4484]

              "niri/window": {
                "max-length": 50,
                "separate-outputs": true,
                "rewrite": {
                  "(.*) (—|-) (Zen Browser|Brave)": "󰖟  $1",
                  "(.*) - Discord": "󰙯  $1",
                  "(.*) — nu": " $1"
                }
              },

Replacement in modules/status-bar.nix at line 63 [10.3517]

B:BD[10.4485] → [17.1100:1406]

            "niri/window": {
              "max-length": 50,
              "separate-outputs": true,
              "rewrite": {
                "(.*) (—|-) (Zen Browser|Brave)": "󰖟  $1",
                "(.*) - Discord": "󰙯  $1",
                "(.*) — nu": " $1"
              }
            },

[10.4485]

[10.4773]

              "tray": {
                "reverse-direction": true,
                "spacing": 5
              },

Replacement in modules/status-bar.nix at line 68 [10.3517]

B:BD[10.4774] → [17.1407:1512]

            "tray": {
              "reverse-direction": true,
              "spacing": 5
            },

[10.4774]

[10.4871]

              "pulseaudio": {
                "format": "{format_source} {icon}  {volume}%",
                "format-muted": "{format_source}  󰸈",
                "format-source": "󰍬",
                "format-source-muted": "",
                "format-icons": {
                  "default": ["󰕿", "󰖀", "󰕾"]
                },
                "on-click": "${getExe pkgs.pwvucontrol}",
                "on-click-right": "${getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle",
                "tooltip": true,
                "tooltip-format": "Volume: {volume}%"
              },

Replacement in modules/status-bar.nix at line 82 [10.3517]

B:BD[10.4872] → [17.1513:1821]

            "pulseaudio": {
              "format": "{format_source} {icon}  {volume}%",
              "format-muted": "{format_source}  󰸈",
              "format-source": "󰍬",
              "format-source-muted": "",
              "format-icons": {
                "default": ["󰕿", "󰖀", "󰕾"]

[10.4872]

[17.1821]

              "cpu": {
                "format": "󰘚  {usage}%",
                "tooltip": true,
                "tooltip-format": "CPU Usage: {usage}%\nLoad: {load}",
                "interval": 3,
                "on-click": "${kitty} ${nu} '${btop}'",
                "states": {
                  "warning": 70,
                  "critical": 90
                }

Deletion in modules/status-bar.nix at line 93 [10.3517]

B:BD[17.1838] → [14.258:422]

∅:D[14.422] → [17.1957:1988]

B:BD[17.1957] → [17.1957:1988]

B:BD[17.1988] → [14.423:475]

∅:D[14.475] → [10.5166:5181]

∅:D[17.2093] → [10.5166:5181]

B:BD[10.5166] → [10.5166:5181]

              "on-click": "${getExe pkgs.pwvucontrol}",
              "on-click-right": "${getExe' pkgs.wireplumber "wpctl"} set-mute @DEFAULT_AUDIO_SINK@ toggle",
              "tooltip": true,
              "tooltip-format": "Volume: {volume}%"
            },

Replacement in modules/status-bar.nix at line 94 [10.3517]

B:BD[10.5442] → [17.2094:2257]

B:BD[17.2257] → [20.84:113]

B:BD[20.113] → [14.476:530]

∅:D[14.530] → [17.2326:2445]

B:BD[17.2326] → [17.2326:2445]

            "cpu": {
              "format": "󰘚  {usage}%",
              "tooltip": true,
              "tooltip-format": "CPU Usage: {usage}%\nLoad: {load}",
              "interval": 3,
              "on-click": "${kitty} ${nu} '${btop}'",
              "states": {
                "warning": 70,
                "critical": 90
              }
            },

[10.5442]

[17.2445]

              "memory": {
                "format": "󰽘  {used:0.1f}G/{total:0.1f}G",
                "tooltip": true,
                "tooltip-format": "Memory: {used:0.1f}G/{total:0.1f}G ({percentage}%)\nAvailable: {avail:0.1f}G",
                "interval": 3,
                "on-click": "${kitty} ${nu} '${btop}'",
                "states": {
                  "warning": 70,
                  "critical": 90
                }
              },

Replacement in modules/status-bar.nix at line 106 [10.3517]

B:BD[17.2446] → [17.2446:2673]

B:BD[17.2673] → [20.114:143]

B:BD[20.143] → [14.531:585]

∅:D[14.585] → [17.2742:2861]

B:BD[17.2742] → [17.2742:2861]

            "memory": {
              "format": "󰽘  {used:0.1f}G/{total:0.1f}G",
              "tooltip": true,
              "tooltip-format": "Memory: {used:0.1f}G/{total:0.1f}G ({percentage}%)\nAvailable: {avail:0.1f}G",
              "interval": 3,
              "on-click": "${kitty} ${nu} '${btop}'",
              "states": {
                "warning": 70,
                "critical": 90
              }
            },

[17.2446]

[10.5771]

              "disk": {
                "format": "󰋊  {percentage_used}%",
                "path": "/",
                "tooltip": true,
                "tooltip-format": "Disk: {used}/{total} ({percentage_used}%)\nAvailable: {free}",
                "interval": 600,
                "states": {
                  "warning": 70,
                  "critical": 90
                }
              },

Replacement in modules/status-bar.nix at line 118 [10.3517]

B:BD[10.5772] → [17.2862:3090]

B:BD[17.3090] → [20.144:175]

∅:D[20.175] → [17.3121:3240]

B:BD[17.3121] → [17.3121:3240]

            "disk": {
              "format": "󰋊  {percentage_used}%",
              "path": "/",
              "tooltip": true,
              "tooltip-format": "Disk: {used}/{total} ({percentage_used}%)\nAvailable: {free}",
              "interval": 600,
              "states": {
                "warning": 70,
                "critical": 90
              }
            },

[10.5772]

[10.6165]

              "custom/gpu": {
                "exec": "${bash} 'if command -v nvidia-smi >/dev/null; then nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits | head -1; elif command -v radeontop >/dev/null; then radeontop -d - -l 1 | grep -o \"gpu [0-9]*\" | cut -d\" \" -f2; else echo \"N/A\"; fi'",
                "format": "󰢮  {}%",
                "interval": 5,
                "tooltip": true,
                "tooltip-format": "GPU Usage: {}%",
                "on-click": "${kitty} ${nu} '${btop}'",
                "states": {
                  "warning": 70,
                  "critical": 90
                }
              },

Replacement in modules/status-bar.nix at line 131 [10.3517]

B:BD[10.6166] → [17.3241:3269]

B:BD[17.3269] → [2.137:423]

∅:D[2.423] → [17.3555:3652]

∅:D[14.870] → [17.3555:3652]

B:BD[17.3555] → [17.3555:3652]

B:BD[17.3652] → [14.871:975]

∅:D[14.975] → [17.3770:3889]

B:BD[17.3770] → [17.3770:3889]

            "custom/gpu": {
              "exec": "${bash} 'if command -v nvidia-smi >/dev/null; then nvidia-smi --query-gpu=utilization.gpu --format=csv,noheader,nounits | head -1; elif command -v radeontop >/dev/null; then radeontop -d - -l 1 | grep -o \"gpu [0-9]*\" | cut -d\" \" -f2; else echo \"N/A\"; fi'",
              "format": "󰢮  {}%",
              "interval": 5,
              "tooltip": true,
              "tooltip-format": "GPU Usage: {}%",
              "on-click": "${kitty} ${nu} '${btop}'",
              "states": {
                "warning": 70,
                "critical": 90
              }
            },

[10.6166]

[10.6522]

              "battery": {
                "format": "{icon}  {capacity}%",
                "format-charging": "󰂄  {capacity}%",
                "format-plugged": "󰂄  {capacity}%",
                "format-icons": [
                  "󰁺", "󰁻", "󰁼", "󰁽", "󰁾",
                  "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
                ],
                "tooltip": true,
                "tooltip-format": "Battery: {capacity}%\nTime: {time}\nHealth: {health}%",
                "states": {
                  "warning": 30,
                  "critical": 15
                }
              },

Replacement in modules/status-bar.nix at line 147 [10.3517]

B:BD[10.6523] → [17.3890:4437]

            "battery": {
              "format": "{icon}  {capacity}%",
              "format-charging": "󰂄  {capacity}%",
              "format-plugged": "󰂄  {capacity}%",
              "format-icons": [
                "󰁺", "󰁻", "󰁼", "󰁽", "󰁾",
                "󰁿", "󰂀", "󰂁", "󰂂", "󰁹"
              ],
              "tooltip": true,
              "tooltip-format": "Battery: {capacity}%\nTime: {time}\nHealth: {health}%",
              "states": {
                "warning": 30,
                "critical": 15

[10.6523]

[17.4437]

              "clock": {
                "interval": 1,
                "format": " {:%Y-%m-%d | %H:%M:%S}",
                "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"

Replacement in modules/status-bar.nix at line 152 [10.3517]
B:BD[17.4453] → [17.4453:4468]
```
            },
```
[17.4453]
[10.7147]
```
            }
          '';
```

Replacement in modules/status-bar.nix at line 155 [10.3517]

B:BD[10.7148] → [17.4469:4662]

            "clock": {
              "interval": 1,
              "format": " {:%Y-%m-%d | %H:%M:%S}",
              "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"

[10.7148]

[10.7669]

        xdg.config.files."waybar/style.css".text =
          with theme.withHash; # css
          ''
            * {
              border: none;
              border-radius: 0;
              font-family: "${theme.font.sans.name}";
              font-size: ${toString theme.font.size.normal}px;
              margin: 0;
              padding: 0;

Deletion in modules/status-bar.nix at line 166 [10.3517]
B:BD[10.7882] → [10.7882:7894]
B:BD[10.7904] → [10.7904:7916]
```
          }
        '';
```

Replacement in modules/status-bar.nix at line 167 [10.3517]

B:BD[10.7917] → [15.187:236]

∅:D[16.153] → [10.7966:8134]

∅:D[15.236] → [10.7966:8134]

B:BD[10.7966] → [10.7966:8134]

B:BD[10.8134] → [6.1627:1688]

∅:D[6.1688] → [10.8194:8253]

B:BD[10.8194] → [10.8194:8253]

      xdg.config.files."waybar/style.css".text =
        with theme.withHash; # css
        ''
          * {
            border: none;
            border-radius: 0;
            font-family: "${theme.font.sans.name}";
            font-size: ${toString theme.font.size.normal}px;
            margin: 0;
            padding: 0;
          }

[10.7917]

[10.8253]

            #waybar {
              background: rgba(${concatStringsSep ", " (map toString theme.withRgb.base00)}, 1.0);
              color: ${base07};
              border: ${toString theme.border.small}px solid transparent;
              border-radius: ${toString theme.radius.small}px;
              border-image: linear-gradient(225deg, ${base0B}, ${base09}) ${toString theme.border.small};
              border-image-slice: 1;
            }

Replacement in modules/status-bar.nix at line 176 [10.3517]

B:BD[10.8254] → [10.8254:8274]

B:BD[10.8274] → [5.144:241]

∅:D[5.241] → [10.8637:8667]

B:BD[10.8637] → [10.8637:8667]

B:BD[10.8667] → [21.443:515]

B:BD[21.515] → [19.117:178]

B:BD[19.178] → [5.242:381]

∅:D[19.178] → [10.8802:8814]

∅:D[5.381] → [10.8802:8814]

∅:D[18.514] → [10.8802:8814]

∅:D[21.577] → [10.8802:8814]

B:BD[10.8802] → [10.8802:8814]

          #waybar {
            background: rgba(${concatStringsSep ", " (map toString theme.withRgb.base00)}, 1.0);
            color: ${base07};
            border: ${toString theme.border.small}px solid transparent;
            border-radius: ${toString theme.radius.small}px;
            border-image: linear-gradient(225deg, ${base0B}, ${base09}) ${toString theme.border.small};
            border-image-slice: 1;
          }

[10.8254]

[10.8814]

            #window {
              color: ${base07};
            }

Replacement in modules/status-bar.nix at line 180 [10.3517]

B:BD[10.8815] → [10.8815:8878]

B:BD[10.8878] → [19.179:290]

          #window {
            color: ${base07};
          }
          #window > box {
            margin: 0;
            padding: 0;
            border: none;
          }

[10.8815]

[19.290]

            #window > box {
              margin: 0;
              padding: 0;
              border: none;
            }

Replacement in modules/status-bar.nix at line 186 [10.3517]

∅:D[19.291] → [10.8878:8968]

B:BD[10.8878] → [10.8878:8968]

B:BD[10.8968] → [21.578:650]

B:BD[21.650] → [19.292:353]

∅:D[19.353] → [10.9104:9116]

B:BD[10.9104] → [10.9104:9116]

          #workspaces button {
            padding: 0 ${toString theme.padding.normal}px;
            border: ${toString theme.border.small}px solid transparent;
            border-radius: ${toString theme.radius.small}px;
          }

[19.291]

[10.9116]

            #workspaces button {
              padding: 0 ${toString theme.padding.normal}px;
              border: ${toString theme.border.small}px solid transparent;
              border-radius: ${toString theme.radius.small}px;
            }

Replacement in modules/status-bar.nix at line 192 [10.3517]

B:BD[10.9117] → [10.9117:9196]

          #workspaces button.empty {
            color: ${base03};
          }

[10.9117]

[10.9196]

            #workspaces button.empty {
              color: ${base03};
            }

Replacement in modules/status-bar.nix at line 196 [10.3517]

B:BD[10.9197] → [10.9197:9265]

B:BD[10.9265] → [12.572:682]

∅:D[12.682] → [10.9384:9396]

B:BD[10.9384] → [10.9384:9396]

          #workspaces button.active {
            color: ${base07};
            background: rgba(${concatStringsSep ", " (map toString theme.withRgb.base00)}, 0.45) padding-box;
          }

[10.9197]

[10.9396]

            #workspaces button.active {
              color: ${base07};
              background: rgba(${concatStringsSep ", " (map toString theme.withRgb.base00)}, 0.45) padding-box;
            }

Replacement in modules/status-bar.nix at line 201 [10.3517]

B:BD[10.9397] → [10.9397:9697]

          #tray, #pulseaudio, #cpu, #memory, #disk, #battery, #clock, #custom-gpu {
            margin: 0;
            margin-left: ${toString theme.margin.normal}px;
            padding: 0 ${toString theme.padding.normal}px;
            color: ${base07}; /* Use highest contrast text */
          }

[10.9397]

[10.9697]

            #tray, #pulseaudio, #cpu, #memory, #disk, #battery, #clock, #custom-gpu {
              margin: 0;
              margin-left: ${toString theme.margin.normal}px;
              padding: 0 ${toString theme.padding.normal}px;
              color: ${base07}; /* Use highest contrast text */
            }

Replacement in modules/status-bar.nix at line 208 [10.3517]

B:BD[10.9698] → [20.176:225]

∅:D[20.225] → [10.10106:10118]

B:BD[10.10106] → [10.10106:10118]

          #clock {
            min-width: 125px;
          }

[10.9698]

[10.10118]

            #clock {
              min-width: 125px;
            }

Replacement in modules/status-bar.nix at line 212 [10.3517]

B:BD[10.10119] → [20.226:301]

∅:D[20.301] → [10.10206:10218]

B:BD[10.10206] → [10.10206:10218]

          #cpu, #memory, #disk, #custom-gpu {
            min-width: 42px;
          }

[10.10119]

[10.10218]

            #cpu, #memory, #disk, #custom-gpu {
              min-width: 42px;
            }

Replacement in modules/status-bar.nix at line 216 [10.3517]

B:BD[10.10219] → [20.302:417]

∅:D[20.417] → [10.10301:10331]

B:BD[10.10301] → [10.10301:10331]

B:BD[10.10576] → [10.10576:10588]

          #battery.critical:not(.charging) #cpu.critical, #memory.critical, #disk.critical, #custom-gpu.critical {
            color: ${base08};
          }

[10.10219]

[10.10588]

            #battery.critical:not(.charging) #cpu.critical, #memory.critical, #disk.critical, #custom-gpu.critical {
              color: ${base08};
            }

Replacement in modules/status-bar.nix at line 220 [10.3517]

B:BD[10.10589] → [10.10589:10709]

B:BD[10.10709] → [22.368:380]

          #cpu.warning, #memory.warning, #disk.warning, #custom-gpu.warning {
            color: ${base0A};
          }
        '';

[10.10589]

[22.380]

            #cpu.warning, #memory.warning, #disk.warning, #custom-gpu.warning {
              color: ${base0A};
            }
          '';
      };

Replacement in modules/status-bar.nix at line 227 [10.3517]
B:BD[22.388] → [11.1314:1345]
```
  flake.modules.hjem.polybar =
```
[22.388]
[22.426]
```
  polybarBase =
```
Replacement in modules/status-bar.nix at line 231 [10.3517]
B:BD[22.455] → [22.455:500]
```
      theme,
      isDesktop,
      isLinux,
```
[22.455]
[22.500]
```
      config,
```

Replacement in modules/status-bar.nix at line 235 [10.3517]

B:BD[22.525] → [22.525:559]

      inherit (lib.modules) mkIf;

[22.525]

[22.559]

      inherit (lib.lists) singleton;
      inherit (config) theme;
    in
    {
      hjem.extraModules = singleton {
        packages = singleton pkgs.polybar;

Replacement in modules/status-bar.nix at line 242 [10.3517]

B:BD[22.560] → [22.560:668]

      enable = false;
    in
    mkIf (isDesktop && isLinux && enable) {
      packages = [ pkgs.polybar ];

[22.560]

[22.668]

        xdg.config.files."polybar/config.ini".text =
          with theme; # ini
          ''
            [colors]
              background = #282A2E
              background-alt = #373B41
              foreground = #C5C8C6
              primary = #F0C674
              secondary = #8ABEB7
              alert = #A54242
              disabled = #707880

Replacement in modules/status-bar.nix at line 254 [10.3517]

B:BD[22.669] → [22.669:1000]

      xdg.config.files."polybar/config.ini".text =
        with theme; # ini
        ''
          [colors]
            background = #282A2E
            background-alt = #373B41
            foreground = #C5C8C6
            primary = #F0C674
            secondary = #8ABEB7
            alert = #A54242
            disabled = #707880

[22.669]

[22.1000]

            [bar/example]
              width = 100%
              height = 24pt
              radius = ${toString radius.small}

Replacement in modules/status-bar.nix at line 259 [10.3517]

B:BD[22.1001] → [22.1001:1122]

          [bar/example]
            width = 100%
            height = 24pt
            radius = ${toString radius.small}

[22.1001]

[22.1122]

              background = ''${colors.background}
              foreground = ''${colors.foreground}

Replacement in modules/status-bar.nix at line 262 [10.3517]

B:BD[22.1123] → [22.1123:1219]

            background = ''${colors.background}
            foreground = ''${colors.foreground}

[22.1123]

[22.1219]

              line-size = 3pt

Replacement in modules/status-bar.nix at line 264 [10.3517]

B:BD[22.1220] → [22.1220:1248]

            line-size = 3pt

[22.1220]

[22.1248]

              border-size = 4pt
              border-color = #00000000

Replacement in modules/status-bar.nix at line 267 [10.3517]

B:BD[22.1249] → [22.1249:1316]

            border-size = 4pt
            border-color = #00000000

[22.1249]

[22.1316]

              padding-left = 0
              padding-right = 1

Replacement in modules/status-bar.nix at line 270 [10.3517]

B:BD[22.1317] → [22.1317:1376]

            padding-left = 0
            padding-right = 1

[22.1317]

[22.1376]

              module-margin = 1

Replacement in modules/status-bar.nix at line 272 [10.3517]

B:BD[22.1377] → [22.1377:1407]

            module-margin = 1

[22.1377]

[22.1407]

              separator = |
              separator-foreground = ''${colors.disabled}

Replacement in modules/status-bar.nix at line 275 [10.3517]

B:BD[22.1408] → [22.1408:1490]

            separator = |
            separator-foreground = ''${colors.disabled}

[22.1408]

[22.1490]

              font-0 = ${font.sans.name};2

Replacement in modules/status-bar.nix at line 277 [10.3517]

B:BD[22.1491] → [22.1491:1532]

            font-0 = ${font.sans.name};2

[22.1491]

[22.1532]

              modules-left = xworkspaces xwindow
              modules-right = filesystem pulseaudio xkeyboard memory cpu wlan eth date

Replacement in modules/status-bar.nix at line 280 [10.3517]

B:BD[22.1533] → [22.1533:1665]

            modules-left = xworkspaces xwindow
            modules-right = filesystem pulseaudio xkeyboard memory cpu wlan eth date

[22.1533]

[22.1665]

              cursor-click = pointer
              cursor-scroll = ns-resize

Replacement in modules/status-bar.nix at line 283 [10.3517]

B:BD[22.1666] → [22.1666:1739]

            cursor-click = pointer
            cursor-scroll = ns-resize

[22.1666]

[22.1739]

              enable-ipc = true

Replacement in modules/status-bar.nix at line 285 [10.3517]

B:BD[22.1740] → [22.1740:1770]

            enable-ipc = true

[22.1740]

[22.1770]

              ; wm-restack = generic
              ; wm-restack = bspwm
              ; wm-restack = i3

Replacement in modules/status-bar.nix at line 289 [10.3517]

B:BD[22.1771] → [22.1771:1869]

            ; wm-restack = generic
            ; wm-restack = bspwm
            ; wm-restack = i3

[22.1771]

[22.1869]

              ; override-redirect = true

Replacement in modules/status-bar.nix at line 291 [10.3517]

B:BD[22.1870] → [22.1870:1909]

            ; override-redirect = true

[22.1870]

[22.1909]

              ; This module is not active by default (to enable it, add it to one of the
              ; modules-* list above).
              ; Please note that only a single tray can exist at any time. If you launch
              ; multiple bars with this module, only a single one will show it, the others
              ; will produce a warning. Which bar gets the module is timing dependent and can
              ; be quite random.
              ; For more information, see the documentation page for this module:
              ; https://polybar.readthedocs.io/en/stable/user/modules/tray.html
            [module/systray]
              type = internal/tray

Replacement in modules/status-bar.nix at line 302 [10.3517]

B:BD[22.1910] → [22.1910:2551]

            ; This module is not active by default (to enable it, add it to one of the
            ; modules-* list above).
            ; Please note that only a single tray can exist at any time. If you launch
            ; multiple bars with this module, only a single one will show it, the others
            ; will produce a warning. Which bar gets the module is timing dependent and can
            ; be quite random.
            ; For more information, see the documentation page for this module:
            ; https://polybar.readthedocs.io/en/stable/user/modules/tray.html
          [module/systray]
            type = internal/tray

[22.1910]

[22.2551]

              format-margin = 8pt
              tray-spacing = 16pt

Replacement in modules/status-bar.nix at line 305 [10.3517]

B:BD[22.2552] → [22.2552:2616]

            format-margin = 8pt
            tray-spacing = 16pt

[22.2552]

[22.2616]

            [module/xworkspaces]
              type = internal/xworkspaces

Replacement in modules/status-bar.nix at line 308 [10.3517]

B:BD[22.2617] → [22.2617:2688]

          [module/xworkspaces]
            type = internal/xworkspaces

[22.2617]

[22.2688]

              label-active = %name%
              label-active-background = ''${colors.background-alt}
              label-active-underline= ''${colors.primary}
              label-active-padding = 1

Replacement in modules/status-bar.nix at line 313 [10.3517]

B:BD[22.2689] → [22.2689:2881]

            label-active = %name%
            label-active-background = ''${colors.background-alt}
            label-active-underline= ''${colors.primary}
            label-active-padding = 1

[22.2689]

[22.2881]

              label-occupied = %name%
              label-occupied-padding = 1

Replacement in modules/status-bar.nix at line 316 [10.3517]

B:BD[22.2882] → [22.2882:2957]

            label-occupied = %name%
            label-occupied-padding = 1

[22.2882]

[22.2957]

              label-urgent = %name%
              label-urgent-background = ''${colors.alert}
              label-urgent-padding = 1

Replacement in modules/status-bar.nix at line 320 [10.3517]

B:BD[22.2958] → [22.2958:3085]

            label-urgent = %name%
            label-urgent-background = ''${colors.alert}
            label-urgent-padding = 1

[22.2958]

[22.3085]

              label-empty = %name%
              label-empty-foreground = ''${colors.disabled}
              label-empty-padding = 1

Replacement in modules/status-bar.nix at line 324 [10.3517]

B:BD[22.3086] → [22.3086:3213]

            label-empty = %name%
            label-empty-foreground = ''${colors.disabled}
            label-empty-padding = 1

[22.3086]

[22.3213]

            [module/xwindow]
              type = internal/xwindow
              label = %title:0:60:...%

Replacement in modules/status-bar.nix at line 328 [10.3517]

B:BD[22.3214] → [22.3214:3314]

          [module/xwindow]
            type = internal/xwindow
            label = %title:0:60:...%

[22.3214]

[22.3314]

              [module/filesystem]
              type = internal/fs
              interval = 25

Replacement in modules/status-bar.nix at line 332 [10.3517]

B:BD[22.3315] → [22.3315:3404]

            [module/filesystem]
            type = internal/fs
            interval = 25

[22.3315]

[22.3404]

              mount-0 = /

Replacement in modules/status-bar.nix at line 334 [10.3517]

B:BD[22.3405] → [22.3405:3429]

            mount-0 = /

[22.3405]

[22.3429]

              label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%%

Replacement in modules/status-bar.nix at line 336 [10.3517]

B:BD[22.3430] → [22.3430:3506]

            label-mounted = %{F#F0C674}%mountpoint%%{F-} %percentage_used%%

[22.3430]

[22.3506]

              label-unmounted = %mountpoint% not mounted
              label-unmounted-foreground = ''${colors.disabled}

Replacement in modules/status-bar.nix at line 339 [10.3517]

B:BD[22.3507] → [22.3507:3624]

            label-unmounted = %mountpoint% not mounted
            label-unmounted-foreground = ''${colors.disabled}

[22.3507]

[22.3624]

            [module/pulseaudio]
              type = internal/pulseaudio

Replacement in modules/status-bar.nix at line 342 [10.3517]

B:BD[22.3625] → [22.3625:3694]

          [module/pulseaudio]
            type = internal/pulseaudio

[22.3625]

[22.3694]

              format-volume-prefix = "VOL "
              format-volume-prefix-foreground = ''${colors.primary}
              format-volume = <label-volume>

Replacement in modules/status-bar.nix at line 346 [10.3517]

B:BD[22.3695] → [22.3695:3846]

            format-volume-prefix = "VOL "
            format-volume-prefix-foreground = ''${colors.primary}
            format-volume = <label-volume>

[22.3695]

[22.3846]

              label-volume = %percentage%%

Replacement in modules/status-bar.nix at line 348 [10.3517]

B:BD[22.3847] → [22.3847:3888]

            label-volume = %percentage%%

[22.3847]

[22.3888]

              label-muted = muted
              label-muted-foreground = ''${colors.disabled}

Replacement in modules/status-bar.nix at line 351 [10.3517]

B:BD[22.3889] → [22.3889:3979]

            label-muted = muted
            label-muted-foreground = ''${colors.disabled}

[22.3889]

[22.3979]

            [module/xkeyboard]
              type = internal/xkeyboard
              blacklist-0 = num lock

Replacement in modules/status-bar.nix at line 355 [10.3517]

B:BD[22.3980] → [22.3980:4082]

          [module/xkeyboard]
            type = internal/xkeyboard
            blacklist-0 = num lock

[22.3980]

[22.4082]

              label-layout = %layout%
              label-layout-foreground = ''${colors.primary}

Replacement in modules/status-bar.nix at line 358 [10.3517]

B:BD[22.4083] → [22.4083:4177]

            label-layout = %layout%
            label-layout-foreground = ''${colors.primary}

[22.4083]

[22.4177]

              label-indicator-padding = 2
              label-indicator-margin = 1
              label-indicator-foreground = ''${colors.background}
              label-indicator-background = ''${colors.secondary}

Replacement in modules/status-bar.nix at line 363 [10.3517]

B:BD[22.4178] → [22.4178:4384]

            label-indicator-padding = 2
            label-indicator-margin = 1
            label-indicator-foreground = ''${colors.background}
            label-indicator-background = ''${colors.secondary}

[22.4178]

[22.4384]

            [module/memory]
              type = internal/memory
              interval = 2
              format-prefix = "RAM "
              format-prefix-foreground = ''${colors.primary}
              label = %percentage_used:2%%

Replacement in modules/status-bar.nix at line 370 [10.3517]

B:BD[22.4385] → [22.4385:4606]

          [module/memory]
            type = internal/memory
            interval = 2
            format-prefix = "RAM "
            format-prefix-foreground = ''${colors.primary}
            label = %percentage_used:2%%

[22.4385]

[22.4606]

            [module/cpu]
              type = internal/cpu
              interval = 2
              format-prefix = "CPU "
              format-prefix-foreground = ''${colors.primary}
              label = %percentage:2%%

Replacement in modules/status-bar.nix at line 377 [10.3517]

B:BD[22.4607] → [22.4607:4817]

          [module/cpu]
            type = internal/cpu
            interval = 2
            format-prefix = "CPU "
            format-prefix-foreground = ''${colors.primary}
            label = %percentage:2%%

[22.4607]

[22.4817]

            [network-base]
              type = internal/network
              interval = 5
              format-connected = <label-connected>
              format-disconnected = <label-disconnected>
              label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected

Replacement in modules/status-bar.nix at line 384 [10.3517]

B:BD[22.4818] → [22.4818:5085]

          [network-base]
            type = internal/network
            interval = 5
            format-connected = <label-connected>
            format-disconnected = <label-disconnected>
            label-disconnected = %{F#F0C674}%ifname%%{F#707880} disconnected

[22.4818]

[22.5085]

            [module/wlan]
              inherit = network-base
              interface-type = wireless
              label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip%

Replacement in modules/status-bar.nix at line 389 [10.3517]

B:BD[22.5086] → [22.5086:5257]

          [module/wlan]
            inherit = network-base
            interface-type = wireless
            label-connected = %{F#F0C674}%ifname%%{F-} %essid% %local_ip%

[22.5086]

[22.5257]

            [module/eth]
              inherit = network-base
              interface-type = wired
              label-connected = %{F#F0C674}%ifname%%{F-} %local_ip%

Replacement in modules/status-bar.nix at line 394 [10.3517]

B:BD[22.5258] → [22.5258:5417]

          [module/eth]
            inherit = network-base
            interface-type = wired
            label-connected = %{F#F0C674}%ifname%%{F-} %local_ip%

[22.5258]

[22.5417]

            [module/date]
              type = internal/date
              interval = 1

Replacement in modules/status-bar.nix at line 398 [10.3517]

B:BD[22.5418] → [22.5418:5500]

          [module/date]
            type = internal/date
            interval = 1

[22.5418]

[22.5500]

              date = %H:%M
              date-alt = %Y-%m-%d %H:%M:%S

Replacement in modules/status-bar.nix at line 401 [10.3517]

B:BD[22.5501] → [22.5501:5567]

            date = %H:%M
            date-alt = %Y-%m-%d %H:%M:%S

[22.5501]

[22.5567]

              label = %date%
              label-foreground = ''${colors.primary}

Replacement in modules/status-bar.nix at line 404 [10.3517]

B:BD[22.5568] → [22.5568:5646]

            label = %date%
            label-foreground = ''${colors.primary}

[22.5568]

[22.5646]

            [settings]
              screenchange-reload = true
              pseudo-transparency = true

Replacement in modules/status-bar.nix at line 408 [10.3517]

B:BD[22.5647] → [22.5647:5746]

          [settings]
            screenchange-reload = true
            pseudo-transparency = true

[22.5647]

[22.5746]

            # [bar/plumjam]
            #   height=50
            #   width=100%
          '';
      };

Deletion in modules/status-bar.nix at line 414 [10.3517]

B:BD[22.5747] → [22.5747:5834]

          # [bar/plumjam]
          #   height=50
          #   width=100%
        '';

Replacement in modules/status-bar.nix at line 416 [10.3517]
B:BD[22.5842] → [11.1346:1376]
```
  flake.modules.hjem.ashell =
```
[22.5842]
[22.5879]
```
  ashellBase =
```
Deletion in modules/status-bar.nix at line 421 [10.3517]
B:BD[22.5921] → [22.5921:5953]
```
      isDesktop,
      isLinux,
```
Deletion in modules/status-bar.nix at line 424 [10.3517]
B:BD[22.5978] → [22.5978:6012]
```
      inherit (lib.modules) mkIf;
```
Deletion in modules/status-bar.nix at line 426 [10.3517]
B:BD[22.6013] → [22.6013:6035]
```
      enable = false;
```

Replacement in modules/status-bar.nix at line 438 [10.3517]

B:BD[22.6042] → [22.6042:6086]

B:BD[22.6086] → [7.328:422]

    mkIf (isDesktop && isLinux && enable) {
      packages = singleton inputs.ashell.packages.${pkgs.stdenv.hostPlatform.system}.default;

[22.6042]

[22.6120]

    {
      hjem.extraModules = singleton {
        packages = singleton inputs.ashell.packages.${pkgs.stdenv.hostPlatform.system}.default;
        xdg.config.files."ashell/config.toml".source = toml.generate "ashell.toml" settings;
      };
    };
in
{
  flake-file.inputs = {
    ashell = {
      url = "github:malpenzibo/ashell";

Replacement in modules/status-bar.nix at line 451 [10.3517]

B:BD[22.6121] → [23.511:602]

      xdg.config.files."ashell/config.toml".source = toml.generate "ashell.toml" settings;

[22.6121]

[10.10827]

      inputs.nixpkgs.follows = "os";

Insertion in modules/status-bar.nix at line 453 [10.3517]

[10.10834]

  };
  flake.modules.nixos.waybar = waybarBase;
  flake.modules.nixos.polybar = polybarBase;
  flake.modules.nixos.ashell = ashellBase;

Insertion in modules/hosts.nix at line 45 [25.110]
[9.269]
[24.225]
```
      git
```
Insertion in modules/hosts.nix at line 59 [25.110]
[26.1883]
[8.3075]
```
      waybar
```
Replacement in modules/git.nix at line 1 [10.101083]
B:BD[10.101083] → [10.101084:101086]
B:BD[10.101086] → [11.3609:3636]
```
{
  flake.modules.hjem.git =
```
[10.101083]
[27.161]
```
let
  gitBase =
```
Insertion in modules/git.nix at line 11 [10.101083]
[4.253]
[10.101240]
```
      inherit (lib.lists) singleton;
```
Insertion in modules/git.nix at line 13 [10.101083]
[10.101241]
[4.254]
```
      gitIni = pkgs.formats.gitIni { };
```

Replacement in modules/git.nix at line 47 [10.101083]

B:BD[4.1033] → [4.1033:1104]

        core.editor = "${config.environment.sessionVariables.EDITOR}";

[4.1033]

[4.1104]

        core.editor = "${config.environment.variables.EDITOR}";

Deletion in modules/git.nix at line 68 [10.101083]
B:BD[4.1651] → [4.1651:1692]
```
      gitIni = pkgs.formats.gitIni { };
```

Replacement in modules/git.nix at line 70 [10.101083]

B:BD[4.1705] → [4.1705:1824]

      packages = [
        pkgs.gh
        pkgs.git
        pkgs.difftastic
        pkgs.git-credential-oauth
      ];

[4.1705]

[10.102807]

      hjem.extraModules = singleton {
        packages = [
          pkgs.gh
          pkgs.git
          pkgs.difftastic
          pkgs.git-credential-oauth
        ];

Replacement in modules/git.nix at line 78 [10.101083]

B:BD[10.102808] → [4.1825:1944]

      xdg.config.files."git/ignore".text = # .gitignore
        ''
          .claude/
          mprocs.log
        '';

[10.102808]

[10.102856]

        xdg.config.files."git/ignore".text = # .gitignore
          ''
            .claude/
            mprocs.log
          '';

Replacement in modules/git.nix at line 84 [10.101083]

B:BD[10.102857] → [4.1945:2025]

      xdg.config.files."git/config".source = gitIni.generate "config" settings;

[10.102857]

[28.217]

        xdg.config.files."git/config".source = gitIni.generate "config" settings;

Replacement in modules/git.nix at line 86 [10.101083]

B:BD[10.102934] → [28.259:347]

B:BD[28.347] → [3.217:258]

∅:D[3.258] → [28.441:499]

B:BD[28.441] → [28.441:499]

B:BD[28.499] → [3.259:511]

∅:D[29.169] → [28.499:511]

∅:D[3.511] → [28.499:511]

B:BD[28.499] → [28.499:511]

      xdg.config.files."git/credentials".text = # ini
        ''
          [credential]
            helper=cache --timeout 21600
            helper=oauth
            helper=oauth -device
            helper=!gh auth git-credential
          [credential "https://git.plumj.am"]
            oauthClientId=a4792ccc-144e-407e-86c9-5e7d8d9c3269
            oauthAuthURL=/login/oauth/authorize
            oauthTokenURL=/login/oauth/access_token
        '';

[28.218]

[10.102934]

        xdg.config.files."git/credentials".text = # ini
          ''
            [credential]
              helper=cache --timeout 21600
              helper=oauth
              helper=oauth -device
              helper=!gh auth git-credential
            [credential "https://git.plumj.am"]
              oauthClientId=a4792ccc-144e-407e-86c9-5e7d8d9c3269
              oauthAuthURL=/login/oauth/authorize
              oauthTokenURL=/login/oauth/access_token
          '';
      };

Insertion in modules/git.nix at line 100 [10.101083]

[10.102941]

in
{
  flake.modules.nixos.git = gitBase;
  flake.modules.darwin.git = gitBase;