chore: gitignore '.pre-commit-config.yaml'

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/colmena.nix

@@ -17,7 +17,7 @@ in
 inputs.colmena.lib.makeHive {
   meta = {
     nixpkgs = import inputs.nixpkgs {
-      localSystem = "x86_64-linux";
+      system = "x86_64-linux";
     };
 
     nodeNixpkgs = builtins.mapAttrs (_: v: v.pkgs) self.nixosConfigurations;

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/.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/update-vim

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

dots/.config/kitty/kitty.conf

@@ -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/nvim/after/plugin/lspconfig.lua

@@ -85,7 +85,6 @@ local servers = {
       },
     },
   },
-  openscad_ls = {},
   pyright = {},
   -- tsserver = {},
   svelte = {

dots/.config/nvim/flake.nix

@@ -37,6 +37,7 @@
 
   outputs =
     {
+      self,
       nixpkgs,
       nixCats,
       ...
@@ -49,7 +50,7 @@
 
       mkDependencyOverlays = system: [
         (utils.standardPluginOverlay inputs)
-        (_final: _prev: {
+        (final: prev: {
           mcp-hub = inputs.mcp-hub.packages.${system}.default;
         })
       ];

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

@@ -68,7 +68,18 @@ 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'
 %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"'
 

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

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

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)

flake.lock

@@ -121,11 +121,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1771732978,
+        "lastModified": 1771041825,
-        "narHash": "sha256-o7gZh/eXFkEEmzwlBdIbgCJhmdlqQhOhVjudqgsIefg=",
+        "narHash": "sha256-O+wN3O4yXWsNZBS7qG32fg0UnecVzDAr3aQNz/nT38s=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "18226106e18bc40cce99d436ee741a946f1888f6",
+        "rev": "03e6c3789a1952bd68837ff1d358375b953d35e8",
         "type": "gitlab"
       },
       "original": {
@@ -284,11 +284,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771857445,
+        "lastModified": 1770726378,
-        "narHash": "sha256-NCrhxU9wq5+4jQG1fvRbyTnH8GSbH6LovreVoH2fOL4=",
+        "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "3d7a52f678227930ab089f5d9b384f2d50f7d534",
+        "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
         "type": "github"
       },
       "original": {
@@ -344,11 +344,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771851181,
+        "lastModified": 1771037579,
-        "narHash": "sha256-gFgE6mGUftwseV3DUENMb0k0EiHd739lZexPo5O/sdQ=",
+        "narHash": "sha256-NX5XuhGcsmk0oEII2PEtMRgvh2KaAv3/WWQsOpxAgR4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9a4b494b1aa1b93d8edf167f46dc8e0c0011280c",
+        "rev": "05e6dc0f6ed936f918cb6f0f21f1dad1e4c53150",
         "type": "github"
       },
       "original": {
@@ -376,6 +376,29 @@
         "type": "github"
       }
     },
+    "nix-formatter-pack": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs"
+        ],
+        "nmd": "nmd",
+        "nmt": "nmt"
+      },
+      "locked": {
+        "lastModified": 1705252799,
+        "narHash": "sha256-HgSTREh7VoXjGgNDwKQUYcYo13rPkltW7IitHrTPA5c=",
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "rev": "2de39dedd79aab14c01b9e2934842051a160ffa5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Gerschtli",
+        "repo": "nix-formatter-pack",
+        "type": "github"
+      }
+    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -397,6 +420,34 @@
         "type": "github"
       }
     },
+    "nix-on-droid": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ],
+        "nix-formatter-pack": "nix-formatter-pack",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-docs": "nixpkgs-docs",
+        "nixpkgs-for-bootstrap": "nixpkgs-for-bootstrap",
+        "nmd": "nmd_2"
+      },
+      "locked": {
+        "lastModified": 1720396533,
+        "narHash": "sha256-UFzk/hZWO1VkciIO5UPaSpJN8s765wsngUSvtJM6d5Q=",
+        "owner": "nix-community",
+        "repo": "nix-on-droid",
+        "rev": "f3d3b8294039f2f9a8fb7ea82c320f29c6b0fe25",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "release-24.05",
+        "repo": "nix-on-droid",
+        "type": "github"
+      }
+    },
     "nix-secrets": {
       "flake": false,
       "locked": {
@@ -417,11 +468,11 @@
     },
     "nixCats": {
       "locked": {
-        "lastModified": 1770584904,
+        "lastModified": 1769578476,
-        "narHash": "sha256-9Zaz8lbKF2W9pwXZEnbiGsicHdBoU+dHt3Wv3mCJoZ8=",
+        "narHash": "sha256-4+KbiBcC6hQ3sh0UbPXjy6TOfLh9yhskRlfPzyZ2FH4=",
         "owner": "BirdeeHub",
         "repo": "nixCats-nvim",
-        "rev": "538fdde784d2909700d97a8ef307783b33a86fb1",
+        "rev": "48f8be4bdafccfa19ceaaf08071a15eca36fdb1d",
         "type": "github"
       },
       "original": {
@@ -453,11 +504,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1771423359,
+        "lastModified": 1770882871,
-        "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=",
+        "narHash": "sha256-nw5g+xl3veea+maxJ2/81tMEA/rPq9aF1H5XF35X+OE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b",
+        "rev": "af04cb78aa85b2a4d1c15fc7270347e0d0eda97b",
         "type": "github"
       },
       "original": {
@@ -469,11 +520,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771369470,
+        "lastModified": 1771008912,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
+        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
+        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
         "type": "github"
       },
       "original": {
@@ -483,6 +534,38 @@
         "type": "github"
       }
     },
+    "nixpkgs-docs": {
+      "locked": {
+        "lastModified": 1705957679,
+        "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "9a333eaa80901efe01df07eade2c16d183761fa3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-for-bootstrap": {
+      "locked": {
+        "lastModified": 1720244366,
+        "narHash": "sha256-WrDV0FPMVd2Sq9hkR5LNHudS3OSMmUrs90JUTN+MXpA=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "49ee0e94463abada1de470c9c07bfc12b36dcf40",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1743689281,
@@ -499,6 +582,60 @@
         "type": "github"
       }
     },
+    "nmd": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1666190571,
+        "narHash": "sha256-Z1hc7M9X6L+H83o9vOprijpzhTfOBjd0KmUTnpHAVjA=",
+        "owner": "rycee",
+        "repo": "nmd",
+        "rev": "b75d312b4f33bd3294cd8ae5c2ca8c6da2afc169",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmd",
+        "type": "gitlab"
+      }
+    },
+    "nmd_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nix-on-droid",
+          "nixpkgs-docs"
+        ],
+        "scss-reset": "scss-reset"
+      },
+      "locked": {
+        "lastModified": 1705050560,
+        "narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
+        "owner": "~rycee",
+        "repo": "nmd",
+        "rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
+        "type": "sourcehut"
+      },
+      "original": {
+        "owner": "~rycee",
+        "repo": "nmd",
+        "type": "sourcehut"
+      }
+    },
+    "nmt": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1648075362,
+        "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
+        "owner": "rycee",
+        "repo": "nmt",
+        "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
+        "type": "gitlab"
+      },
+      "original": {
+        "owner": "rycee",
+        "repo": "nmt",
+        "type": "gitlab"
+      }
+    },
     "nur": {
       "inputs": {
         "flake-parts": [
@@ -533,6 +670,7 @@
         ],
         "plugins-beancount-nvim": "plugins-beancount-nvim",
         "plugins-helm-ls-nvim": "plugins-helm-ls-nvim",
+        "plugins-m-taskwarrior-d-nvim": "plugins-m-taskwarrior-d-nvim",
         "plugins-mcphub-nvim": "plugins-mcphub-nvim",
         "plugins-nvimkit-nvim": "plugins-nvimkit-nvim",
         "plugins-shipwright-nvim": "plugins-shipwright-nvim",
@@ -580,6 +718,22 @@
         "type": "github"
       }
     },
