From 1a55a41d4def525c4f395be3440f242312c81fcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?= Date: Sat, 11 Oct 2025 23:28:21 +0200 Subject: [PATCH] style: sort program/module list alphabetically --- SwarselSystems.org | 210 +++++++++++++++------------- modules/home/common/programs.nix | 24 ++-- profiles/home/personal/default.nix | 102 ++++++++------ profiles/nixos/personal/default.nix | 82 +++++------ 4 files changed, 223 insertions(+), 195 deletions(-) diff --git a/SwarselSystems.org b/SwarselSystems.org index 07af640..49cc57d 100644 --- a/SwarselSystems.org +++ b/SwarselSystems.org @@ -11701,7 +11701,7 @@ Sets environment variables. Here I am only setting the EDITOR variable, most var } #+end_src -**** General Programs: bottom, imv, sioyek, bat, carapace, wlogout, swayr, yt-dlp, mpv, jq, nix-index, ripgrep, pandoc, fzf, zoxide +**** General Programs: bottom, imv, less, lesspipe, sioyek, bat, carapace, wlogout, swayr, yt-dlp, mpv, jq, nix-index, ripgrep, pandoc, fzf, zoxide, timidity :PROPERTIES: :CUSTOM_ID: h:f0e0b580-2e1c-4ca6-a983-f05d3ebbbcde :END: @@ -11714,26 +11714,30 @@ This section is for programs that require no further configuration. zsh Integrat options.swarselmodules.programs = lib.mkEnableOption "programs settings"; config = lib.mkIf config.swarselmodules.programs { programs = { - bottom.enable = true; - imv.enable = true; - sioyek.enable = true; bat = { enable = true; extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ]; }; + bottom.enable = true; carapace.enable = true; - wlogout.enable = true; - swayr.enable = true; - yt-dlp.enable = true; - mpv.enable = true; - jq.enable = true; - ripgrep.enable = true; - pandoc.enable = true; fzf = { enable = true; enableBashIntegration = false; enableZshIntegration = false; }; + imv.enable = true; + jq.enable = true; + less.enable = true; + lesspipe.enable = true; + mpv.enable = true; + pandoc.enable = true; + rclone.enable = true; + ripgrep.enable = true; + sioyek.enable = true; + swayr.enable = true; + timidity.enable = true; + wlogout.enable = true; + yt-dlp.enable = true; zoxide = { enable = true; enableZshIntegration = true; @@ -18041,52 +18045,52 @@ Modules that need to be loaded on the NixOS level. Note that these will not be a options.swarselprofiles.personal = lib.mkEnableOption "is this a personal host"; config = lib.mkIf config.swarselprofiles.personal { swarselmodules = { - packages = lib.mkDefault true; - pii = lib.mkDefault true; - general = lib.mkDefault true; - home-manager = lib.mkDefault true; - xserver = lib.mkDefault true; - users = lib.mkDefault true; - env = lib.mkDefault true; - security = lib.mkDefault true; - systemdTimeout = lib.mkDefault true; - hardware = lib.mkDefault true; - pulseaudio = lib.mkDefault true; - pipewire = lib.mkDefault true; - network = lib.mkDefault true; - time = lib.mkDefault true; - sops = lib.mkDefault true; - stylix = lib.mkDefault true; - programs = lib.mkDefault true; - zsh = lib.mkDefault true; - syncthing = lib.mkDefault true; - blueman = lib.mkDefault true; - networkDevices = lib.mkDefault true; - gvfs = lib.mkDefault true; - interceptionTools = lib.mkDefault true; # keyd = lib.mkDefault true; - swayosd = lib.mkDefault true; - ppd = lib.mkDefault true; - yubikey = lib.mkDefault true; - ledger = lib.mkDefault true; - keyboards = lib.mkDefault true; - login = lib.mkDefault true; - nix-ld = lib.mkDefault true; - impermanence = lib.mkDefault true; - nvd = lib.mkDefault true; - gnome-keyring = lib.mkDefault true; - uwsm = lib.mkDefault true; - sway = lib.mkDefault true; - niri = lib.mkDefault true; - xdg-portal = lib.mkDefault true; - distrobox = lib.mkDefault true; appimage = lib.mkDefault true; - lid = lib.mkDefault true; - lowBattery = lib.mkDefault true; - lanzaboote = lib.mkDefault true; autologin = lib.mkDefault true; + blueman = lib.mkDefault true; boot = lib.mkDefault true; btrfs = lib.mkDefault true; + distrobox = lib.mkDefault true; + env = lib.mkDefault true; + general = lib.mkDefault true; + gnome-keyring = lib.mkDefault true; + gvfs = lib.mkDefault true; + hardware = lib.mkDefault true; + home-manager = lib.mkDefault true; + impermanence = lib.mkDefault true; + interceptionTools = lib.mkDefault true; + keyboards = lib.mkDefault true; + lanzaboote = lib.mkDefault true; + ledger = lib.mkDefault true; + lid = lib.mkDefault true; + login = lib.mkDefault true; + lowBattery = lib.mkDefault false; + network = lib.mkDefault true; + networkDevices = lib.mkDefault true; + niri = lib.mkDefault true; + nix-ld = lib.mkDefault true; + nvd = lib.mkDefault true; + packages = lib.mkDefault true; + pii = lib.mkDefault true; + pipewire = lib.mkDefault true; + ppd = lib.mkDefault true; + programs = lib.mkDefault true; + pulseaudio = lib.mkDefault true; + security = lib.mkDefault true; + sops = lib.mkDefault true; + stylix = lib.mkDefault true; + sway = lib.mkDefault true; + swayosd = lib.mkDefault true; + syncthing = lib.mkDefault true; + systemdTimeout = lib.mkDefault true; + time = lib.mkDefault true; + users = lib.mkDefault true; + uwsm = lib.mkDefault true; + xdg-portal = lib.mkDefault true; + xserver = lib.mkDefault true; + yubikey = lib.mkDefault true; + zsh = lib.mkDefault true; }; home-manager.users."${config.swarselsystems.mainUser}" = { @@ -18365,53 +18369,63 @@ This holds modules that are to be used on most hosts. These are also the most im options.swarselprofiles.personal = lib.mkEnableOption "is this a personal host"; config = lib.mkIf config.swarselprofiles.personal { swarselmodules = { - packages = lib.mkDefault true; - ownpackages = lib.mkDefault true; - general = lib.mkDefault true; - nixgl = lib.mkDefault true; - sops = lib.mkDefault false; - yubikey = lib.mkDefault false; - ssh = lib.mkDefault true; - stylix = lib.mkDefault true; - desktop = lib.mkDefault true; - symlink = lib.mkDefault true; - env = lib.mkDefault true; - programs = lib.mkDefault true; - nix-index = lib.mkDefault true; - passwordstore = lib.mkDefault true; - direnv = lib.mkDefault true; - eza = lib.mkDefault true; - atuin = lib.mkDefault true; - git = lib.mkDefault true; - fuzzel = lib.mkDefault true; - starship = lib.mkDefault true; - kitty = lib.mkDefault true; - zsh = lib.mkDefault true; - zellij = lib.mkDefault true; - tmux = lib.mkDefault true; - mail = lib.mkDefault true; - emacs = lib.mkDefault true; - waybar = lib.mkDefault true; - firefox = lib.mkDefault true; - gnome-keyring = lib.mkDefault true; - kdeconnect = lib.mkDefault true; - mako = lib.mkDefault true; - swayosd = lib.mkDefault true; - yubikeytouch = lib.mkDefault true; - sway = lib.mkDefault true; - niri = lib.mkDefault true; - kanshi = lib.mkDefault true; - gpgagent = lib.mkDefault true; - gammastep = lib.mkDefault true; - spicetify = lib.mkDefault true; - blueman-applet = lib.mkDefault true; - nm-applet = lib.mkDefault true; - obsidian-tray = lib.mkDefault true; - obsidian = lib.mkDefault true; - anki-tray = lib.mkDefault true; - element-tray = lib.mkDefault true; - vesktop-tray = lib.mkDefault true; anki = lib.mkDefault true; + anki-tray = lib.mkDefault true; + atuin = lib.mkDefault true; + autotiling = lib.mkDefault true; + batsignal = lib.mkDefault true; + blueman-applet = lib.mkDefault true; + desktop = lib.mkDefault true; + direnv = lib.mkDefault true; + element-desktop = lib.mkDefault true; + element-tray = lib.mkDefault true; + emacs = lib.mkDefault true; + env = lib.mkDefault true; + eza = lib.mkDefault true; + firefox = lib.mkDefault true; + fuzzel = lib.mkDefault true; + gammastep = lib.mkDefault true; + general = lib.mkDefault true; + git = lib.mkDefault true; + gnome-keyring = lib.mkDefault true; + gpgagent = lib.mkDefault true; + hexchat = lib.mkDefault true; + kanshi = lib.mkDefault true; + kdeconnect = lib.mkDefault true; + kitty = lib.mkDefault true; + mail = lib.mkDefault true; + mako = lib.mkDefault true; + niri = lib.mkDefault true; + nix-index = lib.mkDefault true; + nixgl = lib.mkDefault true; + nix-your-shell = lib.mkDefault true; + nm-applet = lib.mkDefault true; + obs-studio = lib.mkDefault true; + obsidian = lib.mkDefault true; + obsidian-tray = lib.mkDefault true; + ownpackages = lib.mkDefault true; + packages = lib.mkDefault true; + passwordstore = lib.mkDefault true; + programs = lib.mkDefault true; + sops = lib.mkDefault false; + spicetify = lib.mkDefault true; + spotify-player = lib.mkDefault true; + ssh = lib.mkDefault true; + starship = lib.mkDefault true; + stylix = lib.mkDefault true; + sway = lib.mkDefault true; + swayidle = lib.mkDefault true; + swaylock = lib.mkDefault true; + swayosd = lib.mkDefault true; + symlink = lib.mkDefault true; + tmux = lib.mkDefault true; + vesktop = lib.mkDefault true; + vesktop-tray = lib.mkDefault true; + waybar = lib.mkDefault true; + yubikey = lib.mkDefault false; + yubikeytouch = lib.mkDefault true; + zellij = lib.mkDefault true; + zsh = lib.mkDefault true; }; }; diff --git a/modules/home/common/programs.nix b/modules/home/common/programs.nix index f971174..f577a87 100644 --- a/modules/home/common/programs.nix +++ b/modules/home/common/programs.nix @@ -3,26 +3,30 @@ options.swarselmodules.programs = lib.mkEnableOption "programs settings"; config = lib.mkIf config.swarselmodules.programs { programs = { - bottom.enable = true; - imv.enable = true; - sioyek.enable = true; bat = { enable = true; extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ]; }; + bottom.enable = true; carapace.enable = true; - wlogout.enable = true; - swayr.enable = true; - yt-dlp.enable = true; - mpv.enable = true; - jq.enable = true; - ripgrep.enable = true; - pandoc.enable = true; fzf = { enable = true; enableBashIntegration = false; enableZshIntegration = false; }; + imv.enable = true; + jq.enable = true; + less.enable = true; + lesspipe.enable = true; + mpv.enable = true; + pandoc.enable = true; + rclone.enable = true; + ripgrep.enable = true; + sioyek.enable = true; + swayr.enable = true; + timidity.enable = true; + wlogout.enable = true; + yt-dlp.enable = true; zoxide = { enable = true; enableZshIntegration = true; diff --git a/profiles/home/personal/default.nix b/profiles/home/personal/default.nix index 3ca38e1..cd554b7 100644 --- a/profiles/home/personal/default.nix +++ b/profiles/home/personal/default.nix @@ -3,53 +3,63 @@ options.swarselprofiles.personal = lib.mkEnableOption "is this a personal host"; config = lib.mkIf config.swarselprofiles.personal { swarselmodules = { - packages = lib.mkDefault true; - ownpackages = lib.mkDefault true; - general = lib.mkDefault true; - nixgl = lib.mkDefault true; - sops = lib.mkDefault false; - yubikey = lib.mkDefault false; - ssh = lib.mkDefault true; - stylix = lib.mkDefault true; - desktop = lib.mkDefault true; - symlink = lib.mkDefault true; - env = lib.mkDefault true; - programs = lib.mkDefault true; - nix-index = lib.mkDefault true; - passwordstore = lib.mkDefault true; - direnv = lib.mkDefault true; - eza = lib.mkDefault true; - atuin = lib.mkDefault true; - git = lib.mkDefault true; - fuzzel = lib.mkDefault true; - starship = lib.mkDefault true; - kitty = lib.mkDefault true; - zsh = lib.mkDefault true; - zellij = lib.mkDefault true; - tmux = lib.mkDefault true; - mail = lib.mkDefault true; - emacs = lib.mkDefault true; - waybar = lib.mkDefault true; - firefox = lib.mkDefault true; - gnome-keyring = lib.mkDefault true; - kdeconnect = lib.mkDefault true; - mako = lib.mkDefault true; - swayosd = lib.mkDefault true; - yubikeytouch = lib.mkDefault true; - sway = lib.mkDefault true; - niri = lib.mkDefault true; - kanshi = lib.mkDefault true; - gpgagent = lib.mkDefault true; - gammastep = lib.mkDefault true; - spicetify = lib.mkDefault true; - blueman-applet = lib.mkDefault true; - nm-applet = lib.mkDefault true; - obsidian-tray = lib.mkDefault true; - obsidian = lib.mkDefault true; - anki-tray = lib.mkDefault true; - element-tray = lib.mkDefault true; - vesktop-tray = lib.mkDefault true; anki = lib.mkDefault true; + anki-tray = lib.mkDefault true; + atuin = lib.mkDefault true; + autotiling = lib.mkDefault true; + batsignal = lib.mkDefault true; + blueman-applet = lib.mkDefault true; + desktop = lib.mkDefault true; + direnv = lib.mkDefault true; + element-desktop = lib.mkDefault true; + element-tray = lib.mkDefault true; + emacs = lib.mkDefault true; + env = lib.mkDefault true; + eza = lib.mkDefault true; + firefox = lib.mkDefault true; + fuzzel = lib.mkDefault true; + gammastep = lib.mkDefault true; + general = lib.mkDefault true; + git = lib.mkDefault true; + gnome-keyring = lib.mkDefault true; + gpgagent = lib.mkDefault true; + hexchat = lib.mkDefault true; + kanshi = lib.mkDefault true; + kdeconnect = lib.mkDefault true; + kitty = lib.mkDefault true; + mail = lib.mkDefault true; + mako = lib.mkDefault true; + niri = lib.mkDefault true; + nix-index = lib.mkDefault true; + nixgl = lib.mkDefault true; + nix-your-shell = lib.mkDefault true; + nm-applet = lib.mkDefault true; + obs-studio = lib.mkDefault true; + obsidian = lib.mkDefault true; + obsidian-tray = lib.mkDefault true; + ownpackages = lib.mkDefault true; + packages = lib.mkDefault true; + passwordstore = lib.mkDefault true; + programs = lib.mkDefault true; + sops = lib.mkDefault false; + spicetify = lib.mkDefault true; + spotify-player = lib.mkDefault true; + ssh = lib.mkDefault true; + starship = lib.mkDefault true; + stylix = lib.mkDefault true; + sway = lib.mkDefault true; + swayidle = lib.mkDefault true; + swaylock = lib.mkDefault true; + swayosd = lib.mkDefault true; + symlink = lib.mkDefault true; + tmux = lib.mkDefault true; + vesktop = lib.mkDefault true; + vesktop-tray = lib.mkDefault true; + waybar = lib.mkDefault true; + yubikey = lib.mkDefault false; + yubikeytouch = lib.mkDefault true; + zellij = lib.mkDefault true; + zsh = lib.mkDefault true; }; }; diff --git a/profiles/nixos/personal/default.nix b/profiles/nixos/personal/default.nix index f685224..1dadd06 100644 --- a/profiles/nixos/personal/default.nix +++ b/profiles/nixos/personal/default.nix @@ -3,52 +3,52 @@ options.swarselprofiles.personal = lib.mkEnableOption "is this a personal host"; config = lib.mkIf config.swarselprofiles.personal { swarselmodules = { - packages = lib.mkDefault true; - pii = lib.mkDefault true; - general = lib.mkDefault true; - home-manager = lib.mkDefault true; - xserver = lib.mkDefault true; - users = lib.mkDefault true; - env = lib.mkDefault true; - security = lib.mkDefault true; - systemdTimeout = lib.mkDefault true; - hardware = lib.mkDefault true; - pulseaudio = lib.mkDefault true; - pipewire = lib.mkDefault true; - network = lib.mkDefault true; - time = lib.mkDefault true; - sops = lib.mkDefault true; - stylix = lib.mkDefault true; - programs = lib.mkDefault true; - zsh = lib.mkDefault true; - syncthing = lib.mkDefault true; - blueman = lib.mkDefault true; - networkDevices = lib.mkDefault true; - gvfs = lib.mkDefault true; - interceptionTools = lib.mkDefault true; # keyd = lib.mkDefault true; - swayosd = lib.mkDefault true; - ppd = lib.mkDefault true; - yubikey = lib.mkDefault true; - ledger = lib.mkDefault true; - keyboards = lib.mkDefault true; - login = lib.mkDefault true; - nix-ld = lib.mkDefault true; - impermanence = lib.mkDefault true; - nvd = lib.mkDefault true; - gnome-keyring = lib.mkDefault true; - uwsm = lib.mkDefault true; - sway = lib.mkDefault true; - niri = lib.mkDefault true; - xdg-portal = lib.mkDefault true; - distrobox = lib.mkDefault true; appimage = lib.mkDefault true; - lid = lib.mkDefault true; - lowBattery = lib.mkDefault true; - lanzaboote = lib.mkDefault true; autologin = lib.mkDefault true; + blueman = lib.mkDefault true; boot = lib.mkDefault true; btrfs = lib.mkDefault true; + distrobox = lib.mkDefault true; + env = lib.mkDefault true; + general = lib.mkDefault true; + gnome-keyring = lib.mkDefault true; + gvfs = lib.mkDefault true; + hardware = lib.mkDefault true; + home-manager = lib.mkDefault true; + impermanence = lib.mkDefault true; + interceptionTools = lib.mkDefault true; + keyboards = lib.mkDefault true; + lanzaboote = lib.mkDefault true; + ledger = lib.mkDefault true; + lid = lib.mkDefault true; + login = lib.mkDefault true; + lowBattery = lib.mkDefault false; + network = lib.mkDefault true; + networkDevices = lib.mkDefault true; + niri = lib.mkDefault true; + nix-ld = lib.mkDefault true; + nvd = lib.mkDefault true; + packages = lib.mkDefault true; + pii = lib.mkDefault true; + pipewire = lib.mkDefault true; + ppd = lib.mkDefault true; + programs = lib.mkDefault true; + pulseaudio = lib.mkDefault true; + security = lib.mkDefault true; + sops = lib.mkDefault true; + stylix = lib.mkDefault true; + sway = lib.mkDefault true; + swayosd = lib.mkDefault true; + syncthing = lib.mkDefault true; + systemdTimeout = lib.mkDefault true; + time = lib.mkDefault true; + users = lib.mkDefault true; + uwsm = lib.mkDefault true; + xdg-portal = lib.mkDefault true; + xserver = lib.mkDefault true; + yubikey = lib.mkDefault true; + zsh = lib.mkDefault true; }; home-manager.users."${config.swarselsystems.mainUser}" = {