nix/configuration/configuration.nix

@@ -22,7 +22,6 @@
     ./zfs.nix
     ./network.nix
     ./roles/firewall
-    ./roles/zsh
     ./roles/graphics
     ./roles/sound
     ./roles/sway

nix/configuration/flake.lock

@@ -76,24 +76,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -139,11 +121,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1734945620,
+        "lastModified": 1734200366,
-        "narHash": "sha256-olIfsfJK4/GFmPH8mXMmBDAkzVQ1TWJmeGT3wBGfQPY=",
+        "narHash": "sha256-0NursoP4BUdnc+wy+Mq3icHkXu/RgP1Sjo0MJxV2+Dw=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "d000479f4f41390ff7cf9204979660ad5dd16176",
+        "rev": "c6323585fa0035d780e3d8906eb1b24b65d19a48",
         "type": "github"
       },
       "original": {
@@ -181,11 +163,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734991663,
+        "lastModified": 1734323986,
-        "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=",
+        "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff",
+        "rev": "394571358ce82dff7411395829aa6a3aad45b907",
         "type": "github"
       },
       "original": {
@@ -229,11 +211,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1734649271,
+        "lastModified": 1734424634,
-        "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=",
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
         "type": "github"
       },
       "original": {
@@ -277,8 +259,7 @@
         "lanzaboote": "lanzaboote",
         "nixpkgs": "nixpkgs",
         "nixpkgs-b93b4e9b5": "nixpkgs-b93b4e9b5",
-        "nixpkgs-unstable": "nixpkgs-unstable",
+        "nixpkgs-unstable": "nixpkgs-unstable"
-        "zsh-histdb": "zsh-histdb"
       }
     },
     "rust-overlay": {
@@ -320,39 +301,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "zsh-histdb": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-Cf8NVSnjPiAi29Df1Tb1Ea6uqISWps5nx3qJl5yAbOo=",
-        "path": "flakes/zsh-histdb",
-        "type": "path"
-      },
-      "original": {
-        "path": "flakes/zsh-histdb",
-        "type": "path"
-      }
     }
   },
   "root": "root",

nix/configuration/flake.nix

@@ -38,12 +38,6 @@
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.1";
 
-      # Optional but recommended to limit the size of your system closure.
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    zsh-histdb = {
-      url = "path:flakes/zsh-histdb";
-
       # Optional but recommended to limit the size of your system closure.
       inputs.nixpkgs.follows = "nixpkgs";
     };
@@ -58,7 +52,6 @@
       impermanence,
       home-manager,
       lanzaboote,
-      zsh-histdb,
       ...
     }@inputs:
     let
@@ -80,7 +73,6 @@
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
           }
-          { nixpkgs.overlays = [ zsh-histdb.overlays.default ]; }
           ./configuration.nix
         ];
       };

nix/configuration/flakes/zsh-histdb/flake.lock

@@ -1,61 +0,0 @@
-{
-  "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1734991663,
-        "narHash": "sha256-8T660guvdaOD+2/Cj970bWlQwAyZLKrrbkhYOFcY1YE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "6c90912761c43e22b6fb000025ab96dd31c971ff",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}

nix/configuration/flakes/zsh-histdb/flake.nix

@@ -1,34 +0,0 @@
-{
-  description = "A slightly better history for zsh";
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
-
-  outputs =
-    {
-      self,
-      nixpkgs,
-      flake-utils,
-      ...
-    }:
-    let
-      out =
-        system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-          # Maybe pkgs = import nixpkgs { inherit system; }; ?
-          appliedOverlay = self.overlays.default pkgs pkgs;
-        in
-        {
-          packages = rec {
-            default = zsh-histdb;
-            zsh-histdb = appliedOverlay.zsh-histdb;
-          };
-        };
-    in
-    flake-utils.lib.eachDefaultSystem out
-    // {
-      overlays.default = final: prev: {
-        zsh-histdb = final.callPackage ./package.nix { };
-      };
-    };
-}

nix/configuration/flakes/zsh-histdb/package.nix

