fix: declare graphics config for 'astyanax' host

Reviewed-on: #1

.gitignore

@@ -1,7 +1,3 @@
-#
-.claude/
-home/hosts/work/packages.local.nix
-
 # ---> Nix
 # Ignore build outputs from performing a nix-build or `nix build` command
 result
@@ -9,4 +5,4 @@ result-*
 
 nixos-efi-vars.fd
 
-/.pre-commit-config.yaml
+home/hosts/work/packages.local.nix

README.md

@@ -1,27 +1,15 @@
 # NixOS flake
 
-## hosts
+## Set up virtual machine ([`disko`](https://github.com/nix-community/disko/blob/master/docs/interactive-vm.md))
 
-### NixOS
+1. Build the virtual machine
-
-```
-nixos-rebuild switch --flake .#<hostname>
-```
-
-### home manager
-
-```
-home-manager switch --flake .#work
-```
-
-### virtual machines
 
 ```
 nix build -L '.#nixosConfigurations.vm.config.system.build.vmWithDisko'
-./result/bin/disko-vm
 ```
 
-## docs
+2. Run the virtual machine
 
-* [deploy using colmena](./deploy/README.md)
+```
-* [SD installer images](./images/README.md)
+./result/bin/disko-vm
+```

deploy/README.md

@@ -1,9 +0,0 @@
-# `colmena` deployments
-
-* tags: `local`, `cloud`
-* deployments can be made from `astyanax` and `andromache` hosts
-
-## References
-
-- [docs: `colmena`](https://colmena.cli.rs/)
-- [repo: `colmena`](https://github.com/zhaofengli/colmena)

deploy/colmena.nix

@@ -1,32 +0,0 @@
-{
-  self,
-  inputs,
-}:
-
-let
-  mkNode = hostname: tags: {
-    imports = [ ../hosts/${hostname} ];
-    deployment = {
-      targetHost = self.nixosConfigurations.${hostname}.config.ssh.publicHostname;
-      targetUser = self.nixosConfigurations.${hostname}.config.ssh.username;
-      buildOnTarget = builtins.any (t: t != "local") tags;
-      inherit tags;
-    };
-  };
-in
-inputs.colmena.lib.makeHive {
-  meta = {
-    nixpkgs = import inputs.nixpkgs {
-      localSystem = "x86_64-linux";
-    };
-
-    nodeNixpkgs = builtins.mapAttrs (_: v: v.pkgs) self.nixosConfigurations;
-    nodeSpecialArgs = builtins.mapAttrs (_: v: v._module.specialArgs or { }) self.nixosConfigurations;
-  };
-
-  astyanax = mkNode "astyanax" [ "local" ];
-  andromache = mkNode "andromache" [ "local" ];
-  vm = mkNode "vm" [ "local" ];
-  hecuba = mkNode "hecuba" [ "cloud" ];
-  eetion = mkNode "eetion" [ "arm" ];
-}

dots/.bashrc

@@ -103,6 +103,13 @@ if [[ -z "${SSH_CONNECTION}" ]]; then
 fi
 # }}}
 
+# pnpm
+export PNPM_HOME="/home/h/.local/share/pnpm"
+case ":$PATH:" in
+  *":$PNPM_HOME:"*) ;;
+  *) export PATH="$PNPM_HOME:$PATH" ;;
+esac
+# pnpm end
 
 # Codi
 # Usage: codi [filetype] [filename]

dots/.bashrc.d/editor

@@ -4,3 +4,16 @@
 # Set NeoVim as default editor
 export EDITOR=nvim
 export SUDO_EDITOR="$EDITOR"
+
+declare -A -r EDITOR_CONFIGS=(
+  ["nvim"]="$HOME/.config/nvim/init.lua"
+  ["vim"]="$HOME/.vimrc"
+)
+
+edit_editor_config() {
+  for editor in "${!EDITOR_CONFIGS[@]}"; do
+    if [ "$EDITOR" = "$editor" ]; then
+      $EDITOR "${EDITOR_CONFIGS[$editor]}"
+    fi
+  done
+}

