commit 5f2858a7f443f417580eb0453b2f3eb7ef0a06ca
parent dd74e425d44a32b359d05137f2019cca0192ce0d
Author: mtmn <miro@haravara.org>
Date: Fri, 10 Apr 2026 07:20:29 +0200
Merge branch 'master' of ssh://codeberg.org/mtmn/nix
Diffstat:
8 files changed, 76 insertions(+), 22 deletions(-)
diff --git a/hosts/void/default.nix b/hosts/void/default.nix
@@ -3,21 +3,16 @@
parts = {
utils = with pkgs; [
- libvarlink
- bandit
ruff
shellcheck
shfmt
sops
zls
bear
- bmake
ctags
biome
entr
- act
hyperfine
- iotop
gdb
strace
perf
@@ -29,7 +24,7 @@
moor
watchman
buf
- vdirsyncer
+ clang-tools
];
media = with pkgs; [
@@ -37,7 +32,6 @@
mpc
listenbrainz-mpd
libmpdclient
- ashuffle
ncmpcpp
mympd
sacad
@@ -53,6 +47,8 @@
hadolint
woodpecker-cli
ansible-language-server
+ dnscontrol
+ act
];
gui = with pkgs; [
@@ -109,36 +105,30 @@
bore-cli
chisel
curl
- dnscontrol
hurl
inetutils
lftp
- monolith
mosh
mosquitto
net-tools
- newsraft
nmap
- offpunk
rclone
rsync
sshfs
thrift
trickle
- w3m
websocat
wget
whois
xh
];
- bpf = with pkgs; [
- bpftools
- bpftrace
- bpfmon
- bpftop
- libbpf
- pwru
+ web = with pkgs; [
+ offpunk
+ monolith
+ newsraft
+ w3m
+ vdirsyncer
];
beam28 =
@@ -189,8 +179,8 @@
];
rust = with pkgs; [
- cargo-outdated
rustup
+ cargo-outdated
];
javascript = with pkgs; [
diff --git a/hosts/void/overlays/bin/amen-or-not b/hosts/void/overlays/bin/amen-or-not
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+MODE="remote"
+
+case "$MODE" in
+remote)
+ export MPD_PASS="$(pass show saturn/mpd-pass)"
+ export MPD_HOST="$MPD_PASS@$(pass show saturn/mpd-url)"
+ export MPD_PORT="$(pass show saturn/mpd-port)"
+ ;;
+local)
+ export MPD_HOST=127.0.0.1
+ export MPD_PORT=6695
+ ;;
+*)
+ echo "Unknown MPD_MODE: $MODE (use local or remote)" >&2
+ exit 1
+ ;;
+esac
+
+echo "MPD_HOST=$MPD_HOST"
+echo "MPD_PORT=$MPD_PORT"
diff --git a/hosts/void/overlays/bin/lbmpd b/hosts/void/overlays/bin/lbmpd
@@ -0,0 +1,5 @@
+#!/bin/bash
+eval "$("$HOME/bin/amen-or-not")"
+
+listenbrainz-mpd "$@" | vlogger -t "listenbrainz-mpd" &
+disown
diff --git a/hosts/void/overlays/config/ncmpcpp/config b/hosts/void/overlays/config/ncmpcpp/config
@@ -0,0 +1,36 @@
+mpd_host = 127.0.0.1
+mpd_port = 6695
+mpd_music_dir = /home/miro/misc/mnt/saturn/mu/mu
+
+lyrics_directory = ~/.cache/lyrics
+
+user_interface = "alternative"
+
+alternative_header_first_line_format = "$(11)─┤ $b$(13)%a$(end)$/b ├─$(end)"
+alternative_header_second_line_format = "$(4)%t (%y)$(end)"
+alternative_ui_separator_color = 11
+
+color1 = 13
+color2 = 15
+
+now_playing_prefix = "$b"
+now_playing_suffix = "$/b"
+song_list_format = " $(15)%t$(end) $(cyan){%g}$(end)$R $(11)%a [%b]$(end) ($(cyan)%l$(end)) "
+song_columns_list_format = "(35)[15]{t|f} (10)[cyan]{g} (25)[13]{a} (25)[11]{b} (5)[cyan]{l}"
+browser_playlist_prefix = "$(11) playlist $(end) "
+
+progressbar_color = 1
+progressbar_elapsed_color = 11
+progressbar_look = "──━"
+song_status_format = " $(15)%a$(end) $4⟫$7⟫$0 $(13)%t$(end) $4⟫$7⟫$0 $(11)%b$(end)"
+
+mouse_support = "yes"
+header_visibility = "no"
+statusbar_visibility = "yes"
+playlist_display_mode = "classic" (classic/columns)
+browser_display_mode = "columns"
+search_engine_display_mode = "columns"
+playlist_editor_display_mode = "columns"
+autocenter_mode = "yes"
+titles_visibility = "no"
+enable_window_title = "no"
diff --git a/hosts/void/overlays/config/shell/rc/void b/hosts/void/overlays/config/shell/rc/void
Binary files differ.
diff --git a/modules/mixins/dotfiles/bin/ncm b/modules/mixins/dotfiles/bin/ncm
@@ -1,3 +1,3 @@
#!/bin/sh
eval "$("$HOME/bin/amen-or-not")"
-exec /usr/sbin/ncmpcpp "$@"
+exec ncmpcpp "$@"
diff --git a/modules/mixins/dotfiles/config/nvim/fnl/config/lsp.fnl b/modules/mixins/dotfiles/config/nvim/fnl/config/lsp.fnl
@@ -49,6 +49,7 @@
:intelephense {}
:rust_analyzer {}
:expert {}
+ :ts_ls {}
:zls {}}]
(each [server config (pairs servers)]
(vim.lsp.enable server config))
diff --git a/modules/mixins/dotfiles/config/shell/rc/aliased-short-names b/modules/mixins/dotfiles/config/shell/rc/aliased-short-names
@@ -65,9 +65,9 @@ alias obsno='obsidian "obsidian://open?vault=nota" & disown'
alias obscpt='obsidian "obsidian://open?vault=counterpoint" & disown'
alias kat='khal at'
-alias kan='khal new'
alias khw='khal list now 7d'
alias khi='khal interactive'
+alias kan='khal new --alarms 1h,30m,15m,5m'
alias bpp='backup pass --push'
alias bnp='backup nota --push'
