commit 6c88f061944a2cf07f7942bd92fff8ea9050865c
parent 2feadbcf9aec02cbac54a22c5b2e4eab0bd31a5e
Author: Peter <peter@minskio.co.uk>
Date: Fri, 25 Sep 2026 09:29:39 +0100
Auto-sort various lists
Diffstat:
13 files changed, 96 insertions(+), 43 deletions(-)
diff --git a/common/packages.nix b/common/packages.nix
@@ -1,6 +1,7 @@
{ lib, pkgs, ... }: {
environment.systemPackages = with pkgs; [
+ # sort:start
fastfetch
ffmpeg
file
@@ -18,6 +19,7 @@
syncthing
tmux
unzip
+ # sort:end
];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
diff --git a/home/chromium.nix b/home/chromium.nix
@@ -14,11 +14,15 @@
];
commandLineArgs = [
- "--homepage=https://breadcat.github.io/startpage/"
+ # sort:start
+ "--disable-features=AiModeOmniboxEntryPoint"
+ "--disable-features=HideAimEntrypointOnUserInput"
+ "--disable-features=Translate"
+ "--enable-feature=WebUIDarkMode"
"--force-dark-mode"
+ "--homepage=https://breadcat.github.io/startpage/"
"--no-default-browser-check"
- "--enable-feature=WebUIDarkMode"
- "--disable-features=Translate"
+ # sort:end
];
};
diff --git a/home/espanso.nix b/home/espanso.nix
@@ -14,37 +14,37 @@
matches = {
base = {
matches = [
- { trigger = "(ae)"; replace = "æ"; }
+ # sort:start
+ { trigger = "(!!)"; replace = "¡"; }
+ { trigger = "(!?)"; replace = "‽"; }
+ { trigger = "(?!)"; replace = "‽"; }
+ { trigger = "(??)"; replace = "¿"; }
{ trigger = "(Ae)"; replace = "Æ"; }
- { trigger = "(AE)"; replace = "Æ"; }
- { trigger = "(ai)"; replace = "ä"; }
+ { trigger = "(ae)"; replace = "æ"; }
{ trigger = "(Ai)"; replace = "Ä"; }
- { trigger = "(AI)"; replace = "Ä"; }
- { trigger = "(ao)"; replace = "å"; }
+ { trigger = "(ai)"; replace = "ä"; }
{ trigger = "(Ao)"; replace = "Å"; }
- { trigger = "(AO)"; replace = "Å"; }
- { trigger = "(o/)"; replace = "ø"; }
+ { trigger = "(ao)"; replace = "å"; }
+ { trigger = "(deg)"; replace = "°"; }
{ trigger = "(O/)"; replace = "Ø"; }
- { trigger = "(oi)"; replace = "ö"; }
+ { trigger = "(o/)"; replace = "ø"; }
{ trigger = "(Oi)"; replace = "Ö"; }
- { trigger = "(OI)"; replace = "Ö"; }
- { trigger = "(??)"; replace = "¿"; }
- { trigger = "(!!)"; replace = "¡"; }
- { trigger = "(?!)"; replace = "‽"; }
- { trigger = "(!?)"; replace = "‽"; }
- { trigger = "(deg)"; replace = "°"; }
+ { trigger = "(oi)"; replace = "ö"; }
+ { trigger = "_addr"; replace = "${vars.user.address}"; }
{ trigger = "_date"; replace = "{{date}}"; }
- { trigger = "_time"; replace = "{{time}}"; }
{ trigger = "_dttime"; replace = "{{datetime}}"; }
- { trigger = "_reg"; replace = "\n\nRegards,\n${vars.user.fullname}"; }
- { trigger = "_kreg"; replace = "\n\nKind regards,\n${vars.user.fullname}"; }
{ trigger = "_hem"; replace = "${vars.user.email}"; }
- { trigger = "_addr"; replace = "${vars.user.address}"; }
+ { trigger = "_kreg"; replace = "\n\nKind regards,\n${vars.user.fullname}"; }
+ { trigger = "_reg"; replace = "\n\nRegards,\n${vars.user.fullname}"; }
+ { trigger = "_time"; replace = "{{time}}"; }
+ # sort:end
];
global_vars = [
- { name = "date"; type = "date"; params = { format = "%Y-%m-%d"; }; }
- { name = "time"; type = "date"; params = { format = "%H:%M"; }; }
- { name = "datetime"; type = "date"; params = { format = "%Y-%m-%dT%H:%M"; }; }
+ # sort:start
+ { name = "date"; type = "date"; params = { format = "%Y-%m-%d"; }; }
+ { name = "datetime"; type = "date"; params = { format = "%Y-%m-%dT%H:%M"; }; }
+ { name = "time"; type = "date"; params = { format = "%H:%M"; }; }
+ # sort:end
];
};
};
diff --git a/home/firefox.nix b/home/firefox.nix
@@ -12,6 +12,7 @@
isDefault = true;
settings = {
+ # sort:start
"browser.aboutConfig.showWarning" = false; # disable about:config warning
"browser.aboutwelcome.enabled" = false; # disable welcome screen
"browser.ai.control.default" = "blocked"; # ai blocking
@@ -49,6 +50,7 @@
"media.webspeech.synth.dont_notify_on_error" = true; # disable speech errors
"media.webspeech.synth.enabled" = false; # disable speech entirely
"privacy.reducePageProtection.infobar.enabled.pbmode" = false; # reloading page tracker protecion bar
+ # sort:end
};
extensions = {
diff --git a/home/fish.nix b/home/fish.nix
@@ -4,6 +4,7 @@
programs.fish = {
enable = true;
functions = {
+ # sort:start
__fish_command_not_found_handler = { body = "echo fish: Unknown command $argv[1]"; onEvent = "fish_command_not_found"; };
backup = "tar -zcvf (basename \$argv)_backup-(date +%F-%H%M%S).tar.gz \$argv";
book = "grep -i \"$argv\" \"$SYNCDIR/src/blog.${vars.user.domain}/content/reading-list.md\"";
@@ -12,8 +13,8 @@
mcd = "mkdir -p $argv[1] && cd $argv[1]";
mergeinto = "rsync --progress --remove-source-files -av \"$argv[1]\" \"$argv[2]\" && find \"$argv[1]\" -empty -delete";
ncdu = ''set arg (count $argv); if test $arg -eq 0; set argv .; end; "${pkgs.rclone}/bin/rclone" ncdu $argv'';
- notes = ''set file (find "$SYNCDIR/notes" -name ".git" -prune -o -type f | fzf --preview 'cat {}' --preview-window='right:60%:wrap'); and nvim "$file"'';
vat = "math $argv + \"($argv * 0.2)\"";
+ # sort:end
};
shellInit = ''
set fish_greeting # Disable greeting
@@ -24,6 +25,7 @@
set -gx VISUAL $EDITOR
'';
shellAliases = {
+ # sort:start
cdv = "cd $HOME/vault/";
crypto-sum = "${pkgs.rbw}/bin/rbw get 'crypto purchases' | awk '/^20/ {print $2}' | paste -sd+ | math";
empties = "find . -maxdepth 3 -mount -not -path \"*/\.*\" -empty -print";
@@ -31,6 +33,7 @@
jdupes = "jdupes -A"; # exclude hidden files
vaultedit = "find \"$SYNCDIR\" -maxdepth 5 -type f -not -path \"\*/\.git\" | ${pkgs.fzf}/bin/fzf --preview \"cat {}\" --layout reverse | xargs -r -I{} \"$EDITOR\" {}";
week = "date +%V";
+ # sort:end
};
interactiveShellInit = ''
set -g fish_greeting
diff --git a/home/retroarch.nix b/home/retroarch.nix
@@ -7,6 +7,7 @@
let
cores = [
+ # sort:start
"dolphin"
"flycast"
"genesis-plus-gx"
@@ -19,6 +20,7 @@ let
"sameboy"
"snes9x"
"swanstation"
+ # sort:end
];
in
@@ -27,11 +29,7 @@ in
enable = true;
cores = lib.genAttrs cores (_: { enable = true; });
settings = {
- video_fullscreen = "true";
- input_driver = "wayland";
- video_driver = "vulkan";
- system_directory = "/tank/media/games/.firmware";
- rgui_browser_directory = "/tank/media/games";
+ # sort:start
audio_driver = "pipewire";
audio_enable_menu = "true";
audio_enable_menu_bgm = "true";
@@ -45,9 +43,15 @@ in
content_show_netplay = "false";
content_show_playlists = "false";
content_show_video = "false";
+ input_driver = "wayland";
menu_driver = "xmb";
+ rgui_browser_directory = "/tank/media/games";
+ system_directory = "/tank/media/games/.firmware";
+ video_driver = "vulkan";
+ video_fullscreen = "true";
xmb_menu_color_theme = "21";
xmb_theme = "1";
+ # sort:end
};
};
}
diff --git a/machines/arcadia.nix b/machines/arcadia.nix
@@ -5,6 +5,8 @@
{
imports = [
+ # sort:start
+ # ../common/cec-mini-kb.nix
../common/audio.nix
../common/autologin.nix
../common/boot-systemd.nix
@@ -23,8 +25,10 @@
../common/syncthing.nix
../common/user.nix
../scripts/seedy.nix
- ];
+ # sort:end
+ ];
home-manager.users.${vars.user.username} = {pkgs, ...}: { imports = [
+ # sort:start
../home/alacritty.nix
../home/firefox.nix
../home/fish.nix
@@ -35,6 +39,7 @@
../home/spotify.nix
../home/ssh.nix
../home/yt-dlp.nix
+ # sort:end
];
home.stateVersion = "24.11";
};
diff --git a/machines/artemis.nix b/machines/artemis.nix
@@ -5,9 +5,10 @@
{
imports = [
+ # sort:start
../common/boot-systemd.nix
- ../common/docker.nix
../common/docker-webdev.nix
+ ../common/docker.nix
../common/flakes.nix
../common/garbage.nix
../common/home-manager.nix
@@ -23,11 +24,15 @@
../scripts/blog-duolingo.nix
../scripts/blog-status.nix
../scripts/magnets.nix
+ ../scripts/notes.nix
../scripts/restic.nix
../scripts/stagit-generate.nix
+ ../scripts/startpage-sort.nix
../scripts/taudiobooker.nix
+ # sort:end
];
home-manager.users.${vars.user.username} = {pkgs, ...}: { imports = [
+ # sort:start
../home/fish.nix
../home/git.nix
../home/htop.nix
@@ -36,9 +41,10 @@
../home/rclone.nix
../home/ssh.nix
../home/yt-dlp.nix
+ # sort:end
];
home.stateVersion = "25.05";
- };
+ };
# Hardware and system
boot.initrd = { availableKernelModules = [ "xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" ]; };
@@ -46,4 +52,4 @@
system.stateVersion = "25.05"; # Did you read the comment?
-}
-\ No newline at end of file
+}
diff --git a/machines/atlas.nix b/machines/atlas.nix
@@ -5,6 +5,7 @@
{
imports = [
+ # sort:start
../common/audio.nix
../common/autologin.nix
../common/boot-systemd.nix
@@ -25,17 +26,24 @@
../common/steam.nix
../common/syncthing.nix
../common/user.nix
+ ../common/ydotool.nix
+ ../common/zerotier.nix
../scripts/ctimerename.nix
../scripts/duplicate-filenames.nix
../scripts/duupmove.nix
+ ../scripts/notes.nix
../scripts/restic.nix
../scripts/scan-to-pdf.nix
../scripts/seedy.nix
+ ../scripts/startpage-sort.nix
../scripts/taudiobooker.nix
../scripts/vidyaplace-tears.nix
../scripts/vidyaplace.nix
+ ../scripts/watchedlist.nix
+ # sort:end
];
home-manager.users.${vars.user.username} = {pkgs, ...}: { imports = [
+ # sort:start
../home/alacritty.nix
../home/clipse.nix
../home/cursor.nix
@@ -60,6 +68,7 @@
../home/wayle.nix
../home/yt-dlp.nix
../home/zathura.nix
+ # sort:end
];
home.stateVersion = "24.11";
};
diff --git a/machines/hades.nix b/machines/hades.nix
@@ -5,6 +5,7 @@
{
imports = [
<nixos-wsl/modules> # include NixOS-WSL modules
+ # sort:start
../common/home-manager.nix
../common/locale.nix
../common/networking.nix
@@ -12,22 +13,29 @@
../common/syncthing.nix
../common/user.nix
../common/wsl.nix
+ ../scripts/notes.nix
../scripts/pbx.nix
+ # sort:end
];
home-manager.users.${vars.user.username} = {pkgs, ...}: { imports = [
+ # sort:start
../home/fish.nix
+ ../home/git.nix
../home/neovim.nix
../home/rbw.nix
../home/ssh.nix
+ # sort:end
];
home.stateVersion = "26.05";
- };
+ };
- environment.systemPackages = with pkgs; [
+ environment.systemPackages = with pkgs; [
+ # sort:start
ffmpeg
gping
miller
nmap
+ # sort:end
];
system.stateVersion = "26.05"; # Did you read the comment?
diff --git a/machines/ilias.nix b/machines/ilias.nix
@@ -5,9 +5,10 @@
{
imports = [
+ # sort:start
+ # ../common/cec-mini-kb.nix
../common/boot-systemd.nix
../common/bruschetta.nix
- ../common/cec-mini-kb.nix
../common/caddy-ilias.nix
../common/devel.nix
../common/flakes.nix
@@ -38,6 +39,7 @@
../scripts/ctimerename.nix
../scripts/duplicate-filenames.nix
../scripts/duupmove.nix
+ ../scripts/notes.nix
../scripts/overtid.nix
../scripts/payslips.nix
../scripts/pbx.nix
@@ -51,8 +53,10 @@
../scripts/vidyaplace-tears.nix
../scripts/watchedlist.nix
../scripts/youtube-id-rss.nix
+ # sort:end
];
home-manager.users.${vars.user.username} = {pkgs, ...}: { imports = [
+ # sort:start
../home/fish.nix
../home/git.nix
../home/htop.nix
@@ -61,9 +65,10 @@
../home/rclone.nix
../home/ssh.nix
../home/yt-dlp.nix
+ # sort:end
];
home.stateVersion = "24.11";
- };
+ };
# Hardware and system
boot.initrd = { availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; };
@@ -76,6 +81,7 @@
# Packages
environment.systemPackages = with pkgs; [
+ # sort:start
czkawka # duplicate file finder
jdupes # duplicate file finder
mmv # mass renamer
@@ -85,6 +91,7 @@
python3
qpdf
sqlite
+ # sort:end
];
system.stateVersion = "24.11";
diff --git a/machines/minerva.nix b/machines/minerva.nix
@@ -5,6 +5,7 @@
{
imports = [
+ # sort:start
../common/audio.nix
../common/autologin.nix
../common/boot-grub.nix
@@ -23,16 +24,19 @@
../common/speechd.nix
../common/ssh.nix
../common/syncthing.nix
- ../common/user.nix
../common/upower.nix
+ ../common/user.nix
../common/zerotier.nix
../scripts/ctimerename.nix
../scripts/duupmove.nix
+ ../scripts/notes.nix
../scripts/restic.nix
../scripts/vidyaplace-tears.nix
../scripts/vidyaplace.nix
+ # sort:end
];
home-manager.users.${vars.user.username} = {pkgs, ...}: { imports = [
+ # sort:start
../home/alacritty.nix
../home/clipse.nix
../home/cursor.nix
@@ -55,9 +59,10 @@
../home/wayle.nix
../home/yt-dlp.nix
../home/zathura.nix
+ # sort:end
];
home.stateVersion = "24.11";
- };
+ };
# Hardware and system
boot.initrd = { availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "sdhci_pci" ]; };
diff --git a/variables.sample.nix b/variables.sample.nix
@@ -27,4 +27,4 @@ rec {
machine1 = "id-number-1";
machine2 = "id-number-2";
};
-}
-\ No newline at end of file
+}
