commit a8035b441e76e625bd71cf6b19a4a5730a64dacc
parent 980b0df58892c231c6b2490b741b79d1f4f20f2e
Author: mtmn <miro@haravara.org>
Date: Thu, 14 May 2026 13:24:16 +0200
void: add `-vi` to dmenu_args, etc.
Diffstat:
10 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/.gitattributes b/.gitattributes
@@ -2,6 +2,7 @@
modules/services/filestash.nix filter=git-crypt diff=git-crypt
# hosts
+hosts/void/overlays/config/magdalena/* filter=git-crypt diff=git-crypt
hosts/void/overlays/config/shell/rc/* filter=git-crypt diff=git-crypt
hosts/nixaran/** filter=git-crypt diff=git-crypt
hosts/work/** filter=git-crypt diff=git-crypt
diff --git a/flake.lock b/flake.lock
@@ -32,11 +32,11 @@
},
"locked": {
"dir": "bandeno",
- "lastModified": 1778496303,
- "narHash": "sha256-oDdTq8025xzsKiGSZjam2K1evv4T9PfFRhsfjmTm0XA=",
+ "lastModified": 1778774361,
+ "narHash": "sha256-yP+/t3V9ocNrTtxg1IjpVbQkIjfFrx8ViW+m+Hm4Akk=",
"owner": "~mtmn",
"repo": "tools",
- "rev": "9c475d90375b614619a8602ffd8e23fc026e31d6",
+ "rev": "15db339eec0f1c610ceb56196d203eb3b5798a2a",
"type": "sourcehut"
},
"original": {
@@ -54,11 +54,11 @@
]
},
"locked": {
- "lastModified": 1778378436,
- "narHash": "sha256-wQGmKhua8XBGcRk4ioXEezgg4N1ENwX39Z+CLONoyCs=",
+ "lastModified": 1778863142,
+ "narHash": "sha256-zqHBGBSy6EUxQFeWJGmYqBjioljHffCcCMoeW3LrOtg=",
"owner": "~mtmn",
"repo": "corpus",
- "rev": "62eb8719333225ced9b5f1c772b1f5a3235bab2e",
+ "rev": "6d95c09835fb6556d6a54a85e93a885a76cf6efd",
"type": "sourcehut"
},
"original": {
@@ -261,11 +261,11 @@
]
},
"locked": {
- "lastModified": 1778594112,
- "narHash": "sha256-VA9z90SZviIvOcA4QyatA48FIyqb8mmsmH/EsXXWAG4=",
+ "lastModified": 1778858474,
+ "narHash": "sha256-uOh5fCoxOgdFa50WymuhCwJKuEVv/Eo4VYjK0SgzlPs=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "1768d4e49860b86cb7652ee738de0e6b3050dd40",
+ "rev": "ca77575d39c908de876c10f93704532689df546f",
"type": "github"
},
"original": {
@@ -332,11 +332,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1778458615,
- "narHash": "sha256-cY07EsdhBJ8tFXPzDYevgqxRev9ZLxFonuq9wmq5kwg=",
+ "lastModified": 1778794387,
+ "narHash": "sha256-BL04pOS9453Awkeb9f90XBJXBSkWxN+vB7HIgnL0iMM=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "c6e5ca3c836a5f4dd9af9f2c1fc1c38f0fac988a",
+ "rev": "8a1b0127302ea51e05bf4ea5a291743fac442406",
"type": "github"
},
"original": {
diff --git a/hosts/nixaran/configuration.nix b/hosts/nixaran/configuration.nix
Binary files differ.
diff --git a/hosts/void/default.nix b/hosts/void/default.nix
@@ -29,18 +29,14 @@
gron
datasette
tokyocabinet
- jotdown
dhall
pandoc
codespelunker
- opensearch-cli
graphviz
lowdown
- harper
];
vcs = [
- git-bug
git-crypt
git-absorb
lazygit
@@ -60,7 +56,6 @@
rclone
xh
lftp
- miniserve
nmap
knot-dns
aria2
@@ -113,12 +108,16 @@
lorri
];
+ beam = lib.concatLists [
+ (with beamMinimal28Packages; [rebar3 erlang erlang-language-platform])
+ [gleam]
+ ];
+
javascript = lib.concatLists [
[
nodejs_24
+ pnpm
purescript
- esbuild
- typescript-language-server
]
(with elmPackages; [
elm
@@ -128,16 +127,16 @@
])
];
- beam = lib.concatLists [
- (with beamMinimal28Packages; [rebar3 erlang erlang-language-platform])
- [gleam]
- ];
-
lua = lib.concatLists [
(with luaPackages; [fennel lua])
[fnlfmt]
];
+ guile = [
+ guile
+ haunt
+ ];
+
gui = [
picard
xnviewmp
@@ -150,14 +149,11 @@
llm = [
ollama
codex
- gitingest
- opencode
];
other = [
babashka
nickel
- zls
];
}));
}
diff --git a/hosts/void/overlays/config/magdalena/config.json.nix b/hosts/void/overlays/config/magdalena/config.json.nix
Binary files differ.
diff --git a/hosts/void/overlays/config/river/init b/hosts/void/overlays/config/river/init
@@ -7,7 +7,7 @@ alt="Mod4"
term="foot"
wobsock="$XDG_RUNTIME_DIR/wob.sock"
-dmenu_args="-fn 'Ttyp0 OTB:size=10' -l 10 -h 20 -nb '#181818' -nf '#e7e7e7' -sb '#505050' -sf '#e7e7e7' -nhb '#181818' -nhf '#a0c0d0'"
+dmenu_args="-vi -fn 'Ttyp0 OTB:size=10' -l 10 -h 20 -nb '#181818' -nf '#e7e7e7' -sb '#505050' -sf '#e7e7e7' -nhb '#181818' -nhf '#a0c0d0'"
rivertile -view-padding 0 -outer-padding 0 -main-ratio 0.50 &
@@ -135,9 +135,7 @@ services_to_start=(
habitual
kanshi
psi-notify
- khal_notifier
memcached
- plants-daemon
)
for s in "${services_to_start[@]}"; do
diff --git a/justfile b/justfile
@@ -12,7 +12,7 @@ deploy host="nixaran":
nix develop -c deploy .#{{ host }} 2>&1 | grep -vE "unknown flake output '(deploy|configData)'"
local:
- @backup -t git:nix
+ -@backup -t git:nix
nix develop -c nh home switch .
diff:
diff --git a/modules/mixins/dotfiles/config/shell/profile/ghcup b/modules/mixins/dotfiles/config/shell/profile/ghcup
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-[ -f "$HOME/.ghcup/env" ] && . "$HOME/.ghcup/env"
diff --git a/modules/mixins/dotfiles/config/shell/rc/aliased-short-names b/modules/mixins/dotfiles/config/shell/rc/aliased-short-names
@@ -18,6 +18,13 @@ alias mgrf='cdg && magdalena grep && cd -'
alias mrd='magdalena recent-dirs'
alias mrf='magdalena recent-files'
+alias alt='aaltomuoto'
+alias vrt='virittaa'
+alias hkn='hakuna'
+
+alias mach='matcha'
+alias machp='matcha --playlist'
+
alias pdm='pkill -f dmenu'
alias pcm='pcmanfm &>/dev/null & disown'
@@ -118,8 +125,5 @@ alias bdj='just build'
alias dpj='just deploy'
alias dfj='just diff'
-alias mak='matchakey'
-alias makp='matchakey --playlist'
-
alias bexec='bundle exec'
alias brake='bexec rake'
diff --git a/modules/mixins/dotfiles/config/tiny/config.yml b/modules/mixins/dotfiles/config/tiny/config.yml
Binary files differ.
