plumjam/nixos - Change VLQ45OFB6Q2PBFEV2LCV2UINWGUL5YFD4MJ3PWP464VZWLD75HAQC

dendritic: Migrate Tailscale, unfree, Waybar, and zoxide configs.

Created by PlumJam on January 10, 2026

VLQ45OFB6Q2PBFEV2LCV2UINWGUL5YFD4MJ3PWP464VZWLD75HAQC

Dependencies

In channels

main

Change contents

File move: zoxide.mod.nix → zoxide.nix
BF:BFD[3.2] → [2.1246:1284]
BF:BF[2.1284] → [2.1047:1047]
[3.2]
[2.1047]

Replacement in modules/zoxide.nix at line 2 [2.1047]

B:BD[2.1050] → [2.1050:1149]

  config.flake.modules.homeModules.zoxide =
    {
      programs.zoxide = {
        enable = true;

[2.1050]

[2.1149]

  config.flake.modules.hjem.zoxide = {
    rum.programs.zoxide = {
      enable = true;

Replacement in modules/zoxide.nix at line 6 [2.1047]
B:BD[2.1150] → [2.1150:1182]
```
        flags = [ "--cmd cd" ];
```
[2.1150]
[2.1182]
```
      flags = [ "--cmd cd" ];
```

Replacement in modules/zoxide.nix at line 8 [2.1047]

B:BD[2.1183] → [2.1183:1236]

        integrations.nushell.enable = true;
      };

[2.1183]

[2.1236]

      integrations.nushell.enable = true;

Insertion in modules/zoxide.nix at line 10 [2.1047]
[2.1243]
[2.1243]
```
  };
```
File move: waybar.mod.nix → waybar.nix
BF:BFD[3.2] → [2.10837:10875]
BF:BF[2.10875] → [2.3517:3517]
[3.2]
[2.3517]

Replacement in modules/waybar.nix at line 2 [2.3517]

B:BD[2.3520] → [2.3520:3717]

  config.flake.modules.nixosModules.waybar = {
    programs.waybar.enable = true;
  };
  config.flake.modules.homeModules.waybar =
    { config, ... }:
    let
      inherit (config) theme;
    in

[2.3520]

[2.3717]

  config.flake.modules.hjem.waybar =
    { theme, ... }:

Replacement in modules/waybar.nix at line 8 [2.3517]

B:BD[2.3802] → [2.3802:4062]

        {
          "layer": "top",
          "height": ${toString theme.margin.big},
          "margin-top": ${toString theme.margin.normal},
          "margin-left": ${toString theme.margin.normal},
          "margin-right": ${toString theme.margin.normal},

[2.3802]

[2.4062]

          {
            "layer": "top",
            "height": ${toString theme.margin.big},
            "margin-top": ${toString theme.margin.normal},
            "margin-left": ${toString theme.margin.normal},
            "margin-right": ${toString theme.margin.normal},

Replacement in modules/waybar.nix at line 15 [2.3517]

B:BD[2.4063] → [2.4063:4373]

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

[2.4063]

[2.4373]

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

Replacement in modules/waybar.nix at line 28 [2.3517]

B:BD[2.4374] → [2.4374:4484]

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

[2.4374]

[2.4484]

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

Replacement in modules/waybar.nix at line 33 [2.3517]

B:BD[2.4485] → [2.4485:4773]

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

[2.4485]

[2.4773]

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

Replacement in modules/waybar.nix at line 43 [2.3517]

B:BD[2.4774] → [2.4774:4871]

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

[2.4774]

[2.4871]

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

Replacement in modules/waybar.nix at line 48 [2.3517]

B:BD[2.4872] → [2.4872:5166]

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

[2.4872]

[2.5166]

            "pulseaudio": {
              "format": "{format_source} {icon}  {volume}%",
              "format-muted": "{format_source}  󰸈",
              "format-source": "󰍬",
              "format-source-muted": "",
              "format-icons": {
                "default": ["󰕿", "󰖀", "󰕾"]
              },
              "on-click": "pwvucontrol",
              "on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
              "tooltip": true,
              "tooltip-format": "Volume: {volume}%\nClick: Open audio manager\nRight-click: Mute toggle"

Deletion in modules/waybar.nix at line 61 [2.3517]

B:BD[2.5181] → [2.5181:5441]

            "on-click": "pwvucontrol",
            "on-click-right": "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle",
            "tooltip": true,
            "tooltip-format": "Volume: {volume}%\nClick: Open audio manager\nRight-click: Mute toggle"
          },

Replacement in modules/waybar.nix at line 62 [2.3517]

B:BD[2.5442] → [2.5442:5771]

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

[2.5442]

[2.5771]

            "cpu": {
              "format": "󰘚  {usage}%",
              "tooltip": true,
              "tooltip-format": "CPU Usage: {usage}%\nLoad: {load}",
              "interval": 2,
              "on-click": "kitty btop",
              "states": {
                "warning": 70,
                "critical": 90
              }
            },
            "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": 2,
              "on-click": "kitty btop",
              "states": {
                "warning": 70,
                "critical": 90
              }
            },

Replacement in modules/waybar.nix at line 86 [2.3517]

B:BD[2.5772] → [2.5772:6165]

          "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": 2,
            "on-click": "kitty btop",
            "states": {
              "warning": 70,
              "critical": 90
            }
          },

[2.5772]

[2.6165]

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

Replacement in modules/waybar.nix at line 98 [2.3517]

B:BD[2.6166] → [2.6166:6522]

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

[2.6166]

[2.6522]

            "custom/gpu": {
              "exec": "bash -c '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: {}%\nClick: Open system monitor",
              "on-click": "kitty btop",
              "states": {
                "warning": 70,
                "critical": 90
              }
            },

Replacement in modules/waybar.nix at line 111 [2.3517]

B:BD[2.6523] → [2.6523:7147]

          "custom/gpu": {
            "exec": "bash -c '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: {}%\nClick: Open system monitor",
            "on-click": "kitty btop",
            "states": {
              "warning": 70,
              "critical": 90
            }
          },

[2.6523]

[2.7147]

            "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/waybar.nix at line 127 [2.3517]

B:BD[2.7148] → [2.7148:7669]

          "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

[2.7148]

[2.7669]

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

Deletion in modules/waybar.nix at line 132 [2.3517]

B:BD[2.7683] → [2.7683:7882]

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

Deletion in modules/waybar.nix at line 133 [2.3517]
B:BD[2.7894] → [2.7894:7904]
```
        }
```
File move: unfree.mod.nix → unfree.nix
BF:BFD[3.2] → [2.15134:15172]
BF:BF[2.15172] → [2.13974:13974]
[3.2]
[2.13974]
Replacement in modules/unfree.nix at line 1 [2.13974]
B:BD[2.13974] → [2.13975:14022]
```
{
  config.flake.modules.nixosModules.unfree =
```
[2.13974]
[2.14022]
```
let
  commonModule =
```

Replacement in modules/unfree.nix at line 10 [2.13974]

B:BD[2.14177] → [2.14177:14231]

      options.unfree.allowedPackageNames = mkOption {

[2.14177]

[2.14231]

      options.unfree.allowedNames = mkOption {

Replacement in modules/unfree.nix at line 20 [2.13974]

B:BD[2.14424] → [2.14424:14546]

      config.nixpkgs.config.allowUnfreePredicate =
        pkg: elem (lib.getName pkg) config.unfree.allowedPackageNames;

[2.14424]

[2.14546]

      config.nixpkgs.config.allowUnfreePredicate = pkg: elem (lib.getName pkg) config.unfree.allowedNames;

Deletion in modules/unfree.nix at line 22 [2.13974]

B:BD[2.14553] → [2.14553:15001]


  config.flake.modules.darwinModules.unfree =
    { config, lib, ... }:
    let
      inherit (lib.lists) elem;
      inherit (lib.options) mkOption;
      inherit (lib.types) listOf str;
    in
    {
      options.unfree.allowedPackageNames = mkOption {
        type = listOf str;
        default = [ ];
        description = "List of unfree package names to allow";
        example = [
          "discord"
          "vscode"
        ];
      };

Replacement in modules/unfree.nix at line 23 [2.13974]

B:BD[2.15002] → [2.15002:15131]

      config.nixpkgs.config.allowUnfreePredicate =
        pkg: elem (lib.getName pkg) config.unfree.allowedPackageNames;
    };

[2.15002]

[2.15131]

in
{
  config.flake.modules.nixos.unfree = commonModule;
  config.flake.modules.darwin.unfree = commonModule;

File move: tailscale.mod.nix → tailscale.nix
BF:BFD[3.2] → [2.38926:38967]
BF:BF[2.38967] → [2.38278:38278]
[3.2]
[2.38278]
Replacement in modules/tailscale.nix at line 2 [2.38278]
B:BD[2.38281] → [2.38281:38329]
```
  config.flake.modules.nixosModules.tailscale =
```
[2.38281]
[2.38329]
```
  config.flake.modules.nixos.tailscale =
```

Deletion in modules/tailscale.nix at line 17 [2.38278]

B:BD[2.38601] → [2.38601:38781]


  config.flake.modules.darwinModules.tailscale =
    let
      interface = "ts0";
      domains = [ "taild29fec.ts.net" ];
    in
    {
      services.resolved.domains = domains;

Replacement in modules/tailscale.nix at line 18 [2.38278]

B:BD[2.38782] → [2.38782:38923]

      services.tailscale = {
        enable = true;
        useRoutingFeatures = "both";
        interfaceName = interface;
      };
    };

[2.38782]

[2.38923]

  config.flake.modules.darwin.tailscale = {
    services.tailscale.enable = true;
  };

File deletion: unfree.nix

BF:BFD[4.9] → [5.235:269]

BF:BFD[5.269] → [5.23:23]

B:BD[5.23] → [5.24:125]

∅:D[6.12573] → [5.232:234]

B:BD[5.232] → [5.232:234]

B:BD[5.125] → [6.12458:12573]

{ config, lib, ... }: let
  inherit (lib) mkValue;
in {
  options.unfree.allowedNames = mkValue [];
}
  config.nixpkgs.config.allowUnfreePredicate = package: lib.elem (lib.getName package) config.unfree.allowedNames;

File deletion: tailscale.nix

BF:BFD[4.9] → [7.259:296]

BF:BFD[7.296] → [7.24:24]

B:BD[7.24] → [7.25:258]

{ lib, ... }: let
  inherit (lib) enabled;
  interface = "ts0";
in {
  services.resolved.domains = ["taild29fec.ts.net"];
  services.tailscale = enabled {
    useRoutingFeatures = "both";
    interfaceName      = interface;
  };
}