+    "plugins-m-taskwarrior-d-nvim": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767960157,
+        "narHash": "sha256-ov0qi4LhIlwqrBzSbTJ6APC5qjl2d/vlKWJfW5ZiDrg=",
+        "owner": "huantrinh1802",
+        "repo": "m_taskwarrior_d.nvim",
+        "rev": "107247387cd81823046bc2b8e71150c8edf041d3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "huantrinh1802",
+        "repo": "m_taskwarrior_d.nvim",
+        "type": "github"
+      }
+    },
     "plugins-mcphub-nvim": {
       "flake": false,
       "locked": {
@@ -651,6 +805,7 @@
         "firefox-addons": "firefox-addons",
         "git-hooks": "git-hooks",
         "home-manager": "home-manager",
+        "nix-on-droid": "nix-on-droid",
         "nix-secrets": "nix-secrets",
         "nixgl": "nixgl",
         "nixos-hardware": "nixos-hardware",
@@ -660,6 +815,22 @@
         "stylix": "stylix"
       }
     },
+    "scss-reset": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1631450058,
+        "narHash": "sha256-muDlZJPtXDIGevSEWkicPP0HQ6VtucbkMNygpGlBEUM=",
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "rev": "0cf50e27a4e95e9bb5b1715eedf9c54dee1a5a91",
+        "type": "github"
+      },
+      "original": {
+        "owner": "andreymatin",
+        "repo": "scss-reset",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -667,11 +838,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771735105,
+        "lastModified": 1770683991,
-        "narHash": "sha256-MJuVJeszZEziquykEHh/hmgIHYxUcuoG/1aowpLiSeU=",
+        "narHash": "sha256-xVfPvXDf9QN3Eh9dV+Lw6IkWG42KSuQ1u2260HKvpnc=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d7755d820f5fa8acf7f223309c33e25d4f92e74f",
+        "rev": "8b89f44c2cc4581e402111d928869fe7ba9f7033",
         "type": "github"
       },
       "original": {
@@ -717,11 +888,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1771787992,
+        "lastModified": 1770914701,
-        "narHash": "sha256-Vg4bGwwenNYI8p3nJTl9FRyeIyrjATeZrZr+GyUSDrw=",
+        "narHash": "sha256-QHFYyngohNhih4w+3IqQty5DV+p1txsx1kkk6XJWar8=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "30054cca073b49b42a71289edec858f535b27fe9",
+        "rev": "db03fed72e5ca02be34e1d24789345a943329738",
         "type": "github"
       },
       "original": {

flake.nix

@@ -26,6 +26,11 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nix-on-droid = {
+      url = "github:nix-community/nix-on-droid/release-24.05";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.home-manager.follows = "home-manager";
+    };
     nixgl = {
       url = "github:nix-community/nixGL";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -53,6 +58,7 @@
       self,
       nixpkgs,
       home-manager,
+      nix-on-droid,
       nixgl,
       git-hooks,
       ...
@@ -77,36 +83,23 @@
         (lib.genAttrs hostDirNames (
           host:
           nixpkgs.lib.nixosSystem {
-            modules = [
+            system = import ./hosts/${host}/system.nix;
-              ./hosts/${host}
+            modules = [ ./hosts/${host} ];
-              { nixpkgs.hostPlatform = import ./hosts/${host}/system.nix; }
-            ];
             specialArgs = {
               inherit inputs outputs dotsPath;
             };
           }
         ))
         // {
-          sd-image-orange-pi-aarch64 = nixpkgs.lib.nixosSystem {
+          sd-image-aarch64 = nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
             modules = [
               "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
-              ./images/sd-image-orange-pi-aarch64.nix
+              ./images/sd-image-aarch64.nix
               {
-                nixpkgs.buildPlatform = "x86_64-linux";
+                nixpkgs.crossSystem = {
-                nixpkgs.hostPlatform = "aarch64-linux";
+                  system = "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 = {
@@ -114,7 +107,6 @@
             };
           };
         };
-
       homeConfigurations = {
         work = home-manager.lib.homeManagerConfiguration {
           pkgs = import nixpkgs {
@@ -127,10 +119,22 @@
           };
         };
       };
+      # https://github.com/nix-community/nix-on-droid/blob/master/templates/advanced/flake.nix
+      nixOnDroidConfigurations = {
+        pixel = nix-on-droid.lib.nixOnDroidConfiguration {
+          modules = [ ./phone ];
+          extraSpecialArgs = {
+            inherit inputs outputs dotsPath;
+          };
+          pkgs = import nixpkgs {
+            system = "aarch64-linux";
+            overlays = [ nix-on-droid.overlays.default ];
+          };
+          home-manager-path = home-manager.outPath;
+        };
+      };
 
-      apps.${system}.colmena = inputs.colmena.apps.${system}.default;
+      colmenaHive = import ./deploy/colmena.nix {
-
-      colmena = import ./deploy/colmena.nix {
         inherit
           self
           inputs
@@ -141,11 +145,6 @@
       formatter.${system} = gitHooks.formatter;
       devShells.${system} = gitHooks.devShells;
 
-      legacyPackages.${system} = {
+      images.sd-image-aarch64 = self.nixosConfigurations.sd-image-aarch64.config.system.build.sdImage;
-        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

@@ -10,10 +10,7 @@ let
   pre-commit-check = git-hooks.lib.${system}.run {
     inherit src;
     hooks = {
-      nixfmt = {
+      nixfmt.enable = true;
-        enable = true;
-        package = pkgs.nixfmt;
-      };
       statix.enable = true;
       deadnix.enable = true;
     };

home/hosts/andromache/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  inputs,
   config,
   pkgs,
   ...
@@ -10,9 +11,7 @@ let
 in
 {
   imports = [
-    ../../modules
     ../../modules/ai-tools.nix
-    ../../modules/audio
     ../../modules/cloud
     ../../modules/comms
     ../../modules/desktop/niri
@@ -23,7 +22,6 @@ in
     ../../modules/kitty.nix
     ../../modules/music
     ../../modules/nvim.nix
-    ../../modules/pandoc.nix
     ../../modules/ssh.nix
     ../../modules/taskwarrior.nix
     ../../modules/keepassxc.nix
@@ -47,7 +45,6 @@ in
   cloud.hetzner.enable = true;
   comms.signal.enable = true;
   github.enable = true;
-  pandoc.enable = true;
 
   shell.bash = {
     enable = true;

home/hosts/astyanax/default.nix

@@ -9,9 +9,7 @@ let
 in
 {
   imports = [
-    ../../modules
     ../../modules/ai-tools.nix
-    ../../modules/audio
     ../../modules/anki.nix
     ../../modules/cloud
     ../../modules/comms
@@ -23,7 +21,6 @@ in
     ../../modules/music
     ../../modules/nfc
     ../../modules/nvim.nix
-    ../../modules/pandoc.nix
     ../../modules/ssh.nix
     ../../modules/taskwarrior.nix
     ../../modules/keepassxc.nix
@@ -46,7 +43,6 @@ in
   comms.signal.enable = true;
   github.enable = true;
   nfc.proxmark3.enable = true;
-  pandoc.enable = true;
 
   shell.bash = {
     enable = true;

home/hosts/packages.nix

@@ -6,12 +6,17 @@ with pkgs;
   entr
   feh
   fzf
+  haskellPackages.pandoc-crossref
   htop
   jq
+  nixfmt-rfc-style
   nmap
+  nodejs_24
   nvimpager
+  pandoc
   parallel
   pass
+  pnpm
   ripgrep
   silver-searcher
   sops

home/hosts/work/default.nix

@@ -11,31 +11,25 @@ in
 {
   imports = [
     inputs.sops-nix.homeManagerModules.sops
-    ../../modules
     ../../modules/stylix.nix
+    ../../modules/lib.nix
     ../../modules/ai-tools.nix
     ../../modules/cloud
     ../../modules/comms
-    ../../modules/desktop/niri
     ../../modules/dconf.nix
     ../../modules/direnv
     ../../modules/docker
     ../../modules/git
-    ../../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 = {
@@ -48,29 +42,14 @@ in
       taskwarrior_sync_encryption_secret = { };
       anki_sync_user = { };
       anki_sync_key = { };
-      opencode_api_key = { };
     };
 
-    templates = {
+    templates."taskrc.d/sync" = {
-      "taskrc.d/sync" = {
+      content = ''
-        content = ''
+        sync.server.url=${config.sops.placeholder.taskwarrior_sync_server_url}
-          sync.server.url=${config.sops.placeholder.taskwarrior_sync_server_url}
+        sync.server.client_id=${config.sops.placeholder.taskwarrior_sync_server_client_id}
-          sync.server.client_id=${config.sops.placeholder.taskwarrior_sync_server_client_id}
+        sync.encryption_secret=${config.sops.placeholder.taskwarrior_sync_encryption_secret}
-          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}"
-            }
-          }
-        '';
-      };
     };
   };
 
@@ -92,13 +71,9 @@ in
   cloud.azure.enable = true;
   comms.signal.enable = true;
   comms.teams.enable = true;
-  ai-tools = {
+  ai-tools.claude-code.enable = true;
-    claude-code.enable = true;
-    opencode.enable = true;
-  };
   github.enable = true;
   gitlab.enable = true;
-  pandoc.enable = true;
 
   shell.bash.enable = true;
   starship.enable = true;

home/modules/ai-tools.nix

@@ -74,16 +74,6 @@ in
       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/audio/default.nix

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

home/modules/browser/firefox-base.nix

@@ -1,9 +1,7 @@
 {
   config,
   inputs,
-  lib,
   pkgs,
-  ...
 }:
 
 let
@@ -25,10 +23,8 @@ in
         "extensions.autoDisableScopes" = 0;
       };
       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

home/modules/browser/firefox.nix

@@ -11,13 +11,6 @@
     programs.firefox = {
       enable = true;
     }
-    // (import ./firefox-base.nix {
+    // (import ./firefox-base.nix { inherit config inputs pkgs; });
-      inherit
-        config
-        inputs
-        lib
-        pkgs
-        ;
-    });
   };
 }

home/modules/browser/librewolf.nix

@@ -13,13 +13,6 @@
         programs.librewolf = {
           enable = true;
         }
-        // (import ./firefox-base.nix {
+        // (import ./firefox-base.nix { inherit config inputs pkgs; });
-          inherit
-            config
-            inputs
-            lib
-            pkgs
-            ;
-        });
       };
 }

home/modules/bruno.nix

@@ -1,7 +1,19 @@
 { config, pkgs, ... }:
 
+let
+  needsNixGL = config.lib ? nixGL;
+  bruno =
+    if needsNixGL then
+      pkgs.bruno.overrideAttrs (old: {
+        postInstall = (old.postInstall or "") + ''
+          wrapProgram $out/bin/bruno --add-flags "--no-sandbox"
+        '';
+      })
+    else
+      pkgs.bruno;
+in
 {
   config = {
-    home.packages = [ (config.nixgl.wrap (config.wrapApp pkgs.bruno "--no-sandbox")) ];
+    home.packages = [ (config.nixgl.wrap bruno) ];
   };
 }

home/modules/comms/signal.nix

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

home/modules/comms/teams.nix

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

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/fuzzel/default.nix

@@ -1,8 +1,11 @@
+{ lib, ... }:
+
 {
   programs.fuzzel = {
     enable = true;
     settings = {
       main = {
+        font = lib.mkForce "Iosevka Term SS08";
         horizontal-pad = 0;
         vertical-pad = 0;
       };

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

@@ -13,11 +13,6 @@
     upbound
   ];
 
-  programs.kubecolor = {
-    enable = true;
-    enableAlias = true;
-  };
-
   imports = [
     ./helm.nix
     ./k9s.nix

home/modules/keepassxc.nix

@@ -1,3 +1,5 @@
+{ pkgs, ... }:
+
 {
   programs.keepassxc = {
     enable = true;

home/modules/kitty.nix

@@ -7,16 +7,18 @@
 
 {
   config = {
+    home.packages = [ (config.nixgl.wrap pkgs.kitty) ];
     programs.bash.shellAliases = {
       icat = "kitty +kitten icat";
     };
 
-    programs.kitty = {
+    home.file = {
-      enable = true;
+      ".config/kitty/kitty.conf".source = dotsPath + "/.config/kitty/kitty.conf";
-      package = config.nixgl.wrap pkgs.kitty;
+      ".config/kitty/nvim.conf".source = dotsPath + "/.config/kitty/nvim.conf";
-      extraConfig = builtins.readFile (dotsPath + "/.config/kitty/kitty.conf");
+      ".config/kitty/themes/zenwritten_light.conf".source =
+        dotsPath + "/.config/kitty/themes/zenwritten_light.conf";
+      ".config/kitty/themes/zenwritten_dark.conf".source =
+        dotsPath + "/.config/kitty/themes/zenwritten_dark.conf";
     };
-
-    home.file.".config/kitty/nvim.conf".source = dotsPath + "/.config/kitty/nvim.conf";
   };
 }

home/modules/lib.nix

@@ -0,0 +1,9 @@
+{ 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;
+  };
+}

home/modules/mako/default.nix

@@ -1,5 +1,11 @@
+{ lib, ... }:
+
 {
   services.mako = {
     enable = true;
+    settings = {
+      border-color = lib.mkForce "#bbbbbb";
+      font = lib.mkForce "Iosevka Term SS08 10";
+    };
   };
 }

home/modules/music/default.nix

@@ -17,11 +17,11 @@ let
 in
 {
   home.packages = with pkgs; [
+    ncspot
     spotifyWithWayland
   ];
 
-  programs.ncspot = {
+  home.file = {
-    enable = true;
+    ".config/ncspot/config.toml".source = dotsPath + "/.config/ncspot/config.toml";
-    settings = builtins.fromTOML (builtins.readFile (dotsPath + "/.config/ncspot/config.toml"));
   };
 }

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

@@ -3,7 +3,7 @@
 {
   config = {
     home.packages = [
-      inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.nvim
+      inputs.nvim.packages.${pkgs.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/shell/bash.nix

@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   dotsPath,
   ...
 }:

home/modules/shell/prompt.nix

@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }:
 {

home/modules/stylix.nix

@@ -1,45 +1,40 @@
 {
-  config,
   inputs,
   pkgs,
   ...
 }:
 
-let
-  theme = import ../../modules/stylix/theme.nix { inherit pkgs; };
-in
 {
   imports = [ inputs.stylix.homeModules.stylix ];
 
   stylix = {
     enable = true;
-    inherit (theme)
+    polarity = "dark";
-      polarity
+    base16Scheme = ../../stylix/zenwritten-dark.yaml;
-      base16Scheme
+    image = pkgs.runCommand "solid-bg.png" { nativeBuildInputs = [ pkgs.imagemagick ]; } ''
-      override
+      magick -size 1x1 xc:#191919 $out
-      image
+    '';
-      ;
     fonts = {
-      monospace = theme.monospaceFont;
+      monospace = {
-      serif = config.stylix.fonts.monospace;
+        package = pkgs.iosevka-bin.override { variant = "SS08"; };
-      sansSerif = config.stylix.fonts.monospace;
+        name = "Iosevka Term SS08";
-      emoji = config.stylix.fonts.monospace;
+      };
+      serif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Serif";
+      };
+      sansSerif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans";
+      };
     };
     targets = {
-      firefox = {
+      firefox.profileNames = [ "default" ];
-        profileNames = [ "default" ];
-        colorTheme.enable = true;
-      };
-      librewolf = {
-        profileNames = [ "default" ];
-        colorTheme.enable = true;
-      };
       gnome.enable = false;
       gtk.enable = false;
-      kitty = {
+      kitty.enable = false;
-        variant256Colors = true;
-      };
       nixvim.enable = false;
+      waybar.enable = false;
     };
   };
 }

home/modules/taskwarrior.nix

@@ -39,14 +39,6 @@ in
     ".local/share/task/hooks/on-exit.sync.py" = {
       source = dotsPath + "/.local/share/task/hooks/on-exit.sync.py";
     };
-    ".local/share/task/hooks/on-add.limit.py" = {
-      source = dotsPath + "/.local/share/task/hooks/on-add.limit.py";
-      executable = true;
-    };
-    ".local/share/task/hooks/on-modify.limit.py" = {
-      source = dotsPath + "/.local/share/task/hooks/on-modify.limit.py";
-      executable = true;
-    };
     ".local/share/task/scripts/sync-and-notify.sh" = {
       source = dotsPath + "/.local/share/task/scripts/sync-and-notify.sh";
       executable = true;

home/modules/tmux.nix

@@ -1,19 +1,25 @@
-{ pkgs, dotsPath, ... }:
+{
-
+  pkgs,
+  dotsPath,
+  ...
+}:
 {
   config = {
     home.packages = with pkgs; [
+      tmux
       tmuxp
       reptyr
     ];
 
-    programs.tmux = {
-      enable = true;
-      extraConfig = builtins.readFile (dotsPath + "/.config/tmux/tmux.conf");
-    };
-
     home.file = {
+      ".config/tmux/tmux.conf".source = dotsPath + "/.config/tmux/tmux.conf";
+      ".config/tmux/tmux.regular.conf".source = dotsPath + "/.config/tmux/tmux.regular.conf";
+      ".config/tmux/themes/zenwritten_light.tmux".source =
+        dotsPath + "/.config/tmux/themes/zenwritten_light.tmux";
+      ".config/tmux/themes/zenwritten_dark.tmux".source =
+        dotsPath + "/.config/tmux/themes/zenwritten_dark.tmux";
       ".config/tmux/hooks/tmux.ssh.conf".source = dotsPath + "/.config/tmux/hooks/tmux.ssh.conf";
+      ".config/tmux/hooks/tmux.regular.conf".source = dotsPath + "/.config/tmux/hooks/tmux.regular.conf";
     };
   };
 }

home/modules/vscode.nix

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

home/modules/waybar/config.jsonc

@@ -0,0 +1,57 @@
+[
+  {
+    "height": 16,
+    "spacing": 4,
+    "modules-left": ["niri/workspaces"],
+    "modules-right": [
+      "pulseaudio",
+      "memory",
+      "cpu",
+      "network",
+      "clock",
+      "battery",
+    ],
+    "clock": {
+      "format": "W{:%V %d %b %H:%M}",
+      "tooltip-format": "{calendar}",
+      "format-alt": "{:%Y-%m-%d %H:%M:%S}",
+    },
+    "battery": {
+      "bat": "BAT0",
+      "adapter": "ADP1",
+      "interval": 5,
+      "full-at": 99,
+      "states": {
+        "good": 80,
+        "warning": 20,
+        "critical": 10,
+      },
+      "format": "{capacity}%--",
+      "format-charging": "{capacity}%++",
+      "format-plugged": "{capacity}%",
+      "format-alt": "{time} {power}W",
+    },
+    "pulseaudio": {
+      "format": "VOL {volume}%",
+      "format-muted": "muted",
+      "on-click": "pavucontrol",
+    },
+    "memory": {
+      "interval": 2,
+      "format": "RAM {percentage}%",
+      "format-alt": "RAM {used:0.1f}G/{total:0.1f}G",
+    },
+    "cpu": {
+      "interval": 2,
+      "format": "CPU {usage}%",
+      "format-alt": "CPU {avg_frequency}GHz",
+    },
+    "network": {
+      "interval": 5,
+      "format-wifi": "{ifname} {ipaddr} {essid}",
+      "format-ethernet": "{ifname} {ipaddr}",
+      "format-disconnected": "{ifname} disconnected",
+      "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
+    },
+  },
+]

home/modules/waybar/default.nix

@@ -1,68 +1,8 @@
-{
-  lib,
-  ...
-}:
-
 {
   programs.waybar = {
     enable = true;
-    settings = [
-      {
-        height = 16;
-        spacing = 4;
-        modules-left = [ "niri/workspaces" ];
-        modules-right = [
-          "pulseaudio"
-          "memory"
-          "cpu"
-          "network"
-          "clock"
-          "battery"
-        ];
-        clock = {
-          format = "W{:%V %d %b %H:%M}";
-          tooltip-format = "{calendar}";
-          format-alt = "{:%Y-%m-%d %H:%M:%S}";
-        };
-        battery = {
-          bat = "BAT0";
-          adapter = "ADP1";
-          interval = 5;
-          full-at = 99;
-          states = {
-            good = 80;
-            warning = 20;
-            critical = 10;
-          };
-          format = "{capacity}%--";
-          format-charging = "{capacity}%++";
-          format-plugged = "{capacity}%";
-          format-alt = "{time} {power}W";
-        };
-        pulseaudio = {
-          format = "VOL {volume}%";
-          format-muted = "muted";
-          on-click = "pavucontrol";
-        };
-        memory = {
-          interval = 2;
-          format = "RAM {percentage}%";
-          format-alt = "RAM {used:0.1f}G/{total:0.1f}G";
-        };
-        cpu = {
-          interval = 2;
-          format = "CPU {usage}%";
-          format-alt = "CPU {avg_frequency}GHz";
-        };
-        network = {
-          interval = 5;
-          format-wifi = "{ifname} {ipaddr} {essid}";
-          format-ethernet = "{ifname} {ipaddr}";
-          format-disconnected = "{ifname} disconnected";
-          tooltip-format = "{ifname}: {ipaddr}/{cidr}";
-        };
-      }
-    ];
-    style = lib.readFile ./style.css;
   };
+
+  home.file.".config/waybar/config.jsonc".source = ./config.jsonc;
+  home.file.".config/waybar/style.css".source = ./style.css;
 }

home/modules/waybar/style.css

@@ -1,4 +1,8 @@
 * {
+  font-family:
+    Iosevka Term SS08,
+    monospace;
+  font-size: 12px;
   border-radius: 0px;
 }
 
@@ -18,22 +22,21 @@ window#waybar.hidden {
 }
 
 #workspaces button {
-  color: @base07;
   padding: 0;
   background-color: transparent;
 }
 
 #workspaces button:hover {
-  background: @base00;
+  background: #000000;
 }
 
 #workspaces button.focused,
 #workspaces button.active {
-  background-color: @base01;
+  background-color: #111111;
 }
 
 #workspaces button.urgent {
-  background-color: @base08;
+  background-color: #eb4d4b;
 }
 
 #clock,
@@ -43,8 +46,8 @@ window#waybar.hidden {
 #cpu,
 #network {
   padding: 0 4px;
-  color: @base07;
+  color: #ffffff;
-  background-color: @base01;
+  background-color: #111111;
 }
 
 #window,

hosts/andromache/default.nix

@@ -1,11 +1,11 @@
 {
   lib,
   inputs,
+  outputs,
   config,
   pkgs,
   ...
 }:
-
 let
   username = "h";
   hostName = "andromache";
@@ -28,7 +28,6 @@ in
     ../../modules/desktops/niri
     ../../modules/backups
     ../../modules/bluetooth
-    ../../modules/gaming
     ../../modules/keyboard
     (import ../../modules/networking { inherit hostName; })
     ../../modules/users
@@ -36,12 +35,9 @@ in
     ../../modules/localization
     ../../modules/fonts
     ../../modules/ssh/hardened-openssh.nix
-    ../../modules/storage
-    ../../modules/stylix
     (import ../../modules/secrets { inherit lib inputs config; })
     ../../modules/docker
     ../../modules/syncthing
-    ../../modules/nvidia
   ];
 
   home-manager.users.${username} = import ../../home/hosts/andromache {
@@ -83,24 +79,59 @@ in
     };
   };
 
-  hardware.cpu.intel.updateMicrocode = true;
+  hardware = {
+    cpu.intel.updateMicrocode = true;
+    graphics.enable = true;
+    nvidia = {
+      modesetting.enable = true;
+      powerManagement.enable = true;
+      powerManagement.finegrained = false;
+      open = true;
+      nvidiaSettings = true;
+      package = config.boot.kernelPackages.nvidiaPackages.stable;
+    };
+  };
 
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
 
   environment.systemPackages = [
-    inputs.colmena.packages.${pkgs.stdenv.hostPlatform.system}.colmena
+    inputs.colmena.packages.${pkgs.system}.colmena
   ];
 
   services = {
-    locate = {
+    xserver = {
-      enable = true;
+      videoDrivers = [ "nvidia" ];
-      package = pkgs.plocate;
     };
 
     openssh = {
       enable = true;
       harden = true;
     };
+    locate = {
+      enable = true;
+      package = pkgs.plocate;
+    };
+  };
+
+  my.syncthing = {
+    enable = true;
+    deviceNames = [
+      "boox"
+      "astyanax"
+    ];
+    folders = {
+      readings = {
+        path = "/home/h/doc/readings";
+        id = "readings";
+        devices = [
+          {
+            device = "boox";
+            type = "receiveonly";
+          }
+          "astyanax"
+        ];
+      };
+    };
   };
 
   networking = {

hosts/andromache/hard.nix

@@ -4,6 +4,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }:

hosts/astyanax/default.nix

@@ -1,6 +1,7 @@
 {
   lib,
   inputs,
+  outputs,
   config,
   pkgs,
   ...
@@ -35,10 +36,10 @@ in
     ../../modules/localization
     ../../modules/fonts
     ../../modules/ssh/hardened-openssh.nix
-    ../../modules/storage
+    # ../../modules/vpn/wireguard.nix
-    ../../modules/stylix
     (import ../../modules/secrets { inherit lib inputs config; })
     ../../modules/docker
+    ../../modules/syncthing
     ../../modules/nfc
   ];
 
@@ -59,7 +60,6 @@ in
   secrets.username = username;
   docker.user = username;
   nfc.user = username;
-  desktop.ly.enable = true;
 
   nix.settings.secret-key-files = [ config.sops.secrets.nix_signing_key_astyanax.path ];
 
@@ -81,7 +81,7 @@ in
   };
 
   environment.systemPackages = [
-    inputs.colmena.packages.${pkgs.stdenv.hostPlatform.system}.colmena
+    inputs.colmena.packages.${pkgs.system}.colmena
     (pkgs.writeShellApplication {
       name = "wol-andromache";
       runtimeInputs = [ pkgs.wakeonlan ];
@@ -104,24 +104,33 @@ in
       enable = true;
       harden = true;
     };
+  };
+
+  my.syncthing = {
+    enable = true;
+    deviceNames = [
+      "boox"
+      "andromache"
+    ];
+    folders = {
+      readings = {
+        path = "/home/h/doc/readings";
+        id = "readings";
+        devices = [
+          {
+            device = "boox";
+            type = "receiveonly";
+          }
+          "andromache"
+        ];
+      };
+    };
+  };
+
+  services = {
     locate = {
       enable = true;
       package = pkgs.plocate;
     };
-    tlp = {
-      enable = true;
-      settings = {
-        CPU_SCALING_GOVERNOR_ON_AC = "performance";
-        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-
-        CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
-        CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
-
-        CPU_MIN_PERF_ON_AC = 0;
-        CPU_MAX_PERF_ON_AC = 100;
-        CPU_MIN_PERF_ON_BAT = 0;
-        CPU_MAX_PERF_ON_BAT = 20;
-      };
-    };
   };
 }

hosts/astyanax/hard.nix

@@ -4,6 +4,7 @@
 {
   config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }:

hosts/eetion-02/default.nix

@@ -1,86 +0,0 @@
-{ pkgs, ... }:
-
-# Raspberry Pi 3
-# See <https://nixos.wiki/wiki/NixOS_on_ARM/Raspberry_Pi_3>
-
-let
-  username = "h";
-  hostName = "eetion-02";
-in
-{
-  imports = [
-    ./hard.nix
-    ../../modules/ssh/hardened-openssh.nix
-  ];
-
-  ssh = {
-    inherit username;
-    publicHostname = "eetion-02";
-    authorizedHosts = [
-      "andromache"
-      "astyanax"
-    ];
-  };
-
-  boot = {
-    kernelParams = [
-      "console=ttyS1,115200n8"
-    ];
-
-    kernel.sysctl."net.ipv4.ip_forward" = 1;
-
-    loader = {
-      grub.enable = false;
-      generic-extlinux-compatible.enable = true;
-    };
-  };
-
-  hardware.enableRedistributableFirmware = true;
-
-  networking = {
-    inherit hostName;
-    networkmanager.enable = true;
-    firewall = {
-      enable = true;
-      allowedTCPPorts = [
-        80
-        443
-      ];
-    };
-  };
-
-  users.users = {
-    root.hashedPassword = "!";
-    ${username} = {
-      isNormalUser = true;
-      extraGroups = [ "wheel" ];
-    };
-  };
-
-  security.sudo.wheelNeedsPassword = false;
-
-  services = {
-    openssh = {
-      enable = true;
-      harden = true;
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    vim
-    git
-  ];
-
-  nix.settings = {
-    experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
-    trusted-users = [
-      "root"
-      "@wheel"
-    ];
-  };
-
-  system.stateVersion = "26.05";
-}

hosts/eetion-02/hard.nix

@@ -1,24 +0,0 @@
-{ lib, modulesPath, ... }:
-
-{
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
-
-  boot = {
-    initrd.availableKernelModules = [ ];
-    initrd.kernelModules = [ ];
-    kernelModules = [ ];
-    extraModulePackages = [ ];
-  };
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-label/NIXOS_SD";
-    fsType = "ext4";
-    options = [ "noatime" ];
-  };
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
-}

hosts/eetion-02/system.nix

@@ -1 +0,0 @@
-"aarch64-linux"

hosts/hecuba/default.nix

@@ -17,7 +17,6 @@ in
     ./hard.nix
     ../../modules/ssh/hardened-openssh.nix
     ../../modules/docker
-    ../../modules/uptime-kuma
   ];
 
   networking.hostName = hostName;
@@ -32,8 +31,6 @@ in
 
   docker.user = username;
 
-  my.uptime-kuma.enable = false;
-
   fileSystems."/" = {
     device = "/dev/disk/by-label/nixos";
     fsType = "ext4";
@@ -83,4 +80,15 @@ in
     enable = true;
     harden = true;
   };
+
+  nix.settings = {
+    trusted-public-keys = [
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      "astyanax:JY2qJkZUFSax47R3c1nq53AZ8GnLfNqz6mSnJ60cLZ4="
+      "andromache:XM4VLrEw63RB/3v/56OxzH/Yw+kKXKMBLKCb7UGAXzo="
+    ];
+    auto-optimise-store = true;
+    keep-derivations = false;
+    keep-outputs = false;
+  };
 }

hosts/hecuba/hard.nix

@@ -2,7 +2,9 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
+  config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }:

