From 0243da86f28ec89a34556e0499bf76cca5bbad8c Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Sat, 12 Sep 2026 11:15:04 -0400 Subject: [PATCH 1/2] refactor(home): trim user packages and move GUI modules into Richie's config --- users/math/home/programs.nix | 39 +-------------------- users/{shared => richie/home/gui}/comms.nix | 0 users/richie/home/gui/default.nix | 8 ++--- users/{shared => richie/home/gui}/games.nix | 0 users/{shared => richie/home/gui}/sweet.nix | 0 users/richie/home/programs.nix | 13 ------- 6 files changed, 5 insertions(+), 55 deletions(-) rename users/{shared => richie/home/gui}/comms.nix (100%) rename users/{shared => richie/home/gui}/games.nix (100%) rename users/{shared => richie/home/gui}/sweet.nix (100%) diff --git a/users/math/home/programs.nix b/users/math/home/programs.nix index 15a46df..02ab180 100644 --- a/users/math/home/programs.nix +++ b/users/math/home/programs.nix @@ -3,54 +3,17 @@ home.packages = with pkgs; [ # cli bat - btop - eza - fd - ffmpegthumbnailer fzf git - gnupg - imagemagick jq ncdu - ouch + fastfetch p7zip - poppler rar - ripgrep - starship - tmux unzip - yazi zoxide - # system info - hwloc - lynis - pciutils - smartmontools - usbutils - # networking - iperf3 - nmap - wget # python ruff uv - # nodejs - nodejs - # Rust packages - trunk - wasm-pack - cargo-watch - cargo-generate - cargo-audit - cargo-update - # nix - nix-init - nix-output-monitor - nix-prefetch - nix-tree - nixfmt - treefmt ]; } diff --git a/users/shared/comms.nix b/users/richie/home/gui/comms.nix similarity index 100% rename from users/shared/comms.nix rename to users/richie/home/gui/comms.nix diff --git a/users/richie/home/gui/default.nix b/users/richie/home/gui/default.nix index 3486a21..fff6342 100644 --- a/users/richie/home/gui/default.nix +++ b/users/richie/home/gui/default.nix @@ -1,12 +1,12 @@ -{ inputs, pkgs, ... }: +{ pkgs, ... }: { imports = [ - "${inputs.self}/users/shared/comms.nix" - "${inputs.self}/users/shared/games.nix" - "${inputs.self}/users/shared/sweet.nix" + ./comms.nix ./firefox + ./games.nix ./kitty.nix ./llm_tools.nix + ./sweet.nix ./t3_code ./vscode ]; diff --git a/users/shared/games.nix b/users/richie/home/gui/games.nix similarity index 100% rename from users/shared/games.nix rename to users/richie/home/gui/games.nix diff --git a/users/shared/sweet.nix b/users/richie/home/gui/sweet.nix similarity index 100% rename from users/shared/sweet.nix rename to users/richie/home/gui/sweet.nix diff --git a/users/richie/home/programs.nix b/users/richie/home/programs.nix index d380da4..0d31f28 100644 --- a/users/richie/home/programs.nix +++ b/users/richie/home/programs.nix @@ -3,21 +3,14 @@ home.packages = with pkgs; [ # cli bat - fd - ffmpegthumbnailer fzf git - gnupg - imagemagick jq ncdu fastfetch - ouch p7zip - poppler rar unzip - yazi zoxide # Home Assistant esphome @@ -35,8 +28,6 @@ # python ruff uv - # nodejs - nodejs # Rust packages bacon cargo @@ -51,9 +42,6 @@ rustfmt trunk wasm-pack - # cpp - clang-tools - clang_20 # nix nix-init nix-output-monitor @@ -61,6 +49,5 @@ nix-tree nixfmt treefmt - codebase-memory-mcp ]; } -- 2.55.0 From f1f027abfe7b864e3afaaf4b3bcdfaae6f73b2df Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Sat, 12 Sep 2026 11:15:37 -0400 Subject: [PATCH 2/2] removed steve --- systems/bob/default.nix | 1 - systems/jeeves/default.nix | 3 +- users/steve/default.nix | 44 ------------------------- users/steve/home/cli/default.nix | 9 ----- users/steve/home/cli/direnv.nix | 8 ----- users/steve/home/cli/git.nix | 15 --------- users/steve/home/cli/zsh.nix | 28 ---------------- users/steve/home/global.nix | 22 ------------- users/steve/home/programs.nix | 56 -------------------------------- users/steve/home/ssh_config.nix | 6 ---- users/steve/systems/bob.nix | 5 --- users/steve/systems/jeeves.nix | 5 --- 12 files changed, 1 insertion(+), 201 deletions(-) delete mode 100644 users/steve/default.nix delete mode 100644 users/steve/home/cli/default.nix delete mode 100644 users/steve/home/cli/direnv.nix delete mode 100644 users/steve/home/cli/git.nix delete mode 100644 users/steve/home/cli/zsh.nix delete mode 100644 users/steve/home/global.nix delete mode 100644 users/steve/home/programs.nix delete mode 100644 users/steve/home/ssh_config.nix delete mode 100644 users/steve/systems/bob.nix delete mode 100644 users/steve/systems/jeeves.nix diff --git a/systems/bob/default.nix b/systems/bob/default.nix index 638dd2f..7cfff86 100644 --- a/systems/bob/default.nix +++ b/systems/bob/default.nix @@ -3,7 +3,6 @@ imports = [ "${inputs.self}/users/math" "${inputs.self}/users/richie" - "${inputs.self}/users/steve" "${inputs.self}/common/global" "${inputs.self}/common/optional/docker.nix" "${inputs.self}/common/optional/monitoring-agent.nix" diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix index 9f1a836..242f708 100644 --- a/systems/jeeves/default.nix +++ b/systems/jeeves/default.nix @@ -1,4 +1,4 @@ -{ inputs, lib, ... }: +{ inputs, ... }: let vars = import ./vars.nix; in @@ -6,7 +6,6 @@ in imports = [ "${inputs.self}/users/math" "${inputs.self}/users/richie" - "${inputs.self}/users/steve" "${inputs.self}/common/global" "${inputs.self}/common/optional/docker.nix" "${inputs.self}/common/optional/monitoring-agent.nix" diff --git a/users/steve/default.nix b/users/steve/default.nix deleted file mode 100644 index d9bdfe3..0000000 --- a/users/steve/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - pkgs, - config, - ... -}: -let - ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups; -in -{ - - users = { - users.steve = { - isNormalUser = true; - - shell = pkgs.zsh; - group = "steve"; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJH03VzDbUhzfhvwD+OsYh6GobODYaI9jdNdzWQoqFsp matth@Jove" # cspell:disable-line - ]; - extraGroups = [ - "audio" - "video" - "wheel" - "users" - ] - ++ ifTheyExist [ - "dialout" - "docker" - "hass" - "libvirtd" - "networkmanager" - "plugdev" - "scanner" - "transmission" - "uaccess" - "wireshark" - ]; - uid = 1005; - }; - - groups.steve.gid = 1005; - }; - home-manager.users.steve = import ./systems/${config.networking.hostName}.nix; -} diff --git a/users/steve/home/cli/default.nix b/users/steve/home/cli/default.nix deleted file mode 100644 index 863c25f..0000000 --- a/users/steve/home/cli/default.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - imports = [ - ./direnv.nix - ./git.nix - ./zsh.nix - ]; - - programs.starship.enable = true; -} diff --git a/users/steve/home/cli/direnv.nix b/users/steve/home/cli/direnv.nix deleted file mode 100644 index 75129d9..0000000 --- a/users/steve/home/cli/direnv.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - - programs.direnv = { - enable = true; - enableZshIntegration = true; - nix-direnv.enable = true; - }; -} diff --git a/users/steve/home/cli/git.nix b/users/steve/home/cli/git.nix deleted file mode 100644 index d4ade0f..0000000 --- a/users/steve/home/cli/git.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - programs.git = { - enable = true; - signing.format = null; - settings = { - user = { - email = "matthew.michal11@gmail.com"; - name = "Matthew Michal"; - }; - pull.rebase = true; - color.ui = true; - }; - lfs.enable = true; - }; -} diff --git a/users/steve/home/cli/zsh.nix b/users/steve/home/cli/zsh.nix deleted file mode 100644 index 69cf853..0000000 --- a/users/steve/home/cli/zsh.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - programs.zsh = { - enable = true; - syntaxHighlighting.enable = true; - history.size = 10000; - oh-my-zsh = { - enable = true; - plugins = [ - "git" - "docker" - "docker-compose" - "colored-man-pages" - "rust" - "systemd" - "tmux" - "ufw" - "z" - ]; - }; - shellAliases = { - "lrt" = "eza --icons -lsnew"; - "ls" = "eza"; - "ll" = "eza --long --group"; - "la" = "eza --all"; - - }; - }; -} diff --git a/users/steve/home/global.nix b/users/steve/home/global.nix deleted file mode 100644 index c23a756..0000000 --- a/users/steve/home/global.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ config, ... }: -{ - imports = [ - ./cli - ./programs.nix - ./ssh_config.nix - ]; - - programs = { - home-manager.enable = true; - git.enable = true; - }; - - home = { - username = "steve"; - homeDirectory = "/home/${config.home.username}"; - stateVersion = "24.05"; - sessionVariables = { - FLAKE = "$HOME/dotfiles"; - }; - }; -} diff --git a/users/steve/home/programs.nix b/users/steve/home/programs.nix deleted file mode 100644 index 15a46df..0000000 --- a/users/steve/home/programs.nix +++ /dev/null @@ -1,56 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = with pkgs; [ - # cli - bat - btop - eza - fd - ffmpegthumbnailer - fzf - git - gnupg - imagemagick - jq - ncdu - ouch - p7zip - poppler - rar - ripgrep - starship - tmux - unzip - yazi - zoxide - # system info - hwloc - lynis - pciutils - smartmontools - usbutils - # networking - iperf3 - nmap - wget - # python - ruff - uv - # nodejs - nodejs - # Rust packages - trunk - wasm-pack - cargo-watch - cargo-generate - cargo-audit - cargo-update - # nix - nix-init - nix-output-monitor - nix-prefetch - nix-tree - nixfmt - treefmt - ]; -} diff --git a/users/steve/home/ssh_config.nix b/users/steve/home/ssh_config.nix deleted file mode 100644 index 8b9aa69..0000000 --- a/users/steve/home/ssh_config.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - programs.ssh = { - enable = true; - enableDefaultConfig = false; - }; -} diff --git a/users/steve/systems/bob.nix b/users/steve/systems/bob.nix deleted file mode 100644 index 6bbef61..0000000 --- a/users/steve/systems/bob.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ../home/global.nix - ]; -} diff --git a/users/steve/systems/jeeves.nix b/users/steve/systems/jeeves.nix deleted file mode 100644 index 6bbef61..0000000 --- a/users/steve/systems/jeeves.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - imports = [ - ../home/global.nix - ]; -} -- 2.55.0