From 1d7c4cebebe916d0fb53618d6a1a9ba9d95a278e Mon Sep 17 00:00:00 2001 From: MDietermann Date: Wed, 12 Aug 2026 15:37:35 +0200 Subject: [PATCH] Collapse 26 trivial single-package programs into home/programs/common.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Consolidates alacritty, audacity, blender, blockbench, claude-code, fd, filezilla, fzf, gcc, godot_4, imv, jdk21, jetbrains-toolbox, lazygit, lua-language-server, mpv, nil, nixpkgs-fmt, nodejs, obsidian, pkg-config, prismlauncher, vesktop, xclip, xwallpaper, yt-dlp into a single list. rustup.nix kept separate due to its configuration (session vars, many deps). Updates imports: - hivebrain: all 26 + rustup now via common.nix + rustup.nix - nikita-nixos: blender.nix → common.nix (gets all lightweight tools) --- home/programs/alacritty.nix | 4 ---- home/programs/audacity.nix | 4 ---- home/programs/blender.nix | 4 ---- home/programs/blockbench.nix | 4 ---- home/programs/claude-code.nix | 4 ---- home/programs/common.nix | 31 +++++++++++++++++++++++++++ home/programs/fd.nix | 4 ---- home/programs/filezilla.nix | 4 ---- home/programs/fzf.nix | 4 ---- home/programs/gcc.nix | 4 ---- home/programs/godot.nix | 4 ---- home/programs/imv.nix | 4 ---- home/programs/jdk.nix | 4 ---- home/programs/jetbrains-toolbox.nix | 4 ---- home/programs/lazygit.nix | 4 ---- home/programs/lua-language-server.nix | 4 ---- home/programs/mpv.nix | 4 ---- home/programs/nil.nix | 4 ---- home/programs/nixpkgs-fmt.nix | 4 ---- home/programs/nodejs.nix | 4 ---- home/programs/obsidian.nix | 4 ---- home/programs/pkg-config.nix | 4 ---- home/programs/prismlauncher.nix | 4 ---- home/programs/vesktop.nix | 4 ---- home/programs/xclip.nix | 4 ---- home/programs/xwallpaper.nix | 4 ---- home/programs/yt-dlp.nix | 4 ---- hosts/hivebrain/home.nix | 27 +---------------------- hosts/nikita-nixos/home.nix | 2 +- 29 files changed, 33 insertions(+), 131 deletions(-) delete mode 100644 home/programs/alacritty.nix delete mode 100644 home/programs/audacity.nix delete mode 100644 home/programs/blender.nix delete mode 100644 home/programs/blockbench.nix delete mode 100644 home/programs/claude-code.nix create mode 100644 home/programs/common.nix delete mode 100644 home/programs/fd.nix delete mode 100644 home/programs/filezilla.nix delete mode 100644 home/programs/fzf.nix delete mode 100644 home/programs/gcc.nix delete mode 100644 home/programs/godot.nix delete mode 100644 home/programs/imv.nix delete mode 100644 home/programs/jdk.nix delete mode 100644 home/programs/jetbrains-toolbox.nix delete mode 100644 home/programs/lazygit.nix delete mode 100644 home/programs/lua-language-server.nix delete mode 100644 home/programs/mpv.nix delete mode 100644 home/programs/nil.nix delete mode 100644 home/programs/nixpkgs-fmt.nix delete mode 100644 home/programs/nodejs.nix delete mode 100644 home/programs/obsidian.nix delete mode 100644 home/programs/pkg-config.nix delete mode 100644 home/programs/prismlauncher.nix delete mode 100644 home/programs/vesktop.nix delete mode 100644 home/programs/xclip.nix delete mode 100644 home/programs/xwallpaper.nix delete mode 100644 home/programs/yt-dlp.nix diff --git a/home/programs/alacritty.nix b/home/programs/alacritty.nix deleted file mode 100644 index 9795f2f..0000000 --- a/home/programs/alacritty.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.alacritty ]; -} diff --git a/home/programs/audacity.nix b/home/programs/audacity.nix deleted file mode 100644 index b570400..0000000 --- a/home/programs/audacity.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.audacity ]; -} diff --git a/home/programs/blender.nix b/home/programs/blender.nix deleted file mode 100644 index f7e34ca..0000000 --- a/home/programs/blender.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.blender ]; -} diff --git a/home/programs/blockbench.nix b/home/programs/blockbench.nix deleted file mode 100644 index e17a897..0000000 --- a/home/programs/blockbench.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.blockbench ]; -} diff --git a/home/programs/claude-code.nix b/home/programs/claude-code.nix deleted file mode 100644 index 7c25562..0000000 --- a/home/programs/claude-code.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.claude-code ]; -} diff --git a/home/programs/common.nix b/home/programs/common.nix new file mode 100644 index 0000000..9cfd33e --- /dev/null +++ b/home/programs/common.nix @@ -0,0 +1,31 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ + alacritty + audacity + blender + blockbench + claude-code + fd + filezilla + fzf + gcc + godot_4 + imv + jdk21 + jetbrains-toolbox + lazygit + lua-language-server + mpv + nil + nixpkgs-fmt + nodejs + obsidian + pkg-config + prismlauncher + vesktop + xclip + xwallpaper + yt-dlp + ]; +} diff --git a/home/programs/fd.nix b/home/programs/fd.nix deleted file mode 100644 index 61bd222..0000000 --- a/home/programs/fd.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.fd ]; -} diff --git a/home/programs/filezilla.nix b/home/programs/filezilla.nix deleted file mode 100644 index fe425a2..0000000 --- a/home/programs/filezilla.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.filezilla ]; -} diff --git a/home/programs/fzf.nix b/home/programs/fzf.nix deleted file mode 100644 index 3cc0147..0000000 --- a/home/programs/fzf.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.fzf ]; -} diff --git a/home/programs/gcc.nix b/home/programs/gcc.nix deleted file mode 100644 index e7876f3..0000000 --- a/home/programs/gcc.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.gcc ]; -} diff --git a/home/programs/godot.nix b/home/programs/godot.nix deleted file mode 100644 index 3eafd81..0000000 --- a/home/programs/godot.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.godot_4 ]; -} diff --git a/home/programs/imv.nix b/home/programs/imv.nix deleted file mode 100644 index 2d090e4..0000000 --- a/home/programs/imv.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.imv ]; -} diff --git a/home/programs/jdk.nix b/home/programs/jdk.nix deleted file mode 100644 index d03e3b8..0000000 --- a/home/programs/jdk.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.jdk21 ]; -} diff --git a/home/programs/jetbrains-toolbox.nix b/home/programs/jetbrains-toolbox.nix deleted file mode 100644 index 2460d94..0000000 --- a/home/programs/jetbrains-toolbox.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.jetbrains-toolbox ]; -} diff --git a/home/programs/lazygit.nix b/home/programs/lazygit.nix deleted file mode 100644 index 720dbd7..0000000 --- a/home/programs/lazygit.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.lazygit ]; -} diff --git a/home/programs/lua-language-server.nix b/home/programs/lua-language-server.nix deleted file mode 100644 index 85fe1b2..0000000 --- a/home/programs/lua-language-server.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.lua-language-server ]; -} diff --git a/home/programs/mpv.nix b/home/programs/mpv.nix deleted file mode 100644 index 368b977..0000000 --- a/home/programs/mpv.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.mpv ]; -} diff --git a/home/programs/nil.nix b/home/programs/nil.nix deleted file mode 100644 index 2f79402..0000000 --- a/home/programs/nil.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.nil ]; -} diff --git a/home/programs/nixpkgs-fmt.nix b/home/programs/nixpkgs-fmt.nix deleted file mode 100644 index 850628c..0000000 --- a/home/programs/nixpkgs-fmt.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.nixpkgs-fmt ]; -} diff --git a/home/programs/nodejs.nix b/home/programs/nodejs.nix deleted file mode 100644 index 2c1beeb..0000000 --- a/home/programs/nodejs.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.nodejs ]; -} diff --git a/home/programs/obsidian.nix b/home/programs/obsidian.nix deleted file mode 100644 index 510f09e..0000000 --- a/home/programs/obsidian.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.obsidian ]; -} diff --git a/home/programs/pkg-config.nix b/home/programs/pkg-config.nix deleted file mode 100644 index a9fad61..0000000 --- a/home/programs/pkg-config.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.pkg-config ]; -} diff --git a/home/programs/prismlauncher.nix b/home/programs/prismlauncher.nix deleted file mode 100644 index 10cdc0a..0000000 --- a/home/programs/prismlauncher.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.prismlauncher ]; -} diff --git a/home/programs/vesktop.nix b/home/programs/vesktop.nix deleted file mode 100644 index 9eae666..0000000 --- a/home/programs/vesktop.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.vesktop ]; -} diff --git a/home/programs/xclip.nix b/home/programs/xclip.nix deleted file mode 100644 index 0841e80..0000000 --- a/home/programs/xclip.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.xclip ]; -} diff --git a/home/programs/xwallpaper.nix b/home/programs/xwallpaper.nix deleted file mode 100644 index a784f6d..0000000 --- a/home/programs/xwallpaper.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.xwallpaper ]; -} diff --git a/home/programs/yt-dlp.nix b/home/programs/yt-dlp.nix deleted file mode 100644 index a33c6f2..0000000 --- a/home/programs/yt-dlp.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [ pkgs.yt-dlp ]; -} diff --git a/hosts/hivebrain/home.nix b/hosts/hivebrain/home.nix index c3d9285..6bb5b7d 100644 --- a/hosts/hivebrain/home.nix +++ b/hosts/hivebrain/home.nix @@ -9,33 +9,8 @@ ../../home/symlinks.nix ../../home/tmux.nix ../../home/packages-base.nix - ../../home/programs/alacritty.nix - ../../home/programs/audacity.nix - ../../home/programs/blender.nix - ../../home/programs/blockbench.nix - ../../home/programs/claude-code.nix - ../../home/programs/fd.nix - ../../home/programs/filezilla.nix - ../../home/programs/fzf.nix - ../../home/programs/gcc.nix - ../../home/programs/godot.nix - ../../home/programs/imv.nix - ../../home/programs/jetbrains-toolbox.nix - ../../home/programs/jdk.nix - ../../home/programs/lazygit.nix - ../../home/programs/lua-language-server.nix - ../../home/programs/mpv.nix - ../../home/programs/nil.nix - ../../home/programs/nixpkgs-fmt.nix - ../../home/programs/nodejs.nix - ../../home/programs/obsidian.nix - ../../home/programs/pkg-config.nix - ../../home/programs/prismlauncher.nix + ../../home/programs/common.nix ../../home/programs/rustup.nix - ../../home/programs/vesktop.nix - ../../home/programs/xclip.nix - ../../home/programs/xwallpaper.nix - ../../home/programs/yt-dlp.nix ]; home.username = "marvin"; diff --git a/hosts/nikita-nixos/home.nix b/hosts/nikita-nixos/home.nix index cb6a8e3..8435c64 100644 --- a/hosts/nikita-nixos/home.nix +++ b/hosts/nikita-nixos/home.nix @@ -7,7 +7,7 @@ ../../home/yazi.nix ../../home/symlinks.nix ../../home/packages-base.nix - ../../home/programs/blender.nix + ../../home/programs/common.nix ]; home.username = "nikita";