hosts/vm/default.nix

@@ -1,6 +1,7 @@
 {
   lib,
   inputs,
+  outputs,
   config,
   pkgs,
   ...
@@ -25,7 +26,6 @@ in
     ../../modules/x
     ../../modules/fonts
     ../../modules/ssh/hardened-openssh.nix
-    ../../modules/storage
     (import ../../modules/secrets {
       inherit lib inputs config;
     })

hosts/vm/hard.nix

@@ -2,7 +2,9 @@
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
 {
+  config,
   lib,
+  pkgs,
   modulesPath,
   ...
 }:

images/README.md

@@ -1,15 +0,0 @@
-# building SD Images
-
-## Raspberry Pi 3B+
-
-```bash
-nix build .#images.sd-image-raspberry-pi-aarch64
-nix-shell -p zstd --run "zstdcat result/sd-image/*.img.zst | sudo dd of=/dev/sdX bs=4M status=progress conv=fsync"
-```
-
-## Orange Pi Zero2 H616
-```bash
-nix build .#images.sd-image-orange-pi-aarch64
-nix-shell -p zstd --run "zstdcat result/sd-image/*.img.zst | sudo dd of=/dev/sdX bs=4M status=progress conv=fsync"
-sudo dd if=~/dl/u-boot-sunxi-with-spl.bin of=/dev/sdX bs=1024 seek=8
-```

images/sd-image-raspberry-pi-aarch64.nix

@@ -1,73 +0,0 @@
-# see <https://nixos.wiki/wiki/NixOS_on_ARM#Build_your_own_image_natively>
-# see <https://nixos.wiki/wiki/NixOS_on_ARM/Raspberry_Pi_3>
-# ```
-# nix build .#images.sd-image-raspberry-pi-aarch64
-# nix-shell -p zstd --run "zstdcat result/sd-image/*.img.zst | sudo dd of=/dev/sdX bs=4M status=progress conv=fsync"
-# ```
-
-{ pkgs, ... }:
-
-let
-  username = "h";
-in
-{
-  imports = [
-    ../modules/ssh/hardened-openssh.nix
-  ];
-
-  ssh.username = username;
-  ssh.authorizedHosts = [
-    "andromache"
-    "astyanax"
-  ];
-
-  boot.kernelParams = [
-    "console=ttyS1,115200n8"
-  ];
-
-  boot.kernelModules = [
-    "bcm2835-v4l2"
-  ];
-
-  hardware.enableRedistributableFirmware = true;
-
-  services.pulseaudio.enable = true;
-
-  networking.wireless.enable = true;
-
-  systemd.services.btattach = {
-    before = [ "bluetooth.service" ];
-    after = [ "dev-ttyAMA0.device" ];
-    wantedBy = [ "multi-user.target" ];
-    serviceConfig = {
-      ExecStart = "${pkgs.bluez}/bin/btattach -B /dev/ttyAMA0 -P bcm -S 3000000";
-    };
-  };
-
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
-
-  users.users = {
-    root.initialPassword = "nixos";
-    ${username} = {
-      isNormalUser = true;
-      extraGroups = [ "wheel" ];
-      initialPassword = "nixos";
-    };
-  };
-
-  security.sudo.wheelNeedsPassword = false;
-
-  services.openssh = {
-    enable = true;
-    harden = true;
-  };
-
-  environment.systemPackages = with pkgs; [
-    libraspberrypi
-  ];
-
-  system.stateVersion = "26.05";
-}

modules/audio/default.nix

@@ -1,9 +1,6 @@
-{
+_:
-  nixpkgs.allowedUnfree = [
-    "spotify"
-    "spotify-unwrapped"
-  ];
 
+{
   security.rtkit.enable = true;
   services = {
     pulseaudio.enable = false;

modules/common/default.nix

@@ -2,66 +2,55 @@
   inputs,
   outputs,
   dotsPath,
-  config,
   ...
 }:
 
-let
-  inherit (inputs.nixpkgs) lib;
-in
 {
   imports = [
     inputs.home-manager.nixosModules.default
+    ../stylix.nix
   ];
 
-  options.nixpkgs.allowedUnfree = lib.mkOption {
+  system.stateVersion = "25.05";
-    type = lib.types.listOf lib.types.str;
+
-    default = [ ];
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+
+  nixpkgs.config.allowUnfree = true;
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = {
+      inherit inputs outputs dotsPath;
+    };
   };
 
-  config = {
+  nix = {
-    system.stateVersion = "25.05";
+    optimise = {
-
+      automatic = true;
-    nix = {
+      dates = [ "05:00" ];
-      optimise = {
-        automatic = true;
-        dates = [ "05:00" ];
-      };
-      gc = {
-        automatic = true;
-        dates = "weekly";
-        options = "--delete-older-than 30d";
-      };
-      settings.experimental-features = [
-        "nix-command"
-        "flakes"
-      ];
     };
-
+    gc = {
-    system.autoUpgrade = {
+      automatic = true;
-      enable = true;
+      dates = "weekly";
-      flags = [
+      options = "--delete-older-than 30d";
-        "--recreate-lock-file"
-        "--commit-lock-file"
-        "--print-build-logs"
-        "--refresh"
-      ];
-      dates = "05:00";
-      randomizedDelaySec = "45min";
-      allowReboot = false;
     };
+  };
 
-    nixpkgs.config.allowUnfreePredicate =
+  system.autoUpgrade = {
-      pkg: builtins.elem (lib.getName pkg) config.nixpkgs.allowedUnfree;
+    enable = true;
-
+    flake = inputs.self.outPath;
-    environment.defaultPackages = lib.mkForce [ ];
+    operation = "switch";
-
+    flags = [
-    home-manager = {
+      "--recreate-lock-file"
-      useGlobalPkgs = true;
+      "--commit-lock-file"
-      useUserPackages = true;
+      "--print-build-logs"
-      extraSpecialArgs = {
+    ];
-        inherit inputs outputs dotsPath;
+    dates = "05:00";
-      };
+    randomizedDelaySec = "45min";
-    };
+    allowReboot = false;
   };
 }

modules/desktops/gnome.nix

@@ -1,3 +1,5 @@
+{ config, pkgs, ... }:
+
 {
   services.xserver = {
     displayManager.gdm.enable = true;

modules/desktops/niri/default.nix

@@ -1,32 +1,16 @@
-{ config, lib, ... }:
-
-let
-  cfg = config.desktop;
-in
 {
-  options.desktop = {
+  programs.niri.enable = true;
-    ly = {
+
-      enable = lib.mkOption {
+  services = {
-        type = lib.types.bool;
+    dbus.enable = true;
-        default = false;
+    logind.settings.Login = {
-      };
+      HandleLidSwitch = "suspend";
+      IdleAction = "suspend";
+      IdleActionSec = 1800;
     };
-  };
 
-  config = {
+    displayManager.ly = {
-    programs.niri.enable = true;
+      enable = true;
-
-    services = {
-      dbus.enable = true;
-      logind.settings.Login = {
-        HandleLidSwitch = "suspend";
-        IdleAction = "suspend";
-        IdleActionSec = 1800;
-      };
-
-      displayManager.ly = lib.mkIf cfg.ly.enable {
-        enable = true;
-      };
     };
   };
 }

modules/gaming/default.nix

@@ -1,12 +0,0 @@
-{
-  nixpkgs.allowedUnfree = [
-    "steam"
-    "steam-unwrapped"
-  ];
-
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = false;
-    dedicatedServer.openFirewall = false;
-  };
-}

modules/keyboard/default.nix

@@ -3,7 +3,7 @@
 with pkgs;
 let
   tools = interception-tools;
-  inherit (interception-tools-plugins) caps2esc;
+  caps2esc = interception-tools-plugins.caps2esc;
 in
 {
   services.interception-tools = {

modules/nvidia/default.nix

@@ -1,22 +0,0 @@
-{ config, ... }:
-
-{
-  nixpkgs.allowedUnfree = [
-    "nvidia-x11"
-    "nvidia-persistenced"
-    "nvidia-settings"
-  ];
-
-  hardware.graphics.enable = true;
-
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = true;
-    powerManagement.finegrained = false;
-    open = true;
-    nvidiaSettings = true;
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
-  };
-
-  services.xserver.videoDrivers = [ "nvidia" ];
-}

modules/printing/default.nix

@@ -1,3 +1,5 @@
+{ pkgs, ... }:
+
 {
   # services.avahi = {
   #   enable = true;

modules/storage/default.nix

@@ -1,3 +0,0 @@
-{
-  services.udisks2.enable = true;
-}

modules/stylix.nix

@@ -0,0 +1,43 @@
+{
+  inputs,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [ inputs.stylix.nixosModules.stylix ];
+
+  stylix = {
+    enable = true;
+    polarity = "dark";
+    base16Scheme = ../stylix/zenwritten-dark.yaml;
+    image = pkgs.runCommand "solid-bg.png" { nativeBuildInputs = [ pkgs.imagemagick ]; } ''
+      magick -size 1x1 xc:#191919 $out
+    '';
+    fonts = {
+      monospace = {
+        package = pkgs.iosevka-bin.override { variant = "SS08"; };
+        name = "Iosevka Term SS08";
+      };
+      serif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Serif";
+      };
+      sansSerif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans";
+      };
+    };
+    autoEnable = true;
+  };
+
+  home-manager.sharedModules = [
+    {
+      stylix.targets = {
+        firefox.profileNames = [ "default" ];
+        kitty.enable = false;
+        # waybar.enable = false;
+      };
+    }
+  ];
+}

modules/stylix/default.nix

@@ -1,49 +0,0 @@
-{
-  config,
-  inputs,
-  pkgs,
-  ...
-}:
-
-let
-  theme = import ./theme.nix { inherit pkgs; };
-in
-{
-  imports = [ inputs.stylix.nixosModules.stylix ];
-
-  stylix = {
-    enable = true;
-    inherit (theme)
-      polarity
-      base16Scheme
-      override
-      image
-      ;
-    fonts = {
-      monospace = theme.monospaceFont;
-      serif = config.stylix.fonts.monospace;
-      sansSerif = config.stylix.fonts.monospace;
-      emoji = config.stylix.fonts.monospace;
-    };
-    autoEnable = true;
-  };
-
-  home-manager.sharedModules = [
-    {
-      stylix.targets = {
-        firefox = {
-          profileNames = [ "default" ];
-          colorTheme.enable = true;
-        };
-        librewolf = {
-          profileNames = [ "default" ];
-          colorTheme.enable = true;
-        };
-        kitty.variant256Colors = true;
-        gnome.enable = false;
-        gtk.enable = false;
-        nixvim.enable = false;
-      };
-    }
-  ];
-}

modules/stylix/theme.nix

@@ -1,16 +0,0 @@
-{ pkgs }:
-
-{
-  polarity = "dark";
-  base16Scheme = ./zenwritten-dark.yaml;
-  override = {
-    base04 = "8E8E8E";
-  };
-  image = pkgs.runCommand "solid-bg.png" { nativeBuildInputs = [ pkgs.imagemagick ]; } ''
-    magick -size 1x1 xc:#191919 $out
-  '';
-  monospaceFont = {
-    package = pkgs.iosevka-bin.override { variant = "SS08"; };
-    name = "Iosevka Term SS08";
-  };
-}

modules/syncthing/default.nix

@@ -8,6 +8,7 @@ with lib;
 
 let
   cfg = config.my.syncthing;
+  allDevices = import ./devices.nix;
 in
 {
   options.my.syncthing = {
@@ -16,11 +17,41 @@ in
       type = types.str;
       default = "h";
     };
+    deviceNames = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+    };
+    folders = mkOption {
+      type = types.attrsOf (
+        types.submodule {
+          options = {
+            path = mkOption { type = types.path; };
+            id = mkOption { type = types.str; };
+            devices = mkOption {
+              type = types.listOf (
+                types.either types.str (
+                  types.submodule {
+                    options = {
+                      device = mkOption { type = types.str; };
+                      type = mkOption {
+                        type = types.str;
+                        default = "sendreceive";
+                      };
+                    };
+                  }
+                )
+              );
+              default = cfg.deviceNames;
+            };
+          };
+        }
+      );
+      default = { };
+    };
   };
 
   config = mkIf cfg.enable {
     users.groups.${cfg.username} = { };
-    users.users.${cfg.username}.extraGroups = [ cfg.username ];
 
     services.syncthing = {
       enable = true;
@@ -28,6 +59,27 @@ in
       group = cfg.username;
       configDir = "/home/${cfg.username}/.local/state/syncthing";
       openDefaultPorts = true;
+      settings = {
+        options = {
+          localAnnounceEnabled = true;
+          globalAnnounceEnabled = true;
+          relaysEnabled = true;
+          urAccepted = -1;
+        };
+        devices = mapAttrs (name: id: { inherit id; }) (
+          filterAttrs (name: _: elem name cfg.deviceNames) allDevices
+        );
+        folders = mapAttrs (name: folder: {
+          inherit (folder) id path;
+          devices = map (
+            device:
+            if isString device then
+              allDevices.${device}
+            else
+              device // { deviceID = allDevices.${device.device}; }
+          ) folder.devices;
+        }) cfg.folders;
+      };
     };
   };
 }

modules/uptime-kuma/default.nix

@@ -1,39 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-let
-  cfg = config.my.uptime-kuma;
-in
-{
-  options.my.uptime-kuma.enable = lib.mkEnableOption "Uptime Kuma monitoring service (Docker container)";
-
-  config = lib.mkIf cfg.enable {
-    virtualisation.oci-containers = {
-      backend = "docker";
-      containers.uptime-kuma = {
-        image = "louislam/uptime-kuma:latest";
-        ports = [ "127.0.0.1:3001:3001" ];
-        volumes = [ "/var/lib/uptime-kuma:/app/data" ];
-        environment = {
-          TZ = "UTC";
-          UMASK = "0022";
-        };
-        extraOptions = [
-          "--network=proxiable"
-        ];
-      };
-    };
-
-    systemd.tmpfiles.settings."uptime-kuma" = {
-      "/var/lib/uptime-kuma".d = {
-        mode = "0755";
-      };
-    };
-
-    environment.systemPackages = with pkgs; [ docker-compose ];
-  };
-}

modules/users/default.nix

@@ -1,3 +1,5 @@
+{ pkgs, ... }:
+
 {
   users.users.h = {
     isNormalUser = true;

phone/default.nix

@@ -0,0 +1,26 @@
+{
+  pkgs,
+  ...
+}:
+
+{
+  environment.packages = with pkgs; [
+    neovim
+  ];
+
+  environment.etcBackupExtension = ".bak";
+
+  system.stateVersion = "24.05";
+
+  nix.extraOptions = ''
+    experimental-features = nix-command flakes
+  '';
+
+  time.timeZone = "Europe/Brussels";
+
+  home-manager = {
+    config = ./home.nix;
+    backupFileExtension = "hm-bak";
+    useGlobalPkgs = true;
+  };
+}

phone/home.nix

@@ -0,0 +1,3 @@
+{
+  home.stateVersion = "24.05";
+}

utils/default.nix

@@ -2,5 +2,6 @@
 
 {
   dirNames =
-    path: builtins.attrNames (lib.filterAttrs (_: type: type == "directory") (builtins.readDir path));
+    path:
+    builtins.attrNames (lib.filterAttrs (name: type: type == "directory") (builtins.readDir path));
 }