@@ -1,29 +0,0 @@
-# unpackPhase
-# patchPhase
-# configurePhase
-# buildPhase
-# checkPhase
-# installPhase
-# fixupPhase
-# installCheckPhase
-# distPhase
-{
-  stdenv,
-  pkgs,
-  sqlite,
-  ...
-}:
-stdenv.mkDerivation {
-  name = "zsh-histdb";
-  src = pkgs.fetchgit {
-    url = "https://github.com/larkery/zsh-histdb.git";
-    rev = "90a6c104d0fcc0410d665e148fa7da28c49684eb";
-    sha256 = "sha256-vtG1poaRVbfb/wKPChk1WpPgDq+7udLqLfYfLqap4Vg=";
-  };
-  buildInputs = [ sqlite ];
-  phases = [ "installPhase" ];
-  installPhase = ''
-    mkdir -p $out/share/zsh/plugins/zsh-histdb
-    cp -r $src/histdb-* $src/*.zsh $src/db_migrations $out/share/zsh/plugins/zsh-histdb/
-  '';
-}

nix/configuration/network.nix

@@ -42,6 +42,5 @@
     iw
     iwd
     ldns # for drill
-    arp-scan # To find devices on the network
   ];
 }

nix/configuration/roles/sound/default.nix

@@ -21,43 +21,5 @@
     pulse.enable = true;
     # If you want to use JACK applications, uncomment this
     #jack.enable = true;
-
-    extraLv2Packages = [ pkgs.rnnoise-plugin ];
-    configPackages = [
-      (pkgs.writeTextDir "share/pipewire/pipewire.conf.d/20-rnnoise.conf" ''
-        context.modules = [
-        {   name = libpipewire-module-filter-chain
-            args = {
-                node.description = "Noise Canceling source"
-                media.name = "Noise Canceling source"
-                filter.graph = {
-                    nodes = [
-                        {
-                            type = lv2
-                            name = rnnoise
-                            plugin = "https://github.com/werman/noise-suppression-for-voice#stereo"
-                            label = noise_suppressor_stereo
-                            control = {
-                            }
-                        }
-                    ]
-                }
-                capture.props = {
-                    node.name =  "capture.rnnoise_source"
-                    node.passive = true
-                    audio.rate = 48000
-                    # Optionally specify a specific input: (ID from `pactl list`)
-                    # target.object = "alsa_input.usb-Shure_Incorporated_Shure_Digital-00.analog-stereo"
-                }
-                playback.props = {
-                    node.name =  "rnnoise_source"
-                    media.class = Audio/Source
-                    audio.rate = 48000
-                }
-            }
-        }
-        ]
-      '')
-    ];
   };
 }

nix/configuration/roles/zsh/default.nix

@@ -1,98 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  zshrc = pkgs.writeTextFile {
-    name = ".zshrc";
-    text = ''
-      # Lines configured by zsh-newuser-install
-      HISTFILE=~/.zhistory
-      HISTSIZE=100000
-      SAVEHIST=100000
-      setopt appendhistory notify
-      unsetopt beep
-      bindkey -e
-      # End of lines configured by zsh-newuser-install
-      # The following lines were added by compinstall
-      #
-
-      # Use menu complete immediately instead of after the first tab
-      setopt MENU_COMPLETE
-
-      zstyle :compinstall filename "$HOME/.zshrc"
-
-      autoload -Uz compinit
-      compinit
-      # End of lines added by compinstall
-
-      # Enable the 2d menu for tab completion
-      zstyle ':completion:*' menu select
-
-      autoload colors zsh/terminfo
-      if [[ "$terminfo[colors]" -ge 8 ]]; then
-          colors
-      fi
-      for color in RED GREEN YELLOW BLUE MAGENTA CYAN WHITE; do
-          eval PR_$color='%{$terminfo[bold]$fg[''${(L)color}]%}'
-          eval PR_LIGHT_$color='%{$fg[''${(L)color}]%}'
-          (( count = $count + 1 ))
-      done
-      PR_NO_COLOR="%{$terminfo[sgr0]%}"
-      PS1="[$PR_BLUE%n$PR_WHITE@$PR_GREEN%U%m%u$PR_NO_COLOR:$PR_RED%2c$PR_NO_COLOR]%(!.#.$) "
-
-      source ${pkgs.zsh-histdb}/share/zsh/plugins/zsh-histdb/sqlite-history.zsh
-      autoload -Uz add-zsh-hook
-
-      source ${pkgs.zsh-histdb}/share/zsh/plugins/zsh-histdb/histdb-interactive.zsh
-      bindkey '^r' _histdb-isearch
-
-      # TODO: Consider moving to /etc/profile.d
-      #while read file; do
-      #    if [ -e "$file" ]; then
-      #        source "$file"
-      #    fi
-      #done <<<"$(find $HOME/.config/ansible_deploy/zshrc -maxdepth 1 -type f -name '*.zsh' -print)"
-    '';
-  };
-in
-{
-  imports = [ ];
-
-  environment.systemPackages = with pkgs; [
-    zsh
-    sqlite # TODO: can this be pulled into zsh-histdb automatically?
-  ];
-
-  users.users.talexander.shell = pkgs.zsh;
-  environment.shells = with pkgs; [ zsh ];
-
-  programs.zsh = {
-    enable = true;
-  };
-
-  home-manager.users.talexander =
-    { pkgs, ... }:
-    {
-      home.file.".zshrc" = {
-        source = "${zshrc}";
-      };
-    };
-
-  environment.persistence."/persist" = lib.mkIf (!config.me.buildingIso) {
-    hideMounts = true;
-    users.talexander = {
-      directories = [
-        {
-          directory = ".histdb";
-          user = "talexander";
-          group = "talexander";
-          mode = "0700";
-        }
-      ];
-    };
-  };
-}