snapshot pre-cleanup-2026-10-11T14-05-01Z

- all hyprlandScripts were migrated to lua functions
- hyprland.nix just handles the host specific and replacing the
  placeholders from hyprland.lua

README.md

@@ -1,195 +1,461 @@
-⚠️ Documentation outdated. I recently rewrote the entire config using the [dendritic pattern](https://github.com/mightyiam/dendritic/). One of these days, I will update the README.
-
 # NixOS Configuration
-![NixOS configuration](/assets/example.png)
 
-## Installation Guide
+This repository contains my personal NixOS configuration.
 
-⚠️ **Important Notes**  
-Before applying this configuration on another system, make sure to:
-- Update the `hostName` (in `configuration.nix` and `home.nix`).
+The configuration uses the **[dendritic pattern](https://github.com/mightyiam/dendritic)**. Instead of keeping one large system configuration, functionality is split into smaller, composable modules. This makes it easier to reuse pieces of the configuration across hosts and to keep application, hardware, utility, and host-specific configuration separate.
 
-Requirements: `git` installed. Then run:
-
-```bash
-cd
-git clone https://github.com/Totorile1/nixos.git
-cd nixos
-sudo cp /etc/nixos/hardware-configuration.nix ./hosts/laptop/hardware-configuration
-sudo nixos-rebuild switch --flake ~/nixos/#laptop
-```
-
-### Things That Don't Work Reliably and need manual setup
-
-- Librewolf's extension settings
-- Librewolf's bookmarks
-- Thunderbird's email servers and settings and birdtray's settings[^1]
-- Inkscape's settings
-
-
-[^1]: You must change in Advanced settings Thunderbird command line to the result of `where thunderbird`.
+See the [dendritic pattern repository](https://github.com/mightyiam/dendritic) for an explanation of the approach.
 
 ---
 
-## Configuration Structure
+## Installation
+
+This configuration is primarily designed for my own machines, so some parts are host- and hardware-specific.
+
+### Requirements
+
+* NixOS
+* Git
+* Nix flakes enabled
+
+Clone the repository:
+
+```bash
+cd ~
+git clone https://github.com/tomasriveral/nixos.git
+cd nixos
+```
+
+The available hosts are:
+
+```text
+hosts/
+├── laptop.nix
+└── desktop.nix
+```
+
+Build and switch to a host with:
+
+```bash
+sudo nixos-rebuild switch --flake ~/nixos#laptop
+```
+
+or:
+
+```bash
+sudo nixos-rebuild switch --flake ~/nixos#desktop
+```
+
+For a temporary test generation:
+
+```bash
+sudo nixos-rebuild test --flake ~/nixos#laptop
+```
+
+### Hardware configuration
+
+Hardware-specific configuration is kept under:
+
+```text
+modules/hardware/
+```
+
+This includes:
+
+* bootloader configuration
+* disks and filesystems
+* battery and power management
+* Bluetooth
+* NVIDIA
+* performance settings
+* udev rules
+* hardware utilities
+
+Declarative disk configuration is located in:
+
+```text
+modules/hardware/disko/
+```
+
+When deploying this configuration to a new machine, review the host and hardware modules rather than assuming the existing hardware configuration is appropriate.
+
+---
+
+# Repository Structure
 
 ```text
 nixos/
-├── assets/                # Images, icons, wallpapers, sounds
-├── hosts/laptop/          # Host-specific NixOS config
+├── assets/                 # Wallpapers, images, sounds and other static assets
+├── docs/                   # Additional documentation
+│   └── printing.md
+│
 ├── modules/
-│   ├── home-manager/      # User-level configurations (apps, shell, WM, plugins)
-│   ├── nixos/             # System-level modules (daemons, services, udev, ly)
-│   ├── qt/                # qt modules (qtbatticon)
-│   └── scripts/           # Custom scripts called from keybinds or tools
+│   ├── applications/       # Application and desktop application configuration
+│   ├── hardware/           # Hardware, boot, disk, battery, GPU and device configuration
+│   ├── other/              # Fonts, cursor, printer, desktop entries, user configuration, etc.
+│   ├── packages/            # Custom packages and scripts
+│   └── utilities/           # Reusable utilities and supporting services
+│
+├── hosts/
+│   ├── laptop.nix          # Laptop-specific configuration
+│   └── desktop.nix         # Desktop-specific configuration
+│
 ├── other/
-│   ├── kblayouts/         # Framework 16 RGB macropad layout
-│   └── quickshell/        # QML configuration for topbar, notifications, screenshot, etc.
+│   ├── hyprland/           # Hyprland configuration
+│   │   ├── hyprland.conf   # Previous hyprlang configuration
+│   │   ├── hyprland.lua    # Current Lua configuration
+│   │   └── README.md
+│   ├── kblayouts/          # Keyboard and Framework macropad layouts
+│   ├── mullvad/            # Mullvad configuration
+│   └── quickshell/         # Legacy Quickshell configuration
+│
+├── secrets/                # agenix-encrypted secrets
 ├── flake.nix
 ├── flake.lock
 └── README.md
 ```
 
-> other/quickshell is the older quickshell configuration.  
+---
+
+# Modules
+
+## Applications
+
+`modules/applications/` contains configuration for applications and desktop components.
+
+Some examples:
+
+* `anki.nix`
+* `browser.nix`
+* `caelestia.nix`
+* `git.nix`
+* `gtk.nix`
+* `hypridle.nix`
+* `hyprland.nix`
+* `kitty.nix`
+* `neovim.nix`
+* `obsidian.nix`
+* `rofi.nix`
+* `thunderbird.nix`
+* `waybar.nix`
+* `wlogout.nix`
+* `zsh.nix`
+
+## Hardware
+
+`modules/hardware/` contains machine-level configuration such as:
+
+* battery and power management
+* Bluetooth
+* bootloader
+* disks
+* hardware detection/configuration
+* NVIDIA
+* performance tuning
+* udev rules
+
+## Other
+
+`modules/other/` contains configuration that does not fit directly into applications or hardware, such as:
+
+* cursors
+* desktop entries
+* fonts
+* I/O configuration
+* printers
+* user configuration
+
+## Packages
+
+`modules/packages/` contains custom packages and scripts used throughout the configuration.
+
+Examples include:
+
+* `custom-bottom`
+* `custom-browserprofiles`
+* `custom-colorpicker`
+* `custom-cowsay`
+* `custom-syllabes`
+* `custom-tomato`
+* `custom-weather`
+* manually derived packages
+
+Many of these packages are called directly by Hyprland keybindings.
+
+## Utilities
+
+`modules/utilities/` contains reusable system utilities and services, including:
+
+* agenix
+* audio/media configuration
+* automatic cleanup
+* automatic updates
+* communication and notifications
+* development tools
+* documentation tools
+* Git backup
+* LaTeX
+* networking
+* Nix utilities
+* office tools
+* Ollama
+* RSS tools
 
 ---
 
-## Applications & Tools
+# Hosts
 
-### Shell & Terminal
-- [`zsh`](https://www.zsh.org/) with [`oh-my-zsh`](https://ohmyz.sh/) for shell customization  
-- [`kitty`](https://sw.kovidgoyal.net/kitty/) terminal  
+Host-specific configuration is kept under:
 
-### Window Management
-- [`hyprland`](https://github.com/hyprwm/Hyprland) (tiling window manager)  
-- [`ly`](https://github.com/fairyglade/ly) login manager  
-- [`swaylock`](https://github.com/swaywm/swaylock) screen locking  
-- [`hypridle`](https://github.com/hyprwm/Hyprland/wiki/HyprIdle) for idle mode  
+```text
+hosts/
+```
 
-### Browsing & Productivity
-- [`librewolf`](https://librewolf-community.gitlab.io/) browser  
-  - Extensions: [AdNauseam](https://github.com/dhowe/AdNauseam), [Enhancer for YouTube](https://github.com/ParticleCore/yt-enhancer), [TrackMeNot](https://www.tornhq.com/tmn/), [SponsorBlock](https://sponsor.ajay.app/)  
-  - Privacy options mostly enabled; some disabled to avoid conflicts with AdNauseam  
-- [`thunderbird`](https://www.thunderbird.net/) email client  
-- [`obsidian`](https://obsidian.md/) notes and knowledge management  
-- [`libreoffice`](https://www.libreoffice.org/) full-featured office suite  
+Currently:
 
-### Utilities
-- [`cliphist`](https://github.com/skywind3000/cliphist) clipboard manager  
-- [`zoxide`](https://github.com/ajeetdsouza/zoxide) faster directory navigation  
-- [`fastfetch`](https://github.com/LinusDierheimer/fastfetch) system info  
-- [`gnome-calculator`](https://wiki.gnome.org/Apps/Calculator)  
-- [`gnome-characters`](https://wiki.gnome.org/Apps/Characters)  
-- [`gnome-disk-utility`](https://wiki.gnome.org/Apps/Disks)  
-- [`gnome-font-viewer`](https://wiki.gnome.org/Apps/FontViewer)  
-- [`nautilus`](https://wiki.gnome.org/Apps/Nautilus) file manager  
-- [`okular`](https://okular.kde.org/) document & image viewer  
-- [`vlc`](https://www.videolan.org/vlc/) media player  
-- [`krita`](https://krita.org/) and [`inkscape`](https://inkscape.org/) for image editing  and drawing
-- [`anki`](https://apps.ankiweb.net/) flashcards for learning  
-- [`texlive`](https://www.tug.org/texlive/) LaTeX distribution  
-- [`biber`](https://ctan.org/pkg/biber) bibliography for LaTeX 
-- [`eza`](https://github.com/eza-community/eza) replacement for `ls`
+```text
+hosts/
+├── laptop.nix
+└── desktop.nix
+```
 
-### System & Hardware
-- [`bottom`](https://github.com/ClementTsang/bottom) system monitor  
-- [`tomato-c`](https://github.com/erikras/tomato-c) Pomodoro timer  
-- [`framework-tool-tui`](https://github.com/romanl/fx16-tui) Framework 16 laptop settings  
-
-**Daemons:** `upower`, `pipewire`, `pulseaudio`, `brightnessctl`, `playerctl`, `blueman`, `udiskie`, `networkmanager-applet`, `swww` wallpaper daemon  
-
-### Screenshots, Notifications, Bar and much more!
-- [caelestia-shell](https://github.com/caelestia-dots/shell)
+The host files combine the nixos and home-manager modules needed for each machine.
 
 ---
 
-## Keybindings
+# Hyprland
 
-### Window Management
-| Key | Action |
-|-----|--------|
-| `$mod + W` | Toggle floating |
-| `$mod + G` | Toggle group |
-| `Alt + Return` | Fullscreen |
-| `$mod + Arrow keys` / `Alt + Tab` | Move focus |
-| `$mod + Shift + Ctrl + Arrow keys` | Move window |
-| `$mod + Shift + Arrow keys` | Resize window |
+Hyprland is configured using its **Lua configuration API**.
 
-### Workspaces
-| Key | Action |
-|-----|--------|
-| `$mod + 1..0` | Switch workspace |
-| `$mod + Shift + 1..0` | Move window to workspace |
-| `$mod + Ctrl + Arrow keys` | Cycle workspaces |
-| `$mod + Mouse wheel` | Scroll workspace |
-| `$mod + S` / `Alt + $mod + S` | Special workspace |
+The current configuration is:
 
-### Layout
-| Key | Action |
-|-----|--------|
-| `$mod + A` | Scroll layout column left |
-| `$mod + D` | Scroll layout column right |
+```text
+other/hyprland/hyprland.lua
+```
 
-### Applications
-| Key | Action |
-|-----|--------|
-| `$mod + T` | Terminal |
-| `$mod + E` | File manager |
-| `$mod + F` | Browser |
-| `$mod + N` | Notes |
-| `$mod + Shift + A` | App launcher |
-| `$mod + Alt + A` | Toggle sidebar | 
-| `$mod + Q` | Kill apps (Steam/Pomodoro to special workspace) |
-| `$mod + L` | Lock screen |
-| `$mod + Shift + S` | Screenshot a window|
-| `F11` | Screenshot the whole screen|
+The previous hyprlang configuration remains here:
 
-### Multimedia & System
-| Key | Action |
-|-----|--------|
-| F1 | Mute audio |
-| F2 / F3 | Volume down / up |
-| F4 / F5 / F6 | Media prev / play / next |
-| F7 / F8 | Brightness down / up |
-| `$mod + mouse` | Move / resize window |
+```text
+other/hyprland/hyprland.conf
+```
+
+Host specific hyprland settings are generated by `/modules/applications/hyprland.nix` as `host.lua` which is imported by `hyprland.lua`.
+
+
+## Workspace layouts
+
+The current layout configuration is:
+
+| Workspace | Layout      |
+| --------- | ----------- |
+| `1`       | `master`    |
+| `2`       | `scrolling` 0.45 width |
+| `other`   | `dwindle` |
+
+## Wallpapers
+
+The wallpapers are stored in:
+
+```text
+assets/
+├── wallpaper1.jpg
+├── wallpaper2.jpg
+├── wallpaper3.jpg
+├── wallpaper4.jpg
+└── wallpaper5.jpg
+```
+
+The active wallpaper is selected based on the workspace:
+
+| Workspace | Wallpaper        |
+| --------- | ---------------- |
+| `1`       | `wallpaper1.jpg` |
+| `2`       | `wallpaper2.jpg` |
+| `3`       | `wallpaper3.jpg` |
+| `4`       | `wallpaper4.jpg` |
+| `5`       | `wallpaper5.jpg` |
+| `6`       | `wallpaper1.jpg` |
+| `7`       | `wallpaper2.jpg` |
+| `8`       | `wallpaper3.jpg` |
+| `9`       | `wallpaper4.jpg` |
+| `10`      | `wallpaper5.jpg` |
+
+The Lua configuration contains placeholders for these paths, which are replaced by Nix during configuration generation.
+
+The five wallpapers are paintings from Thomas Cole's *The Course of Empire* series.
 
 ---
 
-### Framework 16 RGB Macropad
+# Hyprland Keybindings
 
-The **Framework 16 RGB macropad** is a 4×6 programmable key grid. Each key triggers one of the keybindings above via a macro.  
+`SUPER` is the primary modifier.
 
-If you **don’t have the physical macropad**, the table below shows which keybinding each macro triggers so you can run it from the keyboard instead:
-
-| Macropad Key | Linked Action (Hyprland keybinding)          |
-| ------------ | -------------------------------------------- |
-| Row 1, Col 1 | Kill all apps except focused (`Ctrl+$mod+6`) |
-| Row 1, Col 2 | Performance mode (`Ctrl+Alt+7`)              |
-| Row 1, Col 3 | Do not disturb (`Ctrl+$mod+4`                |
-| Row 1, Col 4 | Notification center (`Ctrl+Alt+1`)           |
-| Row 2, Col 1 | Pulseaudio control (`Ctrl+$mod+3`)           |
-| Row 2, Col 2 | Change audio output (`Ctrl+Alt+Shift+0`)     |
-| Row 2, Col 3 | Special characters (`Ctrl+$mod+3`)           |
-| Row 2, Col 4 | Color picker (`Ctrl+Alt+8`)                  |
-| Row 3, Col 1 | Pomodoro timer (`Ctrl+Alt+0`)                |
-| Row 4, Col 1 | Launch Anki (`Ctrl+Alt+9`)                   |
-
-> Positions are labeled as `[row, column]` starting from top-left `[1,1]`.  
-> Each macro calls a script or application from this configuration.
-
-### Neovim keybinds
+## Window management
 
 | Key                                 | Action            |
-|-------------|-----------------------|
-| `<Space>`     | `<leader>`              |
+| ----------------------------------- | ----------------- |
+| `SUPER + W`                         | Toggle floating   |
+| `SUPER + G`                         | Toggle group      |
+| `ALT + Return`                      | Toggle fullscreen |
+| `SUPER + Arrow keys`                | Move focus        |
+| `SUPER + CTRL + A`                  | Swap column left  |
+| `SUPER + CTRL + D`                  | Swap column right |
+| `SUPER + SHIFT + CTRL + Arrow keys` | Move window       |
+| `SUPER + SHIFT + Arrow keys`        | Resize window     |
+| `SUPER + Z`                         | Drag window       |
+| `SUPER + X`                         | Resize window     |
+| `SUPER + mouse:272`                 | Drag window       |
+| `SUPER + mouse:273`                 | Resize window     |
+
+## Workspaces
+
+| Key                    | Action                                  |
+| ---------------------- | --------------------------------------- |
+| `SUPER + 1..9`         | Focus workspace 1–9                     |
+| `SUPER + 0`            | Focus workspace 10                      |
+| `SUPER + SHIFT + 1..9` | Move window to workspace 1–9            |
+| `SUPER + SHIFT + 0`    | Move window to workspace 10             |
+| `SUPER + CTRL + Right` | Move to relative workspace `+1`         |
+| `SUPER + CTRL + Left`  | Move to relative workspace `-1`         |
+| `SUPER + CTRL + Down`  | Focus an empty workspace                |
+| `SUPER + mouse_down`   | Next workspace                          |
+| `SUPER + mouse_up`     | Previous workspace                      |
+| `SUPER + S`            | Toggle special workspace                |
+| `SUPER + ALT + S`      | Move active window to special workspace |
+
+## Scrolling layout
+
+| Key         | Action                      |
+| ----------- | --------------------------- |
+| `SUPER + A` | Move scrolling layout left  |
+| `SUPER + D` | Move scrolling layout right |
+
+## Custom window management
+
+### `SUPER + Q`
+
+A custom Lua function checks the active window.
+
+* Steam → move it to the special workspace
+* `custom-pomodoro` → move it to the special workspace
+* anything else → close the window
+
+### `SUPER + CTRL + 6`
+
+Closes every window on the current workspace except the currently focused window.
+
+---
+
+# Applications
+
+| Key                 | Action                   |
+| ------------------- | ------------------------ |
+| `SUPER + T`         | Kitty                    |
+| `SUPER + E`         | Dolphin                  |
+| `SUPER + F`         | Browser profile selector |
+| `SUPER + N`         | Obsidian vault selector  |
+| `SUPER + SHIFT + A` | Application launcher     |
+| `SUPER + Backspace` | Session drawer           |
+| `CTRL + ALT + W`    | Sidebar                  |
+| `SUPER + L`         | Lock screen              |
+| `SUPER + SHIFT + S` | Screenshot picker        |
+| `F11`               | Screenshot               |
+| `SUPER + V`         | Clipboard history
+
+Additional bindings launch or control:
+
+* Hyprland keybinding viewer
+* Pavucontrol
+* GNOME Characters
+* Anki
+* custom performance mode
+* custom tomato/pomodoro
+* custom bottom launcher
+* custom audio-output selector
+* Caelestia shell
+
+---
+
+# Multimedia and Hardware Keys
+
+| Key  | Action               |
+| ---- | -------------------- |
+| `F1` | Mute audio           |
+| `F2` | Volume down          |
+| `F3` | Volume up            |
+| `F4` | Previous media track |
+| `F5` | Play/pause           |
+| `F6` | Next media track     |
+| `F7` | Brightness down      |
+| `F8` | Brightness up        |
+
+Volume and brightness bindings repeat while held.
+
+---
+
+# Gestures
+
+The current Hyprland configuration includes:
+
+| Gesture                 | Action        |
+| ----------------------- | ------------- |
+| Three-finger horizontal | `scroll_move` (only for scrolling layout) |
+| Two-finger pinch        | Cursor zoom   |
+
+---
+
+# Framework 16 RGB Macropad
+
+The Framework 16 RGB Macropad layout is stored at:
+
+```text
+other/kblayouts/framework_laptop_16_rgb_macropad.layout.json
+```
+
+The macropad is used as a collection of physical shortcuts for actions that already have Hyprland keybindings.
+
+The macros in the layout generate combinations involving `CTRL`, `ALT`, `SUPER`, and `SHIFT`. The important part is the **logical mapping** between each physical macropad position and its Hyprland shortcut.
+
+> Positions are documented as `[row, column]`, starting from the top-left.
+
+| Macropad Key | Linked Action                                     |
+| ------------ | ------------------------------------------------- |
+| Row 1, Col 1 | Kill all apps except focused (`CTRL + SUPER + 6`) |
+| Row 1, Col 2 | Performance mode (`CTRL + ALT + 7`)               |
+| Row 1, Col 3 | Do not disturb (`CTRL + SUPER + 4`)               |
+| Row 1, Col 4 | Notification center (`CTRL + ALT + 1`)            |
+| Row 2, Col 1 | PulseAudio control (`CTRL + SUPER + 3`)           |
+| Row 2, Col 2 | Change audio output (`CTRL + ALT + SHIFT + 0`)    |
+| Row 2, Col 3 | Special characters (`CTRL + SUPER + 5`)           |
+| Row 2, Col 4 | Color picker (`CTRL + ALT + 8`)                   |
+| Row 4, Col 1 | Launch Anki (`CTRL + ALT + 9`)                    |
+
+The physical layout file contains additional transparent/unused positions, but the bindings above are the active shortcuts documented for the macropad.
+
+---
+
+# Neovim
+
+Neovim is configured in:
+
+```text
+modules/applications/neovim.nix
+```
+
+The configuration includes LSP support, Telescope, Git tooling, grammar tooling and custom commands.
+
+`<Space>` is the leader key.
+
+| Key                | Action                 |
+| ------------------ | ---------------------- |
 | `§`                | Cheatsheet             |
 | `<leader>1`        | Open fold              |
 | `<leader>2`        | Close fold             |
+| `<leader>e1`       | Show error message     |
+| `<leader>e2`       | Show correction        |
+| `<leader>e3`       | Show diagnostics       |
 | `<leader>e4`       | Previous error         |
 | `<leader>e5`       | Next error             |
-| `<leader>e1`  | See error message     |
-| `<leader>e3`  | See list of errors    |
-| `<leader>e2`  | Show correction       |
 | `<leader>e<Tab>`   | Stop grammar LSP       |
 | `<leader>f1`       | Telescope files        |
 | `<leader>f2`       | Telescope grep         |
@@ -200,36 +466,219 @@ If you **don’t have the physical macropad**, the table below shows which keybi
 | `<leader>g3`       | Go to declaration      |
 | `<leader>g4`       | Go to implementation   |
 | `<leader>g5`       | Show references        |
-| `<leader><leader>` | Launch runner (terminal) |
-| `<leader>r1` | Run fugit |
-| `t` | Count syllabes (french) |
+| `<leader><leader>` | Launch runner          |
+| `<leader>r1`       | Run Fugitive           |
+| `t`                | Count French syllables |
 
-All moving macros with `<Space>`, `g`, and the recording with `q` are disabled.
----
-
-## Aliases
-
-| Alias  | Command                                                           |
-| ------ | ----------------------------------------------------------------- |
-| `snrt` | `git add -A && sudo nixos-rebuild test --flake ~/nixos/#laptop`   |
-| `snrs` | `git add -A && sudo nixos-rebuild switch --flake ~/nixos/#laptop` |
+Some movement macros involving `<Space>`, `g`, and recording with `q` are intentionally disabled.
 
 ---
 
-## Useful Information
-- If you have an error similar to `Failed to register with host portal QDBusError("org.freedesktop.portal.Error.Failed", "Could not register app ID: App info not found for 'org.quickshell'")` see `./modules/other/desktopEntries.nix`
-- `ls` is an alias for `eza`. If you want more info than the normal `ls` run `eza`, `l`, `ll` or `la`
-- `qtbatticon` is a custom battery icon tray, because `cbatticon` and `batticonplus` did not work. Click on it to get more info about the battery.
-- `man` and `manix` use `fzf` for fuzzy search of pages.  
-- `pkgs-unstable` can be used for unstable nixpkgs packages.  
-- Nix garbage collection runs weekly, deleting generations older than 7 days.  
-- Non-free packages (e.g., Obsidian) are allowed.  
-- `neovim` plugins configured in `./modules/home-manager/neovim.nix`  
-- `oh-my-zsh` plugins configured in `./modules/home-manager/oh-my-zsh.nix`  
-- `ripgrep` default flags: `-S -. -p -n`  
-- Wallpapers change per workspace (5 paintings from Thomas Cole’s *The Course of Empire*).  
-- LibreWolf search engines: `@q` (Quant), `@hm` (Home-manager), `@np` (nixpkgs), `@nw` (Nixwiki), `@map` (OpenStreetMap).  
-- `ccat` colors `cat` output when not redirected; disables coloring if output is redirected (e.g., `>>`) to avoid breaking pipelines.  
-- Anki addons: `./modules/nixos/anki.nix`  
-- TLP config: `./modules/nixos/battery.nix`  
-- Framework 16 RGB macropad layout: `./other/kblayouts/framework_laptop_16_rgb_macropad.layout.json`  
+# Shell
+
+The shell is based on **zsh**.
+
+Relevant configuration is primarily found in:
+
+```text
+modules/applications/zsh.nix
+```
+
+and related application modules.
+
+`oh-my-zsh` is used for shell customization.
+
+`deja` is used for shell completion.
+
+Useful command-line tools include:
+
+* `eza`
+* `zoxide`
+* `ripgrep`
+* `fzf`
+* `fastfetch`
+* `man`
+* `manix`
+* `trash`
+
+`ls`. `l`, `ll` and `la` are aliased/replaced by `eza`.
+
+`man` and `manix` are modified to use fzf to search for the man(ix) page. So in `man(ix) <arg>` `<arg>` will be ignored. If you want a specific man(ix) page, you can use `\man` and `\manix`.
+
+`rm` is replaced by trash-cli :
+* `rm` alias to `trash-put`
+* `rml` alias to `trash-list`
+* `rmr` alias to `trash-restore`
+* `rme` alias to `trash-empty`
+* `rmx` alias to `trash-rm` (remove individual item from the trash).
+
+---
+
+# Git and Nix Workflow
+
+The configuration includes tooling for Git, Nix development, backups and cherry-picking.
+
+Relevant modules include:
+
+```text
+modules/utilities/gitBackup.nix
+modules/utilities/nixGitCherryPicker.nix
+modules/utilities/nixUtils.nix
+```
+
+Two useful rebuild aliases are:
+
+```bash
+snrt
+```
+
+which runs:
+
+```bash
+git add -A && sudo nixos-rebuild test --flake ~/nixos/#laptop
+```
+
+and:
+
+```bash
+snrs
+```
+
+which runs:
+
+```bash
+git add -A && sudo nixos-rebuild switch --flake ~/nixos/#laptop
+```
+
+These aliases currently target the laptop host.
+
+---
+
+# Secrets
+
+Secrets are managed using **agenix**.
+
+The relevant files are:
+
+```text
+secrets/
+├── ntfy.age
+└── secrets.nix
+```
+
+Encrypted secrets should remain encrypted in Git. Decrypted secret contents and private keys should not be committed.
+
+* To edit a secret use `agenix -e <secret_file>.age -i /etc/ssh/ssh_host_ed25519_key`.
+* To decrypt a secret use `sudo agenix -d <secret_file>.age -i /etc/ssh/ssh_host_ed25519_key`.
+
+---
+
+# Quickshell
+
+The legacy Quickshell configuration lives under:
+
+```text
+other/quickshell/
+```
+---
+
+# Custom Packages
+
+Custom scripts and packages are located in:
+
+```text
+modules/packages/
+```
+
+Or imported in flake.nix from other repos.
+
+Examples include:
+* `custom-browserprofiles` Fzf selector between different LibreWolf profiles, private window and the tor browser.
+* `custom-syllabes` A syllab counter when I write french poetry. (note: algorithmic syllab counting is pretty difficult in french, so this small scripts makes a lot of errors)
+* `ngcp` (see the [GitHub repo](https://github.com/tomasriveral/Nix-Git-Cherry-Picker)) is what i use to manage between my `laptop` and `desktop` git branch.
+* `nixpkgs-notifier` (see the [GitHub repo](https://github.com/tomasriveral/nixpkgs-notifier)) notifies my when PRs get merged to nixos-unstable.
+* `notewrapper` (see the [GitHub repo](https://github.com/tomasriveral/Notewrapper)) a notetaking/journalling TUI wrapper organizer.
+---
+
+# Applications and Desktop Environment
+
+The configuration currently contains modules for applications and components such as:
+
+* Hyprland
+* Kitty
+* Dolphin
+* LibreWolf/browser tooling
+* Thunderbird
+* Obsidian
+* Neovim
+* Caelestia
+* Quickshell
+* Hypridle
+* Rofi
+* Waybar
+* Wlogout
+* Git
+* SSH
+* Mullvad
+* Bluetooth
+* audio/media tools
+* office tools
+* LaTeX
+* development tools
+* Ollama
+
+The exact set of enabled software depends on the host configuration and imported modules.
+
+---
+
+# Things That Still Require Manual Setup
+
+Not everything used by the desktop environment is completely declarative.
+
+Some application state may need to be configured manually after installation:
+
+* LibreWolf extension settings
+* LibreWolf bookmarks
+* Thunderbird account/server settings
+* Birdtray settings
+* Inkscape settings
+* other application-specific user data
+* git configuration
+
+---
+
+# Useful Information
+
+* Wallpapers are five paintings from Thomas Cole's *The Course of Empire*.
+* `qtbatticon` is a custom battery tray indicator.
+* `man` and `manix` use `fzf` for fuzzy searching.
+* `pkgs-unstable` is available for packages that need to come from unstable nixpkgs.
+* `pkgs-master` can be enabled in flake.nix. Attention, all the packages will need to be compiled on the machine.
+* `pkgs-local` can be enable in flake.nix. Attention, all the packages will need to be compiled on the machine.
+* Automatic Nix garbage collection removes old generations according to the configured cleanup policy.
+* Non-free packages are enabled where required.
+* Neovim plugins are configured in `modules/applications/neovim.nix`.
+* `oh-my-zsh` configuration is kept with the shell/application modules.
+* The Framework 16 RGB Macropad layout is stored in `other/kblayouts/framework_laptop_16_rgb_macropad.layout.json`.
+* Anki-related configuration is distributed across the relevant application/package modules.
+* Battery and power-related configuration is under `modules/hardware/`.
+* Custom commands used by Hyprland are generally provided by `modules/packages/`.
+
+---
+
+# Documentation
+
+Additional documentation is kept close to the corresponding configuration where practical.
+
+Important documentation files include:
+
+```text
+docs/printing.md
+modules/applications/README.md
+modules/hardware/disko/README.md
+modules/packages/README.md
+modules/utilities/README.md
+other/hyprland/README.md
+other/mullvad/README.md
+other/quickshell/README.md
+```

flake.lock

@@ -36,11 +36,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786071436,
-        "narHash": "sha256-/CQJ781dRGWWUMrJ34vIj1PQnNEEWgnEEuod0r5LKGk=",
+        "lastModified": 1787276686,
+        "narHash": "sha256-rYdGb5rKIfETdlenQRxHfg17dhf9fN8eaRryX6sztnQ=",
         "owner": "caelestia-dots",
         "repo": "cli",
-        "rev": "751fbc555a83faba5dd589270d14eeb22afab174",
+        "rev": "7401d9e3a371e583bc0b42dc1a139d01e278e6c1",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
         "quickshell": "quickshell"
       },
       "locked": {
-        "lastModified": 1786238888,
-        "narHash": "sha256-pnO0u0UUYwkr72pJR5Giu93LZfU/fhTKJZYa1xeM7Po=",
+        "lastModified": 1787890941,
+        "narHash": "sha256-j91lsxm/wuuoPPwz4RQOr520EXlHgLPWfSW0KqKsy7E=",
         "owner": "caelestia-dots",
         "repo": "shell",
-        "rev": "817a220e8e87c4df9f3681033a0d8a8054cdaa30",
+        "rev": "1b7052d108677a7ca0d3d3365511bfe8281a6868",
         "type": "github"
       },
       "original": {
@@ -119,12 +119,12 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1785627969,
-        "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=",
-        "rev": "427bf4bd9435fdf21321c8cc628c24efc14c0f7a",
-        "revCount": 483,
+        "lastModified": 1787559586,
+        "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
+        "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
+        "revCount": 489,
         "type": "tarball",
-        "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.483%2Brev-427bf4bd9435fdf21321c8cc628c24efc14c0f7a/019fc124-5bcc-79d1-a1e4-306df724dc0a/source.tar.gz"
+        "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.489%2Brev-9d0d87172c374f89da73c1cfe6d81ae62feac1f1/01a034df-3c80-7cd2-a669-be2243c45202/source.tar.gz"
       },
       "original": {
         "type": "tarball",
@@ -155,11 +155,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785119570,
-        "narHash": "sha256-Rgs2xKnGLFWQscxUaXX07oyZeuMDOHEbqDOsgliLFGM=",
+        "lastModified": 1787377438,
+        "narHash": "sha256-Sxu1NLTD/Ern6hFGLlZmtKCSct3YQXZI/lls8RE1XeM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d4fd24667c8cbef124bb70a20380cab75ec8474d",
+        "rev": "65258d5c65a250189fde2e35f490d15e064c4c62",
         "type": "github"
       },
       "original": {
@@ -226,11 +226,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1786535285,
-        "narHash": "sha256-rG5HKMAgAhMgydvKGtco6rqTxRq4EDZQCx9USLvVqYw=",
+        "lastModified": 1787848966,
+        "narHash": "sha256-7gDpu5hpq0rOYnYMcOWqSzquK4HA/xU8Xf3CjUBOOJA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9f78f44a87948854445dae0b6bf82b2e87e4efb5",
+        "rev": "d57af924f160a5084293c71c2043f058bd1cdb60",
         "type": "github"
       },
       "original": {
@@ -280,11 +280,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1786534138,
-        "narHash": "sha256-fBJMdnKUTUDtfi/BYLr71HLaC9dG382arxLF2Egg2uo=",
+        "lastModified": 1787814960,
+        "narHash": "sha256-PYZq1qzCJXC2zGI0mH07vrZBsw6DRBAOX0jN1pPtqOQ=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "044bfe75bfe4c7bbe043dc17b5e42ea823b84a09",
+        "rev": "c27cdad491a991b11ed731760aa2ef8db0cb0410",
         "type": "github"
       },
       "original": {
@@ -304,11 +304,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1786346006,
-        "narHash": "sha256-PDM9fB1zBhqVVE75WxRM7vIo3QhL2LGKKdd6N+hTGlg=",
+        "lastModified": 1787547082,
+        "narHash": "sha256-v2KPBHgeSvThqz/qsajxpc98CIcBhXson4uUazAuwFs=",
         "owner": "tomasriveral",
         "repo": "notewrapper",
-        "rev": "689c3074c03328e2086dc032a2fc3de00bbef466",
+        "rev": "713fa27893c91896607229895d06e4b853edceeb",
         "type": "github"
       },
       "original": {
@@ -328,11 +328,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1786270331,
-        "narHash": "sha256-GRhNuYIXR/0WWBya4CHfTKyCbL3wuFPJC5yBh5pHU8s=",
+        "lastModified": 1787604401,
+        "narHash": "sha256-r5Ts5BWk99uIuyFqai85c+WdS3AAar20Qgd0diV1YoM=",
         "owner": "r14dd",
         "repo": "patent",
-        "rev": "d852cea921124a8b9002db9beb2af2d935af8130",
+        "rev": "bbe68e8ebc29ca6cec996f89b03997a5d67aa550",
         "type": "github"
       },
       "original": {
@@ -349,11 +349,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785704021,
-        "narHash": "sha256-eQtczKMAS4ItlB4pr1B3MqBZiyRVl2nkqNdtyRSQMa8=",
+        "lastModified": 1787440121,
+        "narHash": "sha256-OZdLL1rMR9kjTFZroOODeyQ0u6nrSxcFHlK6JUi+R/c=",
         "ref": "refs/heads/master",
-        "rev": "28771c7c74b42e20afca0b1b63980cb46515537c",
-        "revCount": 835,
+        "rev": "0fed22a2c47d9568ddf13cf61586b3f2ac4378a2",
+        "revCount": 847,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },

flake.nix

@@ -69,12 +69,15 @@
         flake = let
           system = "x86_64-linux";
           unfreePkgs = [
+            "code"
             "hplip"
             "nvidia-x11"
             "nvidia-settings"
             "steam"
             "steam-unwrapped"
             "cheatsheet.nvim"
+            "vscode"
+            "vscode-fhs"
             "zoom-us"
             "zoom"
           ];

modules/applications/browser.nix

@@ -402,6 +402,24 @@
               keyword = "nix function search";
               url = "https://noogle.dev";
             }
+            {
+              name = "EPFL Moodle";
+              tags = ["epfl" "moodle"];
+              keyword = "epfl moodle";
+              url = "https://moodle.epfl.ch/my/courses.php";
+            }
+            {
+              name = "EPFL ICC Courseware";
+              tags = ["icc" "epfl" "courseware"];
+              keyword = "icc epfl courseware";
+              url = "https://courseware.epfl.ch/learner-dashboard/";
+            }
+            {
+              name = "Detexify";
+              tags = ["draw" "Latex" "symbols"];
+              keyword = "draw latex symbols";
+              url = "https://detexify.kirelabs.org/";
+            }
           ];
         };
         search = {

modules/applications/caelestia.nix

@@ -24,16 +24,16 @@
       inhibitWhenAudio = true;
       timeouts = [
         {
-          timeout = 180;
+          timeout = 1000;
           idleAction = "lock";
         }
         {
-          timeout = 300;
+          timeout = 1010;
           idleAction = "dpms off"; # what's that?
           returnAction = "dpms on";
         }
         {
-          timeout = 600;
+          timeout = 12200;
           idleAction = ["systemctl" "suspend-then-hibernate"];
         }
       ];

modules/applications/git.nix

@@ -3,6 +3,8 @@ _: {
     programs.git = {
       enable = true;
       /*
+        for some reason this doesnt work really well. So it's best to setup git imperatively
+        push.autoSetupRemote to true
         settings = {
         init.defaultBranch = "main";
       };

modules/applications/hyprland.nix

@@ -1,4 +1,4 @@
-{...}: {
+_: {
   flake.nixosModules.hyprland = {
     pkgs,
     pkgs-unstable,
@@ -39,7 +39,6 @@
       text = ''
           hl.on("hyprland.start", function()
             hl.exec_cmd("qtbatticon")
-        hl.exec_cmd("source /run/agenix/ntfy && nixpkgs-notifier listen")
         end)
 
         hl.monitor({
@@ -52,8 +51,8 @@
       enable = true;
       force = true;
     };
-};
-flake.homeModules.hyprland-desktop = {
+  };
+  flake.homeModules.hyprland-desktop = {
     home.file.".config/hypr/host.lua" = {
       text = ''
         hl.monitor({
@@ -66,16 +65,16 @@ flake.homeModules.hyprland-desktop = {
       enable = true;
       force = true;
     };
-};
-flake.homeModules.hyprland = {pkgs-unstable, ... }:
-let
+  };
+  flake.homeModules.hyprland = {pkgs-unstable, ...}: let
     wallpaper1 = ../../assets/wallpaper1.jpg;
     wallpaper2 = ../../assets/wallpaper2.jpg;
     wallpaper3 = ../../assets/wallpaper3.jpg;
     wallpaper4 = ../../assets/wallpaper4.jpg;
     wallpaper5 = ../../assets/wallpaper5.jpg;
 
-  hyprlandLua = builtins.replaceStrings
+    hyprlandLua =
+      builtins.replaceStrings
       [
         "WALLPAPER1/PATH/PLACEHOLDER"
         "WALLPAPER2/PATH/PLACEHOLDER"
@@ -91,8 +90,7 @@ let
         (toString wallpaper5)
       ]
       (builtins.readFile ../../other/hyprland/hyprland.lua);
-in
-  {
+  in {
     #refer to https://wiki.hypr.land/Nix/Hyprland-on-Home-Manager/
     wayland.windowManager.hyprland.enable = true;
     wayland.windowManager.hyprland.package = pkgs-unstable.hyprland;

modules/applications/kdrive.nix

@@ -14,7 +14,6 @@
   flake.nixosModules.kdrive-desktop = {pkgs-unstable, ...}: {
     environment.systemPackages = with pkgs-unstable; [
       rclone
-      icloudpd
       self.packages.${pkgs-unstable.system}.custom-checkKdrive
       self.packages.${pkgs-unstable.system}.custom-synckdrive-desktop
     ];

modules/applications/mullvad.nix

@@ -1,13 +0,0 @@
-_: {
-  flake.nixosModules.mullvad = _: {
-    services.mullvad-vpn = {
-      enable = true;
-    };
-  };
-  flake.homeModules.mullvad = _: {
-    programs.mullvad-vpn = {
-      # gui
-      enable = true;
-    };
-  };
-}

modules/applications/neovim.nix

@@ -333,6 +333,8 @@ _: {
             }
         })
         vim.lsp.config("texlab", { cmd = { "texlab" }, filetypes = { "tex" }, on_attach = on_attach })
+
+        -- i remove ltex from being enable bellow as it's too anoying and doesn't really help as sometime i write in french and other times in english/spanish or even german
         vim.lsp.config("ltex", {
           cmd = { "ltex-ls-plus" },
           filetypes = { "markdown", "text", "tex", "plaintex" },
@@ -373,7 +375,7 @@ _: {
           },
         })
 
-        vim.lsp.enable({ "lua_ls", "clangd", "pylsp", "texlab", "nixd", "ltex", "leanls"})
+        vim.lsp.enable({ "lua_ls", "clangd", "pylsp", "texlab", "nixd", "leanls"})
               -- =========================
               -- DASHBOARD
               -- =========================

modules/applications/notewrapper.nix

@@ -8,7 +8,7 @@
       force = true;
       text = ''
         {
-          "directory": ["~/kdrive/Notes/"],
+          "directory": ["~/Documents/Notes/"],
           "render": true,
           "jumpToEndOfFileOnLaunch": true,
           "editor": "neovim",
@@ -16,13 +16,17 @@
           "dateEntry": "# %Y %m %d %a",
           "newLineOnOpening": true,
           "backup": {
-            "enable": false,
+            "enable": true,
             "directory": {
-              "~/Documents/Notes/": "~/kdrive/Notes/",
-              "~/test/": "~/backupTest/"
+              "~/Documents/Notes/": "~/kdrive/Notes/"
             },
             "interval": "daily",
-            "rsyncArgs": ["-Lqah", "--update"]
+            "rsyncArgs": ["-Lqah", "--update"],
+            "git": {
+              "enable": true,
+              "name": "Tomas Rivera",
+              "email": "tomas.riveral@icloud.com"
+            }
           }
         }
       '';
@@ -47,7 +51,7 @@
           "backup": {
             "enable": false,
             "directory": {
-              "~/Documents/Notes/": "~/kdrive/Notes/",
+              "~/Documents/Notes/": "~/hdd/kdrive/Notes/",
               "~/test/": "~/backupTest/"
             },
             "interval": "daily",

modules/applications/zsh.nix

@@ -36,12 +36,18 @@ _: {
     home.packages = [
       #self.packages.${pkgs.system}.dejaManuallyDerived
       pkgs-unstable.deja
+      pkgs-unstable.trash-cli
     ];
 
     programs.zsh = {
       enable = true;
       autosuggestion.enable = false; # zsh-autocomplete is replaced by deja
       initContent = ''
+        # those aliases can't be written in nix, because of ö
+        # l and ö are very close
+        alias -- ös=ls
+        alias -- öös=ls
+
         # Safe cat that uses colorize plugin ccat
         custom-cat() {
           if [[ -t 1 ]]; then
@@ -60,7 +66,11 @@ _: {
         }
         eval "$(direnv hook zsh)"
         eval "$(deja init zsh)"
-              fastfetch''\n'';
+        if [[ "$TERM_PROGRAM" != "vscode" ]]; then
+          fastfetch
+        fi
+
+      '';
       shellAliases = {
         ".." = "z ..";
         grep = "rg";
@@ -89,6 +99,11 @@ _: {
         nvvim = "nvim";
         nviim = "nvim";
         hledger-ui = "puffin";
+        rm = "trash-put";
+        rml = "trash-list";
+        rmr = "trash-restore";
+        rme = "trash-empty";
+        rmx = "trash-rm";
       };
     };
   };

modules/hardware/battery.nix

@@ -1,8 +1,4 @@
-{
-  self,
-  inputs,
-  ...
-}: {
+{self, ...}: {
   flake.nixosModules.battery-laptop = {pkgs, ...}:
   # https://discourse.nixos.org/t/what-is-the-best-option-for-power-management/63406/2
   # we just activate tlp unconditonally
@@ -35,7 +31,7 @@
     */
     services.system76-scheduler.settings.cfsProfiles.enable = true; # Better scheduling for CPU cycles - thanks System76!!!
     services.thermald.enable = false; # Enable thermald, the temperature management daemon. (only necessary if on Intel CPUs)
-    services.power-profiles-daemon.enable = true; # ppd is recommended over tlp for framework 16
+    #services.power-profiles-daemon.enable = true; # ppd is recommended over tlp for framework 16
     /*
       services.tlp = {
       enable = true; # Enable TLP (better than gnomes internal power manager)
@@ -336,184 +332,5 @@
         install -m755 qtbatticon $out/bin/
       '';
     };
-    # This was replaced by caelestia shell's Game Mode
-    packages.custom-performance = pkgs.writeShellApplication {
-      name = "custom-performance";
-      runtimeInputs = with pkgs; [
-        hyprland
-        brightnessctl
-        swaynotificationcenter
-        self.packages.${pkgs.system}.custom-wallpaper
-        libnotify
-        inputs.caelestia-shell.packages.${pkgs.system}.default
-      ];
-      text = ''
-        STATE="$HOME/.cache/hypr-battery-saver"
-
-        enable() {
-            mkdir -p "$(dirname "$STATE")"
-
-            echo "Enabling battery saver mode..."
-
-            # Save brightness
-            brightnessctl get > "''${STATE}.brightness" 2>/dev/null || true
-
-            # Kill heavy UI components
-            pkill -f caelestia-shell || true
-            pkill -f caelestia || true
-            pkill shell || true
-            pkill -f custom-wallpaper || true
-
-            # Start lightweight notifications
-            pkill swaync || true
-            swaync & disown
-
-            # Start lightweight waybar
-            pkill waybar || true
-            waybar & disown
-
-            # Lower refresh rate (BIGGEST win)
-            hyprctl keyword monitor "eDP-1,2560x1600@60,0x0,1"
-
-            # Core performance toggles
-            hyprctl --batch "\
-                keyword animations:enabled 0;\
-                keyword animation borderangle,0;\
-                keyword decoration:shadow:enabled 0;\
-                keyword decoration:blur:enabled 0;\
-                keyword decoration:rounding 0;\
-                keyword decoration:fullscreen_opacity 1;\
-                keyword general:gaps_in 0;\
-                keyword general:gaps_out 0;\
-                keyword general:border_size 1;\
-                keyword decoration:active_opacity 1;\
-                keyword decoration:inactive_opacity 1;\
-                keyword misc:vfr true"
-
-            # Lower brightness
-            brightnessctl set 5% 2>/dev/null || true
-
-            touch "$STATE"
-
-            notify-send "Battery Saver" "Enabled"
-        }
-
-        disable() {
-            echo "Disabling battery saver mode..."
-
-            # Restore refresh rate
-            hyprctl keyword monitor "eDP-1,2560x1600@165,0x0,1"
-
-            # Restore Caelestia
-            pkill swaync || true
-            pkill waybar || true
-            caelestia shell -d >/dev/null 2>&1 &
-            disown
-
-
-            # Restart wallpaper
-            custom-wallpaper >/dev/null 2>&1 &
-            disown
-
-            # Restore full UI via reload (safe here on exit)
-            hyprctl reload
-
-            # Restore brightness
-            if [[ -f "''${STATE}.brightness" ]]; then
-                brightnessctl set "$(cat "''${STATE}.brightness")" 2>/dev/null || true
-            fi
-
-            rm -f "$STATE" "''${STATE}.brightness"
-
-            notify-send "Battery Saver" "Disabled"
-        }
-
-        if [[ -f "$STATE" ]]; then
-            disable
-        else
-            enable
-        fi
-      '';
-    };
-    # Old script that was used for the battery. Might not work.
-    packages.custom-olddeprecatedbatterynotify = pkgs.writeShellApplication {
-      name = "custom-olddeprecatedbatterynotify";
-
-      runtimeInputs = with pkgs; [
-        libnotify # provides notify-send
-        systemd # provides systemctl
-      ];
-
-      text = ''
-        set -euo pipefail
-
-        LOW="''${BATTERY_LOW_THRESHOLD:-20}"
-        CRITICAL="''${BATTERY_CRITICAL_THRESHOLD:-5}"
-        FULL="''${BATTERY_FULL_THRESHOLD:-95}"
-        INTERVAL="''${BATTERY_INTERVAL:-30}"
-        ACTION="''${BATTERY_CRITICAL_ACTION:-systemctl suspend}"
-
-        notify() {
-          notify-send -a "Battery" -u "$1" "$2" "$3"
-        }
-
-        get_info() {
-          total=0
-          count=0
-
-          for bat in /sys/class/power_supply/BAT*; do
-            [ -f "$bat/capacity" ] || continue
-            capacity=$(<"$bat/capacity")
-            status=$(<"$bat/status")
-            total=$((total + capacity))
-            count=$((count + 1))
-          done
-
-          [ "$count" -gt 0 ] || exit 0
-          percentage=$((total / count))
-        }
-
-        last_state=""
-
-        while true; do
-          get_info
-
-          if [[ "$status" == "Discharging" && "$percentage" -le "$CRITICAL" ]]; then
-            notify critical "Battery Critically Low" "$percentage% — suspending."
-            $ACTION
-
-          elif [[ "$status" == "Discharging" && "$percentage" -le "$LOW" ]]; then
-            if [[ "$last_state" != "low" ]]; then
-              notify normal "Battery Low" "$percentage% remaining."
-              last_state="low"
-            fi
-
-          elif [[ "$status" != "Discharging" && "$percentage" -ge "$FULL" ]]; then
-            if [[ "$last_state" != "full" ]]; then
-              notify normal "Battery Full" "$percentage% — unplug charger."
-              last_state="full"
-            fi
-
-          else
-            last_state=""
-          fi
-
-          sleep "$INTERVAL"
-        done
-      '';
-    };
-  };
-  flake.homeModules.cbatticon = _: {
-    # don't works. some GTK error. I let it here if someday, someone is interest in this shit.
-    # ChatGPT half baked a replacement that works on my system.
-    # see qtbatticon
-    services.cbatticon = {
-      enable = true;
-      lowLevelPercent = 20;
-      criticalLevelPercent = 5;
-      batteryId = "BAT1";
-      hideNotification = true; # we use another script for battery notifications
-      updateIntervalSeconds = 10;
-    };
   };
 }

modules/hardware/hardwareUtils.nix

@@ -1,10 +1,26 @@
 _: {
-  flake.nixosModules.hardwareUtils-laptop = {pkgs, ...}: {
-    environment.systemPackages = with pkgs; [
+  flake.nixosModules.hardwareUtils-laptop = {pkgs-unstable, ...}: {
+    environment.systemPackages = with pkgs-unstable; [
       # used for the framework 16 laptop
-      #framework-tool
-      #framework-tool-tui
+      framework-tool
+      framework-tool-tui
       vial # Open-source GUI and QMK fork for configuring your keyboard in real time
+      netwatch
+      (diskwatch.override {
+        withSmartmontools = true;
+      })
+      syswatch
     ];
+    services.fwupd.enable = true; # update device firmware
+  };
+  flake.nixosModules.hardwareUtils-desktop = {pkgs-unstable, ...}: {
+    environment.systemPackages = with pkgs-unstable; [
+      netwatch
+      (diskwatch.override {
+        withSmartmontools = true;
+      })
+      syswatch
+    ];
+    services.fwupd.enable = true; # update device firmware
   };
 }

modules/hosts/desktop.nix

@@ -29,6 +29,7 @@
       fonts
       games
       hardware-configuration-desktop
+      hardwareUtils-desktop
       hdd
       hledger
       hledger-desktop
@@ -38,7 +39,6 @@
       latex
       ly
       mathematics
-      mullvad
       networking
       nixUtils
       notifications
@@ -51,6 +51,7 @@
       rss
       udev
       user
+      vpn
     ];
   };
   flake.homeModules.desktop = {...}: {
@@ -68,7 +69,6 @@
       hyprland-desktop
       kitty
       librewolf
-      mullvad
       neovim
       nix-git-cherry-picker-desktop
       desktop-notewrapper

modules/hosts/laptop.nix

@@ -25,10 +25,12 @@
       bootloader
       browsers
       caelestia
+      cs-119l # I'm obliged to use vscode. RIP neovim
       development
       documentation
       disk
       disk-laptop
+      epfl
       fonts
       gitBackup
       hardware-configuration-laptop
@@ -41,7 +43,6 @@
       latex
       ly
       mathematics
-      mullvad
       networking
       nixUtils-laptop
       nixUtils
@@ -54,6 +55,7 @@
       rss
       udev
       user
+      vpn
     ];
   };
   flake.homeModules.laptop = {...}: {
@@ -72,7 +74,6 @@
       hyprland-laptop
       kitty
       librewolf
-      mullvad
       neovim
       nix-git-cherry-picker-laptop
       laptop-notewrapper

modules/other/user.nix

@@ -44,6 +44,18 @@ _: {
               command = "${pkgs-unstable.nixos-rebuild}/bin/nixos-rebuild";
               options = ["NOPASSWD"];
             }
+            {
+              command = "/run/current-system/sw/bin/open";
+              options = ["NOPASSWD"];
+            }
+            {
+              command = "${pkgs.openconnect}/bin/openconnect";
+              options = ["NOPASSWD"];
+            }
+            {
+              command = "${pkgs-unstable.openconnect}/bin/openconnect";
+              options = ["NOPASSWD"];
+            }
           ];
         }
       ];

modules/utilities/agenix.nix

@@ -13,5 +13,11 @@
       group = "users";
       mode = "0400";
     };
+    age.secrets.epfl = {
+      file = ../../secrets/epfl.age;
+      owner = "tomasr";
+      group = "users";
+      mode = "0400";
+    };
   };
 }

modules/utilities/communicationAndNotification.nix

@@ -4,11 +4,14 @@
       libnotify # Library that sends desktop notifications to a notification daemon
       socat # Utility for bidirectional data transfer between two independent data channels (used to communicate between hyprland and awww to change wallpapers dinamically)
       # battery notifications
+      /*
         self.packages.${pkgs.system}.custom-batterynotify
       self.packages.${pkgs.system}.custom-batterywarning
+      */
       self.packages.${pkgs.system}.custom-gitnotify # checks if git is set up
       self.packages.${pkgs.system}.custom-checkKdrive # check if kdrive is set up with rclone
       zoom-us
+      telegram-desktop
     ];
   };
   perSystem = {pkgs, ...}: {

modules/utilities/epfl.nix

@@ -0,0 +1,65 @@
+{self, ...}: {
+  flake.nixosModules.epfl = {pkgs, ...}: {
+    environment.systemPackages = with pkgs; [
+      openconnect
+      self.packages.${pkgs.system}.custom-mountEpflDrive
+    ];
+  };
+
+  flake.nixosModules.cs-119l = {pkgs, ...}: let
+    user = "tomasr";
+    home = "/home/${user}";
+    src = "${home}/epfl/cs-119l-ICC/";
+    dst = "${home}/kdrive/Travail/2 - Bachelor/BA1/Information, calcul, communication CS-119l/code/";
+  in {
+    environment.systemPackages = with pkgs; [
+      vscode-fhs
+    ];
+    systemd.services.sync-cs119l-to-kdrive = {
+      description = "Sync CS-119l ICC to kDrive";
+
+      serviceConfig = {
+        Type = "oneshot";
+        User = user;
+
+        ExecStart = "${pkgs.rsync}/bin/rsync -a '${src}' '${dst}'";
+      };
+    };
+
+    systemd.timers.sync-cs119l-to-kdrive = {
+      description = "Sync CS-119l ICC to kDrive every Thursday and Friday evening";
+
+      wantedBy = ["timers.target"];
+
+      timerConfig = {
+        OnCalendar = [
+          "Thu *-*-* 20:00:00"
+          "Fri *-*-* 20:00:00"
+        ];
+        Persistent = true;
+      };
+    };
+  };
+  perSystem = {pkgs, ...}: {
+    packages.custom-mountEpflDrive = pkgs.writeShellApplication {
+      name = "custom-mountEpflDrive";
+      runtimeInputs = with pkgs; [
+        rclone
+        libnotify
+      ];
+      text = ''
+        REMOTE_NAME="epfl"
+        MOUNT_POINT="$HOME/epfl/drive"
+
+        if rclone listremotes | rg "^''${REMOTE_NAME}:"; then
+            echo "Mounting ''${REMOTE_NAME}..."
+            rclone mount "''${REMOTE_NAME}:" "$MOUNT_POINT" --vfs-cache-mode writes --allow-non-empty &
+        else
+            notify-send "rclone mount failed" \
+                "Remote ''${REMOTE_NAME} not found.\nConfigure rclone and create the dir ~/epfl/drive/ or comment out the exec line in hyprland.lua."
+        echo        "Remote ''${REMOTE_NAME} not found. Configure rclone or comment out the exec line in hyprland.lua."
+        fi
+      '';
+    };
+  };
+}

modules/utilities/nixUtils.nix

@@ -45,6 +45,7 @@
       nix-index
       statix
       self.packages.${pkgs-unstable.system}.custom-trimmer
+      nix-update # nix-update <package> --build --test --format # the review will be done by nixpkgs-review-gha
     ];
   };
   perSystem = {pkgs, ...}: {

modules/utilities/otherUtils.nix

@@ -1,7 +1,11 @@
 {self, ...}: {
   flake.nixosModules.otherUtils =
     # try to keep packages here at a minium. Preferably use a dedicated file
-    {pkgs, ...}: {
+    {
+      pkgs,
+      pkgs-unstable,
+      ...
+    }: {
       environment.systemPackages = with pkgs; [
         gnome-calculator
         snapshot
@@ -18,8 +22,7 @@
         usbutils # used for lsusb
         self.packages.${pkgs.system}.custom-tomato
         self.packages.${pkgs.system}.custom-syllabes
-        # Electron 39 EOL. https://github.com/bitwarden/clients/pull/20448 should move it to 41. For the moment use the browser extension
-        #pkgs-unstable.bitwarden-desktop
+        pkgs-unstable.bitwarden-desktop
         fluffychat # matrix client
       ];
     };

modules/utilities/vpn.nix

@@ -0,0 +1,99 @@
+# config for openconnect is in ./epfl.nix
+{self, ...}: {
+  flake.nixosModules.vpn = {pkgs, ...}: {
+    services.mullvad-vpn = {
+      enable = true;
+    };
+    environment.systemPackages = [
+      self.packages.${pkgs.system}.custom-vpn-picker
+    ];
+    age.secrets.epfl = {
+      file = ../../secrets/epfl.age;
+    };
+  };
+  perSystem = {pkgs, ...}: {
+    packages.custom-vpn-picker = pkgs.writeShellApplication {
+      name = "custom-vpn-picker";
+
+      runtimeInputs = with pkgs; [
+        fzf
+        mullvad-compass
+        mullvad
+        openconnect
+        gawk
+        wl-clipboard
+        cliphist
+      ];
+
+      text = ''
+        mullvad_connect () {
+          mullvad disconnect
+          mullvad relay set location "$1"
+          mullvad connect
+        }
+
+        profiles=(
+          "mullvad-best"
+          "mullvad-zurich"
+          "mullvad-tirana"
+          "mullvad-bogota"
+          "epfl"
+          "disconnect"
+        )
+
+        selected=$(printf "%s\n" "''${profiles[@]}" |
+          fzf --height 8 --reverse --prompt="Select vpn:")
+
+        [[ -z "$selected" ]] && exit 0
+
+        if [[ "$selected" == "mullvad-best" ]]; then
+          mullvad_connect "$(
+            mullvad-compass |
+              awk '/Best server:/ {
+                getline
+                split($1, a, "-")
+                print a[1]
+              }'
+          )"
+
+        elif [[ "$selected" == "mullvad-zurich" ]]; then
+          mullvad_connect ch
+
+        elif [[ "$selected" == "mullvad-tirana" ]]; then
+          mullvad_connect al
+
+        elif [[ "$selected" == "mullvad-bogota" ]]; then
+          mullvad_connect co
+
+        elif [[ "$selected" == "epfl" ]]; then
+          # shellcheck disable=SC1091
+          source /run/agenix/epfl
+
+          # Put password in clipboard so it can be pasted into openconnect.
+          printf '%s' "$EPFL_VPN_PASSWORD" | wl-copy
+
+          sudo openconnect \
+            --background \
+            --pid-file="$HOME/.local/state/epfl-openconnect.pid" \
+            --server="$EPFL_VPN_SERVER" \
+            --user="$EPFL_VPN_USER"
+
+          # Remove the password from cliphist and clear the current clipboard.
+          cliphist delete-query "$EPFL_VPN_PASSWORD" || true
+          wl-copy --clear
+
+        elif [[ "$selected" == "disconnect" ]]; then
+          if [[ -f "$HOME/.local/state/epfl-openconnect.pid" ]]; then
+            sudo kill "$(cat "$HOME/.local/state/epfl-openconnect.pid")" 2>/dev/null || true
+          fi
+
+          mullvad disconnect
+          rm "$HOME/.local/state/epfl-openconnect.pid"
+        fi
+
+        pkill -f "kitty.*Select vpn option" || true
+        exit
+      '';
+    };
+  };
+}

other/hyprland/hyprland.lua

@@ -38,6 +38,7 @@ local function close_other_windows()
     end
 end
 
+local wallpapers_enabled = true
 local wallpapers = {
     [1] = "WALLPAPER1/PATH/PLACEHOLDER",
     [2] = "WALLPAPER2/PATH/PLACEHOLDER",
@@ -51,13 +52,144 @@ local wallpapers = {
     [10] = "WALLPAPER5/PATH/PLACEHOLDER",
 }
 
-hl.on("workspace.active", function(workspace)
+local function set_wallpaper(workspace)
+    if not wallpapers_enabled then
+        return
+    end
+
     local wallpaper = wallpapers[workspace.id]
 
     if wallpaper then
         hl.exec_cmd("awww img -t none " .. wallpaper)
     end
-end)
+end
+
+hl.on("workspace.active", set_wallpaper)
+
+local performance_mode = false
+local saved_brightness = nil
+
+local function get_brightness()
+    local handle = io.popen("brightnessctl get 2>/dev/null")
+
+    if not handle then
+        return nil
+    end
+
+    local value = handle:read("*a")
+    handle:close()
+
+    if not value then
+        return nil
+    end
+
+    value = value:gsub("%s+$", "")
+    return tonumber(value)
+end
+
+local function set_performance_mode()
+      if performance_mode then
+        hl.monitor({
+            output = "eDP-1",
+            mode = "2560x1600@165",
+            position = "0x0",
+            scale = 1,
+        })
+
+        hl.exec_cmd("pkill swaync || true")
+        hl.exec_cmd("pkill waybar || true")
+        hl.exec_cmd("caelestia shell -d")
+
+        if saved_brightness then
+            hl.exec_cmd("brightnessctl set " .. saved_brightness)
+        end
+
+        saved_brightness = nil
+        wallpapers_enabled = true
+        performance_mode = false
+
+        hl.exec_cmd("hyprctl reload")
+
+        local workspace = hl.get_active_workspace()
+        if workspace then
+            set_wallpaper(workspace)
+        end
+
+        hl.notification.create({
+            text = "Battery Saver",
+            subtext = "Disabled",
+            timeout = 3000,
+        })
+
+        return
+    end
+    -- Save current brightness.
+    saved_brightness = get_brightness()
+
+    -- Lower refresh rate.
+    hl.monitor({
+        output = "eDP-1",
+        mode = "2560x1600@60",
+        position = "0x0",
+        scale = 1,
+    })
+
+    -- Stop heavy UI components.
+    hl.exec_cmd("pkill -f caelestia-shell || true")
+    hl.exec_cmd("pkill -f caelestia || true")
+
+    -- Start lightweight notification daemon.
+    hl.exec_cmd("pkill swaync || true")
+    hl.exec_cmd("swaync")
+
+    -- Start lightweight status bar.
+    hl.exec_cmd("pkill waybar || true")
+    hl.exec_cmd("waybar")
+
+    -- Disable expensive Hyprland effects.
+    hl.config({
+        animations = {
+            enabled = false,
+        },
+
+        decoration = {
+            shadow = {
+                enabled = false,
+            },
+            blur = {
+                enabled = false,
+            },
+            rounding = 0,
+            fullscreen_opacity = 1,
+            active_opacity = 1,
+            inactive_opacity = 1,
+        },
+
+        general = {
+            gaps_in = 0,
+            gaps_out = 0,
+            border_size = 1,
+        },
+
+        misc = {
+            vfr = 1,
+        },
+    })
+
+    -- Lower brightness.
+    hl.exec_cmd("brightnessctl set 5%")
+
+    -- Disable workspace wallpaper switching.
+    wallpapers_enabled = false
+
+    performance_mode = true
+
+    hl.notification.create({
+        text = "Battery Saver",
+        subtext = "Enabled",
+        timeout = 3000,
+    })
+end
 
 hl.curve("wind", { type = "bezier", points = { { 0.05, 0.9 }, { 0.1, 1.05 } } })
 hl.curve("winIn", { type = "bezier", points = { { 0.1, 1.1 }, { 0.1, 1.1 } } })
@@ -168,22 +300,29 @@ hl.bind(mod .. " + D", hl.dsp.layout("move +col"))
 hl.bind(mod .. " + T", hl.dsp.exec_cmd(term))
 hl.bind(mod .. " + E", hl.dsp.exec_cmd(file))
 hl.bind(mod .. " + F", hl.dsp.exec_cmd(browser))
-hl.bind(mod .. " + N", hl.dsp.exec_cmd(notes))
+hl.bind(mod .. " + N", hl.dsp.exec_cmd("kitty --hold --class \"custom-vpn-picker\" --name \"Select vpn option\" custom-vpn-picker"))
 hl.bind(mod .. " + SHIFT + A", hl.dsp.exec_cmd("caelestia shell drawers toggle launcher"))
 hl.bind(mod .. " + Q", close_or_move_special)
-hl.bind("CTRL + ALT + W", hl.dsp.exec_cmd("caelestia shell drawers toggle sidebar"))
+local function toggle_sidebar()
+    if performance_mode then
+        hl.exec_cmd("swaync-client -t")
+    else
+        hl.exec_cmd("caelestia shell drawers toggle sidebar")
+    end
+end
+hl.bind("CTRL + ALT + W", toggle_sidebar)
 hl.bind(mod .. " + L", hl.dsp.exec_cmd("caelestia shell lock lock"))
 hl.bind("F11", hl.dsp.exec_cmd("caelestia screenshot"))
 hl.bind(mod .. " + SHIFT + S", hl.dsp.exec_cmd("caelestia shell picker open"))
 hl.bind(mod .. " + CTRL + 6", close_other_windows)
-hl.bind("CTRL + ALT + 7", hl.dsp.exec_cmd("custom-performance"))
+hl.bind("CTRL + ALT + 7", set_performance_mode)
 hl.bind("CTRL + ALT + 1", hl.dsp.exec_cmd("caelestia shell drawers toggle sidebar"))
 hl.bind(mod .. " + CTRL + 4", hl.dsp.exec_cmd("caelestia shell notifs toggleDnd"))
 hl.bind(mod .. " + CTRL + 3", hl.dsp.exec_cmd("pavucontrol"))
 hl.bind("CTRL + SHIFT + ALT + 0", hl.dsp.exec_cmd("kitty --hold --class \"custom-changeAudioOutput\" --name \"Select audio output\" zsh -c \"custom-changeAudioOutput\""))
 hl.bind(mod .. " + CTRL + 5", hl.dsp.exec_cmd("gnome-characters"))
 hl.bind("CTRL + ALT + 8", hl.dsp.exec_cmd("hyprpicker | tee >(wl-copy) | cliphist store"))
-hl.bind("CTRL + ALT + 0", hl.dsp.exec_cmd("custom-tomato"))
+-- hl.bind("CTRL + ALT + 0", hl.dsp.exec_cmd("custom-tomato"))
 hl.bind("CTRL + ALT + 2", hl.dsp.exec_cmd("custom-bottom"))
 hl.bind("CTRL + ALT + 9", hl.dsp.exec_cmd("anki"))
 
@@ -673,6 +812,13 @@ hl.window_rule({
     float = true,
     size = "400 225",
 })
+hl.window_rule({
+    match = {
+        class = "^(custom-vpn-picker)$",
+    },
+    float = true,
+    size = "350 250",
+})
 
 hl.window_rule({
     match = {
@@ -780,7 +926,6 @@ hl.config({
 
 hl.on("hyprland.start", function()
     hl.exec_cmd("/nix/store/8kih8alkk4qzgjchg5501r1c3a8a71aw-dbus-1.16.2/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target")
-    hl.exec_cmd("qtbatticon")
     hl.exec_cmd("source /run/agenix/ntfy && nixpkgs-notifier listen")
     hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP")
     hl.exec_cmd("dbus-update-activation-environment --systemd --all")
@@ -790,12 +935,12 @@ hl.on("hyprland.start", function()
     hl.exec_cmd("udiskie --no-automount --smart-tray")
     hl.exec_cmd("nm-applet --indicator")
     hl.exec_cmd("rm -rf ~/.cache/cliphist/ && wl-paste --type text --watch cliphist store & wl-paste --type image --watch cliphist store")
-    hl.exec_cmd("custom-batterynotify")
-    hl.exec_cmd("custom-batterywarning")
+--    hl.exec_cmd("custom-batterynotify")
+--    hl.exec_cmd("custom-batterywarning")
     hl.exec_cmd("awww img WALLPAPER/PATH/PLACEHOLDER")
     hl.exec_cmd("awww-daemon")
-    hl.exec_cmd("sleep 1 && custom-wallpaper")
     hl.exec_cmd("custom-checkKdrive && custom-mountkdrive")
+    hl.exec_cmd("custom-mountEpflDrive")
     hl.exec_cmd("custom-gitnotify")
     hl.exec_cmd("sleep 4 & caelestia-shell")
     hl.exec_cmd("sleep 20 && ngcp pull --automatic")

secrets/epfl.age

@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> X25519 XuDyuQL0WjW/IvtzxswKnOfXlJa42Itdu+inNPsiNhw
+3z2v3GbNdMvX9QtgAMrWZB/5Y1HatgpoXGQUMnW91+M
+-> ssh-ed25519 +tvThg i3NM64rsEgRRgah4PKWdrl4i0pmP6X2bgr2Etzm33Ag
+OwUETps78LPyjIAcJo8eC9eh0m9qtRUh399xGzMCTwQ
+--- 7LnVrVnmfA8YubysLVeGyRGlLI+ef0VxnIHRi6rRAlc
+W¾TîópF’X±áì‘làBTœÝ"^ï”�-þµ‹à¤û§÷Ÿ(üÛ'™ghÕóÎôGÜqx5FË~6Èï6DÎí¬gŒz…¾w·nñSÏHtß…ÌÂÓT«Úè›æŒÅó¤˜
sød@°1!P""WHA$Ÿ�›,d68Ñ“õˆ�k“tù\qXÞHŽ®R=�vÕîŸZ

secrets/secrets.nix

@@ -6,4 +6,8 @@ in {
     backupAgeKey
     laptopHostKey
   ];
+  "epfl.age".publicKeys = [
+    backupAgeKey
+    laptopHostKey
+  ];
 }

test

@@ -1,8 +0,0 @@
-I am testing the tool ngcp i created. If this file disapears. It means I coded it wrong.
-
-
-The problem before was that it did:
-1. cherry pick
-2. push
-
-I didn't pulled changed before cherry picking