dots/.bin/bak

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-# back up a file by copying it to a new file with a .bak extension
-# reference: https://askubuntu.com/questions/962489/is-there-any-way-to-create-backup-copy-of-a-file-without-type-its-name-twice
-
-usage() {
-  echo "Usage: bak [-t|--timestamp] <file to back up>"
-  exit 1
-}
-
-timestamp=false
-
-while [[ $# -gt 0 ]]; do
-  case $1 in
-    -t|--timestamp)
-      timestamp=true
-      shift
-      ;;
-    *)
-      break
-      ;;
-  esac
-done
-
-[ $# -eq 1 ] || usage
-
-if $timestamp; then
-  date="$(date +%Y-%m-%d_%H-%M-%S)"
-  cp -vpn "$1"{,."$date".bak}
-else
-  cp -vpn "$1"{,.bak}
-fi

dots/.bin/pomo

@@ -8,24 +8,19 @@ Pomodoro timer
 - Notification on break finish
 """
 
-import atexit
 import os
+import atexit
 from argparse import ArgumentParser
 from time import sleep
-
 from plyer import notification
 
-POMO_PATH = os.path.join(
+POMO_PATH = os.path.join(os.getenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share")), "pomo")
-    os.getenv("XDG_DATA_HOME", os.path.expanduser("~/.local/share")), "pomo"
-)
-
 
 @atexit.register
 def clear():
     if os.path.exists(POMO_PATH):
         os.remove(POMO_PATH)
 
-
 def format_mins_secs(mins, secs):
     return f"{mins:02d}:{secs:02d}"
 
@@ -39,7 +34,6 @@ def make_countdown():
             os.system(f'echo -n "{time_str}" > {POMO_PATH}')
             sleep(1)
             duration -= 1
-
     return countdown
 
 
@@ -64,23 +58,21 @@ def main(args):
 def handle_signal(signal, frame):
     # Wait for clear to finish
     clear()
-    print("Exiting")
+    print('Exiting')
     exit(0)
 
 
-if __name__ == "__main__":
+if __name__ == '__main__':
 
     parser = ArgumentParser()
-    parser.add_argument(
+    parser.add_argument('-w', '--work-duration', type=int,
-        "-w", "--work-duration", type=int, help="Session duration", default=25
+                        help='Session duration', default=25)
-    )
+    parser.add_argument('-b', '--break-duration', type=int,
-    parser.add_argument(
+                        help='Break duration', default=5)
-        "-b", "--break-duration", type=int, help="Break duration", default=5
+    parser.add_argument('-r', '--repeats', type=int,
-    )
+                        help='Numer of sessions', default=1)
-    parser.add_argument(
+    parser.add_argument('-c', '--clear', action='store_true',
-        "-r", "--repeats", type=int, help="Numer of sessions", default=1
+                        help='Clear timer')
-    )
-    parser.add_argument("-c", "--clear", action="store_true", help="Clear timer")
 
     args = parser.parse_args()
 

dots/.bin/r5rs

@@ -2,8 +2,8 @@
 
 session="r5rs"
 
-tmux attach-session -t "$session" || tmux new-session -s "$session" \; \
+tmux attach-session -t $session || tmux new-session -s $session \; \
   split-window -h -t $session \; \
-  send-keys -t 1 "nvim -c \"set ft=scheme\"" C-m \; \
+  send-keys -t 0 "vim" C-m \; \
-  send-keys -t 2 "plt-r5rs --no-prim" C-m \; \
+  send-keys -t 1 "plt-r5rs --no-prim" C-m \; \
-  select-pane -t 1
+  select-pane -t 0

dots/.bin/save-home

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+# Back up my $HOME folder to OneDrive using `restic`.
+#
+# Adds extra flags needed for using `rclone` with sharepoint WebDav I.e. add
+# `--ignore-size --ignore-checksum --update` to the default `rclone.args`.
+#
+# Select directory in repo using -r rclone:<repo>:<directory>
+#
+# Runs `backup` command on $HOME and ignore what is listed in `.resticexclude`
+#
+# ```/etc/restic-env
+# export B2_ACCOUNT_ID=
+# export B2_ACCOUNT_KEY=
+# ```
+#
+# `restic -r b2:desktop-arch init`
+
+source /etc/restic-env
+restic -r "$RESTIC_REPOSITORY:$HOSTNAME" backup \
+  --tag "hektor" \
+  --one-file-system \
+  --files-from="$HOME/.resticinclude" \
+  --exclude-file="$HOME/.resticexclude" \
+  --verbose=3

dots/.bin/sb-pomo

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-[ -f "/home/h/.local/share/pomo" ] && cat /home/h/.local/share/pomo || echo ""
+[ -f "/tmp/pomo" ] && cat /tmp/pomo || echo ""

dots/.bin/screen-temperature

@@ -1,12 +1,12 @@
 #!/usr/bin/env python
 
-import subprocess
 import sys
+import subprocess
 
 DEFAULT_TEMPERATURE = 3500
 
 try:
-    with open("/tmp/temperature", "r") as temp_file:
+    with open('/tmp/temperature', 'r') as temp_file:
         current_temperature = int(temp_file.read())
 except FileNotFoundError:
     current_temperature = DEFAULT_TEMPERATURE
@@ -16,8 +16,7 @@ if len(sys.argv) == 1:
     print(current_temperature)
     sys.exit(0)
 elif len(sys.argv) != 2:
-    print(
+    print("""
-        """
 Usage:
 
   screen-temperature
@@ -28,8 +27,7 @@ Usage:
 
   screen-temperature <+|-><temperature>
       increase or decrease screen temperature by <temperature>
-"""
+""")
-    )
     sys.exit(1)
 
 temperature_change = sys.argv[1]
@@ -43,10 +41,11 @@ else:
 
 try:
     subprocess.run(["redshift", "-O", str(new_temperature), "-P"], check=True)
-    with open("/tmp/temperature", "w") as temp_file:
+    with open('/tmp/temperature', 'w') as temp_file:
-        temp_file.write(str(new_temperature) + "\n")
+        temp_file.write(str(new_temperature) + '\n')
     # Send notification
-    subprocess.run(["notify-send", str(new_temperature) + "K"])
+    subprocess.run(
+        ["notify-send", str(new_temperature) + "K"])
 except subprocess.CalledProcessError:
     print("Error: could not set screen temperature.")
     sys.exit(1)

dots/.bin/setup-gnome

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+gsettings set org.gnome.desktop.background primary-color "#555555"
+
+gsettings set org.gnome.desktop.wm.preferences workspace-names "['sh', 'www', 'dev', 'info', 'etc']"
+gsettings set org.gnome.desktop.wm.keybindings close "['<Shift><Super>Delete']"
+gsettings set org.gnome.desktop.wm.keybindings switch-applications "['<Super>j']"
+gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward "['<Super>k']"
+gsettings set org.gnome.shell.keybindings toggle-application-view "['<Super>p']"
+gsettings set org.gnome.mutter center-new-windows true
+gsettings set org.gnome.shell.keybindings toggle-quick-settings []
+
+gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-1 "['<Super>a']"
+gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-2 "['<Super>s']"
+gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-3 "['<Super>d']"
+gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-4 "['<Super>f']"
+gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-5 "['<Super>g']"
+gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-1 "['<Super><Shift>a']"
+gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-2 "['<Super><Shift>s']"
+gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-3 "['<Super><Shift>d']"
+gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-4 "['<Super><Shift>f']"
+gsettings set org.gnome.desktop.wm.keybindings move-to-workspace-5 "['<Super><Shift>g']"
+
+gsettings set org.gnome.settings-daemon.plugins.media-keys custom-keybindings "['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/']"
+gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/ name "Kitty"
+gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/ command "kitty"
+gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/ binding "<Shift><Super>Return"
+
+gsettings set org.gnome.shell.keybindings screenshot "['Print']"
+
+gsettings set org.gnome.desktop.wm.preferences num-workspaces "5"
+gsettings set org.gnome.mutter dynamic-workspaces "false"
+gsettings set org.gnome.shell.extensions.window-list display-all-workspaces "true"
+gsettings set org.gnome.shell.app-switcher current-workspace-only "true"
+
+gsettings set org.gnome.login-screen logo ''
+gsettings set org.gnome.shell favorite-apps "['firefox-developer-edition.desktop']"

dots/.bin/update-vim

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+# Tiny Vim update helper
+
+nvim +PlugUpgrade +PlugUpdate +CocUpdate

dots/.bin/zk

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 
-current_zettel_path="$ZK_PATH/$(cat "$ZK_PATH/current-zettel.txt")"
-
 if [ "$TERM_PROGRAM" = tmux ]; then
-  cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
+  cd ~/.zk && $EDITOR "$(cat ~/.zk/current-zettel.txt)"
 else
   echo 'Not in tmux'
   echo 'Choose an option:'
@@ -20,12 +18,12 @@ else
       else
         # Create session with a window named 'zk' and start nvim
         tmux new-session -s zk -n zk -d
-        tmux send-keys -t zk:zk "cd $ZK_PATH && $EDITOR $current_zettel_path" Enter
+        tmux send-keys -t zk:zk "cd ~/.zk && $EDITOR \"\$(cat ~/.zk/current-zettel.txt)\"" Enter
         tmux attach -t zk
       fi
       ;;
     2)
-      cd "$ZK_PATH" && $EDITOR "$current_zettel_path"
+      cd ~/.zk && $EDITOR "$(cat ~/.zk/current-zettel.txt)"
       ;;
     *)
       echo 'Not opening Zettelkasten'

dots/.config/kitty/kitty.conf

@@ -56,7 +56,7 @@ hide_window_decorations yes
 
 #: Tab bar {{{
 
-tab_bar_edge bottom
+tab_bar_edge top
 tab_bar_style powerline
 tab_bar_min_tabs 1
 tab_powerline_style slanted
@@ -163,4 +163,5 @@ map cmd+q
 
 #: }}}
 
+include ./themes/zenwritten_dark.conf
 include ./nvim.conf

dots/.config/kitty/themes/zenwritten_dark.conf

@@ -0,0 +1,49 @@
+# This file is auto-generated by shipwright.nvim
+# vim:ft=kitty
+## name: zenwritten_dark
+## author: Michael Chris Lopez
+## license: MIT
+## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenwritten_dark.conf
+## blurb: A zenbones variant with zero hue and saturation.
+foreground                      #BBBBBB
+background                      #191919
+selection_foreground            #BBBBBB
+selection_background            #404040
+# Cursor colors
+cursor                          #C9C9C9
+cursor_text_color               #191919
+# URL underline color when hovering with mouse
+# kitty window border colors
+# OS Window titlebar colors
+# Tab bar colors
+active_tab_foreground           #BBBBBB
+active_tab_background           #65435E
+inactive_tab_foreground         #BBBBBB
+inactive_tab_background         #303030
+# Colors for marks (marked text in the terminal)
+# The basic 16 colors
+# black
+color0 #191919
+color8 #3D3839
+# red
+color1 #DE6E7C
+color9 #E8838F
+# green
+color2  #819B69
+color10 #8BAE68
+# yellow
+color3  #B77E64
+color11 #D68C67
+# blue
+color4  #6099C0
+color12 #61ABDA
+# magenta
+color5  #B279A7
+color13 #CF86C1
+# cyan
+color6  #66A5AD
+color14 #65B8C1
+# white
+color7  #BBBBBB
+color15 #8E8E8E
+# You can set the remaining 240 colors as color16 to color255.

dots/.config/kitty/themes/zenwritten_light.conf

@@ -0,0 +1,49 @@
+# This file is auto-generated by shipwright.nvim
+# vim:ft=kitty
+## name: zenwritten_light
+## author: Michael Chris Lopez
+## license: MIT
+## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenwritten_light.conf
+## blurb: A zenbones variant with zero hue and saturation.
+foreground                      #353535
+background                      #EEEEEE
+selection_foreground            #353535
+selection_background            #D7D7D7
+# Cursor colors
+cursor                          #353535
+cursor_text_color               #EEEEEE
+# URL underline color when hovering with mouse
+# kitty window border colors
+# OS Window titlebar colors
+# Tab bar colors
+active_tab_foreground           #353535
+active_tab_background           #DEB9D6
+inactive_tab_foreground         #353535
+inactive_tab_background         #CFCFCF
+# Colors for marks (marked text in the terminal)
+# The basic 16 colors
+# black
+color0 #EEEEEE
+color8 #C6C3C3
+# red
+color1 #A8334C
+color9 #94253E
+# green
+color2  #4F6C31
+color10 #3F5A22
+# yellow
+color3  #944927
+color11 #803D1C
+# blue
+color4  #286486
+color12 #1D5573
+# magenta
+color5  #88507D
+color13 #7B3B70
+# cyan
+color6  #3B8992
+color14 #2B747C
+# white
+color7  #353535
+color15 #5C5C5C
+# You can set the remaining 240 colors as color16 to color255.

dots/.config/ncspot/config.toml

@@ -1,6 +1,5 @@
 default_keybindings = false
 flip_status_indicators = true
-library_tabs = ["tracks", "albums", "artists", "playlists", "browse"] # remove podcasts tab
 
 [keybindings]
 "Enter" = "play"
@@ -25,10 +24,11 @@ library_tabs = ["tracks", "albums", "artists", "playlists", "browse"] # remove p
 "c" = "clear"
 "=" = "volup 1"
 "-" = "voldown 1"
+"/" = "focus search"
+"Q" = "focus queue"
+"L" = "focus library"
 "1" = "focus queue"
-"2" = "focus search"
+"2" = "focus library"
-"3" = "focus library"
-"4" = "focus cover"
 "h" = "move left 1"
 "j" = "move down 1"
 "k" = "move up 1"
@@ -41,5 +41,26 @@ library_tabs = ["tracks", "albums", "artists", "playlists", "browse"] # remove p
 "Y" = "share selected"
 "U" = "update"
 
+[theme]
+primary="#aaaaaa"
+secondary="#555555"
+background="1a1a1a"
+title="#cccccc"
+title_secondary="#aaaaaa"
+playing="#ffffff"
+playing_bg="1a1a1a"
+playing_selected="#ffffff"
+highlight="#cccccc"
+highlight_bg="#333333"
+error="#ffffff"
+error_bg="#333333"
+statusbar="#cccccc"
+statusbar_bg="#1a1a1a"
+statusbar_progress="#cccccc"
+statusbar_progress_bg="#1a1a1a"
+cmdline="#cccccc"
+cmdline_bg="#1a1a1a"
+search_match="#ffffff"
+
 backend="pipe"
 notify="false"

dots/.config/ncspot/credentials.toml

@@ -0,0 +1,3 @@
+username = 'hektor.misplon@gmail.com'
+auth_type = 0
+auth_data = 'KDEzMzc9PXRydTMpPzo='

dots/.config/nvim/after/plugin/claude-code.nvim.lua

@@ -1,61 +0,0 @@
-require("claude-code").setup({
-  -- Terminal window settings
-  window = {
-    split_ratio = 0.3, -- Percentage of screen for the terminal window (height for horizontal, width for vertical splits)
-    position = "vertical", -- Position of the window: "botright", "topleft", "vertical", "float", etc.
-    enter_insert = true, -- Whether to enter insert mode when opening Claude Code
-    hide_numbers = true, -- Hide line numbers in the terminal window
-    hide_signcolumn = true, -- Hide the sign column in the terminal window
-
-    -- Floating window configuration (only applies when position = "float")
-    float = {
-      width = "80%", -- Width: number of columns or percentage string
-      height = "80%", -- Height: number of rows or percentage string
-      row = "center", -- Row position: number, "center", or percentage string
-      col = "center", -- Column position: number, "center", or percentage string
-      relative = "editor", -- Relative to: "editor" or "cursor"
-      border = "rounded", -- Border style: "none", "single", "double", "rounded", "solid", "shadow"
-    },
-  },
-  -- File refresh settings
-  refresh = {
-    enable = true, -- Enable file change detection
-    updatetime = 100, -- updatetime when Claude Code is active (milliseconds)
-    timer_interval = 1000, -- How often to check for file changes (milliseconds)
-    show_notifications = true, -- Show notification when files are reloaded
-  },
-  -- Git project settings
-  git = {
-    use_git_root = true, -- Set CWD to git root when opening Claude Code (if in git project)
-  },
-  -- Shell-specific settings
-  shell = {
-    separator = "&&", -- Command separator used in shell commands
-    pushd_cmd = "pushd", -- Command to push directory onto stack (e.g., 'pushd' for bash/zsh, 'enter' for nushell)
-    popd_cmd = "popd", -- Command to pop directory from stack (e.g., 'popd' for bash/zsh, 'exit' for nushell)
-  },
-  -- Command settings
-  command = "claude", -- Command used to launch Claude Code
-  -- Command variants
-  command_variants = {
-    -- Conversation management
-    continue = "--continue", -- Resume the most recent conversation
-    resume = "--resume", -- Display an interactive conversation picker
-
-    -- Output options
-    verbose = "--verbose", -- Enable verbose logging with full turn-by-turn output
-  },
-  -- Keymaps
-  keymaps = {
-    toggle = {
-      normal = "<C-,>", -- Normal mode keymap for toggling Claude Code, false to disable
-      terminal = "<C-,>", -- Terminal mode keymap for toggling Claude Code, false to disable
-      variants = {
-        continue = "<leader>cC", -- Normal mode keymap for Claude Code with continue flag
-        verbose = "<leader>cV", -- Normal mode keymap for Claude Code with verbose flag
-      },
-    },
-    window_navigation = true, -- Enable window navigation keymaps (<C-h/j/k/l>)
-    scrolling = true, -- Enable scrolling keymaps (<C-f/b>) for page up/down
-  },
-})

dots/.config/nvim/after/plugin/codecompanion.nvim.lua

@@ -1,22 +1,17 @@
 require("codecompanion").setup({
   ignore_warnings = true,
+  extensions = {
+    mcphub = {
+      callback = "mcphub.extensions.codecompanion",
+      opts = {
+        make_vars = true,
+        make_slash_commands = true,
+        show_result_in_chat = true,
+      },
+    },
+  },
   strategies = {
     chat = { adapter = "openai" },
     inline = { adapter = "openai" },
   },
 })
-
--- Load mcphub extension after codecompanion is initialized
--- and ensure the config structure exists
-local ok, cc_config = pcall(require, "codecompanion.config")
-if ok then
-  cc_config.interactions = cc_config.interactions or {}
-  cc_config.interactions.chat = cc_config.interactions.chat or {}
-  cc_config.interactions.chat.tools = cc_config.interactions.chat.tools or {}
-
-  require("mcphub.extensions.codecompanion").setup({
-    make_vars = true,
-    make_slash_commands = true,
-    show_result_in_chat = true,
-  })
-end

dots/.config/nvim/after/plugin/conform.lua

@@ -13,15 +13,14 @@ require("conform").setup({
     gdscript = { "gdformat" },
     haskell = { "ormolu" },
     html = { "prettierd", "prettier", stop_after_first = true },
+    lua = { "stylua" }, -- configured in stylua.toml
+    markdown = { "prettierd", "prettier", stop_after_first = true },
+    nix = { "nixfmt" },
     javascript = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
     javascriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },
     json = { "prettierd", "prettier", stop_after_first = true },
     jsonc = { "prettierd", "prettier", stop_after_first = true },
-    lua = { "stylua" }, -- configured in stylua.toml
-    markdown = { "prettierd", "prettier", stop_after_first = true },
-    nix = { "nixfmt" },
     python = { "isort", "black" },
-    rust = { "rustfmt", lsp_fallback = "fallback" },
     svelte = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
     typescript = { "eslint_d", "prettierd", "prettier", stop_after_first = true },
     typescriptreact = { "eslint_d", "eslint", "prettierd", "prettier", stop_after_first = true },

dots/.config/nvim/after/plugin/fidget.nvim.lua

@@ -1 +0,0 @@
-require("fidget").setup()

dots/.config/nvim/after/plugin/fzf-lua.lua

@@ -11,6 +11,6 @@ vim.keymap.set("n", "<leader>fd", fzf.diagnostics_workspace)
 vim.keymap.set("n", "<leader>fhe", fzf.help_tags)
 vim.keymap.set("n", "<leader>fhi", fzf.search_history)
 vim.keymap.set("n", "<leader>fma", fzf.marks)
-vim.keymap.set("n", "<leader>fmp", fzf.man_pages)
+vim.keymap.set("n", "<leader>fma", fzf.man_pages)
 
 vim.keymap.set("i", "<c-f>", fzf.complete_path)

dots/.config/nvim/after/plugin/lspconfig.lua

@@ -1,5 +1,8 @@
 require("neodev").setup() -- should setup before lspconfig
 
+-- vim.g.coq_settings = { auto_start = 'shut-up' }
+-- local capabilities = coq.lsp_ensure_capabilities()
+
 local cmp_nvim_lsp = require("cmp_nvim_lsp")
 local capabilities = cmp_nvim_lsp.default_capabilities()
 
@@ -61,32 +64,10 @@ local servers = {
       Lua = {},
     },
   },
-  nixd = {
+  -- marksman = {},
-    settings = {
+  nixd = {},
-      nixd = {
-        nixpkgs = {
-          expr = "import <nixpkgs> { }",
-          expr = 'import (builtins.getFlake ("git+file://" + toString ../../../../../.)).inputs.nixpkgs { }',
-        },
-      },
-      options = {
-        nixos = {
-          expr = '(builtins.getFlake ("git+file://" + toString ../../../../../.)).nixosConfigurations."'
-            .. vim.fn.hostname()
-            .. '".options',
-        },
-        home_manager = {
-          expr = '(builtins.getFlake ("git+file://" + toString ../../../../../.)).homeConfigurations."'
-            .. vim.fn.expand("$USER")
-            .. "@"
-            .. vim.fn.hostname()
-            .. '".options',
-        },
-      },
-    },
-  },
-  openscad_ls = {},
   pyright = {},
+  rust_analyzer = {},
   -- tsserver = {},
   svelte = {
     plugin = {

dots/.config/nvim/after/plugin/m_taskwarrior_d.nvim.lua

@@ -1,9 +0,0 @@
--- require("m_taskwarrior_d").setup()
---
--- vim.api.nvim_create_autocmd({ "BufEnter", "BufWritePost" }, {
---   group = vim.api.nvim_create_augroup("TWTask", { clear = true }),
---   pattern = "*.md",
---   callback = function()
---     vim.cmd("TWSyncTasks")
---   end,
--- })

dots/.config/nvim/after/plugin/treesitter.lua

@@ -2,12 +2,12 @@ local ts = require("treesj")
 local vim = vim
 local keymap = vim.keymap
 local opt = vim.opt
-local treesitter = require("nvim-treesitter")
+local treesitter_configs = require("nvim-treesitter.configs")
 
 local nixCatsUtils = require("nixCatsUtils")
 local is_nix = nixCatsUtils.isNixCats
 
-treesitter.setup({
+treesitter_configs.setup({
   -- Basically added what I might need from the docs
   -- <https://github.com/nvim-treesitter/nvim-treesitter?tab=readme-ov-file#supported-languages>
   ensure_installed = is_nix and {} or {

dots/.config/nvim/flake.lock

@@ -1,52 +1,12 @@
 {
   "nodes": {
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "mcp-hub",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743550720,
-        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "mcp-hub": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1755841689,
-        "narHash": "sha256-KakvXZf0vjdqzyT+LsAKHEr4GLICGXPmxl1hZ3tI7Yg=",
-        "owner": "ravitemer",
-        "repo": "mcp-hub",
-        "rev": "9c7670a4c341ed3cf738a6242c0fde1cea40bccf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ravitemer",
-        "repo": "mcp-hub",
-        "type": "github"
-      }
-    },
     "nixCats": {
       "locked": {
-        "lastModified": 1770584904,
+        "lastModified": 1764009888,
-        "narHash": "sha256-9Zaz8lbKF2W9pwXZEnbiGsicHdBoU+dHt3Wv3mCJoZ8=",
+        "narHash": "sha256-hJekfTiW1792txgRSM4LcHnz1lDSY87LYbsJEn2V378=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "538fdde784d2909700d97a8ef307783b33a86fb1",
+        "rev": "16ac3281f322ea15d39843829e42a44d22da3715",
         "type": "github"
       },
       "original": {
@@ -57,27 +17,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1743689281,
+        "lastModified": 1764947035,
-        "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
+        "narHash": "sha256-EYHSjVM4Ox4lvCXUMiKKs2vETUSL5mx+J2FfutM7T9w=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1770843696,
-        "narHash": "sha256-LovWTGDwXhkfCOmbgLVA10bvsi/P8eDDpRudgk68HA8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2343bbb58f99267223bc2aac4fc9ea301a155a16",
+        "rev": "a672be65651c80d3f592a89b3945466584a22069",
         "type": "github"
       },
       "original": {
@@ -103,14 +47,30 @@
         "type": "github"
       }
     },
+    "plugins-crazy-node-movement": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693654676,
+        "narHash": "sha256-hQcQEp39zFN2zphMfcr97yRVcuHhBsSkzKO7XNloDpQ=",
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "rev": "d5cf01cc44c5715501d3d6fe439af7c8b7fa5df2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "type": "github"
+      }
+    },
     "plugins-helm-ls-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768584652,
+        "lastModified": 1761915179,
-        "narHash": "sha256-jnMc87OjURNcqsva0npYgVyUrWc5C6L7yHpNvt9eSmg=",
+        "narHash": "sha256-W9NRa84l5Cs62OsDeqb+LMxk8oYjhVBCB3o3UmE9a0I=",
         "owner": "qvalentin",
         "repo": "helm-ls.nvim",
-        "rev": "f0b9a1723890971a6d84890b50dbf5f40974ea1b",
+        "rev": "d6f3a8d4ad59b4f54cd734267dfb5411679ea608",
         "type": "github"
       },
       "original": {
@@ -122,11 +82,11 @@
     "plugins-mcphub-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768730387,
+        "lastModified": 1759035242,
-        "narHash": "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=",
+        "narHash": "sha256-I6EbgY/2sAdtrxtmH0qbAAQvMCHhOsfolJfblV0fXOk=",
         "owner": "ravitemer",
         "repo": "mcphub.nvim",
-        "rev": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f",
+        "rev": "8ff40b5edc649959bb7e89d25ae18e055554859a",
         "type": "github"
       },
       "original": {
@@ -170,11 +130,11 @@
     "plugins-tailwind-fold-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1766077142,
+        "lastModified": 1752559116,
-        "narHash": "sha256-SwcDLlygXUSV/dytPXA5Y45OpUhjnExc8SZg5a8MZ2k=",
+        "narHash": "sha256-8uefZIVsn9USEd6FyiO3m3TRKAS/vigU4t9Tk5ijd3c=",
         "owner": "razak17",
         "repo": "tailwind-fold.nvim",
-        "rev": "e2ba5ee1ca9b74208709fe9d7314b8aa753b26a7",
+        "rev": "d9e7ca11691d252b35795726dff087bf013b2ebf",
         "type": "github"
       },
       "original": {
@@ -185,10 +145,10 @@
     },
     "root": {
       "inputs": {
-        "mcp-hub": "mcp-hub",
         "nixCats": "nixCats",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs",
         "plugins-beancount-nvim": "plugins-beancount-nvim",
+        "plugins-crazy-node-movement": "plugins-crazy-node-movement",
         "plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
         "plugins-mcphub-nvim": "plugins-mcphub-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",

dots/.config/nvim/flake.nix

@@ -2,16 +2,15 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
     nixCats.url = "github:BirdeeHub/nixCats-nvim";
-    mcp-hub.url = "github:ravitemer/mcp-hub";
 
     plugins-shipwright-nvim = {
       url = "github:rktjmp/shipwright.nvim";
       flake = false;
     };
-    # plugins-m-taskwarrior-d-nvim = {
+    plugins-crazy-node-movement = {
-    #   url = "github:huantrinh1802/m_taskwarrior_d.nvim";
+      url = "github:theHamsta/crazy-node-movement";
-    #   flake = false;
+      flake = false;
-    # };
+    };
     plugins-beancount-nvim = {
       url = "github:polarmutex/beancount.nvim";
       flake = false;
@@ -37,6 +36,7 @@
 
   outputs =
     {
+      self,
       nixpkgs,
       nixCats,
       ...
@@ -47,11 +47,8 @@
       forEachSystem = utils.eachSystem nixpkgs.lib.platforms.all;
       extra_pkg_config = { };
 
-      mkDependencyOverlays = system: [
+      dependencyOverlays = [
         (utils.standardPluginOverlay inputs)
-        (_final: _prev: {
-          mcp-hub = inputs.mcp-hub.packages.${system}.default;
-        })
       ];
 
       categoryDefinitions =
@@ -65,33 +62,19 @@
               black
               clang
               clang-tools
-              delta
-              emmet-language-server
-              eslint_d
-              fd
               gawk
               gdtoolkit_4
-              hadolint
-              helm-ls
               isort
-              lua-language-server
+              tree-sitter
-              mcp-hub
+              ormolu
+              nodePackages.prettier
               nixd
               nixfmt
-              nodePackages.prettier
-              nodePackages.typescript-language-server
-              ormolu
               prettierd
-              rust-analyzer
+              rust-analyzer-unwrapped
-              rustfmt
               shellcheck-minimal
-              stylelint
               stylua
-              tree-sitter
               vscode-langservers-extracted
-              vtsls
-              yaml-language-server
-              yamllint
             ];
           };
 
@@ -141,6 +124,7 @@
               pkgs.neovimPlugins.shipwright-nvim
               lush-nvim
               zenbones-nvim
+              pkgs.neovimPlugins.crazy-node-movement
               nvim-treesitter.withAllGrammars
               nvim-treesitter-textobjects
               # nvim-treesitter-context
@@ -160,11 +144,7 @@
               copilot-lua
               copilot-cmp
               pkgs.neovimPlugins.helm-ls-nvim
-              kitty-scrollback-nvim
+              pkgs.vimPlugins.kitty-scrollback-nvim
-              fidget-nvim
-              rustaceanvim
-              # pkgs.neovimPlugins.m-taskwarrior-d-nvim
-              claude-code-nvim
             ];
           };
 
@@ -181,17 +161,19 @@
         };
 
       packageDefinitions = {
-        nvim = _: {
+        nvim =
-          settings = {
+          { ... }:
-            suffix-path = true;
+          {
-            suffix-LD = true;
+            settings = {
-            wrapRc = true;
+              suffix-path = true;
-            aliases = [ "vim" ];
+              suffix-LD = true;
+              wrapRc = true;
+              aliases = [ "vim" ];
+            };
+            categories = {
+              general = true;
+            };
           };
-          categories = {
-            general = true;
-          };
-        };
       };
       defaultPackageName = "nvim";
     in
@@ -199,7 +181,6 @@
     forEachSystem (
       system:
       let
-        dependencyOverlays = mkDependencyOverlays system;
         nixCatsBuilder = utils.baseBuilder luaPath {
           inherit
             nixpkgs
@@ -219,7 +200,7 @@
             name = defaultPackageName;
             packages = [ defaultPackage ];
             inputsFrom = [ ];
-            shellHook = "";
+            shellHook = '''';
           };
         };
 
@@ -231,32 +212,31 @@
           moduleNamespace = [ defaultPackageName ];
           inherit
             defaultPackageName
+            dependencyOverlays
             luaPath
             categoryDefinitions
             packageDefinitions
             extra_pkg_config
             nixpkgs
             ;
-          dependencyOverlays = mkDependencyOverlays;
         };
         homeModule = utils.mkHomeModules {
           moduleNamespace = [ defaultPackageName ];
           inherit
             defaultPackageName
+            dependencyOverlays
             luaPath
             categoryDefinitions
             packageDefinitions
             extra_pkg_config
             nixpkgs
             ;
-          dependencyOverlays = mkDependencyOverlays;
         };
       in
       {
 
         overlays = utils.makeOverlays luaPath {
-          inherit nixpkgs extra_pkg_config;
+          inherit nixpkgs dependencyOverlays extra_pkg_config;
-          dependencyOverlays = mkDependencyOverlays;
         } categoryDefinitions packageDefinitions defaultPackageName;
 
         nixosModules.default = nixosModule;

dots/.config/nvim/init.lua

@@ -1,7 +1,10 @@
 require("nixCatsUtils").setup({ non_nix_value = true }) -- https://github.com/BirdeeHub/nixCats-nvim/blob/77dffad8235eb77684fcb7599487c8e9f23d5b8f/templates/example/init.lua
 
-vim.opt.termguicolors = true
+vim.cmd([[
-vim.api.nvim_set_hl(0, "Normal", { ctermbg = "NONE", bg = "NONE" })
+set termguicolors
+set bg=light
+hi Normal ctermbg=none guibg=NONE
+]])
 
 require("base")
 require("cursor")
@@ -19,5 +22,7 @@ require("utils")
 require("zk")
 require("reload")
 
+require("paq-setup") -- when not on nixCats
+
 vim.opt.background = "dark"
 vim.opt.laststatus = 3

dots/.config/nvim/lua/paq-setup.lua

@@ -43,5 +43,4 @@ require("nixCatsUtils.catPacker").setup({
   { "zbirenbaum/copilot-cmp" },
   { "qvalentin/helm-ls.nvim", ft = "helm" },
   { "mikesmithgh/kitty-scrollback.nvim" },
-  { "greggh/claude-code.nvim" },
 })

dots/.config/nvim/lua/skeleton/init.lua

@@ -2,10 +2,10 @@ local autocmd = vim.api.nvim_create_autocmd
 
 autocmd("BufNewFile", {
   pattern = "shell.nix",
-  command = "0r ~/.config/nvim/skeletons/shell.nix.skeleton",
+  command = "0r ~/.config/nvim/skeletons/shell.nix",
 })
 
 autocmd("BufNewFile", {
   pattern = "flake.nix",
-  command = "0r ~/.config/nvim/skeletons/flake.nix.skeleton",
+  command = "0r ~/.config/nvim/skeletons/flake.nix",
 })

dots/.config/tmux/hooks/tmux.regular.conf

@@ -0,0 +1 @@
+set  -g status-style bg=default

dots/.config/tmux/hooks/tmux.ssh.conf

@@ -1 +1 @@
-set -g status-style bg=colour12,fg=colour0
+set  -g status-style bg=blue,fg=black;

dots/.config/tmux/themes/zenwritten_dark.tmux

@@ -0,0 +1,22 @@
+# This file is based on the one provided by shipwright.nvim
+set -g @FG '#dddddd'
+set -g @BG '#111111'
+
+set -g status-left ' #[fg=#{@FG},bold]#{s/root//:client_key_table} '
+set -g status-right '#[fg=#{@FG},bold] [#S]#[fg=#{@FG},bold] [%d/%m] #[fg=#{@FG},bold][%I:%M%p] '
+set -g status-style fg='#{@FG}',bg='#{@BG}'
+
+set -g window-status-current-style fg='#{@FG}',bg='#{@BG}',bold
+
+set -g pane-border-style fg='#{@FG}'
+set -g pane-active-border-style fg='#{@FG}'
+
+set -g message-style fg='#{@FG}',bg='#{@FG}'
+
+set -g display-panes-active-colour '#{@FG}'
+set -g display-panes-colour '#{@FG}'
+
+set -g clock-mode-colour '#{@FG}'
+
+set -g mode-style fg='#{@FG}',bg='#{@FG}'
+

dots/.config/tmux/themes/zenwritten_light.tmux

@@ -0,0 +1,22 @@
+# This file is based on the one provided by shipwright.nvim
+set -g @FG '#111111'
+set -g @BG '#dddddd'
+
+set -g status-left ' #[fg=#{@FG},bold]#{s/root//:client_key_table} '
+set -g status-right '#[fg=#{@FG},bold] [#S]#[fg=#{@FG},bold] [%d/%m] #[fg=#{@FG},bold][%I:%M%p] '
+set -g status-style fg='#{@FG}',bg='#{@BG}'
+
+set -g window-status-current-style fg='#{@FG}',bg='#{@BG}',bold
+
+set -g pane-border-style fg='#{@FG}'
+set -g pane-active-border-style fg='#{@FG}'
+
+set -g message-style fg='#{@FG}',bg='#{@FG}'
+
+set -g display-panes-active-colour '#{@FG}'
+set -g display-panes-colour '#{@FG}'
+
+set -g clock-mode-colour '#{@FG}'
+
+set -g mode-style fg='#{@FG}',bg='#{@FG}'
+

dots/.config/tmux/tmux.conf

@@ -39,22 +39,10 @@ bind-key -T root F7 select-window -t 7
 bind-key -T root F8 select-window -t 8
 bind-key -T root F9 select-window -t 9
 
-
-# bind-key j command-prompt -p "join pane from:"  "join-pane -s '%%'"
-# bind-key s command-prompt -p "send pane to:"  "join-pane -t '%%'"
-bind-key -T root S-F1 join-pane -s :1
-bind-key -T root S-F2 join-pane -s :2
-bind-key -T root S-F3 join-pane -s :3
-bind-key -T root S-F4 join-pane -s :4
-bind-key -T root S-F5 join-pane -s :5
-bind-key -T root S-F6 join-pane -s :6
-bind-key -T root S-F7 join-pane -s :7
-bind-key -T root S-F8 join-pane -s :8
-bind-key -T root S-F9 join-pane -s :9
-
 # 1-based indexing makes most sense for keyboard layouts (where number row start at 1)
 set  -g base-index 1
 set  -g pane-base-index 1
+setw -g automatic-rename
 
 # statusbar
 set -g status-position top
@@ -65,10 +53,21 @@ set -g status-left "#[bg=colour235,fg=colour255] #S  #[fg=colour235,bg=default]
 set -g status-right ""
 %else
 set -g status-left '#h '
-set -g status-right '#(uptime | cut -f 4-5 -d " " | cut -f 1 -d ",") %a %l:%M:%S %p %Y-%m-%d'
+set -g status-right '#(uptime | cut -f 4-5 -d " " | cut -f 1 -d ",") %a%l:%M:%S %p %Y-%m-%d'
 %endif
 
-set -g default-terminal "tmux-256color"
+# theming
+%if "#{==:#{host},desktop-arch}"
+set  -g default-terminal "tmux-256color"
+setw -g window-status-style fg=colour244,bg=default
+setw -g window-status-current-style fg=colour232,bg=default,bold
+set  -g message-style fg=colour232,bg=default
+setw -g clock-mode-colour colour235
+set  -g status-style bg=default
+set  -g pane-border-style fg=#cccccc
+set  -g pane-active-border-style fg=#555555
+set  -g message-style bg=#cccccc,fg=#000000
+%endif
 
 set-hook -g after-new-session 'if -F "#{==:#{session_name},ssh}" "source ${XDG_CONFIG_HOME}/tmux/hooks/tmux.ssh.conf" "source ${XDG_CONFIG_HOME}/tmux/hooks/tmux.regular.conf"'
 
@@ -76,5 +75,3 @@ set-hook -g after-new-session 'if -F "#{==:#{session_name},ssh}" "source ${XDG_C
 if-shell "test '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -ge 4 \)'" 'bind-key -Tcopy-mode-vi v send -X begin-selection; bind-key -Tcopy-mode-vi y send -X copy-selection-and-cancel'
 if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 4\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'bind-key -t vi-copy v begin-selection; bind-key -t vi-copy y copy-selection'
 if-shell '\( #{$TMUX_VERSION_MAJOR} -eq 2 -a #{$TMUX_VERSION_MINOR} -lt 2\) -o #{$TMUX_VERSION_MAJOR} -le 1' 'set-option -g status-utf8 on'
-
-set -g allow-passthrough on

dots/.config/tmux/tmux.regular.conf

@@ -0,0 +1 @@
+set  -g status-style bg=default

dots/.gitignore

@@ -84,9 +84,6 @@ dkms.conf
 
 # Dotenv
 .env
-.envrc
-.direnv/
-.pre-commit-config.yaml
 
 # Prevent module files from being ignored (e.g. NestJS)
 !*.module*

dots/.local/share/task/hooks/on-add.limit.py

@@ -1,29 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import json
-
-SLOTS_FILE = "/home/h/.local/share/task/add_slots"
-
-def get_slots():
-    try:
-        with open(SLOTS_FILE, "r") as f:
-            return int(f.read().strip())
-    except:
-        return 0
-
-slots = get_slots()
-
-if slots <= 0:
-    print(f"Cannot add task: No slots available (0/{slots}).")
-    print("Delete or complete a task first to earn an add slot.")
-    sys.exit(1)
-
-with open(SLOTS_FILE, "w") as f:
-    f.write(str(slots - 1))
-
-print(f"Task added. Slots remaining: {slots - 1}")
-
-for line in sys.stdin:
-    task = json.loads(line)
-    print(json.dumps(task))
-    sys.exit(0)

dots/.local/share/task/hooks/on-modify.limit.py

@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import json
-
-SLOTS_FILE = "/home/h/.local/share/task/add_slots"
-
-def get_slots():
-    try:
-        with open(SLOTS_FILE, "r") as f:
-            return int(f.read().strip())
-    except:
-        return 0
-
-data = sys.stdin.read().strip().split("\n")
-if len(data) < 2:
-    for line in data:
-        if line:
-            print(line)
-    sys.exit(0)
-
-old_task = json.loads(data[0])
-new_task = json.loads(data[1])
-
-was_pending = old_task.get("status") == "pending"
-is_not_pending = new_task.get("status") in ("completed", "deleted")
-
-if was_pending and is_not_pending:
-    slots = get_slots() + 1
-    with open(SLOTS_FILE, "w") as f:
-        f.write(str(slots))
-    print(f"Slot earned! Total slots: {slots}")
-
-print(json.dumps(new_task))
-sys.exit(0)

dots/.resticexclude

@@ -0,0 +1,44 @@
+# Restic ignore
+
+# General
+.trash
+Trash
+.cache
+cache
+Cache
+CachedData
+CachedExtension
+CacheStorage
+__pycache__
+GPUCache
+ShaderCache
+build
+.git
+node_modules
+venv
+env
+
+# Specifics
+$HOME/.android
+$HOME/.atom
+$HOME/.build
+$HOME/.cabal
+$HOME/.cargo
+$HOME/.conda
+$HOME/.config/BraveSoftware/Brave-Browser/Default/Local Storage
+$HOME/.config/BraveSoftware/Brave-Browser/Default/Local Extension Settings
+$HOME/.config/nvm/versions
+$HOME/.config/devcert
+$HOME/.espressif
+$HOME/.local/share/torbrowser
+$HOME/.mozilla
+$HOME/.nvm
+$HOME/.npm
+$HOME/.nuget
+$HOME/.yarn
+$HOME/.config/yarn
+$HOME/doc/disk-images
+$HOME/.stremio-server
+$HOME/Games
+!$HOME/Games/*/drive_c/users/h/AppData
+!$HOME/Games/rhino

dots/.resticinclude

@@ -0,0 +1,3 @@
+/etc
+/boot
+/home

flake.lock

@@ -1,97 +1,5 @@
 {
   "nodes": {
-    "base16": {
-      "inputs": {
-        "fromYaml": "fromYaml"
-      },
-      "locked": {
-        "lastModified": 1755819240,
-        "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "type": "github"
-      }
-    },
-    "base16-fish": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1765809053,
-        "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
-        "type": "github"
-      }
-    },
-    "base16-helix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1760703920,
-        "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "d646af9b7d14bff08824538164af99d0c521b185",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "type": "github"
-      }
-    },
-    "base16-vim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732806396,
-        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      }
-    },
-    "colmena": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "flake-utils": "flake-utils",
-        "nix-github-actions": "nix-github-actions",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "stable": "stable"
-      },
-      "locked": {
-        "lastModified": 1762034856,
-        "narHash": "sha256-QVey3iP3UEoiFVXgypyjTvCrsIlA4ecx6Acaz5C8/PQ=",
-        "owner": "zhaofengli",
-        "repo": "colmena",
-        "rev": "349b035a5027f23d88eeb3bc41085d7ee29f18ed",
-        "type": "github"
-      },
-      "original": {
-        "owner": "zhaofengli",
-        "repo": "colmena",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -99,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768920986,
+        "lastModified": 1746728054,
-        "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=",
+        "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "de5708739256238fb912c62f03988815db89ec9a",
+        "rev": "ff442f5d1425feb86344c028298548024f21256d",
         "type": "github"
       },
       "original": {
@@ -121,11 +29,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1771732978,
+        "lastModified": 1765057342,
-        "narHash": "sha256-o7gZh/eXFkEEmzwlBdIbgCJhmdlqQhOhVjudqgsIefg=",
+        "narHash": "sha256-a9hxZjrSl3WFp77yzWwTgBkgVZVavejafIb7CJYH+g8=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "18226106e18bc40cce99d436ee741a946f1888f6",
+        "rev": "b0719627ac28759a9dc0d84f59a6f447591eff91",
         "type": "gitlab"
       },
       "original": {
@@ -135,113 +43,7 @@
         "type": "gitlab"
       }
     },
-    "firefox-gnome-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1764873433,
-        "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "type": "github"
-      }
-    },
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1650374568,
-        "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "b4a34015c698c7793d592d66adbab377907a2be8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nvim",
-          "mcp-hub",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743550720,
-        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1767609335,
-        "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_2": {
       "inputs": {
         "systems": "systems"
       },
@@ -259,84 +61,6 @@
         "type": "github"
       }
     },
-    "fromYaml": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731966426,
-        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "type": "github"
-      }
-    },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1771857445,
-        "narHash": "sha256-NCrhxU9wq5+4jQG1fvRbyTnH8GSbH6LovreVoH2fOL4=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "3d7a52f678227930ab089f5d9b384f2d50f7d534",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore": {
-      "inputs": {
-        "nixpkgs": [
-          "git-hooks",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
-    "gnome-shell": {
-      "flake": false,
-      "locked": {
-        "host": "gitlab.gnome.org",
-        "lastModified": 1767737596,
-        "narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
-        "type": "gitlab"
-      },
-      "original": {
-        "host": "gitlab.gnome.org",
-        "owner": "GNOME",
-        "ref": "gnome-49",
-        "repo": "gnome-shell",
-        "type": "gitlab"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -344,11 +68,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771851181,
+        "lastModified": 1764998300,
-        "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=",
+        "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c",
+        "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb",
         "type": "github"
       },
       "original": {
@@ -357,53 +81,13 @@
         "type": "github"
       }
     },
-    "mcp-hub": {
-      "inputs": {
-        "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_2"
-      },
-      "locked": {
-        "lastModified": 1755841689,
-        "narHash": "sha256-KakvXZf0vjdqzyT+LsAKHEr4GLICGXPmxl1hZ3tI7Yg=",
-        "owner": "ravitemer",
-        "repo": "mcp-hub",
-        "rev": "9c7670a4c341ed3cf738a6242c0fde1cea40bccf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ravitemer",
-        "repo": "mcp-hub",
-        "type": "github"
-      }
-    },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "colmena",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1729742964,
-        "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "e04df33f62cdcf93d73e9a04142464753a16db67",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
     "nix-secrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1770135527,
+        "lastModified": 1764371082,
-        "narHash": "sha256-Fup9LiyL6bDID3x+rAB2nP99Xv2o9Is5NkTDbmIy6o0=",
+        "narHash": "sha256-yxFxEKXFuXFyFIDZY1gla2OyuqcIE3uT8KDDgTmm3cE=",
         "ref": "main",
-        "rev": "521d144f8a8ff9fca8ccf492d7fbdd05d9a5fe37",
+        "rev": "b9c2ce32cc4c95d7ff01372faea2668407ef8d27",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@github.com/hektor/nix-secrets"
@@ -417,11 +101,11 @@
     },
     "nixCats": {
       "locked": {
-        "lastModified": 1770584904,
+        "lastModified": 1764009888,
-        "narHash": "sha256-9Zaz8lbKF2W9pwXZEnbiGsicHdBoU+dHt3Wv3mCJoZ8=",
+        "narHash": "sha256-hJekfTiW1792txgRSM4LcHnz1lDSY87LYbsJEn2V378=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "538fdde784d2909700d97a8ef307783b33a86fb1",
+        "rev": "16ac3281f322ea15d39843829e42a44d22da3715",
         "type": "github"
       },
       "original": {
@@ -432,7 +116,7 @@
     },
     "nixgl": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
+        "flake-utils": "flake-utils",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -453,11 +137,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1771423359,
+        "lastModified": 1764440730,
-        "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=",
+        "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b",
+        "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
         "type": "github"
       },
       "original": {
@@ -469,11 +153,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771369470,
+        "lastModified": 1764950072,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "rev": "f61125a668a320878494449750330ca58b78c557",
         "type": "github"
       },
       "original": {
@@ -483,55 +167,14 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1743689281,
-        "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2bfc080955153be0be56724be6fa5477b4eefabb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nur": {
-      "inputs": {
-        "flake-parts": [
-          "stylix",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1767810917,
-        "narHash": "sha256-ZKqhk772+v/bujjhla9VABwcvz+hB2IaRyeLT6CFnT0=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "dead29c804adc928d3a69dfe7f9f12d0eec1f1a4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
     "nvim": {
       "inputs": {
-        "mcp-hub": "mcp-hub",
         "nixCats": "nixCats",
         "nixpkgs": [
           "nixpkgs"
         ],
         "plugins-beancount-nvim": "plugins-beancount-nvim",
+        "plugins-crazy-node-movement": "plugins-crazy-node-movement",
         "plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
         "plugins-mcphub-nvim": "plugins-mcphub-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
@@ -564,14 +207,30 @@
         "type": "github"
       }
     },
+    "plugins-crazy-node-movement": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693654676,
+        "narHash": "sha256-hQcQEp39zFN2zphMfcr97yRVcuHhBsSkzKO7XNloDpQ=",
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "rev": "d5cf01cc44c5715501d3d6fe439af7c8b7fa5df2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "theHamsta",
+        "repo": "crazy-node-movement",
+        "type": "github"
+      }
+    },
     "plugins-helm-ls-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768584652,
+        "lastModified": 1761915179,
-        "narHash": "sha256-jnMc87OjURNcqsva0npYgVyUrWc5C6L7yHpNvt9eSmg=",
+        "narHash": "sha256-W9NRa84l5Cs62OsDeqb+LMxk8oYjhVBCB3o3UmE9a0I=",
         "owner": "qvalentin",
         "repo": "helm-ls.nvim",
-        "rev": "f0b9a1723890971a6d84890b50dbf5f40974ea1b",
+        "rev": "d6f3a8d4ad59b4f54cd734267dfb5411679ea608",
         "type": "github"
       },
       "original": {
@@ -583,11 +242,11 @@
     "plugins-mcphub-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1768730387,
+        "lastModified": 1759035242,
-        "narHash": "sha256-g9tPvjThz6EUk7zcY7lL+YH4lrT4x3FJ6jrNMHA8PAE=",
+        "narHash": "sha256-I6EbgY/2sAdtrxtmH0qbAAQvMCHhOsfolJfblV0fXOk=",
         "owner": "ravitemer",
         "repo": "mcphub.nvim",
-        "rev": "7cd5db330f41b7bae02b2d6202218a061c3ebc1f",
+        "rev": "8ff40b5edc649959bb7e89d25ae18e055554859a",
         "type": "github"
       },
       "original": {
@@ -631,11 +290,11 @@
     "plugins-tailwind-fold-nvim": {
       "flake": false,
       "locked": {
-        "lastModified": 1766077142,
+        "lastModified": 1752559116,
-        "narHash": "sha256-SwcDLlygXUSV/dytPXA5Y45OpUhjnExc8SZg5a8MZ2k=",
+        "narHash": "sha256-8uefZIVsn9USEd6FyiO3m3TRKAS/vigU4t9Tk5ijd3c=",
         "owner": "razak17",
         "repo": "tailwind-fold.nvim",
-        "rev": "e2ba5ee1ca9b74208709fe9d7314b8aa753b26a7",
+        "rev": "d9e7ca11691d252b35795726dff087bf013b2ebf",
         "type": "github"
       },
       "original": {
@@ -646,18 +305,15 @@
     },
     "root": {
       "inputs": {
-        "colmena": "colmena",
         "disko": "disko",
         "firefox-addons": "firefox-addons",
-        "git-hooks": "git-hooks",
         "home-manager": "home-manager",
         "nix-secrets": "nix-secrets",
         "nixgl": "nixgl",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nvim": "nvim",
-        "sops-nix": "sops-nix",
+        "sops-nix": "sops-nix"
-        "stylix": "stylix"
       }
     },
     "sops-nix": {
@@ -667,11 +323,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771735105,
+        "lastModified": 1764483358,
-        "narHash": "sha256-MJuVJeszZEziquykEHh/hmgIHYxUcuoG/1aowpLiSeU=",
+        "narHash": "sha256-EyyvCzXoHrbL467YSsQBTWWg4sR96MH1sPpKoSOelB4=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d7755d820f5fa8acf7f223309c33e25d4f92e74f",
+        "rev": "5aca6ff67264321d47856a2ed183729271107c9c",
         "type": "github"
       },
       "original": {
@@ -680,56 +336,6 @@
         "type": "github"
       }
     },
-    "stable": {
-      "locked": {
-        "lastModified": 1750133334,
-        "narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "36ab78dab7da2e4e27911007033713bab534187b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "stylix": {
-      "inputs": {
-        "base16": "base16",
-        "base16-fish": "base16-fish",
-        "base16-helix": "base16-helix",
-        "base16-vim": "base16-vim",
-        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_2",
-        "gnome-shell": "gnome-shell",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nur": "nur",
-        "systems": "systems_2",
-        "tinted-foot": "tinted-foot",
-        "tinted-kitty": "tinted-kitty",
-        "tinted-schemes": "tinted-schemes",
-        "tinted-tmux": "tinted-tmux",
-        "tinted-zed": "tinted-zed"
-      },
-      "locked": {
-        "lastModified": 1771787992,
-        "narHash": "sha256-Vg4bGwwenNYI8p3nJTl9FRyeIyrjATeZrZr+GyUSDrw=",
-        "owner": "danth",
-        "repo": "stylix",
-        "rev": "30054cca073b49b42a71289edec858f535b27fe9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "danth",
-        "repo": "stylix",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -744,102 +350,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tinted-foot": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726913040,
-        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      }
-    },
-    "tinted-kitty": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735730497,
-        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "type": "github"
-      }
-    },
-    "tinted-schemes": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767710407,
-        "narHash": "sha256-+W1EB79Jl0/gm4JqmO0Nuc5C7hRdp4vfsV/VdzI+des=",
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "rev": "2800e2b8ac90f678d7e4acebe4fa253f602e05b2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "type": "github"
-      }
-    },
-    "tinted-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767489635,
-        "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "type": "github"
-      }
-    },
-    "tinted-zed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767488740,
-        "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "type": "github"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -3,10 +3,6 @@
     nixpkgs = {
       url = "github:nixos/nixpkgs/nixos-unstable";
     };
-    stylix = {
-      url = "github:danth/stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nixos-hardware = {
       url = "github:NixOS/nixos-hardware/master";
     };
@@ -38,114 +34,48 @@
       url = "path:./dots/.config/nvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    colmena = {
-      url = "github:zhaofengli/colmena";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    git-hooks = {
-      url = "github:cachix/git-hooks.nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
     {
       self,
       nixpkgs,
+      nixos-hardware,
+      disko,
+      sops-nix,
+      nix-secrets,
       home-manager,
       nixgl,
-      git-hooks,
+      firefox-addons,
-      ...
+      nvim,
     }@inputs:
     let
-      inherit (self) outputs;
+      lib = inputs.nixpkgs.lib;
-      inherit (inputs.nixpkgs) lib;
       utils = import ./utils { inherit lib; };
       hostDirNames = utils.dirNames ./hosts;
       system = "x86_64-linux";
-      dotsPath = ./dots;
+      pkgs = import nixpkgs {
-      gitHooks = import ./git-hooks.nix {
+        inherit system;
-        inherit nixpkgs git-hooks system;
+        overlays = [ nixgl.overlay ];
-        src = ./.;
       };
     in
     {
       nix.nixPath = [
         "nixpkgs=${inputs.nixpkgs}"
       ]; # <https://github.com/nix-community/nixd/blob/main/nixd/docs/configuration.md>
-      nixosConfigurations =
+      nixosConfigurations = lib.genAttrs hostDirNames (
-        (lib.genAttrs hostDirNames (
+        host:
-          host:
+        nixpkgs.lib.nixosSystem {
-          nixpkgs.lib.nixosSystem {
+          modules = [ ./hosts/${host} ];
-            modules = [
+          specialArgs = { inherit inputs; };
-              ./hosts/${host}
+        }
-              { nixpkgs.hostPlatform = import ./hosts/${host}/system.nix; }
+      );
-            ];
-            specialArgs = {
-              inherit inputs outputs dotsPath;
-            };
-          }
-        ))
-        // {
-          sd-image-orange-pi-aarch64 = nixpkgs.lib.nixosSystem {
-            modules = [
-              "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
-              ./images/sd-image-orange-pi-aarch64.nix
-              {
-                nixpkgs.buildPlatform = "x86_64-linux";
-                nixpkgs.hostPlatform = "aarch64-linux";
-              }
-            ];
-            specialArgs = {
-              inherit inputs outputs dotsPath;
-            };
-          };
-          sd-image-raspberry-pi-aarch64 = nixpkgs.lib.nixosSystem {
-            modules = [
-              "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
-              ./images/sd-image-raspberry-pi-aarch64.nix
-              {
-                nixpkgs.buildPlatform = "x86_64-linux";
-                nixpkgs.hostPlatform = "aarch64-linux";
-              }
-            ];
-            specialArgs = {
-              inherit inputs outputs dotsPath;
-            };
-          };
-        };
-
       homeConfigurations = {
         work = home-manager.lib.homeManagerConfiguration {
-          pkgs = import nixpkgs {
+          inherit pkgs;
-            inherit system;
-            overlays = [ nixgl.overlay ];
-          };
           modules = [ ./home/hosts/work ];
-          extraSpecialArgs = {
+          extraSpecialArgs = { inherit inputs; };
-            inherit inputs outputs dotsPath;
-          };
         };
       };
-
-      apps.${system}.colmena = inputs.colmena.apps.${system}.default;
-
-      colmena = import ./deploy/colmena.nix {
-        inherit
-          self
-          inputs
-          ;
-      };
-
-      checks.${system} = gitHooks.checks;
-      formatter.${system} = gitHooks.formatter;
-      devShells.${system} = gitHooks.devShells;
-
-      legacyPackages.${system} = {
-        sd-image-orange-pi-aarch64 =
-          self.nixosConfigurations.sd-image-orange-pi-aarch64.config.system.build.sdImage;
-        sd-image-raspberry-pi-aarch64 =
-          self.nixosConfigurations.sd-image-raspberry-pi-aarch64.config.system.build.sdImage;
-      };
     };
 }

git-hooks.nix

@@ -1,47 +0,0 @@
-{
-  nixpkgs,
-  git-hooks,
-  system,
-  src,
-}:
-let
-  pkgs = nixpkgs.legacyPackages.${system};
-
-  pre-commit-check = git-hooks.lib.${system}.run {
-    inherit src;
-    hooks = {
-      nixfmt = {
-        enable = true;
-        package = pkgs.nixfmt;
-      };
-      statix.enable = true;
-      deadnix.enable = true;
-    };
-  };
-in
-{
-  checks = {
-    inherit pre-commit-check;
-  };
-
-  formatter =
-    let
-      inherit (pre-commit-check) config;
-      inherit (config) package configFile;
-      script = ''
-        ${pkgs.lib.getExe package} run --all-files --config ${configFile}
-      '';
-    in
-    pkgs.writeShellScriptBin "pre-commit-run" script;
-
-  devShells = {
-    default =
-      let
-        inherit (pre-commit-check) shellHook enabledPackages;
-      in
-      pkgs.mkShell {
-        inherit shellHook;
-        buildInputs = enabledPackages;
-      };
-  };
-}

home/hosts/andromache/default.nix

@@ -1,63 +1,19 @@
 {
   lib,
+  inputs,
   config,
   pkgs,
   ...
 }:
 
-let
-  username = "h";
-in
 {
   imports = [
-    ../../modules
+    (import ../astyanax {
-    ../../modules/ai-tools.nix
+      inherit inputs;
-    ../../modules/audio
+      inherit config;
-    ../../modules/cloud
+      inherit pkgs;
-    ../../modules/comms
+    })
-    ../../modules/desktop/niri
-    ../../modules/direnv
-    ../../modules/3d
-    ../../modules/git
-    ../../modules/k8s/k9s.nix
-    ../../modules/kitty.nix
-    ../../modules/music
-    ../../modules/nvim.nix
-    ../../modules/pandoc.nix
-    ../../modules/ssh.nix
-    ../../modules/taskwarrior.nix
-    ../../modules/keepassxc.nix
-    ../../modules/anki.nix
-    ../../modules/photography
-    ../../modules/browser
-    ../../modules/shell
   ];
 
-  home = {
+  programs.taskwarrior.config.recurrence = lib.mkForce "on";
-    stateVersion = "25.05";
-    inherit username;
-    homeDirectory = "/home/${username}";
-  };
-
-  xdg.userDirs.createDirectories = false;
-  xdg.userDirs.download = "${config.home.homeDirectory}/dl";
-
-  ai-tools.opencode.enable = true;
-  browser.primary = "librewolf";
-  cloud.hetzner.enable = true;
-  comms.signal.enable = true;
-  github.enable = true;
-  pandoc.enable = true;
-
-  shell.bash = {
-    enable = true;
-    aliases.lang-js = true;
-  };
-
-  programs = {
-    home-manager.enable = true;
-    taskwarrior.config.recurrence = lib.mkForce "on";
-  };
-
-  home.packages = import ../packages.nix { inherit pkgs; };
 }

home/hosts/astyanax/default.nix

@@ -1,4 +1,5 @@
 {
+  inputs,
   config,
   pkgs,
   ...
@@ -9,56 +10,69 @@ let
 in
 {
   imports = [
-    ../../modules
-    ../../modules/ai-tools.nix
-    ../../modules/audio
-    ../../modules/anki.nix
-    ../../modules/cloud
-    ../../modules/comms
-    ../../modules/direnv
     ../../modules/desktop/niri
-    ../../modules/git
+    ../../modules/git.nix
-    ../../modules/k8s/k9s.nix
+    ../../modules/k9s.nix
-    ../../modules/kitty.nix
+    (import ../../modules/shikane.nix { inherit pkgs; })
-    ../../modules/music
+    (import ../../modules/taskwarrior.nix {
-    ../../modules/nfc
+      inherit config;
-    ../../modules/nvim.nix
+      inherit pkgs;
-    ../../modules/pandoc.nix
+    })
-    ../../modules/ssh.nix
+    (import ../../modules/keepassxc.nix { inherit pkgs; })
-    ../../modules/taskwarrior.nix
-    ../../modules/keepassxc.nix
-    ../../modules/browser
-    ../../modules/shell
   ];
 
-  home = {
+  home.stateVersion = "25.05";
-    stateVersion = "25.05";
+  home.username = username;
-    inherit username;
+  home.homeDirectory = "/home/${username}";
-    homeDirectory = "/home/${username}";
-  };
 
   xdg.userDirs.createDirectories = false;
   xdg.userDirs.download = "${config.home.homeDirectory}/dl";
 
-  ai-tools.opencode.enable = true;
-  browser.primary = "librewolf";
-  cloud.hetzner.enable = true;
-  comms.signal.enable = true;
-  github.enable = true;
-  nfc.proxmark3.enable = true;
-  pandoc.enable = true;
-
-  shell.bash = {
-    enable = true;
-    aliases.lang-js = true;
-  };
-
   programs = {
+    bash = {
+      enable = true;
+      enableCompletion = true;
+      initExtra = ''
+        for f in /home/h/.bashrc.d/*; do
+          [ -f "$f" ] && source "$f"
+        done
+
+        source /home/h/.bash_aliases/all
+        source /home/h/.bash_aliases/lang-js
+
+        # host-specific config goes here
+        # ...
+
+        export PATH=${../../../dots/.bin}:$PATH
+      '';
+    };
+    firefox = import ../../modules/firefox.nix {
+      inherit inputs;
+      inherit pkgs;
+      inherit config;
+    };
+    fzf = {
+      enable = true;
+      enableBashIntegration = true;
+    };
     home-manager.enable = true;
   };
 
-  home.packages = import ../packages.nix {
+  home.packages = import ./packages.nix {
     inherit pkgs;
     inherit config;
   };
+
+  home.file = {
+    ".inputrc".source = ../../../dots/.inputrc;
+    ".bashrc.d/prompt".source = ../../../dots/.bashrc.d/prompt;
+    ".bashrc.d/editor".source = ../../../dots/.bashrc.d/editor;
+    ".bash_aliases/all".source = ../../../dots/.bash_aliases/all;
+    ".bash_aliases/lang-js".source = ../../../dots/.bash_aliases/lang-js;
+    ".config/kitty/kitty.conf".source = ../../../dots/.config/kitty/kitty.conf;
+    ".config/kitty/themes/zenwritten_light.conf".source =
+      ../../../dots/.config/kitty/themes/zenwritten_light.conf;
+    ".config/kitty/themes/zenwritten_dark.conf".source =
+      ../../../dots/.config/kitty/themes/zenwritten_dark.conf;
+  };
 }

home/hosts/astyanax/packages.nix

@@ -0,0 +1,53 @@
+{ pkgs, ... }:
+
+with pkgs;
+[
+  bash-completion
+  bash-language-server
+  bat
+  brightnessctl
+  entr
+  eslint_d
+  feh
+  fzf
+  gh
+  git
+  haskell-language-server
+  haskellPackages.pandoc-crossref
+  haskellPackages.hadolint
+  htop
+  jq
+  kitty
+  lua-language-server
+  nixfmt-rfc-style
+  nmap
+  nodejs_24
+  nvimpager
+  ormolu
+  pandoc
+  parallel
+  pass
+  pnpm
+  ripgrep
+  signal-desktop
+  silver-searcher
+  sops
+  sshfs
+  stylelint
+  svelte-language-server
+  tailwindcss-language-server
+  tldr
+  tmux
+  tmuxp
+  tree
+  tree-sitter
+  typescript-language-server
+  unzip
+  vim-language-server
+  vimPlugins.vim-plug
+  vtsls
+  wget
+  xbanish
+  xclip
+  yaml-language-server
+]

home/hosts/packages.nix

@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-
-with pkgs;
-[
-  bat
-  entr
-  feh
-  fzf
-  htop
-  jq
-  nmap
-  nvimpager
-  parallel
-  pass
-  ripgrep
-  silver-searcher
-  sops
-  sshfs
-  tldr
-  tree
-  unzip
-  vimPlugins.vim-plug
-  wget
-]

home/hosts/work/default.nix

@@ -10,113 +10,37 @@ let
 in
 {
   imports = [
-    inputs.sops-nix.homeManagerModules.sops
-    ../../modules
-    ../../modules/stylix.nix
-    ../../modules/ai-tools.nix
-    ../../modules/cloud
-    ../../modules/comms
-    ../../modules/desktop/niri
     ../../modules/dconf.nix
-    ../../modules/direnv
+    ../../modules/git.nix
-    ../../modules/docker
+    ../../modules/k9s.nix
-    ../../modules/git
+    (import ../../modules/keepassxc.nix { inherit pkgs; })
-    ../../modules/go
-    ../../modules/k8s
-    ../../modules/k8s/k9s.nix
-    ../../modules/keepassxc.nix
-    ../../modules/kitty.nix
-    ../../modules/nvim.nix
-    ../../modules/pandoc.nix
-    ../../modules/browser
-    ../../modules/shell
-    ../../modules/music
-    ../../modules/nodejs.nix
-    ../../modules/taskwarrior.nix
-    ../../modules/bruno.nix
-    ../../modules/pandoc.nix
-    ../../modules/vscode.nix
   ];
 
-  sops = {
-    age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
-    defaultSopsFile = "${inputs.nix-secrets}/secrets.yaml";
-
-    secrets = {
-      taskwarrior_sync_server_url = { };
-      taskwarrior_sync_server_client_id = { };
-      taskwarrior_sync_encryption_secret = { };
-      anki_sync_user = { };
-      anki_sync_key = { };
-      opencode_api_key = { };
-    };
-
-    templates = {
-      "taskrc.d/sync" = {
-        content = ''
-          sync.server.url=${config.sops.placeholder.taskwarrior_sync_server_url}
-          sync.server.client_id=${config.sops.placeholder.taskwarrior_sync_server_client_id}
-          sync.encryption_secret=${config.sops.placeholder.taskwarrior_sync_encryption_secret}
-        '';
-      };
-
-      "opencode/auth.json" = {
-        path = "${config.home.homeDirectory}/.local/share/opencode/auth.json";
-        content = ''
-          {
-            "zai-coding-plan": {
-              "type": "api",
-              "key": "${config.sops.placeholder.opencode_api_key}"
-            }
-          }
-        '';
-      };
-    };
-  };
-
   nixpkgs.config.allowUnfree = true;
 
-  home = {
+  home.stateVersion = "25.05";
-    stateVersion = "25.05";
+  home.username = username;
-    inherit username;
+  home.homeDirectory = "/home/${username}";
-    homeDirectory = "/home/${username}";
-  };
 
   targets.genericLinux.nixGL = {
-    inherit (inputs.nixgl) packages;
+    packages = inputs.nixgl.packages;
     defaultWrapper = "mesa";
   };
 
-  browser.primary = "firefox";
-  browser.secondary = "chromium";
-  cloud.azure.enable = true;
-  comms.signal.enable = true;
-  comms.teams.enable = true;
-  ai-tools = {
-    claude-code.enable = true;
-    opencode.enable = true;
-  };
-  github.enable = true;
-  gitlab.enable = true;
-  pandoc.enable = true;
-
-  shell.bash.enable = true;
-  starship.enable = true;
-
   programs = {
+    # editorconfig.enable = true;
+    firefox = import ../../modules/firefox.nix {
+      inherit inputs;
+      inherit pkgs;
+      inherit config;
+    };
     gh.enable = true;
     kubecolor.enable = true;
   };
 
-  home.packages =
+  home.packages = import ./packages.nix {
-    import ./packages.nix {
+    inherit inputs;
-      inherit inputs;
+    inherit config;
-      inherit config;
+    inherit pkgs;
-      inherit pkgs;
+  };
-    }
-    ++ import ../packages.nix {
-      inherit inputs;
-      inherit config;
-      inherit pkgs;
-    };
 }

home/hosts/work/packages.nix

@@ -13,4 +13,7 @@ let
       [ ];
 in
 
-localPackages
+(with pkgs; [
+  inputs.nvim.packages.x86_64-linux.nvim
+])
+++ localPackages

home/modules/3d/default.nix

@@ -1,11 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    bambu-studio
-    blender
-    openscad-lsp
-    openscad-unstable
-    orca-slicer
-  ];
-}

home/modules/ai-tools.nix

@@ -1,89 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.ai-tools;
-  rtk-version = "0.18.1";
-in
-{
-  options.ai-tools = {
-    claude-code.enable = lib.mkEnableOption "claude code with rtk and ccline";
-    opencode.enable = lib.mkEnableOption "opencode";
-  };
-
-  config = lib.mkMerge [
-    (lib.mkIf cfg.claude-code.enable {
-      home.packages = with pkgs; [
-        claude-code
-        (pkgs.stdenv.mkDerivation {
-          name = "ccline";
-          src = pkgs.fetchurl {
-            url = "https://github.com/Haleclipse/CCometixLine/releases/download/v1.0.8/ccline-linux-x64.tar.gz";
-            hash = "sha256-Joe3Dd6uSMGi66QT6xr2oY/Tz8rA5RuKa6ckBVJIzI0=";
-          };
-
-          unpackPhase = ''
-            tar xzf $src
-          '';
-
-          installPhase = ''
-            mkdir -p $out/bin
-            cp ccline $out/bin/
-            chmod +x $out/bin/ccline
-          '';
-
-          meta = with pkgs.lib; {
-            description = "CCometixLine Linux x64 CLI (Claude Code statusline)";
-            homepage = "https://github.com/Haleclipse/CCometixLine";
-            license = licenses.mit;
-            platforms = [ "x86_64-linux" ];
-          };
-        })
-        (pkgs.stdenv.mkDerivation {
-          name = "rtk-${rtk-version}";
-          version = rtk-version;
-          src = pkgs.fetchurl {
-            url = "https://github.com/rtk-ai/rtk/releases/download/v${rtk-version}/rtk-x86_64-unknown-linux-gnu.tar.gz";
-            hash = "sha256-XoTia5K8b00OzcKYCufwx8ApkAS31DxUCpGSU0jFs2Q=";
-          };
-
-          unpackPhase = ''
-            tar xzf $src
-          '';
-
-          installPhase = ''
-            mkdir -p $out/bin
-            cp rtk $out/bin/
-            chmod +x $out/bin/rtk
-          '';
-
-          meta = with pkgs.lib; {
-            description = "RTK - AI coding tool enhancer";
-            homepage = "https://www.rtk-ai.app";
-            license = licenses.mit;
-            platforms = [ "x86_64-linux" ];
-          };
-        })
-        mcp-nixos
-      ];
-    })
-    (lib.mkIf cfg.opencode.enable {
-      home.packages = with pkgs; [
-        opencode
-      ];
-      home.file.".config/opencode/opencode.json".text = builtins.toJSON {
-        "$schema" = "https://opencode.ai/config.json";
-        permission = {
-          external_directory = {
-            "/run/secrets/" = "deny";
-            "~/.config/sops/age/keys.txt" = "deny";
-          };
-        };
-        plugin = [ "@mohak34/opencode-notifier@latest" ];
-      };
-    })
-  ];
-}

home/modules/anki.nix

@@ -1,33 +1,6 @@
 {
-  config,
+  enable = true;
-  lib,
+  # sync = {
-  pkgs,
+  #   username = config.sops.secrets."email/personal".path;
-  osConfig ? null,
+  # };
-  ...
-}:
-
-let
-  hmSopsAvailable = config ? sops && config.sops ? secrets;
-  osSopsAvailable = osConfig != null && osConfig ? sops && osConfig.sops ? secrets;
-  sopsAvailable = hmSopsAvailable || osSopsAvailable;
-
-  sopsSecrets = if hmSopsAvailable then config.sops.secrets else osConfig.sops.secrets;
-in
-{
-  warnings = lib.optional (
-    !sopsAvailable && config.programs.anki.enable
-  ) "anki is enabled but sops secrets are not available. anki sync will not be configured.";
-
-  programs.anki = {
-    enable = true;
-    addons = with pkgs.ankiAddons; [
-      anki-connect
-      puppy-reinforcement
-      review-heatmap
-    ];
-    sync = lib.mkIf sopsAvailable {
-      usernameFile = "${sopsSecrets."anki_sync_user".path}";
-      keyFile = "${sopsSecrets."anki_sync_key".path}";
-    };
-  };
 }

home/modules/audio/default.nix

@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [ pulsemixer ];
-}

home/modules/browser/bookmarks.nix

@@ -1,19 +0,0 @@
-{
-  nixos = {
-    name = "NixOS";
-    bookmarks = [
-      {
-        name = "wiki";
-        url = "https://wiki.nixos.org/wiki/NixOS_Wiki";
-      }
-      {
-        name = "packages";
-        url = "https://search.nixos.org/packages";
-      }
-      {
-        name = "options";
-        url = "https://search.nixos.org/options";
-      }
-    ];
-  };
-}

home/modules/browser/chromium.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  config = lib.mkIf (config.browser.primary == "chromium" || config.browser.secondary == "chromium") {
-    home.packages = [ pkgs.chromium ];
-  };
-}

home/modules/browser/default.nix

@@ -1,31 +0,0 @@
-{ lib, ... }:
-
-{
-  options.browser = {
-    primary = lib.mkOption {
-      type = lib.types.enum [
-        "firefox"
-        "chromium"
-        "librewolf"
-      ];
-      default = "firefox";
-    };
-
-    secondary = lib.mkOption {
-      type = lib.types.nullOr (
-        lib.types.enum [
-          "firefox"
-          "chromium"
-          "librewolf"
-        ]
-      );
-      default = null;
-    };
-  };
-
-  imports = [
-    ./firefox.nix
-    ./librewolf.nix
-    ./chromium.nix
-  ];
-}

home/modules/browser/firefox.nix

@@ -1,23 +0,0 @@
-{
-  config,
-  lib,
-  inputs,
-  pkgs,
-  ...
-}:
-
-{
-  config = lib.mkIf (config.browser.primary == "firefox" || config.browser.secondary == "firefox") {
-    programs.firefox = {
-      enable = true;
-    }
-    // (import ./firefox-base.nix {
-      inherit
-        config
-        inputs
-        lib
-        pkgs
-        ;
-    });
-  };
-}

home/modules/browser/librewolf.nix

@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  inputs,
-  pkgs,
-  ...
-}:
-
-{
-  config =
-    lib.mkIf (config.browser.primary == "librewolf" || config.browser.secondary == "librewolf")
-      {
-        programs.librewolf = {
-          enable = true;
-        }
-        // (import ./firefox-base.nix {
-          inherit
-            config
-            inputs
-            lib
-            pkgs
-            ;
-        });
-      };
-}

home/modules/bruno.nix

@@ -1,7 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  config = {
-    home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.bruno "--no-sandbox")) ];
-  };
-}

home/modules/cloud/azure.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  config = lib.mkIf config.cloud.azure.enable {
-    home.packages = with pkgs; [ azure-cli ];
-  };
-}

home/modules/cloud/default.nix

@@ -1,17 +0,0 @@
-{ lib, ... }:
-
-{
-  options.cloud = {
-    azure = {
-      enable = lib.mkEnableOption "azure CLI";
-    };
-    hetzner = {
-      enable = lib.mkEnableOption "hetzner CLI";
-    };
-  };
-
-  imports = [
-    ./azure.nix
-    ./hetzner.nix
-  ];
-}

home/modules/cloud/hetzner.nix

@@ -1,21 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  osConfig ? null,
-  ...
-}:
-
-let
-  isNixOS = osConfig != null;
-in
-{
-  config = lib.mkIf config.cloud.hetzner.enable {
-    warnings =
-      lib.optional (!isNixOS)
-        "hcloud module requires NixOS host configuration. This module will not work with standalone home-manager.";
-    home = {
-      packages = with pkgs; [ hcloud ];
-    };
-  };
-}

home/modules/comms/default.nix

@@ -1,17 +0,0 @@
-{ lib, ... }:
-
-{
-  options.comms = {
-    signal = {
-      enable = lib.mkEnableOption "signal";
-    };
-    teams = {
-      enable = lib.mkEnableOption "teams";
-    };
-  };
-
-  imports = [
-    ./signal.nix
-    ./teams.nix
-  ];
-}

home/modules/comms/signal.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  config = lib.mkIf config.comms.signal.enable {
-    home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.signal-desktop "--no-sandbox")) ];
-  };
-}

home/modules/comms/teams.nix

@@ -1,12 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  config = lib.mkIf config.comms.teams.enable {
-    home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.teams-for-linux "--no-sandbox")) ];
-  };
-}

home/modules/dconf.nix

@@ -1,13 +1,21 @@
-{ config, pkgs, ... }:
-
-let
-  terminal = "kitty";
-  browser = config.browser.primary;
-in
 {
   dconf.settings = {
+    "org/gnome/settings-daemon/plugins/color" = {
+      night-light-enabled = true;
+      night-light-schedule-automatic = true;
+    };
+    "org/gnome/desktop/interface" = {
+      color-scheme = "prefer-dark";
+    };
+
+    "org/gnome/desktop/applications/terminal" = {
+      exec = "kitty";
+      exec-arg = "";
+    };
+
     "org/gnome/desktop/background" = {
       color-shading-type = "solid";
+      picture-opacity = 100;
       picture-options = "zoom";
       picture-uri = "none";
       picture-uri-dark = "none";
@@ -16,54 +24,55 @@ in
       show-desktop-icons = false;
     };
 
-    "org/gnome/desktop/default-applications/office/calendar" = {
+    # "org/gnome/desktop/input-sources" = {
-      exec = "${browser} https://calendar.proton.me";
+    #   sources = [
-      needs-term = false;
+    #     (mkTuple [
-    };
+    #       "xkb"
-
+    #       "us"
-    "org/gnome/desktop/default-applications/office/tasks" = {
+    #     ])
-      exec = "task";
+    #   ];
-      needs-term = true;
+    #   xkb-options = [ "caps:none" ];
-    };
+    # };
-
-    "org/gnome/desktop/default-applications/terminal" = {
-      exec = terminal;
-      exec-arg = "";
-    };
-
-    "org/gnome/desktop/input-sources" = {
-      xkb-options = [ "caps:none" ];
-    };
-
-    "org/gnome/desktop/interface" = {
-      clock-format = "24h";
-      clock-show-weekday = true;
-      color-scheme = "prefer-dark";
-      enable-hot-corners = false;
-      font-name = "Iosevka Term SS08 12";
-      locate-pointer = true;
-      monospace-font-name = "Iosevka Term SS08 12";
-    };
 
     "org/gnome/desktop/wm/keybindings" = {
       close = [ "<Shift><Super>Delete" ];
-      minimize = [ "<Super>h" ];
+      cycle-group = [ ];
-      move-to-monitor-down = [ "<Super><Shift>Down" ];
+      cycle-group-backward = [ ];
-      move-to-monitor-left = [ "<Super><Shift>Left" ];
+      cycle-panels = [ ];
-      move-to-monitor-right = [ "<Super><Shift>Right" ];
+      cycle-panels-backward = [ ];
-      move-to-monitor-up = [ "<Super><Shift>Up" ];
+      cycle-windows = [ ];
+      cycle-windows-backward = [ ];
+      maximize = [ "<Super> " ];
+      minimize = [ ];
       move-to-workspace-1 = [ "<Super><Shift>a" ];
       move-to-workspace-2 = [ "<Super><Shift>s" ];
       move-to-workspace-3 = [ "<Super><Shift>d" ];
       move-to-workspace-4 = [ "<Super><Shift>f" ];
       move-to-workspace-5 = [ "<Super><Shift>g" ];
+      move-to-workspace-last = [ ];
+      move-to-workspace-left = [ "<Super><Shift>h" ];
+      move-to-workspace-right = [ "<Super><Shift>l" ];
+      panel-run-dialog = [ ];
       switch-applications = [ "<Super>j" ];
       switch-applications-backward = [ "<Super>k" ];
+      switch-group = [ ];
+      switch-group-backward = [ ];
+      switch-input-source = [ ];
+      switch-input-source-backward = [ ];
+      switch-panels = [ ];
+      switch-panels-backward = [ ];
       switch-to-workspace-1 = [ "<Super>a" ];
       switch-to-workspace-2 = [ "<Super>s" ];
       switch-to-workspace-3 = [ "<Super>d" ];
       switch-to-workspace-4 = [ "<Super>f" ];
       switch-to-workspace-5 = [ "<Super>g" ];
+      switch-to-workspace-last = [ ];
+      switch-to-workspace-left = [ "<Super>h" ];
+      switch-to-workspace-right = [ "<Super>l" ];
+      switch-windows = [ ];
+      switch-windows-backward = [ ];
+      toggle-maximized = [ "<Super>space" ];
+      unmaximize = [ ];
     };
 
     "org/gnome/desktop/wm/preferences" = {
@@ -77,19 +86,8 @@ in
       ];
     };
 
-    "org/gnome/mutter" = {
-      center-new-windows = true;
-      dynamic-workspaces = false;
-    };
-
-    "org/gnome/settings-daemon/plugins/color" = {
-      night-light-enabled = true;
-      night-light-schedule-automatic = true;
-    };
-
     "org/gnome/settings-daemon/plugins/media-keys" = {
       custom-keybindings = [
-        "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/"
         "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1/"
       ];
     };
@@ -102,23 +100,14 @@ in
 
     "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom1" = {
       binding = "<Super>Return";
-      command = terminal;
+      command = "kitty";
       name = "Kitty";
     };
 
-    "org/gnome/settings-daemon/plugins/power" = {
-      power-button-action = "suspend";
-    };
-
-    "org/gnome/shell/app-switcher" = {
-      current-workspace-only = true;
-    };
-
     "org/gnome/shell/keybindings" = {
+      screenshot = [ "Print" ];
       toggle-application-view = [ "<Super>p" ];
       toggle-quick-settings = [ ];
     };
   };
-
-  home.packages = with pkgs; [ dconf2nix ];
 }

home/modules/default.nix

@@ -1,24 +0,0 @@
-{ config, lib, ... }:
-
-{
-  options.nixgl.wrap = lib.mkOption {
-    type = lib.types.functionTo lib.types.package;
-    default = if config.lib ? nixGL then config.lib.nixGL.wrap else lib.id;
-    readOnly = true;
-  };
-
-  options.wrapApp = lib.mkOption {
-    type = lib.types.raw;
-    default =
-      pkg: flags:
-      if config.lib ? nixGL then
-        pkg.overrideAttrs (old: {
-          postInstall = (old.postInstall or "") + ''
-            wrapProgram $out/bin/${pkg.meta.mainProgram} --add-flags "${flags}"
-          '';
-        })
-      else
-        pkg;
-    readOnly = true;
-  };
-}

home/modules/desktop/niri/config.kdl

@@ -48,7 +48,8 @@ layout {
     }
 }
 
-
+spawn-at-startup "wlsunset -l 51.05 -L 3.72"
+spawn-at-startup "waybar"
 
 hotkey-overlay {
     skip-at-startup

home/modules/desktop/niri/default.nix

@@ -3,24 +3,11 @@
 {
   imports = [
     ../../fuzzel
-    ../../mako
-    ../../shikane
     ../../waybar
   ];
 
   home = {
     file.".config/niri/config.kdl".source = ./config.kdl;
-    packages = with pkgs; [
+    packages = with pkgs; [ wlsunset ];
-      brightnessctl
-      wl-clipboard
-      wlsunset
-    ];
-  };
-
-  services.gammastep = {
-    enable = true;
-    provider = "manual";
-    latitude = 51.05;
-    longitude = 3.71667;
   };
 }

home/modules/direnv/default.nix

@@ -1,7 +0,0 @@
-{
-  programs.direnv = {
-    enable = true;
-    enableBashIntegration = true;
-    nix-direnv.enable = true;
-  };
-}

home/modules/docker/default.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-{
-  config = {
-    home.packages = with pkgs; [
-      dive
-    ];
-  };
-}

home/modules/firefox.nix

@@ -1,34 +1,23 @@
-{
+{ inputs, pkgs, ... }:
-  config,
-  inputs,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  bookmarks = import ./bookmarks.nix;
-in
 
 {
-  nativeMessagingHosts =
+  enable = true;
-    with pkgs;
+  nativeMessagingHosts = with pkgs; [
-    [
+    tridactyl-native
-      tridactyl-native
+  ];
-    ]
+  policies = {
-    ++ lib.optionals config.programs.keepassxc.enable [ keepassxc ];
+    DefaultDownloadDirectory = "\${home}/dl";
+  };
   profiles = {
     default = {
       settings = {
         "signon.rememberSignons" = false;
         "findbar.highlightAll" = true;
-        "extensions.autoDisableScopes" = 0;
+        "extensions.autoDisableScopes" = 0; # Enable extensions by default <https://nix-community.github.io/home-manager/options.xhtml#opt-programs.firefox.profiles._name_.extensions.packages>
       };
       extensions = {
-        force = true;
+        packages = with inputs.firefox-addons.packages.${pkgs.system}; [
-        packages = with inputs.firefox-addons.packages.${pkgs.stdenv.hostPlatform.system}; [
           duckduckgo-privacy-essentials
-          firefox-color
           istilldontcareaboutcookies
           libredirect
           keepassxc-browser
@@ -44,7 +33,23 @@ in
           {
             toolbar = true;
             bookmarks = [
-              bookmarks.nixos
+              {
+                name = "NixOS";
+                bookmarks = [
+                  {
+                    name = "wiki";
+                    url = "https://wiki.nixos.org/wiki/NixOS_Wiki";
+                  }
+                  {
+                    name = "packages";
+                    url = "https://search.nixos.org/packages";
+                  }
+                  {
+                    name = "options";
+                    url = "https://search.nixos.org/options";
+                  }
+                ];
+              }
             ];
           }
         ];
@@ -52,7 +57,6 @@ in
     };
   };
   policies = {
-    DefaultDownloadDirectory = "\${home}/dl";
     ExtensionSettings = {
       "jid1-ZAdIEUB7XOzOJw@jetpack" = {
         default_area = "navbar";

home/modules/fuzzel/default.nix

@@ -3,9 +3,22 @@
     enable = true;
     settings = {
       main = {
+        font = "Iosevka Term SS08";
         horizontal-pad = 0;
         vertical-pad = 0;
       };
+      colors = {
+        background = "ccccccff";
+        text = "111111ff";
+        prompt = "ccccccff";
+        placeholder = "aaaaaaff";
+        input = "111111ff";
+        selection = "eeeeeeff";
+        selection-text = "111111ff";
+        selection-match = "333333ff";
+        counter = "111111ff";
+        border = "111111ff";
+      };
       border = {
         width = 2;
         radius = 0;

home/modules/git.nix

@@ -0,0 +1,8 @@
+{
+  programs.git.enable = true;
+  home.file = {
+    ".gitconfig".source = ../../dots/.gitconfig;
+    ".gitconfig.work".source = ../../dots/.gitconfig.work;
+    ".gitignore".source = ../../dots/.gitignore;
+  };
+}

home/modules/git/default.nix

@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  dotsPath,
-  ...
-}:
-
-{
-  options = {
-    github.enable = lib.mkEnableOption "Github CLI";
-    gitlab.enable = lib.mkEnableOption "Gitlab CLI";
-  };
-
-  config = {
-    programs.git.enable = true;
-    home.file = {
-      ".gitconfig".source = dotsPath + "/.gitconfig";
-      ".gitconfig.work".source = dotsPath + "/.gitconfig.work";
-      ".gitignore".source = dotsPath + "/.gitignore";
-    };
-
-    programs.gh.enable = config.github.enable;
-    home.packages = lib.optionals config.gitlab.enable [ pkgs.glab ];
-  };
-}

home/modules/go/default.nix

@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  options.go = {
-    enable = lib.mkEnableOption "go language";
-  };
-
-  config = lib.mkIf config.go.enable {
-    home.packages = with pkgs; [
-      go
-      gopls
-    ];
-  };
-}

home/modules/k8s/default.nix

@@ -1,25 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    argocd
-    fluxcd
-    k3d
-    kubectl
-    kubernetes
-    kustomize
-    minikube
-    opentofu
-    upbound
-  ];
-
-  programs.kubecolor = {
-    enable = true;
-    enableAlias = true;
-  };
-
-  imports = [
-    ./helm.nix
-    ./k9s.nix
-  ];
-}

home/modules/k8s/helm.nix

@@ -1,15 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    (wrapHelm kubernetes-helm {
-      plugins = with kubernetes-helmPlugins; [
-        helm-diff
-        helm-git
-        helm-schema
-        helm-secrets
-        helm-unittest
-      ];
-    })
-  ];
-}

home/modules/keepassxc.nix

@@ -1,3 +1,5 @@
+{ pkgs, ... }:
+
 {
   programs.keepassxc = {
     enable = true;
@@ -5,4 +7,5 @@
       Browser.Enabled = true;
     };
   };
+  # programs.firefox.nativeMessagingHosts = [ pkgs.keepassxc ]; # FIXME: Resolve 'Access error for config file /home/h/.config/keepassxc/keepassxc.ini' error
 }

home/modules/kitty.nix

@@ -1,22 +0,0 @@
-{
-  pkgs,
-  config,
-  dotsPath,
-  ...
-}:
-
-{
-  config = {
-    programs.bash.shellAliases = {
-      icat = "kitty +kitten icat";
-    };
-
-    programs.kitty = {
-      enable = true;
-      package = config.nixgl.wrap pkgs.kitty;
-      extraConfig = builtins.readFile (dotsPath + "/.config/kitty/kitty.conf");
-    };
-
-    home.file.".config/kitty/nvim.conf".source = dotsPath + "/.config/kitty/nvim.conf";
-  };
-}

home/modules/mako/default.nix

@@ -1,5 +0,0 @@
-{
-  services.mako = {
-    enable = true;
-  };
-}

home/modules/music/default.nix

@@ -1,27 +0,0 @@
-{
-  dotsPath,
-  pkgs,
-  ...
-}:
-
-let
-  spotifyWithWayland = pkgs.symlinkJoin {
-    name = "spotify";
-    paths = [ pkgs.spotify ];
-    buildInputs = [ pkgs.makeWrapper ];
-    postBuild = ''
-      wrapProgram $out/bin/spotify \
-        --add-flags "--enable-features=UseOzonePlatform --ozone-platform=wayland"
-    '';
-  };
-in
-{
-  home.packages = with pkgs; [
-    spotifyWithWayland
-  ];
-
-  programs.ncspot = {
-    enable = true;
-    settings = builtins.fromTOML (builtins.readFile (dotsPath + "/.config/ncspot/config.toml"));
-  };
-}

home/modules/nfc/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./proxmark3.nix
-  ];
-}

home/modules/nfc/proxmark3.nix

@@ -1,21 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.nfc.proxmark3;
-in
-{
-  options.nfc.proxmark3 = {
-    enable = lib.mkEnableOption "proxmark3 (iceman fork)";
-  };
-
-  config = lib.mkIf cfg.enable {
-    home.packages = [
-      (pkgs.proxmark3.override { withGeneric = true; })
-    ];
-  };
-}

home/modules/nodejs.nix

@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  options.nodejs = {
-    enable = lib.mkEnableOption "nodejs (and related packages)";
-    package = lib.mkOption {
-      type = lib.types.package;
-      default = pkgs.nodejs_24;
-    };
-  };
-
-  config = lib.mkIf config.nodejs.enable {
-    home.packages = with pkgs; [
-      config.nodejs.package
-      pnpm
-      yarn
-      biome
-      tsx
-    ];
-  };
-}

home/modules/nvim.nix

@@ -1,9 +0,0 @@
-{ pkgs, inputs, ... }:
-
-{
-  config = {
-    home.packages = [
-      inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.nvim
-    ];
-  };
-}

home/modules/pandoc.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  options.pandoc = {
-    enable = lib.mkEnableOption "pandoc";
-  };
-
-  config = lib.mkIf config.pandoc.enable {
-    home.packages = with pkgs; [
-      haskellPackages.pandoc-crossref
-      pandoc
-      texliveSmall
-    ];
-  };
-}

home/modules/photography/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    darktable
-  ];
-}

home/modules/shell/bash.nix

@@ -1,73 +0,0 @@
-{
-  config,
-  lib,
-  dotsPath,
-  ...
-}:
-let
-  cfg = config.shell.bash;
-  inherit (config.home) username;
-in
-{
-  options.shell.bash = {
-    enable = lib.mkEnableOption "bash configuration";
-
-    aliases = {
-      all = lib.mkOption {
-        type = lib.types.bool;
-        default = true;
-        description = "Enable common aliases";
-      };
-      lang-js = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = "Enable JavaScript/Node.js aliases";
-      };
-    };
-
-    addBinToPath = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-      description = "Add dots .bin directory to PATH";
-    };
-
-    extraInit = lib.mkOption {
-      type = lib.types.lines;
-      default = "";
-      description = "Additional bash initialization";
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    shell-utils.enable = lib.mkDefault true;
-
-    programs.bash = {
-      enable = true;
-      enableCompletion = true;
-      initExtra = ''
-        for f in /home/${username}/.bashrc.d/*; do
-          [ -f "$f" ] && source "$f"
-        done
-
-        ${lib.optionalString cfg.aliases.all "source /home/${username}/.bash_aliases/all"}
-        ${lib.optionalString cfg.aliases.lang-js "source /home/${username}/.bash_aliases/lang-js"}
-
-        ${lib.optionalString cfg.addBinToPath "export PATH=${dotsPath}/.bin:$PATH"}
-
-        ${cfg.extraInit}
-      '';
-    };
-
-    home.file = {
-      ".inputrc".source = dotsPath + "/.inputrc";
-      ".bashrc.d/prompt".source = dotsPath + "/.bashrc.d/prompt";
-      ".bashrc.d/editor".source = dotsPath + "/.bashrc.d/editor";
-    }
-    // lib.optionalAttrs cfg.aliases.all {
-      ".bash_aliases/all".source = dotsPath + "/.bash_aliases/all";
-    }
-    // lib.optionalAttrs cfg.aliases.lang-js {
-      ".bash_aliases/lang-js".source = dotsPath + "/.bash_aliases/lang-js";
-    };
-  };
-}

home/modules/shell/default.nix

@@ -1,8 +0,0 @@
-{
-  imports = [
-    ./bash.nix
-    ./utils.nix
-    ./prompt.nix
-    ../tmux.nix
-  ];
-}

home/modules/shell/prompt.nix

@@ -1,16 +0,0 @@
-{
-  config,
-  lib,
-  ...
-}:
-{
-  options.starship = {
-    enable = lib.mkEnableOption "starship prompt";
-  };
-
-  config = lib.mkIf config.starship.enable {
-    programs.starship = {
-      enable = true;
-    };
-  };
-}

home/modules/shell/utils.nix

@@ -1,26 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  options.shell-utils = {
-    enable = lib.mkEnableOption "shell utilities";
-  };
-
-  config = lib.mkIf config.shell-utils.enable {
-    programs.fzf = {
-      enable = true;
-      enableBashIntegration = lib.mkDefault true;
-    };
-
-    home.packages = with pkgs; [
-      ripgrep
-      bat
-      jq
-      entr
-      parallel
-    ];
-  };
-}