Release v2.4.0

Former-commit-id: 7ddff66f00

.github/assets/README_template.md

@@ -1,111 +0,0 @@
-<div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
-</div>
-
-<br>
-
-# Nixy
-
-<br>
-<div align="center">
-    <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=starship&logoColor={primarycolor}">
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=github&logoColor={primarycolor}">
-    </a>
-    <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor={backgroundcolor}&logo=NixOS&logoColor={primarycolor}&color={primarycolor}">
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA={backgroundcolor}&colorB={primarycolor}&logo=unlicense&logoColor={primarycolor}"/>
-    </a>
-</div>
-<br>
-
-**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
-It's a simple way to manage your system configuration and dotfiles.
-
-I'm Hadi, a french developer, student in infosec, enthusiastic about nix, golang & blockchains.
-This is my own, **keyboard-centric**, and **minimalistic** NixOS configuration.
-I enable vim-like keybindings everywhere I can, and I use a lot of custom scripts to make my life easier.
-
-**Nixy key points:**
-
-- Hypr-ecosystem first (hyprland, hyprlock, hyprpanel, hypridle, ...)
-- Stylix/base16 themes
-- Vim-like keybindings everywhere (hyprland, qutebrowser, nvim, ...)
-
-## Table of Content
-
-{md_table_of_content}
-
-## Gallery
-
-![Nixy helper, peaclock](.github/assets/nixy/1.png)
-![Qutebrowser, pipes, shell](.github/assets/nixy/2.png)
-![nvim, lazygit](.github/assets/nixy/3.png)
-![spotify, cava](.github/assets/nixy/4.png)
-
-## Architecture
-
-### 🏠 home
-
-Those are the dotfiles and configuration files for user-level configuration
-
-**Subfolders:**
-
-- `programs` is a collection of apps configured with home-manager
-- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
-- `system` is some "desktop environment" configuration
-
-### 🐧 nixos
-
-Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
-
-### 🎨 themes
-
-Those are the themes used in the system configuration.
-Those themes are based on [stylix](https://github.com/danth/stylix).
-See avaiable themes in [THEMES.md](docs/THEMES.md)
-
-### 💻 hosts
-
-Those are the host-specific configurations.
-Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
-
-## Installation
-
-1. Clone the repo
-
-```sh
-git clone https://github.com/anotherhadi/nixy ~/.config/nixos
-```
-
-2. Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
-3. Add your `hardware-configuration.nix` to your new host's folder
-4. Add your 'nixosConfigurations' inside `flake.nix`
-
-> [!Important]
-> I added few `# CHANGEME` comments in the files to help you find what to change. Be sure to check them up.
-> You can use `rg "CHANGEME"` to find them all with ripgrep.
-
-> [!TIP]
-> When you add new files, don't forget to run `git add .` to add them to the git repository
-
-5. Build the system
-
-```sh
-sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
-```
-
-## Documentation
-
-- [THEMES](docs/THEMES.md): How themes work and how to create your own
-- [SCRIPTS](docs/SCRIPTS.md): Scripts that are available
-- [KEYBINDINGS-HYPRLAND](docs/KEYBINDINGS-HYPRLAND.md): Keybindings available in Hyprland
-- [WALLPAPERS](https://github.com/anotherhadi/nixy-wallpapers): A collection of wallpapers for Nixy.
-
-- [TODO](docs/TODO.md): What's next (feel free to contribute)
-- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
-- [LICENSE](LICENSE): MIT License

.github/scripts/create_readme.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-# Create the README.md file from the .github/assets/README_template.md file
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-README_FILE="./README.md"
-
-table_of_content=$(markdown-table-of-contents --start-by 2 ./.github/assets/README_template.md) # https://github.com/anotherhadi/markdown-table-of-contents
-readme_content=$(cat "./.github/assets/README_template.md")
-
-# Replace variables
-readme_content=${readme_content//\{primarycolor\}/A594FD}
-readme_content=${readme_content//\{backgroundcolor\}/0b0b0b}
-readme_content=${readme_content//\{md_table_of_content\}/$table_of_content}
-
-echo "[//]: # (This file is autogenerated)" >"$README_FILE"
-echo "$readme_content" >>"$README_FILE"
-sed 's/\r//' "$README_FILE" >"/tmp/readme.md"
-mv "/tmp/readme.md" "$README_FILE"

.github/scripts/create_scripts_docs.sh

@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-DOCS_FILE="./docs/SCRIPTS.md"
-SCRIPTS_FOLDER="./home/scripts"
-
-# search for every directory in the scripts folder:
-# The docs for each scripts are in the beginning of the file prefixed by "#-" or "# -" for the title
-# Inside the folders, the scripts are stored in default.nix files
-echo "[//]: # (This file is autogenerated)" >"$DOCS_FILE"
-echo "# Scripts" >>"$DOCS_FILE"
-echo "" >>"$DOCS_FILE"
-echo "Scripts are located in the 'home/scripts' folder. Home-manager add those in the user's path." >>"$DOCS_FILE"
-echo "" >>"$DOCS_FILE"
-
-for folder in "$SCRIPTS_FOLDER"/*; do
-  script="$folder/default.nix"
-  [[ -f "$script" ]] || continue
-
-  content=$(cat "$script")
-  content=$(echo "$content" | grep -E "^#-|^# -" | sed 's/^#- //;s/^# - //;s/#-//')
-
-  echo "$content" >>"$DOCS_FILE"
-  echo "" >>"$DOCS_FILE"
-done

.github/workflows/update-hyprland-keybindings.yml

@@ -1,24 +0,0 @@
-on:
-  push:
-     paths:
-       - 'home/system/hyprland/bindings.nix'
-permissions:
-  contents: write
-jobs:
-  update-readme:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./
-    steps:
-      - name: Check out the repository to the runner
-        uses: actions/checkout@v4  
-      - name: Run a script
-        run: |
-          chmod +x ./.github/scripts/keybindings_to_markdown.sh
-          ./docs/.github/keybindings_to_markdown.sh
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git add .
-          git commit -m "Update KEYBINDINGS-HYPRLAND.md (auto)"
-          git push

.github/workflows/update-readme.yml

@@ -1,31 +0,0 @@
-on:
-  push:
-     paths:
-       - '.github/assets/README_template.md'
-permissions:
-  contents: write
-jobs:
-  update-readme:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./
-    steps:
-      - name: Check out the repository to the runner
-        uses: actions/checkout@v4  
-      - name: Set up Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: '^1.23'
-      - name: Install required dependencies
-        run: |
-          go install github.com/anotherhadi/markdown-table-of-contents@latest
-      - name: Run a script
-        run: |
-          chmod +x ./.github/scripts/create_readme.sh
-          ./.github/scripts/create_readme.sh
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git add .
-          git commit -m "Update README.md (auto)"
-          git push

.github/workflows/update-scripts-docs.yml

@@ -1,24 +0,0 @@
-on:
-  push:
-     paths:
-       - 'home/scripts'
-permissions:
-  contents: write
-jobs:
-  update-readme:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./
-    steps:
-      - name: Check out the repository to the runner
-        uses: actions/checkout@v4  
-      - name: Run a script
-        run: |
-          chmod +x ./.github/scripts/create_scripts_docs.sh
-          ./.github/scripts/create_scripts_docs.sh
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git add .
-          git commit -m "Update SCRIPTS.md (auto)"
-          git push

README.md

@@ -1,6 +1,11 @@
-[//]: # (This file is autogenerated)
+[//]: # (Title: Nixy)  
+[//]: # (Description: Nixy is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
+[//]: # (Author: Hadi)  
+[//]: # (Date: 09/04/24)
+[//]: # (Version: v2.3.0)
+
 <div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
+    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
 </div>
 
 <br>
@@ -9,17 +14,20 @@
 
 <br>
 <div align="center">
+    <a href="https://github.com/anotherhadi/nixy">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=v2.3.0&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
+    </a>
     <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=A594FD&labelColor=0b0b0b&style=for-the-badge&logo=starship&logoColor=A594FD">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=starship&logoColor=89b4fa">
     </a>
     <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=A594FD&labelColor=0b0b0b&style=for-the-badge&logo=github&logoColor=A594FD">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=github&logoColor=89b4fa">
     </a>
     <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=0b0b0b&logo=NixOS&logoColor=A594FD&color=A594FD">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=181825&logo=NixOS&logoColor=89b4fa&color=89b4fa">
     </a>
     <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=0b0b0b&colorB=A594FD&logo=unlicense&logoColor=A594FD"/>
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=181825&colorB=89b4fa&logo=unlicense&logoColor=89b4fa"/>
     </a>
 </div>
 <br>
@@ -27,38 +35,25 @@
 **Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
 It's a simple way to manage your system configuration and dotfiles.
 
-I'm Hadi, a french developer, student in infosec, enthusiastic about nix, golang & blockchains.
-This is my own, **keyboard-centric**, and **minimalistic** NixOS configuration.
-I enable vim-like keybindings everywhere I can, and I use a lot of custom scripts to make my life easier.
-
-**Nixy key points:**
-
-- Hypr-ecosystem first (hyprland, hyprlock, hyprpanel, hypridle, ...)
-- Stylix/base16 themes
-- Vim-like keybindings everywhere (hyprland, qutebrowser, nvim, ...)
-
 ## Table of Content
 
-- [Table of Content](#table-of-content)
-- [Gallery](#gallery)
-- [Architecture](#architecture)
-  - [🏠 home](#-home)
-  - [🐧 nixos](#-nixos)
-  - [🎨 themes](#-themes)
-  - [💻 hosts](#-hosts)
-- [Installation](#installation)
-- [Documentation](#documentation)
+  - [Table of Content](#table-of-content)
+  - [Gallery](#gallery)
+  - [Architecture](#architecture)
+    - [🏠 `home`](#-home)
+    - [💻 `hosts`](#-hosts)
+  - [Installation](#installation)
+  - [Documentation](#documentation)
 
 ## Gallery
 
-![Nixy helper, peaclock](.github/assets/nixy/1.png)
-![Qutebrowser, pipes, shell](.github/assets/nixy/2.png)
-![nvim, lazygit](.github/assets/nixy/3.png)
-![spotify, cava](.github/assets/nixy/4.png)
+![nixy1](docs/src/nixy/1.png)
+![nixy2](docs/src/nixy/2.png)
+![nixy3](docs/src/nixy/3.png)
 
 ## Architecture
 
-### 🏠 home
+### 🏠 `home`
 
 Those are the dotfiles and configuration files for user-level configuration
 
@@ -67,54 +62,45 @@ Those are the dotfiles and configuration files for user-level configuration
 - `programs` is a collection of apps configured with home-manager
 - `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
 - `system` is some "desktop environment" configuration
+- `wallpapers` are... wallpapers
 
-### 🐧 nixos
+### 💻 `hosts`
 
-Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
-
-### 🎨 themes
-
-Those are the themes used in the system configuration.
-Those themes are based on [stylix](https://github.com/danth/stylix).
-See avaiable themes in [THEMES.md](docs/THEMES.md)
-
-### 💻 hosts
-
-Those are the host-specific configurations.
+Those are the host-specific configurations
 Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
 
-## Installation
+**Subfolders:**
 
-1. Clone the repo
+- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
+- 📦 `modules` are the nix modules that you can import
+- `laptop` is my configuration for my laptop with Nvidia that you can copy
+- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)
+
+## Installation
 
 ```sh
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```
 
-2. Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
-3. Add your `hardware-configuration.nix` to your new host's folder
-4. Add your 'nixosConfigurations' inside `flake.nix`
+- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+- Add your `hardware-configuration.nix` to your new host's folder
+- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
 
-> [!Important]
-> I added few `# CHANGEME` comments in the files to help you find what to change. Be sure to check them up.
-> You can use `rg "CHANGEME"` to find them all with ripgrep.
-
-> [!TIP]
+> [!NOTE]
 > When you add new files, don't forget to run `git add .` to add them to the git repository
 
-5. Build the system
-
 ```sh
 sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 ```
 
 ## Documentation
 
-- [THEMES](docs/THEMES.md): How themes work and how to create your own
-- [SCRIPTS](docs/SCRIPTS.md): Scripts that are available
-- [KEYBINDINGS-HYPRLAND](docs/KEYBINDINGS-HYPRLAND.md): Keybindings available in Hyprland
-- [WALLPAPERS](https://github.com/anotherhadi/nixy-wallpapers): A collection of wallpapers for Nixy.
+- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
+- [APPS.md](docs/APPS.md): Which apps are installed
+- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
+- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
 
-- [TODO](docs/TODO.md): What's next (feel free to contribute)
-- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
+- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
+- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License

docs/APPS.md

@@ -0,0 +1,41 @@
+# Apps and services
+
+*non-exhaustive lists*
+
+## Laptop
+
+The laptop configuration is used by an Omen 16 laptop w/ nvidia and an amd gpu running NixOS.
+The configurations files can be found in the `hosts/laptop` directory.
+
+| Category                                | Name           |
+| --------------------------------------- | -------------- |
+| WM                                      | Hyprland       |
+|                                         | hyprlock       |
+|                                         | hyprpaper      |
+|                                         | hypridle       |
+|                                         | hyprcursor     |
+|                                         | wlogout        |
+| Bar                                     | hyprpanel      |
+| Terminal                                | kitty          |
+| Shell                                   | zsh            |
+|                                         | tmux           |
+|                                         | starship       |
+|                                         | bat            |
+|                                         | eza            |
+|                                         | zoxide         |
+|                                         | fzf            |
+| Editor                                  | neovim(nixvim) |
+| File manager                            | thunar         |
+| Browser                                 | qutebrowser    |
+| Music                                   | spicetify      |
+| Launcher                                | wofi           |
+| DM                                      | tuigreet       |
+| Secrets                                 | sops-nix       |
+| See [hosts/laptop](../hosts/laptop/)... |                |
+
+## Server
+
+The server configuration is used by a home server running NixOS.
+The configurations files can be found in the `hosts/server` directory.
+I mainly use it for self-hosting websites and services such as Nextcloud, Vaultwarden, jellyfin, ...
+I exposed some services to the internet using a reverse proxy (Nginx) and cloudflare-dyndns, others are accessed through a tailscale network

docs/CONTRIBUTING.md

@@ -9,6 +9,9 @@ The process is straight-forward.
 - Write your changes (new theme, bug fixes, task in to-do, ...).
 - Create a Pull Request against the main branch of Nixy.
 
+> [!TIP]
+> When wallpapers are added, run `./docs/scripts/compress_png.sh` and `./docs/scripts/create_preview_wallpapers.sh`
+
 > [!TIP]
 > To update the README, change the `./docs/src/README_template.md` and run `./docs/scripts/create_readme.sh`
 

docs/KEYBINDINGS-HYPRLAND.md

@@ -1,46 +0,0 @@
-[//]: # (This file is autogenerated)
-# Keybindings for Hyprland
-
-> [!NOTE]
-> SUPER is the windows key by default
-
-| Description | Keybinding |
-| -- | -- |
-| Switch Workspace | SUPER + {Number} |
-| Move app to Workspace | SHIFT + SUPER + {Number} |
-| Kitty | SUPER + RETURN |
-| Thunar | SUPER + E |
-| Qutebrowser | SUPER + B |
-| Bitwarden | SUPER + K |
-| Lock | SUPER + L |
-| Powermenu | SUPER + X |
-| Launcher | SUPER + SPACE |
-| Toggle HyprFocus | SHIFT + SUPER + SPACE |
-| Close window | SUPER + Q |
-| Toggle Floating | SUPER + T |
-| Toggle Fullscreen | SUPER + F |
-| Move focus left | SUPER + left |
-| Move focus Right | SUPER + right |
-| Move focus Up | SUPER + up |
-| Move focus Down | SUPER + down |
-| Focus previous monitor | SHIFT + SUPER + up |
-| Focus next monitor | SHIFT + SUPER + down |
-| Add to master | SHIFT + SUPER + left |
-| Remove from master | SHIFT + SUPER + right |
-| Screenshot window | SUPER + PRINT |
-| Screenshot monitor | PRINT |
-| Screenshot region | SHIFT + SUPER + PRINT |
-| Screenshot region then edit | ALTPRINT |
-| Search on internet with wofi | SHIFT + SUPER + S |
-| Clipboard picker with wofi | SHIFT + SUPER + C |
-| Emoji picker with wofi | SHIFT + SUPER + E |
-| Toggle night shift | SUPER + F2 |
-| Toggle night shift | SUPER + F3 |
-| Move Window (mouse) | SUPER + mouse:272 |
-| Resize Window (mouse) | SUPER + R |
-| Toggle Mute | XF86AudioMute |
-| Lock when closing Lid | switch:Lid Switch |
-| Sound Up | XF86AudioRaiseVolume |
-| Sound Down | XF86AudioLowerVolume |
-| Brightness Up | XF86MonBrightnessUp |
-| Brightness Down | XF86MonBrightnessDown |

docs/KEYBINDINGS.md

@@ -0,0 +1,42 @@
+# Keybindings
+
+The list of the keybindings working on Hyprland:
+
+| Description                                | Keybinding               |
+|--------------------------------------------|--------------------------|
+| Switch Workspace                           | SUPER + {Number}         |
+| Move app to Workspace                      | SHIFT + SUPER + {Number} |
+| Kitty                                      | SUPER + RETURN           |
+| Thunar                                     | SUPER + E                |
+| Qutebrowser                                | SUPER + B                |
+| Bitwarden                                  | SUPER + K                |
+| Lock                                       | SUPER + L                |
+| Powermenu                                  | SUPER + X                |
+| Launcher                                   | SUPER + SPACE            |
+| "\$shiftMod, SPACE, hyprexpo:expo, toggle" |                          |
+| Close window                               | SUPER + Q                |
+| Toggle Floating                            | SUPER + T                |
+| Toggle Fullscreen                          | SUPER + F                |
+| Move focus left                            | SUPER + left             |
+| Move focus Right                           | SUPER + right            |
+| Move focus Up                              | SUPER + up               |
+| Move focus Down                            | SUPER + down             |
+| Add to master                              | SHIFT + SUPER + left     |
+| Remove from master                         | SHIFT + SUPER + right    |
+| Screenshot window                          | SUPER + PRINT            |
+| Screenshot monitor                         | PRINT                    |
+| Screenshot region                          | SHIFT + SUPER + PRINT    |
+| Screenshot region then edit                | ALT PRINT                |
+| Search on internet with wofi               | SHIFT + SUPER + S        |
+| Clipboard picker with wofi                 | SHIFT + SUPER + C        |
+| Emoji picker with wofi                     | SHIFT + SUPER + E        |
+| Turn off night shift                       | SUPER + F2               |
+| Turn on night shift                        | SUPER + F3               |
+| Move Window (mouse)                        | SUPER + mouse:272        |
+| Resize Window (mouse)                      | SUPER + R                |
+| Toggle Mute                                | XF86AudioMute            |
+| Lock when closing Lid                      | switch:Lid Switch        |
+| Sound Up                                   | XF86AudioRaiseVolume     |
+| Sound Down                                 | XF86AudioLowerVolume     |
+| Brightness Up                              | XF86MonBrightnessUp      |
+| Brightness Down                            | XF86MonBrightnessDown    |

docs/SCRIPTS.md

@@ -1,88 +1,55 @@
-[//]: # (This file is autogenerated)
-# Scripts
-
-Scripts are located in the 'home/scripts' folder. Home-manager add those in the user's path.
-
-## Brightness
-
-This module provides a set of scripts to control the brightness of the screen.
-
-- `brightness-up` increases the brightness by 5%.
-- `brightness-down` decreases the brightness by 5%.
-- `brightness-set [value]` sets the brightness to the given value.
-- `brightness-change [up|down] [value]` increases or decreases the brightness by the given value.
-
-## Caffeine
-
-Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
-
-- `caffeine-status` - Check if hypridle is running. (0/1)
-- `caffeine-status-icon` - Check if hypridle is running. (icon)
-- `caffeine` - Toggle hypridle.
-
-## Hyprfocus
-
-A simple script to toggle focus on few windows in Hyprland.
-(disable gaps, border, shadow, opacity, etc.)
-
-- `hyprfocus-on` - Enable hyprfocus.
-- `hyprfocus-off` - Disable hyprfocus.
-- `hyprfocus-toggle` - Toggle hyprfocus.
-
-## Hyprpanel
-
-Quick scripts to toggle, reload and kill hyprpanel.
-
-- `hyprpanel-toggle` - Toggle hyprpanel.
-- `hyprpanel-reload` - Reload hyprpanel.
-- `hyprpanel-kill` - Kill hyprpanel.
-
-## Nerdfont FZF
-
-This module provides a script to search for Nerd Fonts icons using fzf.
-
-- `nerdfont-fzf` - Search for Nerd Fonts icons using fzf.
-
-## Night-Shift
-
-Night-Shift is a feature that reduces the amount of blue light emitted by your screen, which can help reduce eye strain and improve sleep quality. This module provides a set of scripts to control Night-Shift on your system.
-
-- `night-shift-on` activates Night-Shift.
-- `night-shift-off` deactivates Night-Shift.
-- `night-shift` toggles Night-Shift.
-- `night-shift-status` checks if Night-Shift is active. (0/1)
-- `night-shift-status-icon` checks if Night-Shift is active. (icon)
-
-## Nixy
-
-Nixy is a simple script that I use to manage my NixOS system. It's a simple script that provides a menu to rebuild, upgrade, update, collect garbage, clean boot menu, etc. 
-
-- `nixy` - UI wizard to manage the system.
-- `nixy rebuild` - Rebuild the system.
-- `nixy ...` - ... see the script for more commands.
-
-
-
-## Screenshot
-
-This module provides a script to take screenshots using `hyprshot` and `swappy`.
-
-- `screenshot [region|window|monitor] [swappy]` - Take a screenshot of the region, window, or monitor. Optionally, use `swappy` to copy the screenshot to the clipboard.
-
-## Sound
-
-This module provides a set of scripts to control the volume of the default audio sink using `wpctl`.
-
-- `sound-up` increases the volume by 5%.
-- `sound-down` decreases the volume by 5%.
-- `sound-set [value]` sets the volume to the given value.
-- `sound-toggle` toggles the mute state of the default audio sink.
-
-## System
-
-Usefull quick scripts
-
-- `menu` - Open wofi with drun mode.
-- `powermenu` - Open power dropdown menu.
-- `lock` - Lock the screen.
-
+# Scripts
+
+Scripts are located in the `home/scripts` folder. Home-manager add those in the user's path.
+
+## Nix/NixOs shortcuts
+
+> [!TIP]
+> The `hostname` variable in `hosts/yourhost/variables.nix` should be also the name of the `nixosConfiguration` in `flake.nix` file.
+
+- `nixy` # UI
+- `nixy rebuild`
+- `nixy update`
+- `nixy upgrade`
+- `nixy gc` # garbage collection
+- `nixy cb` # clean boot menu
+
+## Brightness control
+
+- `brightness-up`
+- `brightness-down`
+- `brightness-set [value]`
+- `brightness-change [up/down] <increment>`
+
+## Sound control
+
+- `sound-up`
+- `sound-down`
+- `sound-toggle`
+- `sound-set [value]`
+- `sound-change [up/down/mute] <increment>`
+
+## Caffeine
+
+Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
+
+- `caffeine` # Toggle caffeine
+- `caffeine-status` # Return 1/0
+- `caffeine-status-icon` # Return 󰅶/󰾪
+
+## Night-Shift
+
+Blue light filter, using wlsunset
+
+- `night-shift` # Toggle night shift
+- `night-shift-status` # Return 1/0
+- `night-shift-status-icon` # Return 󰖕/󰖔
+- `night-shift-on`
+- `night-shift-off`
+
+## Nerdfont FZF
+
+Nerdfont fzf is a quick way to search for nerdfont icons locally.
+It will copy the selected icon to the clipboard.
+
+- `nerdfont-fzf`

docs/THEMES.md

@@ -1,7 +1,7 @@
 # Themes
 
-Themes are defined in `themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
-You can change the selected theme by changing the import statement of your host's configuration.nix file.
+Themes are defined in `hosts/themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
+You can change the selected theme by changing the import statement of your host's variables.nix file.
 
 > [!TIP]
 > To apply the theme to DuckDuckGo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`
@@ -9,13 +9,12 @@ You can change the selected theme by changing the import statement of your host'
 ## Create your theme
 
 Create a copy of one of the existing themes and change the variables.
-Wallpapers are loaded from the [nixy-wallpapers](https://github.com/anotherhadi/nixy-wallpapers) repo.
+Wallpapers are loaded from the `home/wallpapers` folder.
 
 ## Gallery
 
 ### Nixy
 
-![nixy1](../.github/assets/nixy/1.png)
-![nixy2](../.github/assets/nixy/2.png)
-![nixy3](../.github/assets/nixy/3.png)
-![nixy4](../.github/assets/nixy/4.png)
+![nixy1](src/nixy/1.png)
+![nixy2](src/nixy/2.png)
+![nixy3](src/nixy/3.png)

docs/TODO.md

@@ -1,13 +1,33 @@
-# Todolist
+# Todolist {
 
 feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 
-- [!] Qutebrowser Bitwarden integration (I need this.)
+- [ ] Wofi config
+  - Calculator
+
+- [ ] Test hyprshade (replacement for gammastep)
+
+- [ ] Qutebrowser
+  - [ ] !!! Bitwarden integration (I need this.)
+
+- [ ] Hyprland
+  - [ ] Fix screenshots (screenshot region's border shows up in the screenshot, hyprshot jq error?) and add in the scripts doc
 
 - [ ] Nixvim
-  - [ ] Change headings foreground
-  - [ ] neotest golang
-  - [ ] nvim dap
+  - [ ] Keymaps:
+    - Trouble
+    - Tagbar (actually not working)
 
-- [ ] Tofi configuration
-- [ ] OS Hardening with nix-mineral
+- [ ] Change my keyboard backlight
+  - Issue on nixos-hardware ig
+
+- [ ] Update docs
+
+## Server
+
+- [ ] Jackflix V2
+  - Backup Radarr, Prowlarr, Sonarr config
+  - Take a look into buildarr or build a custom solution with *arr apis
+- [ ] Bitcoin-git: broken
+- [ ] Secrets mode 0444: not secure
+- [ ] Adguard config

docs/WALLPAPERS.md

@@ -0,0 +1,39 @@
+# Wallpapers
+
+Wallpapers can be found in the `/home/wallpapers` folder.
+
+| Name                | Preview                                                        |
+|---------------------|----------------------------------------------------------------|
+| astronaut.png       | ![astronaut.png](../home/wallpapers/astronaut.png)             |
+| aurore.png          | ![aurore.png](../home/wallpapers/aurore.png)                   |
+| barcode.png         | ![barcode.png](../home/wallpapers/barcode.png)                 |
+| cat-leaves.png      | ![cat-leaves.png](../home/wallpapers/cat-leaves.png)           |
+| city.png            | ![city.png](../home/wallpapers/city.png)                       |
+| cloud.png           | ![cloud.png](../home/wallpapers/cloud.png)                     |
+| clouds2.png         | ![clouds2.png](../home/wallpapers/clouds2.png)                 |
+| clouds.png          | ![clouds.png](../home/wallpapers/clouds.png)                   |
+| coffee.png          | ![coffee.png](../home/wallpapers/coffee.png)                   |
+| dark_cloud.png      | ![dark_cloud.png](../home/wallpapers/dark_cloud.png)           |
+| dark.png            | ![dark.png](../home/wallpapers/dark.png)                       |
+| fuji-dark.png       | ![fuji-dark.png](../home/wallpapers/fuji-dark.png)             |
+| fuji-light.png      | ![fuji-light.png](../home/wallpapers/fuji-light.png)           |
+| galaxy.png          | ![galaxy.png](../home/wallpapers/galaxy.png)                   |
+| house-cloud.png     | ![house-cloud.png](../home/wallpapers/house-cloud.png)         |
+| key.png             | ![key.png](../home/wallpapers/key.png)                         |
+| lavender-cat.png    | ![lavender-cat.png](../home/wallpapers/lavender-cat.png)       |
+| lofi-computer.png   | ![lofi-computer.png](../home/wallpapers/lofi-computer.png)     |
+| lofi-urban.png      | ![lofi-urban.png](../home/wallpapers/lofi-urban.png)           |
+| magma.png           | ![magma.png](../home/wallpapers/magma.png)                     |
+| mountains-black.png | ![mountains-black.png](../home/wallpapers/mountains-black.png) |
+| mountains.png       | ![mountains.png](../home/wallpapers/mountains.png)             |
+| nix.png             | ![nix.png](../home/wallpapers/nix.png)                         |
+| problems.png        | ![problems.png](../home/wallpapers/problems.png)               |
+| sea2.png            | ![sea2.png](../home/wallpapers/sea2.png)                       |
+| sea.png             | ![sea.png](../home/wallpapers/sea.png)                         |
+| space2.png          | ![space2.png](../home/wallpapers/space2.png)                   |
+| space.png           | ![space.png](../home/wallpapers/space.png)                     |
+| street.png          | ![street.png](../home/wallpapers/street.png)                   |
+| sun.png             | ![sun.png](../home/wallpapers/sun.png)                         |
+| tokyo.png           | ![tokyo.png](../home/wallpapers/tokyo.png)                     |
+| train.png           | ![train.png](../home/wallpapers/train.png)                     |
+| windows.png         | ![windows.png](../home/wallpapers/windows.png)                 |

docs/scripts/compress_png.sh

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Compress png files in ./docs/src and ./home/wallpapers
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+# Main images
+for file in ./docs/src/*.png; do
+  optipng "$file"
+done
+
+# Theme's images
+for file in ./docs/src/*/*.png; do
+  optipng "$file"
+done
+
+# Wallpapers
+for file in ./home/wallpapers/*.png; do
+  optipng "$file"
+done

docs/scripts/create_preview_wallpapers.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+# Create WALLPAPERS.md to preview wallpapers in ./home/wallpapers
+
+WALLPAPERS_FOLDER="./home/wallpapers"
+WALLPAPERS_MD="./docs/WALLPAPERS.md"
+[[ -d "$WALLPAPERS_FOLDER" ]] || (echo "Wallpapers folder not found" && exit 1)
+
+echo "# Wallpapers" >"$WALLPAPERS_MD"
+echo "" >>"$WALLPAPERS_MD"
+echo "Wallpapers can be found in the \`/home/wallpapers\` folder." >>"$WALLPAPERS_MD"
+echo "" >>"$WALLPAPERS_MD"
+echo "| Name | Preview |" >>"$WALLPAPERS_MD"
+echo "| -- | -- |" >>"$WALLPAPERS_MD"
+
+for file in "$WALLPAPERS_FOLDER"/*.png; do
+  filename=$(basename "$file")
+  echo "| $filename | ![$filename](../home/wallpapers/$filename) |" >>"$WALLPAPERS_MD"
+done
+
+pandoc -t commonmark_x "$WALLPAPERS_MD" -o "/tmp/wallpapers.md"
+mv "/tmp/wallpapers.md" "$WALLPAPERS_MD"

docs/scripts/create_readme.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# Create the README.md file from the docs/src/README_template.md file
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+README_FILE="./README.md"
+
+header=$(cat "./docs/src/header.md")
+table_of_content=$(md-table-of-contents ./docs/src/README_template.md) # https://github.com/anotherhadi/md-table-of-contents
+version=$(git describe --tags --abbrev=0)
+readme_content=$(cat "./docs/src/README_template.md")
+description=$(curl -s https://api.github.com/repos/anotherhadi/nixy | jq .description)
+description="${description%\"}"
+description="${description#\"}"
+
+header=${header//\{date\}/$(date '+%D')}
+header=${header//\{primarycolor\}/89b4fa}
+header=${header//\{backgroundcolor\}/181825}
+header=${header//\{version\}/$version}
+header=${header//\{description\}/$description}
+readme_content=${readme_content//\{md_table_of_content\}/$table_of_content}
+
+echo "$header" >"$README_FILE"
+echo "$readme_content" >>"$README_FILE"
+sed 's/\r//' "$README_FILE" >"/tmp/readme.md"
+mv "/tmp/readme.md" "$README_FILE"

docs/scripts/keybindings_to_markdown.sh

@@ -4,7 +4,7 @@
 
 [[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
 
-KEYBINDINGS_FILE="./docs/KEYBINDINGS-HYPRLAND.md"
+KEYBINDINGS_FILE="./docs/KEYBINDINGS.md"
 
 function getList() {
   content=$1
@@ -17,9 +17,9 @@ function getList() {
   echo "$list"
 }
 
-[[ -f "./home/system/hyprland/bindings.nix" ]] || (echo "File ./home/system/hyprland/bindings.nix not found" && exit 1)
+[[ -f "./home/system/hyprland/default.nix" ]] || (echo "File ./home/system/hyprland/default.nix not found" && exit 1)
 
-config=$(cat "./home/system/hyprland/bindings.nix")
+config=$(cat "./home/system/hyprland/default.nix")
 
 # Bind
 bind=$(getList "$config" "bind")
@@ -33,28 +33,29 @@ bindle=$(getList "$config" "bindle")
 # Join the lists:
 keybindings=$(echo -e "$bind\n$bindm\n$bindl\n$bindle" | grep '"')
 
-echo "[//]: # (This file is autogenerated)" >"$KEYBINDINGS_FILE"
-echo "# Keybindings for Hyprland" >>"$KEYBINDINGS_FILE"
+echo "# Keybindings" >"$KEYBINDINGS_FILE"
 echo "" >>"$KEYBINDINGS_FILE"
-echo "> [!NOTE]" >>"$KEYBINDINGS_FILE"
-echo "> SUPER is the windows key by default" >>"$KEYBINDINGS_FILE"
+echo "The list of the keybindings working on Hyprland:" >>"$KEYBINDINGS_FILE"
 echo "" >>"$KEYBINDINGS_FILE"
 
 echo "| Description | Keybinding |" >>"$KEYBINDINGS_FILE"
 echo "| -- | -- |" >>"$KEYBINDINGS_FILE"
 echo "| Switch Workspace | SUPER + {Number} |" >>"$KEYBINDINGS_FILE"
 echo "| Move app to Workspace | SHIFT + SUPER + {Number} |" >>"$KEYBINDINGS_FILE"
-echo "$keybindings" | while read -r line; do
+echo "$keybindings" | while read line; do
   comment=$(echo "$line" | cut -d\# -f2)
   line=$(echo "$line" | cut -d\# -f1)
   line=${line:1:${#line}-3}
   mod=$(echo "$line" | cut -d, -f1)
   key=$(echo "$line" | cut -d, -f2)
-  # dispatcher=$(echo "$line" | cut -d, -f3)
-  # params=$(echo "$line" | cut -d, -f4)
+  dispatcher=$(echo "$line" | cut -d, -f3)
+  params=$(echo "$line" | cut -d, -f4)
 
   [[ $mod == '$mod' ]] && mod="SUPER + "
   [[ $mod == '$shiftMod' ]] && mod="SHIFT + SUPER + "
 
-  echo "| ${comment:1} | $mod$key |" >>"$KEYBINDINGS_FILE"
+  echo "| $comment | $mod$key |" >>"$KEYBINDINGS_FILE"
 done
+
+pandoc -t commonmark_x "$KEYBINDINGS_FILE" -o "/tmp/keybindings.md"
+mv "/tmp/keybindings.md" "$KEYBINDINGS_FILE"

docs/scripts/new_tag.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+TAG=$(git describe --tags --abbrev=0)
+echo "Current tag: $TAG"
+
+read -rp "Enter the new tag name: " NEW_TAG
+
+read -rp "Do you want to compress the png files? [y/N]: " COMPRESS_PNG
+if [[ "$COMPRESS_PNG" == "y" || "$COMPRESS_PNG" == "Y" ]]; then
+  echo "Compresing png files..."
+  bash ./docs/scripts/compress_png.sh
+fi
+
+echo "Creating wallpapers preview..."
+bash ./docs/scripts/create_preview_wallpapers.sh
+echo "Creating README.md..."
+bash ./docs/scripts/create_readme.sh
+echo "Creating keybindings.md..."
+bash ./docs/scripts/keybindings_to_markdown.sh
+
+git add .
+git commit -m "Release $NEW_TAG"
+git tag -a "$NEW_TAG" -m "Release $NEW_TAG"
+git push origin "$NEW_TAG"

docs/scripts/take_rice_screenshot.sh

@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+[ "$1" = "" ] && echo "Usage: $0 <theme_name>" && exit 1
+theme_name=$1
+
+# Switch to workspace 1
+sleep 2
+
+# Step 1
+kitty --class peaclock peaclock &
+sleep 1
+menu &
+sleep 1
+hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "1.png" -d
+sleep 2
+pkill peaclock
+menu
+sleep 2
+
+# Step 2
+kitty cmatrix &
+sleep 1
+kitty &
+sleep 1
+qutebrowser &
+sleep 3
+hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "2.png" -d
+sleep 2
+pkill cmatrix
+pkill --newest qutebrowser ""
+pkill --newest kitty
+sleep 2
+
+# Step 3
+kitty cava &
+sleep 1
+spotify &
+sleep 10
+brightness-down
+sleep 1
+hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "3.png" -d
+sleep 2

docs/src/README_template.md

@@ -0,0 +1,67 @@
+
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
+It's a simple way to manage your system configuration and dotfiles.
+
+## Table of Content
+
+{md_table_of_content}
+
+## Gallery
+
+![nixy1](docs/src/nixy/1.png)
+![nixy2](docs/src/nixy/2.png)
+![nixy3](docs/src/nixy/3.png)
+
+## Architecture
+
+### 🏠 `home`
+
+Those are the dotfiles and configuration files for user-level configuration
+
+**Subfolders:**
+
+- `programs` is a collection of apps configured with home-manager
+- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
+- `system` is some "desktop environment" configuration
+- `wallpapers` are... wallpapers
+
+### 💻 `hosts`
+
+Those are the host-specific configurations
+Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
+
+**Subfolders:**
+
+- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
+- 📦 `modules` are the nix modules that you can import
+- `laptop` is my configuration for my laptop with Nvidia that you can copy
+- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)
+
+## Installation
+
+```sh
+git clone https://github.com/anotherhadi/nixy ~/.config/nixos
+```
+
+- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+- Add your `hardware-configuration.nix` to your new host's folder
+- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
+
+> [!NOTE]
+> When you add new files, don't forget to run `git add .` to add them to the git repository
+
+```sh
+sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+```
+
+## Documentation
+
+- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
+- [APPS.md](docs/APPS.md): Which apps are installed
+- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
+- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
+
+- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
+- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
+- [LICENSE](LICENSE): MIT License

docs/src/header.md

@@ -0,0 +1,33 @@
+[//]: # (Title: Nixy)  
+[//]: # (Description: {description})  
+[//]: # (Author: Hadi)  
+[//]: # (Date: {date})
+[//]: # (Version: {version})
+
+<div align="center">
+    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
+</div>
+
+<br>
+
+# Nixy
+
+<br>
+<div align="center">
+    <a href="https://github.com/anotherhadi/nixy">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message={version}&colorA={backgroundcolor}&colorB={primarycolor}&logo=githubactions&logoColor={primarycolor}"/>
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/stargazers">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=starship&logoColor={primarycolor}">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=github&logoColor={primarycolor}">
+    </a>
+    <a href="https://nixos.org">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor={backgroundcolor}&logo=NixOS&logoColor={primarycolor}&color={primarycolor}">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA={backgroundcolor}&colorB={primarycolor}&logo=unlicense&logoColor={primarycolor}"/>
+    </a>
+</div>
+<br>

docs/src/nixy/1.png.REMOVED.git-id

@@ -0,0 +1 @@
+8c00e379ddd7f89e4bbf9f381a5721d980c8026f

flake.nix

@@ -7,7 +7,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -16,6 +15,7 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
     spicetify-nix = {
       url = "github:Gerg-L/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -25,32 +25,39 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
-    nixy-wallpapers = {
-      url = "github:anotherhadi/nixy-wallpapers";
-      flake = false;
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
     };
-    stylix.url = "github:danth/stylix";
-    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
-    hyprswitch.url = "github:h3rmt/hyprswitch/release";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
   };
 
   outputs = inputs@{ nixpkgs, ... }: {
     nixosConfigurations = {
-      nixy = # CHANGEME
-        nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            {
-              nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
-              _module.args = { inherit inputs; };
-            }
-            inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
-            inputs.home-manager.nixosModules.home-manager
-            inputs.stylix.nixosModules.stylix
-            ./hosts/laptop/configuration.nix # CHANGEME
-          ];
-        };
+      nixy = nixpkgs.lib.nixosSystem { # CHANGEME
+        system = "x86_64-linux";
+        modules = [
+          {
+            nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
+            _module.args = { inherit inputs; };
+          }
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
+          inputs.home-manager.nixosModules.home-manager
+          ./hosts/laptop/configuration.nix # CHANGEME
+        ];
+      };
+
+      jack = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          { _module.args = { inherit inputs; }; }
+          inputs.sops-nix.nixosModules.sops
+          inputs.home-manager.nixosModules.home-manager
+          ./hosts/server/configuration.nix
+        ];
+      };
+
     };
   };
 }

home/programs/btop/default.nix

@@ -0,0 +1,9 @@
+{
+  programs.btop = {
+    enable = true;
+    settings = {
+      color_theme = "Default";
+      theme_background = false;
+    };
+  };
+}

home/programs/cava/default.nix

@@ -0,0 +1,13 @@
+{ config, ... }: {
+  programs.cava = {
+    enable = true;
+    settings = {
+      general.framerate = 60;
+      smoothing.noise_reduction = 88;
+      color = {
+        background = "'#${config.var.theme.colors.bg}'";
+        foreground = "'#${config.var.theme.colors.accent}'";
+      };
+    };
+  };
+}

home/programs/fetch/neofetch/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, config, ... }: {
   home.packages = with pkgs; [ neofetch ];
 
   xdg.configFile."neofetch/ascii.txt".text = ''
@@ -109,6 +109,9 @@
     song_format="%artist% - %album% - %title%"
     song_shorthand="off"
     mpc_args=()
+    colors=(${toString config.var.theme.colors.accentNumber} 1 ${
+      toString config.var.theme.colors.accentNumber
+    } ${toString config.var.theme.colors.accentNumber} 7)
     bold="on"
     underline_enabled="on"
     underline_char="-"

home/programs/fetch/nerdfetch/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 let
   nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''
           ostype="$(uname)"
@@ -345,9 +345,9 @@ let
 
           ## USER VARIABLES -- YOU CAN CHANGE THESE
 
-          lc="$reset$bold$magenta" # labels
-          nc="$reset$bold$magenta" # labels
-          hn="$reset$bold$magenta" # labels
+          lc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
+          nc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
+          hn="$reset$bold''$${config.var.theme.colors.accentName}" # labels
           ic="$reset$white"          # info
           c0="$reset$grey"           # first color
           c1="$reset$white"          # second color

home/programs/git/default.nix

@@ -1,12 +1,8 @@
-{ config, ... }:
-let
-  username = config.var.git.username;
-  email = config.var.git.email;
-in {
+{ config, ... }: {
   programs.git = {
     enable = true;
-    userName = username;
-    userEmail = email;
+    userName = config.var.git.username;
+    userEmail = config.var.git.email;
     ignores = [
       ".cache/"
       ".DS_Store"

home/programs/kitty/default.nix

@@ -1,15 +1,6 @@
-{
+{ config, pkgs, ... }: {
   programs.kitty = {
     enable = true;
-    keybindings = {
-      # Reset existing mappings
-      "ctrl+alt+tab" = "next_tab";
-      "ctrl+alt+shift+tab" = "previous_tab";
-      # Send Ctrl Tab and Ctrl + Shift + Tab for Tmux navigation
-      "ctrl+tab" = "send_text all \\x1b[27;5;9~";
-      "ctrl+shift+tab" = "send_text all \\x1b[27;6;9~";
-      "alt+tab" = "send_text all \\x1b[27;3;9~";
-    };
     settings = {
       scrollback_lines = 10000;
       initial_window_width = 1200;
@@ -19,10 +10,39 @@
       confirm_os_window_close = "0";
       remember_window_size = "no";
       disable_ligatures = "never";
+      shell = "${pkgs.tmux}/bin/tmux";
       url_style = "curly";
       cursor_shape = "Underline";
-      cursor_underline_thickness = 3;
-      window_padding_width = 10;
+      cursor_underline_thickness = config.var.theme.border-size;
+      window_padding_width = config.var.theme.gaps-in;
+
+      # Font
+      font_family = config.var.theme.font-mono;
+      font_size = config.var.theme.font-size;
+
+      # Colors
+      background = "#" + config.var.theme.colors.bg;
+      url_color = "#" + config.var.theme.colors.accent;
+      color0 = "#" + config.var.theme.colors.c0;
+      color8 = "#" + config.var.theme.colors.c8;
+      color1 = "#" + config.var.theme.colors.c1;
+      color9 = "#" + config.var.theme.colors.c9;
+      color2 = "#" + config.var.theme.colors.c2;
+      color10 = "#" + config.var.theme.colors.c10;
+      color3 = "#" + config.var.theme.colors.c3;
+      color11 = "#" + config.var.theme.colors.c11;
+      color4 = "#" + config.var.theme.colors.c4;
+      color12 = "#" + config.var.theme.colors.c12;
+      color5 = "#" + config.var.theme.colors.c5;
+      color13 = "#" + config.var.theme.colors.c13;
+      color6 = "#" + config.var.theme.colors.c6;
+      color14 = "#" + config.var.theme.colors.c14;
+      color7 = "#" + config.var.theme.colors.c7;
+      color15 = "#" + config.var.theme.colors.c15;
+      cursor = "#" + config.var.theme.colors.fg;
+      cursor_text_color = "#" + config.var.theme.colors.bg;
+      selection_foreground = "#" + config.var.theme.colors.accentFg;
+      selection_background = "#" + config.var.theme.colors.accent;
     };
   };
 }

home/programs/lazygit/default.nix

@@ -1,22 +0,0 @@
-{ config, lib, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  muted = "#${config.lib.stylix.colors.base03}";
-in {
-  programs.lazygit = {
-    enable = true;
-    settings = lib.mkForce {
-      gui = {
-        theme = {
-          activeBorderColor = [ accent "bold" ];
-          inactiveBorderColor = [ muted ];
-        };
-        showListFooter = false;
-        showRandomTip = false;
-        showCommandLog = false;
-        showBottomLine = false;
-        nerdFontsVersion = "3";
-      };
-    };
-  };
-}

home/programs/markdown/default.nix

@@ -1,4 +0,0 @@
-# Work in progress on another repo
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ wkhtmltopdf ];
-}

home/programs/nextcloud/default.nix

@@ -1,7 +1,6 @@
-# Nextcloud is a suite of client-server software for creating file hosting services and using them. It is functionally similar to Dropbox, although Nextcloud is free and open-source, allowing anyone to install and operate it on a private server. In contrast to proprietary services, Nextcloud can be hosted on a private server, without additional cost.
 {
-  services.nextcloud-client = {
-    enable = true;
-    startInBackground = true;
-  };
-}
+    services.nextcloud-client = {
+        enable = true;
+        startInBackground = true;
+    };
+}

home/programs/nvim/colorscheme.nix

@@ -0,0 +1,12 @@
+{
+  programs.nixvim = {
+    enable = true;
+    colorschemes.catppuccin = {
+      enable = true;
+      settings = {
+        transparent_background = true;
+        flavour = "mocha";
+      };
+    };
+  };
+}

home/programs/nvim/default.nix

@@ -1,4 +1,3 @@
-# Nixvim is a NixOS module that installs and configures Neovim
 { inputs, ... }: {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
@@ -9,13 +8,10 @@
     ./plugins/tree.nix
     ./plugins/ui.nix
     ./plugins/utils.nix
-    ./plugins/dap.nix
-    ./plugins/telescope.nix
-    ./plugins/zenmode.nix
+    ./plugins/zen-mode.nix
 
     ./options.nix
+    ./colorscheme.nix
     ./keymaps.nix
   ];
-
-  programs.nixvim.enable = true;
 }

home/programs/nvim/keymaps.nix

@@ -1,310 +1,24 @@
 {
-  programs.nixvim = {
-    plugins.which-key = {
-      enable = true;
-      settings = {
-        delay = 600;
-        icons = {
-          breadcrumb = "»";
-          group = "+";
-          separator = ""; # ➜
-          mappings = false;
-        };
-        spec = [
-          # General Mappings
-          {
-            __unkeyed-1 = "<leader>c";
-            mode = [ "n" "v" ];
-            group = "+code";
-          }
-          {
-            __unkeyed-1 = "<leader>d";
-            mode = [ "n" "v" ];
-            group = "+debug";
-          }
-          {
-            __unkeyed-1 = "<leader>s";
-            mode = "n";
-            group = "+search";
-          }
-          {
-            __unkeyed-1 = "<leader>m";
-            mode = "n";
-            group = "+markdown";
-          }
-          {
-            __unkeyed-1 = "<leader>t";
-            mode = "n";
-            group = "+trouble";
-          }
-          {
-            __unkeyed-1 = "<leader>u";
-            mode = "n";
-            group = "+ui";
-          }
-          {
-            __unkeyed-1 = "<leader>w";
-            mode = "n";
-            group = "+windows";
-          }
-          {
-            __unkeyed-1 = "<leader>h";
-            mode = "n";
-            group = "+harpoon";
-          }
-        ];
-        win = {
-          border = "rounded";
-          wo.winblend = 0;
-        };
-      };
-    };
-
-    keymaps = [
-      # General Mappings
-      {
-        key = "<leader>e";
-        action = "<cmd>Oil --float<cr>";
-        options.desc = "Oil";
-      }
-      {
-        key = "-";
-        action = "<cmd>Oil<cr>";
-        options.desc = "Oil";
-      }
-      {
-        key = "<leader>E";
-        action = "<cmd>Neotree toggle<cr>";
-        options.desc = "Neotree";
-      }
-
-      {
-        key = "s";
-        action = "<cmd>lua require('flash').jump()<cr>";
-        options.desc = "Flash";
-      }
-      {
-        key = "K";
-        action = "<cmd>lua vim.lsp.buf.hover()<cr>";
-        options.desc = "LSP Hover";
-      }
-
-      {
-        key = "<C-h>";
-        action = "<cmd>TmuxNavigateLeft<cr>";
-      }
-      {
-        key = "<C-j>";
-        action = "<cmd>TmuxNavigateDown<cr>";
-      }
-      {
-        key = "<C-k>";
-        action = "<cmd>TmuxNavigateUp<cr>";
-      }
-      {
-        key = "<C-l>";
-        action = "<cmd>TmuxNavigateRight<cr>";
-      }
-
-      # UI
-      {
-        key = "<leader>uz";
-        action = "<cmd>ZenMode<cr>";
-        options.desc = "Toggle ZenMode";
-      }
-      {
-        key = "<leader>uw";
-        action = "<cmd>set wrap!<cr>";
-        options.desc = "Toggle word wrapping";
-      }
-      {
-        key = "<leader>ul";
-        action = "<cmd>set linebreak!<cr>";
-        options.desc = "Toggle linebreak";
-      }
-      {
-        key = "<leader>us";
-        action = "<cmd>set spell!<cr>";
-        options.desc = "Toggle spellcheck";
-      }
-      {
-        key = "<leader>uc";
-        action = "<cmd>set cursorline!<cr>";
-        options.desc = "Toggle cursorline";
-      }
-      {
-        key = "<leader>un";
-        action = "<cmd>set number!<cr>";
-        options.desc = "Toggle line numbers";
-      }
-      {
-        key = "<leader>ur";
-        action = "<cmd>set relativenumber!<cr>";
-        options.desc = "Toggle relative line numbers";
-      }
-      {
-        key = "<leader>ut";
-        action = "<cmd>set showtabline=2<cr>";
-        options.desc = "Show tabline";
-      }
-      {
-        key = "<leader>uT";
-        action = "<cmd>set showtabline=0<cr>";
-        options.desc = "Hide tabline";
-      }
-
-      # Search
-      {
-        key = "<leader> ";
-        action = "<cmd>lua require('telescope.builtin').find_files()<cr>";
-        options.desc = "Telescope";
-      }
-      {
-        key = "<leader>sg";
-        action = "<cmd>lua require('telescope.builtin').live_grep()<cr>";
-        options.desc = "Livegrep";
-      }
-      {
-        key = "<leader>sf";
-        action = "<cmd>lua require('telescope.builtin').find_files()<cr>";
-        options.desc = "Find Files";
-      }
-      {
-        key = "<leader>sb";
-        action = "<cmd>lua require('telescope.builtin').buffers()<cr>";
-        options.desc = "Buffers";
-      }
-      {
-        key = "<leader>sh";
-        action = "<cmd>lua require('telescope.builtin').help_tags()<cr>";
-        options.desc = "Help Tags";
-      }
-      {
-        key = "<leader>sc";
-        action = "<cmd>lua require('telescope.builtin').commands()<cr>";
-        options.desc = "Commands";
-      }
-      {
-        key = "<leader>sm";
-        action = "<cmd>lua require('telescope.builtin').marks()<cr>";
-        options.desc = "Marks";
-      }
-      {
-        key = "<leader>so";
-        action = "<cmd>lua require('telescope.builtin').oldfiles()<cr>";
-        options.desc = "Oldfiles";
-      }
-      {
-        key = "<leader>ss";
-        action = "<cmd>lua require('telescope.builtin').spell_suggest()<cr>";
-        options.desc = "Spell Suggest";
-      }
-      {
-        key = "<leader>sr";
-        action = "<cmd>:noh<return><esc>";
-        options.desc = "Reset search";
-      }
-      {
-        key = "<leader>st";
-        action = "<cmd>TodoTelescope<cr>";
-        options.desc = "Todos";
-      }
-
-      # Trouble
-      {
-        key = "<leader>tx";
-        action = "<cmd>Trouble diagnostics toggle<cr>";
-        options.desc = "Diagnostics (Trouble)";
-      }
-      {
-        key = "<leader>tX";
-        action = "<cmd>Trouble diagnostics toggle filter.buf=0<cr>";
-        options.desc = "Buffer Diagnostics (Trouble)";
-      }
-      {
-        key = "<leader>ts";
-        action = "<cmd>Trouble symbols toggle focus=false<cr>";
-        options.desc = "Symbols (Trouble)";
-      }
-      {
-        key = "<leader>tl";
-        action = "<cmd>Trouble lsp toggle focus=false win.position=right<cr>";
-        options.desc = "LSP Definitions / references / ... (Trouble)";
-      }
-      {
-        key = "<leader>tL";
-        action = "<cmd>Trouble loclist toggle<cr>";
-        options.desc = "Location List (Trouble)";
-      }
-      {
-        key = "<leader>tQ";
-        action = "<cmd>Trouble qflist toggle<cr>";
-        options.desc = "Quickfix List (Trouble)";
-      }
-
-      # Windows
-      {
-        key = "<leader>ws";
-        action = "<cmd>split<cr>";
-        options.desc = "Split";
-      }
-      {
-        key = "<leader>wv";
-        action = "<cmd>vsplit<cr>";
-        options.desc = "VSplit";
-      }
-      {
-        key = "<leader>wd";
-        action = "<cmd>close<cr>";
-        options.desc = "Close";
-      }
-
-      # Code
-      {
-        key = "<leader>cd";
-        action = "<cmd>lua vim.lsp.buf.definition()<cr>";
-        options.desc = "LSP Definition";
-      }
-      {
-        key = "<leader>cr";
-        action = "<cmd>lua vim.lsp.buf.references()<cr>";
-        options.desc = "LSP References";
-      }
-      {
-        key = "<leader>ct";
-        action = "<cmd>lua vim.lsp.buf.type_definition()<cr>";
-        options.desc = "LSP Type Definition";
-      }
-      {
-        key = "<leader>ca";
-        action = "<cmd>lua vim.lsp.buf.code_action()<cr>";
-        options.desc = "LSP Code Action";
-      }
-      {
-        key = "<leader>cf";
-        action = "<cmd>lua vim.lsp.buf.formatting()<cr>";
-        options.desc = "LSP Formatting";
-      }
-      {
-        key = "<leader>cn";
-        action = "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>";
-        options.desc = "LSP Next Diagnostic";
-      }
-      {
-        key = "<leader>cp";
-        action = "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>";
-        options.desc = "LSP Previous Diagnostic";
-      }
-      {
-        key = "<leader>cu";
-        action = "<cmd>lua require('dapui').toggle()<CR>";
-        options.desc = "Toggle Dapui";
-      }
-      {
-        key = "<leader>cb";
-        action = "<cmd>lua require('dap').toggle_breakpoint()<CR>";
-        options.desc = "Toggle breakpoint";
-      }
-    ];
-  };
+  programs.nixvim.keymaps = [
+    {
+      key = "<leader>fm";
+      action = "<cmd>lua vim.lsp.buf.format()<cr>";
+      options.desc = "LSP Format";
+    }
+    {
+      key = "<leader>w";
+      action = "<cmd>set wrap!<cr>";
+      options.desc = "Toggle word wrapping";
+    }
+    {
+      key = "<leader>W";
+      action = "<cmd>set linebreak!<cr>";
+      options.desc = "Toggle linebreak";
+    }
+    {
+      key = "<leader>z";
+      action = "<cmd>ZenMode<cr>";
+      options.desc = "ZenMode";
+    }
+  ];
 }

home/programs/nvim/options.nix

@@ -1,4 +1,5 @@
 {
+
   programs.nixvim.globals.mapleader = " ";
   programs.nixvim.opts = {
     updatetime = 50; # Faster completion
@@ -21,13 +22,11 @@
     hlsearch = true;
     smartcase = true;
     wildmode = "list:longest";
-    completeopt = [ "menuone" "noselect" "noinsert" ];
+    completeopt = [ "menuone" "noselect" ];
     signcolumn = "yes";
     cursorline = false;
     scrolloff = 8;
     mouse = "a";
-    termguicolors = true;
-    showmode = false;
 
     wrap = false;
 

home/programs/nvim/plugins/cmp.nix

@@ -15,12 +15,8 @@
         sources = [
           { name = "nvim_lsp"; }
           { name = "luasnip"; }
-          {
-            name = "buffer";
-            option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
-          }
+          { name = "buffer"; }
           { name = "nvim_lua"; }
-          { name = "mkdnflow"; }
           { name = "path"; }
         ];
 
@@ -84,7 +80,7 @@
           completion = {
             winhighlight =
               "FloatBorder:CmpBorder,Normal:CmpPmenu,Search:PmenuSel";
-            scrollbar = false;
+            scrollbar = true;
             sidePadding = 0;
             border = [ "╭" "─" "╮" "│" "╯" "─" "╰" "│" ];
           };

home/programs/nvim/plugins/dap.nix

@@ -1,28 +0,0 @@
-{ pkgs, ... }: {
-  programs.nixvim.plugins.dap = {
-    enable = true;
-    adapters = { };
-    signs = {
-      dapBreakpoint = {
-        text = "●";
-        texthl = "DapBreakpoint";
-      };
-      dapBreakpointCondition = {
-        text = "●";
-        texthl = "DapBreakpointCondition";
-      };
-      dapLogPoint = {
-        text = "◆";
-        texthl = "DapLogPoint";
-      };
-    };
-    extensions = {
-      dap-go = {
-        enable = true;
-        delve.path = "${pkgs.delve}/bin/dlv";
-      };
-      dap-ui = { enable = true; };
-      dap-virtual-text = { enable = true; };
-    };
-  };
-}

home/programs/nvim/plugins/dashboard.nix

@@ -1,15 +1,9 @@
-{ config, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  muted = "#${config.lib.stylix.colors.base03}";
-  foreground = "#${config.lib.stylix.colors.base05}";
-  configDir = config.var.configDirectory;
-in {
+{ config, ... }: {
 
   programs.nixvim.highlight = {
-    AlphaHeaderColor.fg = accent;
-    AlphaTextColor.fg = foreground;
-    AlphaShortcutColor.fg = muted;
+    AlphaHeaderColor.fg = "#${config.var.theme.colors.accent}";
+    AlphaTextColor.fg = "#${config.var.theme.colors.fg}";
+    AlphaShortcutColor.fg = "#${config.var.theme.colors.fgalt}";
   };
 
   programs.nixvim.plugins.alpha = {
@@ -76,7 +70,8 @@ in {
           {
             type = "button";
             val = "  NixOs Config";
-            on_press.__raw = "function() vim.cmd[[Neotree ${configDir}]] end";
+            on_press.__raw =
+              "function() vim.cmd[[Neotree ${config.var.configDirectory}]] end";
             opts = {
               shortcut = "nc";
               position = "center";
@@ -91,7 +86,7 @@ in {
             type = "button";
             val = "  Keybindings";
             on_press.__raw =
-              "function() vim.cmd[[e ${configDir}/docs/KEYBINDINGS.md]] end";
+              "function() vim.cmd[[e ${config.var.configDirectory}/docs/KEYBINDINGS.md]] end";
             opts = {
               shortcut = "nc";
               position = "center";

home/programs/nvim/plugins/lsp.nix

@@ -9,9 +9,16 @@
         gopls.enable = true;
         nixd.enable = true;
         tailwindcss.enable = true;
-        html.enable = true;
+        # html.enable = true; # FIXME: broken for some reason
         svelte.enable = true;
         marksman.enable = true;
+        ltex = {
+          enable = false;
+          settings = {
+            enabled = false;
+            language = "en";
+          };
+        };
       };
       keymaps.lspBuf = {
         "gd" = "definition";
@@ -36,8 +43,6 @@
           tidy.enable = true;
           shellharden.enable = true;
           shfmt.enable = true;
-          golines.enable = true;
-          gofumpt.enable = true;
         };
       };
     };

home/programs/nvim/plugins/markdown.nix

@@ -1,105 +1,28 @@
-# The render-markdown.nvim plugin is a plugin that renders markdown files in a neovim in a more readable way.
-{ config, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  muted = "#${config.lib.stylix.colors.base03}";
-  background = "#${config.lib.stylix.colors.base00}";
-in {
-
-  programs.nixvim = {
-    plugins.mkdnflow = {
+{
+  programs.nixvim.plugins = {
+    mkdnflow = {
       enable = true;
-      modules = { conceal = false; };
-
-      toDo.symbols = [ " " "-" "x" "!" "/" ];
       mappings = {
-        MkdnCreateLink = false;
-        MkdnCreateLinkFromClipboard = {
-          key = "<leader>ml";
-          modes = [ "n" "v" ];
-        };
-        MkdnDecreaseHeading = {
-          key = "<leader>m-";
-          modes = "n";
-        };
-        MkdnDestroyLink = false;
+
+        # Main
         MkdnEnter = {
           key = "<CR>";
-          modes = [ "v" ];
+          modes = [ "n" "v" "i" ];
         };
-        MkdnExtendList = false;
-        MkdnFoldSection = {
-          key = "<leader>mf";
-          modes = "n";
-        };
-        MkdnUnfoldSection = {
-          key = "<leader>mF";
-          modes = "n";
-        };
-        MkdnFollowLink = {
-          key = "gd";
-          modes = "n";
-        };
-        MkdnGoBack = false;
-        MkdnGoForward = false;
-        MkdnIncreaseHeading = {
-          key = "<leader>m+";
-          modes = "n";
-        };
-        MkdnMoveSource = false;
-        MkdnNewListItem = false;
-        MkdnNewListItemAboveInsert = {
-          key = "O";
-          modes = "n";
-        };
-        MkdnNewListItemBelowInsert = {
-          key = "o";
-          modes = "n";
-        };
-        MkdnNextHeading = {
-          key = "<leader>m#";
-          modes = "n";
-        };
-        MkdnNextLink = false;
-        MkdnPrevLink = false;
-        MkdnPrevHeading = {
-          key = "<leader>m*";
-          modes = "n";
-        };
-        MkdnSTab = false;
-        MkdnTab = false;
-        MkdnTableNewColAfter = {
-          key = "<leader>mc";
-          modes = "n";
-        };
-        MkdnTableNewColBefore = {
-          key = "<leader>mC";
-          modes = "n";
-        };
-        MkdnTableNewRowAbove = {
-          key = "<leader>mR";
-          modes = "n";
-        };
-        MkdnTableNewRowBelow = {
-          key = "<leader>mr";
-          modes = "n";
-        };
-        MkdnTableNextCell = {
-          key = "<S-Tab>";
-          modes = "n";
-        };
-        MkdnTableNextRow = false;
-        MkdnTablePrevCell = {
-          key = "<S-Tab>";
-          modes = "n";
-        };
-        MkdnTablePrevRow = false;
-        MkdnToggleToDo = {
-          key = "<C-Space>";
+
+        # Links
+        MkdnCreateLink = false;
+        MkdnCreateLinkFromClipboard = {
+          key = "<leader>lc";
           modes = [ "n" "v" ];
         };
-        MkdnUpdateNumbering = {
-          key = "<leader>mn";
+        MkdnDestroyLink = {
+          key = "<leader>dl";
+          modes = "n";
+        };
+        MkdnFollowLink = false;
+        MkdnNextLink = {
+          key = "<Tab>";
           modes = "n";
         };
         MkdnYankAnchorLink = {
@@ -110,61 +33,99 @@ in {
           key = "yfa";
           modes = "n";
         };
-      };
-    };
-    extraFiles = {
-      "after/ftplugin/markdown.lua".text = ''
-        vim.bo.tabstop = 2
-        vim.bo.shiftwidth = 2
-        vim.bo.expandtab = true 
-      '';
-    };
-    highlight = {
-      RenderMarkdownBg.bg = background;
-      RenderMarkdownH1.fg = accent;
-      RenderMarkdownH2.fg = muted;
-      RenderMarkdownH3.fg = muted;
-      RenderMarkdownH4.fg = muted;
-      RenderMarkdownH5.fg = muted;
-      RenderMarkdownH6.fg = muted;
-      RenderMarkdownTodo.fg = muted;
-      RenderMarkdownWarning.fg = accent;
-    };
-    plugins.render-markdown = {
-      enable = true;
-      settings = {
-        heading = {
-          icons = [ "# " "󰲣 " "󰲥 " "󰲧 " "󰲩 " "󰲫 " ];
-          backgrounds = [ "RenderMarkdownBg" ];
-          foregrounds = [
-            "RenderMarkdownH1"
-            "RenderMarkdownH2"
-            "RenderMarkdownH3"
-            "RenderMarkdownH4"
-            "RenderMarkdownH5"
-            "RenderMarkdownH6"
-          ];
+        MkdnPrevLink = {
+          key = "<S-Tab>";
+          modes = "n";
         };
-        checkbox = {
-          unchecked = { highlight = "RenderMarkdownTodo"; };
-          checked = { highlight = "RenderMarkdownTodo"; };
-          custom = {
-            pending = {
-              raw = "[-]";
-              rendered = "󰥔 ";
-              highlight = "RenderMarkdownTodo";
-            };
-            important = {
-              raw = "[!]";
-              rendered = " ";
-              highlight = "RenderMarkdownWarning";
-            };
-            cancel = {
-              raw = "[/]";
-              rendered = "󱋬 ";
-              highlight = "RenderMarkdownTodo";
-            };
-          };
+
+        MkdnDecreaseHeading = {
+          key = "-";
+          modes = "n";
+        };
+        MkdnExtendList = false;
+        MkdnFoldSection = {
+          key = "<leader>ff";
+          modes = "n";
+        };
+        MkdnUnfoldSection = {
+          key = "<leader>fu";
+          modes = "n";
+        };
+        MkdnGoBack = {
+          key = "<BS>";
+          modes = "n";
+        };
+        MkdnGoForward = {
+          key = "<Del>";
+          modes = "n";
+        };
+        MkdnIncreaseHeading = {
+          key = "+";
+          modes = "n";
+        };
+        MkdnMoveSource = {
+          key = "<F2>";
+          modes = "n";
+        };
+        MkdnNewListItem = false;
+        MkdnNewListItemAboveInsert = {
+          key = "O";
+          modes = "n";
+        };
+        MkdnNewListItemBelowInsert = {
+          key = "o";
+          modes = "n";
+        };
+        MkdnNextHeading = {
+          key = "]]";
+          modes = "n";
+        };
+        MkdnPrevHeading = {
+          key = "[[";
+          modes = "n";
+        };
+        MkdnSTab = false;
+        MkdnTab = false;
+        MkdnTableFormat = {
+          key = "<leader>ft";
+          modes = "n";
+        };
+        MkdnTableNewColAfter = {
+          key = "<leader>ic";
+          modes = "n";
+        };
+        MkdnTableNewColBefore = {
+          key = "<leader>iC";
+          modes = "n";
+        };
+        MkdnTableNewRowAbove = {
+          key = "<leader>iR";
+          modes = "n";
+        };
+        MkdnTableNewRowBelow = {
+          key = "<leader>ir";
+          modes = "n";
+        };
+        MkdnTableNextCell = {
+          key = "<S-Tab>";
+          modes = "i";
+        };
+        MkdnTableNextRow = false;
+        MkdnTablePrevCell = {
+          key = "<M-Tab>";
+          modes = "i";
+        };
+        MkdnTablePrevRow = {
+          key = "<M-CR>";
+          modes = "i";
+        };
+        MkdnToggleToDo = {
+          key = "<C-Space>";
+          modes = [ "n" "v" ];
+        };
+        MkdnUpdateNumbering = {
+          key = "<leader>nn";
+          modes = "n";
         };
       };
     };

home/programs/nvim/plugins/telescope.nix

@@ -1,31 +0,0 @@
-{ config, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  background = "#${config.lib.stylix.colors.base00}";
-  background-alt = "#${config.lib.stylix.colors.base01}";
-in {
-  programs.nixvim = {
-    highlight = {
-      TelescopePromptPrefix.fg = accent;
-      TelescopeSelectionCaret = {
-        fg = accent;
-        bg = background-alt;
-      };
-      TelescopeSelection.bg = background-alt;
-      TelescopePromptTitle = {
-        bg = background;
-        fg = accent;
-      };
-      TelescopePromptNormal.bg = background;
-      TelescopePromptBorder = {
-        bg = background;
-        fg = accent;
-      };
-    };
-    plugins.telescope = {
-      enable = true;
-      extensions.fzf-native = { enable = true; };
-      settings.defaults = { selection_caret = "❚ "; };
-    };
-  };
-}

home/programs/nvim/plugins/tree.nix

@@ -40,5 +40,22 @@
         };
       };
     };
+    keymaps = [
+      {
+        key = "-";
+        action = "<cmd>Oil<cr>";
+        options.desc = "Oil";
+      }
+      {
+        key = "<leader>e";
+        action = "<cmd>Oil --float<cr>";
+        options.desc = "Oil";
+      }
+      {
+        key = "<leader>E";
+        action = "<cmd>Neotree toggle<cr>";
+        options.desc = "Neotree";
+      }
+    ];
   };
 }

home/programs/nvim/plugins/ui.nix

@@ -1,54 +1,43 @@
-{ pkgs, ... }: {
+{ pkgs, config, ... }: {
   home.packages = with pkgs; [ ctags ];
 
   programs.nixvim = {
+    highlight = {
+      Headline.bg = "#${config.var.theme.colors.bgalt}";
+      Headline.bold = true;
+      Headline1.bg = "#${config.var.theme.colors.c0}";
+      Headline1.bold = true;
+    };
     plugins = {
-      lualine = {
-        enable = true;
-        settings = {
-          options.disabled_filetypes.statusline =
-            [ "dashboard" "alpha" "neo-tree" ];
-
-          alwaysDivideMiddle = true;
-          globalstatus = true;
-          ignoreFocus = [ "neo-tree" ];
-          extensions = [ "fzf" ];
-          theme = "auto";
-          componentSeparators = {
-            left = "|";
-            right = "|";
-          };
-          sectionSeparators = {
-            left = "█"; # 
-            right = "█"; # 
-          };
-          sections = {
-            lualine_a = [ "mode" ];
-            lualine_b = [ "branch" "diff" "diagnostics" ];
-            lualine_c = [ "filename" ];
-            lualine_x = [ "filetype" ];
-            lualine_y = [ "progress" ];
-            lualine_z = [ ''" " .. os.date("%R")'' ];
-          };
-        };
-      };
-      web-devicons.enable = true;
+      lualine.enable = true;
       noice.enable = true;
-      notify = {
-        enable = true;
-        level = "warn";
-      };
       gitsigns = {
         enable = true;
         settings.current_line_blame = false;
       };
+      bufferline.enable = true;
       trouble.enable = true;
       indent-blankline.enable = true;
-      nvim-colorizer.enable = true;
-      tagbar = {
+      which-key.enable = true;
+      headlines = {
         enable = true;
-        tagsPackage = pkgs.universal-ctags;
+        settings = {
+          markdown = {
+            headline_highlights = [ "Headline1" "Headline" ];
+            fat_headlines = false;
+            bullets = [ "" "◉" "○" "✸" ];
+            dash_string = "";
+            codeblock_highlight = "Headline";
+          };
+        };
       };
+      nvim-colorizer.enable = true;
+      tagbar.enable = true; # FIXME: Tagbar is not working
     };
+    keymaps = [{
+      key = "<leader>t";
+      action = "<cmd>TroubleToggle<cr>";
+      options.desc = "Trouble";
+    }];
   };
 }

home/programs/nvim/plugins/utils.nix

@@ -1,23 +1,24 @@
 { config, ... }: {
   programs.nixvim = {
     highlightOverride = {
-      FloatBorder.fg = "#${config.lib.stylix.colors.base0D}";
+      FloatBorder.fg = "#${config.var.theme.colors.accent}";
     };
     plugins = {
       copilot-vim.enable = true;
       flash.enable = true;
-      image = {
-        enable = true;
-        integrations.markdown = {
-          clearInInsertMode = true;
-          onlyRenderImageAtCursor = true;
-        };
-      };
+      # image.enable = true;
       tmux-navigator.enable = true;
       comment.enable = true;
       nvim-autopairs.enable = true;
       friendly-snippets.enable = true;
-      todo-comments.enable = true;
+      telescope = {
+        enable = true;
+        keymaps = {
+          "<leader>fg" = "live_grep";
+          "<leader> " = "find_files";
+        };
+        extensions.fzf-native = { enable = true; };
+      };
       treesitter = {
         enable = true;
         nixGrammars = true;
@@ -26,24 +27,25 @@
           highlight.enable = true;
         };
       };
-      harpoon = {
-        enable = true;
-        enableTelescope = true;
-        keymapsSilent = true;
-        keymaps = {
-          addFile = "<leader>ha";
-          toggleQuickMenu = "<leader>hu";
-          navNext = "<leader>hl";
-          navPrev = "<leader>hh";
-          navFile = {
-            "1" = "<leader>h1";
-            "2" = "<leader>h2";
-            "3" = "<leader>h3";
-            "4" = "<leader>h4";
-          };
-        };
-      };
       treesitter-context.enable = true;
     };
+    keymaps = [
+      {
+        key = "<C-h>";
+        action = "<cmd>TmuxNavigateLeft<cr>";
+      }
+      {
+        key = "<C-j>";
+        action = "<cmd>TmuxNavigateDown<cr>";
+      }
+      {
+        key = "<C-k>";
+        action = "<cmd>TmuxNavigateUp<cr>";
+      }
+      {
+        key = "<C-l>";
+        action = "<cmd>TmuxNavigateRight<cr>";
+      }
+    ];
   };
 }

home/programs/nvim/plugins/zen-mode.nix

@@ -0,0 +1,31 @@
+{
+  programs.nixvim.plugins.zen-mode = {
+    enable = true;
+    settings = {
+      on_open = ''
+        function()
+          require("gitsigns.actions").toggle_current_line_blame()
+          vim.opt.relativenumber = false
+          vim.opt.signcolumn = "no"
+          vim.opt.wrap = true
+          vim.opt.linebreak = true
+        end
+      '';
+      plugins = {
+        gitsigns = { enabled = true; };
+        options = {
+          enabled = true;
+          ruler = false;
+          showcmd = false;
+        };
+        tmux = { enabled = true; };
+      };
+      window = {
+        backdrop = 0.95;
+        height = 1;
+        options = { signcolumn = "no"; };
+        width = 0.9;
+      };
+    };
+  };
+}

home/programs/nvim/plugins/zenmode.nix

@@ -1,46 +0,0 @@
-{
-  programs.nixvim.plugins = {
-    zen-mode = {
-      enable = true;
-      settings = {
-        on_close = ''
-          function()
-            require("gitsigns.actions").toggle_current_line_blame()
-            vim.cmd('IBLEnable')
-            vim.opt.signcolumn = "yes:2"
-            vim.wo.wrap = false
-            vim.wo.linebreak = false
-            require("gitsigns.actions").refresh()
-          end
-        '';
-        on_open = ''
-          function()
-            require("gitsigns.actions").toggle_current_line_blame()
-            vim.cmd('IBLDisable')
-            vim.opt.relativenumber = false
-            vim.opt.signcolumn = "no"
-            vim.wo.wrap = true
-            vim.wo.linebreak = true
-            require("gitsigns.actions").refresh()
-          end
-        '';
-        window = {
-          backdrop = 1;
-          height = 1;
-          options = {
-            signcolumn = "no";
-            number = false;
-            relativenumber = false;
-            cursorline = false;
-            cursorcolumn = false;
-            foldcolumn = "0";
-            list = false;
-          };
-          width = 0.8;
-
-        };
-      };
-    };
-
-  };
-}

home/programs/qutebrowser/default.nix

@@ -1,13 +1,5 @@
-# Qutebrowser is a keyboard-focused browser with a minimal GUI.
-# My homepage is generated using https://github.com/anotherhadi/homepage
 { pkgs, config, ... }:
 let
-
-  accent = "#${config.lib.stylix.colors.base0D}";
-  background = "#${config.lib.stylix.colors.base00}";
-  foreground = "#${config.lib.stylix.colors.base05}";
-  muted = "#${config.lib.stylix.colors.base03}";
-
   settings = ''
     {
       "config": {
@@ -15,10 +7,10 @@ let
         "openLinksInNewTab": false,
         "locale": "fr-FR",
         "colors": {
-          "primary": "${accent}",
-          "background": "${background}",
-          "foreground": "${foreground}",
-          "muted": "#${muted}"
+          "primary": "#${config.var.theme.colors.accent}",
+          "background": "#${config.var.theme.colors.bg}",
+          "foreground": "#${config.var.theme.colors.fg}",
+          "muted": "#${config.var.theme.colors.c8}"
         },
         "folders": [
           {
@@ -125,12 +117,98 @@ in {
       };
 
       colors = {
+        tabs = {
+          odd.bg = "#${config.var.theme.colors.bg}";
+          odd.fg = "#${config.var.theme.colors.fg}";
+          even.bg = "#${config.var.theme.colors.bg}";
+          even.fg = "#${config.var.theme.colors.fg}";
+          selected = {
+            odd = {
+              bg = "#${config.var.theme.colors.accent}";
+              fg = "#${config.var.theme.colors.accentFg}";
+            };
+            even = {
+              bg = "#${config.var.theme.colors.accent}";
+              fg = "#${config.var.theme.colors.accentFg}";
+            };
+          };
+          indicator = {
+            error = "#${config.var.theme.colors.c1}";
+            start = "#${config.var.theme.colors.bgalt}";
+            stop = "#${config.var.theme.colors.bgalt}";
+          };
+        };
+
+        hints = {
+          bg = "#${config.var.theme.colors.bgalt}";
+          fg = "#${config.var.theme.colors.fgalt}";
+          match.fg = "#${config.var.theme.colors.bg}";
+        };
+
+        completion = {
+          category = {
+            bg = "#${config.var.theme.colors.bg}";
+            fg = "#${config.var.theme.colors.fg}";
+            border = {
+              top = "#${config.var.theme.colors.bg}";
+              bottom = "#${config.var.theme.colors.bg}";
+            };
+          };
+
+          odd.bg = "#${config.var.theme.colors.bg}";
+          even.bg = "#${config.var.theme.colors.bg}";
+
+          fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ];
+
+          match.fg = "#${config.var.theme.colors.accent}";
+
+          item.selected = {
+            bg = "#${config.var.theme.colors.accent}";
+            border.top = "#${config.var.theme.colors.accent}";
+            border.bottom = "#${config.var.theme.colors.accent}";
+            fg = "#${config.var.theme.colors.accentFg}";
+            match.fg = "#${config.var.theme.colors.accentFg}";
+          };
+        };
+
+        statusbar = {
+          normal.bg = "#${config.var.theme.colors.bg}";
+          normal.fg = "#${config.var.theme.colors.fg}";
+          private.bg = "#${config.var.theme.colors.bg}";
+          private.fg = "#${config.var.theme.colors.fg}";
+          insert.bg = "#${config.var.theme.colors.accent}";
+          insert.fg = "#${config.var.theme.colors.accentFg}";
+          command = {
+            bg = "#${config.var.theme.colors.bgalt}";
+            fg = "#${config.var.theme.colors.fgalt}";
+            private.bg = "#${config.var.theme.colors.bgalt}";
+            private.fg = "#${config.var.theme.colors.fgalt}";
+          };
+        };
+
+        messages = {
+          info = {
+            bg = "#${config.var.theme.colors.bgalt}";
+            fg = "#${config.var.theme.colors.fgalt}";
+            border = "#${config.var.theme.colors.bgalt}";
+          };
+
+          error = {
+            bg = "#${config.var.theme.colors.c1}";
+            fg = "#${config.var.theme.colors.fgalt}";
+            border = "#${config.var.theme.colors.c1}";
+          };
+        };
+
+        #webpage.darkmode.enabled = true; # Enable dark mode for all websites (Weird on images)
         webpage.preferred_color_scheme =
           "dark"; # Enable dark mode for websites that support it
       };
 
       statusbar.show = "in-mode";
 
+      fonts = { default_family = "${config.var.theme.font}"; };
+
       completion = {
         height = "30%";
         open_categories = [ "history" ];
@@ -157,7 +235,10 @@ in {
         remove_finished = 0;
       };
 
-      hints = { radius = 1; };
+      hints = {
+        border = "none";
+        radius = 1;
+      };
 
       scrolling = {
         bar = "never";

home/programs/qutebrowser/duckduckgo-colorscheme.nix

@@ -1,44 +1,36 @@
-# A duckduckgo colorscheme generated for the Stylix theme used.
-{ config, ... }:
-let
-  accent = config.lib.stylix.colors.base0D;
-  background = config.lib.stylix.colors.base00;
-  foreground = config.lib.stylix.colors.base05;
-  background-alt = config.lib.stylix.colors.base01;
-  foreground-alt = config.lib.stylix.colors.base06;
-in {
-  home.file.".duckduckgo-colorscheme.js".text =
-    # js
-    ''
-      // Go to DuckDuckGo settings page, open the console, paste the code and hit enter.
-      // based on https://ddg.codingcodax.dev/
-      // Cookies string for your theme
-      const cookie = '7=${background}; j=${background}; 9=${foreground}; aa=${foreground-alt}; 8=${foreground}; x=${accent}; 21=${background-alt};';
+{ config, ... }: {
+  home.file.".duckduckgo-colorscheme.js".text = ''
+    // Go to DuckDuckGo settings page, open the console, paste the code and hit enter.
+    // based on https://ddg.codingcodax.dev/
+    // Cookies string for your theme
+    const cookie = '7=${config.var.theme.colors.bg}; j=${config.var.theme.colors.bg}; 9=${config.var.theme.colors.fg}; aa=${config.var.theme.colors.fgalt}; 8=${config.var.theme.colors.c7}; x=${config.var.theme.colors.accent}; 21=${config.var.theme.colors.bgalt};';
 
-      // Converts cookie string into formatted JSON
-      const cookieToJSON = (cookieRaw) => {
-        const cookieJson = {};
-        const items = cookieRaw.split(/[ ,]+/);
+    // Converts cookie string into formatted JSON
+    const cookieToJSON = (cookieRaw) => {
+      const cookieJson = {};
+      const items = cookieRaw.split(/[ ,]+/);
 
-        items.forEach((item) => {
-          const parts = item.split('=');
-          cookieJson[parts[0]] = parts[1];
-        });
+      items.forEach((item) => {
+        const parts = item.split('=');
+        cookieJson[parts[0]] = parts[1];
+      });
 
-        return cookieJson;
-      };
+      return cookieJson;
+    };
 
-      // Iterates over JSON, and adds to browser cookie store
-      const setCookies = (cookieJson) => {
-        Object.keys(cookieJson).forEach((key) => {
-          document.cookie = `''${key}=''${cookieJson [ key ]}`;
-        });
-      };
+    // Iterates over JSON, and adds to browser cookie store
+    const setCookies = (cookieJson) => {
+      Object.keys(cookieJson).forEach((key) => {
+        document.cookie = `''${key}=''${cookieJson [ key ]}`;
+      });
+    };
 
-      // Call set cookies, passing in formated cookie data
-      setCookies(cookieToJSON(cookie));
+    alert('The Nixy theme will be applied.');
 
-      // All done, reload page for changes to take effect :)
-      location.reload();
-    '';
+    // Call set cookies, passing in formated cookie data
+    setCookies(cookieToJSON(cookie));
+
+    // All done, reload page for changes to take effect :)
+    location.reload();
+  '';
 }

home/programs/shell/default.nix

@@ -1,4 +1,11 @@
 {
-  imports =
-    [ ./fzf.nix ./zsh.nix ./starship.nix ./zoxide.nix ./tmux.nix ./eza.nix ];
+  imports = [
+    ./fzf.nix
+    ./zsh.nix
+    ./starship.nix
+    ./zoxide.nix
+    ./tmux.nix
+    ./lazygit.nix
+    ./eza.nix
+  ];
 }

home/programs/shell/eza.nix

@@ -1,4 +1,3 @@
-# Eza is a ls replacement
 {
   programs.eza = {
     enable = true;

home/programs/shell/fzf.nix

@@ -1,20 +1,14 @@
-# Fzf is a general-purpose command-line fuzzy finder.
-{ config, lib, ... }:
-let
-  accent = "#" + config.lib.stylix.colors.base0D;
-  foreground = "#" + config.lib.stylix.colors.base05;
-  muted = "#" + config.lib.stylix.colors.base03;
-in {
+{ config, ... }: {
   programs.fzf = {
     enable = true;
     enableZshIntegration = true;
-    colors = lib.mkForce {
-      "fg+" = accent;
+    colors = {
+      "fg+" = config.var.theme.colors.accentName;
       "bg+" = "-1";
-      "fg" = foreground;
+      "fg" = "white";
       "bg" = "-1";
-      "prompt" = muted;
-      "pointer" = accent;
+      "prompt" = "grey";
+      "pointer" = config.var.theme.colors.accentName;
     };
     defaultOptions = [
       "--margin=1"

home/programs/shell/lazygit.nix

@@ -0,0 +1,13 @@
+{ config, ... }: {
+  programs.lazygit = {
+    enable = true;
+    settings = {
+      gui.theme = {
+        ligthTheme = false;
+        activeBorderColor = [ "${config.var.theme.colors.accentName}" "bold" ];
+        inactiveBorderColor = [ "black" ];
+        selectedLineBgColor = [ "default" ];
+      };
+    };
+  };
+}

home/programs/shell/starship.nix

@@ -1,9 +1,4 @@
-# starship is a minimal, fast, and extremely customizable prompt for any shell!
-{ config, lib, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  background-alt = "#${config.lib.stylix.colors.base01}";
-in {
+{ config, lib, ... }: {
   programs.starship = {
     enable = true;
     settings = {
@@ -15,23 +10,22 @@ in {
         "$git_status"
         "$character"
       ];
-      directory = { style = accent; };
+      directory = { style = "#${config.var.theme.colors.accent}"; };
 
       character = {
-        success_symbol = "[❯](${accent})";
+        success_symbol = "[❯](#${config.var.theme.colors.accent})";
         error_symbol = "[❯](red)";
         vimcmd_symbol = "[❮](cyan)";
       };
 
       git_branch = {
-        symbol = "[](${background-alt}) ";
-        style = "fg:${accent} bg:${background-alt}";
-        format = "on [$symbol$branch]($style)[](${background-alt}) ";
+        format = "[$branch]($style)";
+        style = "bright-black";
       };
 
       git_status = {
         format =
-          "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218)($ahead_behind$stashed)]($style)";
+          "[[(*$conflicted$untracked$modified$staged$renamed$deleted)](218) ($ahead_behind$stashed)]($style)";
         style = "cyan";
         conflicted = "";
         renamed = "";

home/programs/shell/tmux.nix

@@ -1,4 +1,3 @@
-# Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window.
 { pkgs, ... }: {
   programs.tmux = {
     enable = true;
@@ -13,21 +12,37 @@
       bind-key j select-pane -D
       bind-key k select-pane -U
       bind-key l select-pane -R
-
       set -gq allow-passthrough on
-      bind-key x kill-pane # skip "kill-pane 1? (y/n)" prompt
-      set -g detach-on-destroy off  # don't exit from tmux when closing a session
-
-      bind-key -n C-Tab next-window
-      bind-key -n C-S-Tab previous-window
-      bind-key -n M-Tab new-window
     '';
 
     plugins = with pkgs; [
       tmuxPlugins.vim-tmux-navigator
-      tmuxPlugins.resurrect
-      tmuxPlugins.sensible
-      tmuxPlugins.tokyo-night-tmux
+      {
+        plugin = tmuxPlugins.catppuccin;
+        extraConfig = ''
+          set-option -g status-position top
+          set -g @catppuccin_window_left_separator ""
+          set -g @catppuccin_window_right_separator " "
+          set -g @catppuccin_window_middle_separator " █"
+          set -g @catppuccin_window_number_position "right"
+
+          set -g @catppuccin_window_default_fill "number"
+          set -g @catppuccin_window_default_text "#W"
+
+          set -g @catppuccin_window_current_fill "number"
+          set -g @catppuccin_window_current_text "#W"
+
+          set -g @catppuccin_status_modules_right ""
+          set -g @catppuccin_status_left_separator  " "
+          set -g @catppuccin_status_right_separator ""
+          set -g @catppuccin_status_fill "icon"
+          set -g @catppuccin_status_connect_separator "no"
+
+          set -g @catppuccin_directory_text "#{pane_current_path}"
+          set -g @catppuccin_status_background "default"
+          set-option -g default-terminal "screen-256color"
+        '';
+      }
     ];
   };
 }

home/programs/shell/zoxide.nix

@@ -1,7 +1,6 @@
-# Zoxide is a cd replacement
 {
   programs.zoxide = {
-    enable = true;
-    enableZshIntegration = true;
+   enable= true;
+   enableZshIntegration = true;
   };
 }

home/programs/shell/zsh.nix

@@ -1,9 +1,6 @@
-# My shell configuration
-{ pkgs, lib, config, ... }:
-let fetch = config.var.theme.fetch; # neofetch, nerdfetch, pfetch
-in {
+{ pkgs, lib, config, ... }: {
 
-  home.packages = with pkgs; [ bat ripgrep tldr sesh ];
+  home.packages = with pkgs; [ bat ripgrep tldr ];
 
   home.sessionPath = [ "$HOME/go/bin" ];
 
@@ -16,31 +13,20 @@ in {
 
     initExtraFirst = ''
       bindkey -e
-      ${if fetch == "neofetch" then
+      ${if config.var.theme.fetch == "neofetch" then
         pkgs.neofetch + "/bin/neofetch"
-      else if fetch == "nerdfetch" then
+      else if config.var.theme.fetch == "nerdfetch" then
         "nerdfetch"
-      else if fetch == "pfetch" then
+      else if config.var.theme.fetch == "pfetch" then
         "echo; ${pkgs.pfetch}/bin/pfetch"
       else
         ""}
-
-      function sesh-sessions() {
-        session=$(sesh list -t -c | fzf --height 70% --reverse)
-        [[ -z "$session" ]] && return
-        sesh connect $session
-      }
-
-      zle     -N             sesh-sessions
-      bindkey -M emacs '\es' sesh-sessions
-      bindkey -M vicmd '\es' sesh-sessions
-      bindkey -M viins '\es' sesh-sessions
     '';
 
     history = {
       ignoreDups = true;
-      save = 10000;
-      size = 10000;
+      save = 1000000;
+      size = 1000000;
     };
 
     profileExtra = lib.optionalString (config.home.sessionPath != [ ]) ''
@@ -63,17 +49,17 @@ in {
       sl = "ls";
       open = "${pkgs.xdg_utils}/bin/xdg-open";
       icat = "${pkgs.kitty}/bin/kitty +kitten icat";
-
       wireguard-import = "nmcli connection import type wireguard file";
-
+      neorg =
+        "cd ~/nextcloud/neorg && vim -c ':ZenMode' -c ':Telescope find_files' index.norg";
       notes =
-        "nvim ~/nextcloud/Notes/index.md --cmd 'cd ~/nextcloud/Notes' -c ':Telescope find_files'";
+        "cd ~/nextcloud/Notes && vim -c ':ZenMode' -c ':Telescope find_files' index.md";
       note = "notes";
 
       # git
-      g = "lazygit";
       ga = "git add";
       gc = "git commit";
+      gcm = "git commit -m";
       gcu = "git add . && git commit -m 'Update'";
       gp = "git push";
       gpl = "git pull";
@@ -82,9 +68,6 @@ in {
       gco = "git checkout";
       gcb = "git checkout -b";
       gbr = "git branch";
-
-      gaa = "git add .";
-      gcm = "git commit -m";
     };
   };
 }

home/programs/spicetify/default.nix

@@ -1,26 +1,31 @@
-# Spicetify is a spotify client customizer
 { pkgs, config, lib, inputs, ... }:
-let
-  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
-  accent = "${config.lib.stylix.colors.base0D}";
+let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
 in {
-  imports = [ inputs.spicetify-nix.homeManagerModules.default ];
 
+  imports = [ inputs.spicetify-nix.homeManagerModules.default ];
   nixpkgs.config.allowUnfreePredicate = pkg:
     builtins.elem (lib.getName pkg) [ "spotify" ];
-
-  stylix.targets.spicetify.enable = false;
-
   programs.spicetify = {
     enable = true;
-    theme = lib.mkForce spicePkgs.themes.text;
-
+    theme = spicePkgs.themes.text;
     colorScheme = "custom";
 
     customColorScheme = {
-      button = accent;
-      button-active = accent;
-      tab-active = accent;
+      text = "${config.var.theme.colors.fg}";
+      subtext = "${config.var.theme.colors.fgalt}";
+      sidebar-text = "${config.var.theme.colors.fgalt}";
+      main = "${config.var.theme.colors.bg}";
+      sidebar = "${config.var.theme.colors.bg}";
+      background = "${config.var.theme.colors.bg}";
+      player = "${config.var.theme.colors.bg}";
+      card = "${config.var.theme.colors.bg}";
+      shadow = "000000";
+      selected-row = "${config.var.theme.colors.bgalt}";
+      button = "${config.var.theme.colors.accent}";
+      button-active = "${config.var.theme.colors.accent}";
+      button-disabled = "${config.var.theme.colors.bgalt}";
+      tab-active = "${config.var.theme.colors.accent}";
+      misc = "${config.var.theme.colors.fgalt}";
     };
 
     enabledExtensions = with spicePkgs.extensions; [

home/programs/thunar/default.nix

@@ -1,46 +0,0 @@
-# Thunar is a file explorer
-{ pkgs, ... }: {
-  # ctrl + m to toggle the menubar
-  home.packages = with pkgs.xfce; [
-    thunar
-    xfconf
-    tumbler
-    thunar-archive-plugin
-    thunar-volman
-  ];
-
-  home.file.".config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml".text = ''
-    <?xml version="1.0" encoding="UTF-8"?>
-
-    <channel name="thunar" version="1.0">
-      <property name="last-view" type="string" value="ThunarIconView"/>
-      <property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_100_PERCENT"/>
-      <property name="last-window-maximized" type="bool" value="true"/>
-      <property name="last-separator-position" type="int" value="170"/>
-      <property name="last-statusbar-visible" type="bool" value="false"/>
-      <property name="last-menubar-visible" type="bool" value="false"/>
-      <property name="misc-single-click" type="bool" value="false"/>
-      <property name="shortcuts-icon-emblems" type="bool" value="true"/>
-      <property name="tree-icon-emblems" type="bool" value="true"/>
-      <property name="misc-file-size-binary" type="bool" value="true"/>
-      <property name="misc-thumbnail-draw-frames" type="bool" value="false"/>
-      <property name="misc-text-beside-icons" type="bool" value="true"/>
-      <property name="misc-change-window-icon" type="bool" value="true"/>
-      <property name="hidden-bookmarks" type="array">
-        <value type="string" value="computer:///"/>
-        <value type="string" value="recent:///"/>
-        <value type="string" value="file:///"/>
-        <value type="string" value="network:///"/>
-      </property>
-      <property name="hidden-devices" type="array">
-        <value type="string" value="52FEA905FEA8E309"/>
-      </property>
-      <property name="last-toolbar-item-order" type="string" value="0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17"/>
-      <property name="last-toolbar-visible-buttons" type="string" value="0,1,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0"/>
-      <property name="last-location-bar" type="string" value="ThunarLocationButtons"/>
-      <property name="last-show-hidden" type="bool" value="false"/>
-      <property name="last-details-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_38_PERCENT"/>
-      <property name="last-details-view-column-widths" type="string" value="50,50,127,50,50,50,50,50,751,50,50,75,50,145"/>
-    </channel>
-  '';
-}

home/programs/yazi/default.nix

@@ -1,4 +1,3 @@
-# Yazi is a TUI file explorer
 {
   programs.yazi = {
     enable = true;
@@ -13,5 +12,28 @@
         sort_reverse = true;
       };
     };
+
+    theme = {
+      filetype = {
+        rules = [
+          {
+            fg = "#7AD9E5";
+            mime = "image/*";
+          }
+          {
+            fg = "#F3D398";
+            mime = "video/*";
+          }
+          {
+            fg = "#F3D398";
+            mime = "audio/*";
+          }
+          {
+            fg = "#CD9EFC";
+            mime = "application/x-bzip";
+          }
+        ];
+      };
+    };
   };
 }

home/scripts/brightness/default.nix

@@ -1,12 +1,3 @@
-# - ## Brightness
-#- 
-#- This module provides a set of scripts to control the brightness of the screen.
-#-
-#- - `brightness-up` increases the brightness by 5%.
-#- - `brightness-down` decreases the brightness by 5%.
-#- - `brightness-set [value]` sets the brightness to the given value.
-#- - `brightness-change [up|down] [value]` increases or decreases the brightness by the given value.
-
 { pkgs, ... }:
 
 let

home/scripts/caffeine/default.nix

@@ -1,11 +1,3 @@
-# - ## Caffeine
-#-
-#- Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
-#-
-#- - `caffeine-status` - Check if hypridle is running. (0/1)
-#- - `caffeine-status-icon` - Check if hypridle is running. (icon)
-#- - `caffeine` - Toggle hypridle.
-
 { pkgs, ... }:
 let
   caffeine-status = pkgs.writeShellScriptBin "caffeine-status" ''
@@ -18,11 +10,11 @@ let
 
   caffeine = pkgs.writeShellScriptBin "caffeine" ''
     if [[ $(pidof "hypridle") ]]; then
-      systemctl --user stop hypridle.service
+      pkill hypridle
       title="󰅶  Caffeine Activated"
       description="Caffeine is now active! Your screen will not turn off automatically."
     else
-      systemctl --user start hypridle.service
+      ${pkgs.hyprland}/bin/hyprctl dispatch exec ${pkgs.hypridle}/bin/hypridle
       title="󰾪  Caffeine Deactivated"
       description="Caffeine is now deactivated! Your screen will turn off automatically."
     fi

home/scripts/default.nix

@@ -4,8 +4,6 @@
     ./sounds
     ./brightness
     ./caffeine
-    ./hyprpanel
-    ./hyprfocus
     ./night-shift
     ./screenshot
     ./nerdfont_fzf

home/scripts/hyprfocus/default.nix

@@ -1,42 +0,0 @@
-# - ## Hyprfocus
-#-
-#- A simple script to toggle focus on few windows in Hyprland.
-#- (disable gaps, border, shadow, opacity, etc.)
-#-
-#- - `hyprfocus-on` - Enable hyprfocus.
-#- - `hyprfocus-off` - Disable hyprfocus.
-#- - `hyprfocus-toggle` - Toggle hyprfocus.
-{ pkgs, ... }:
-let
-  hyprfocus-on = pkgs.writeShellScriptBin "hyprfocus-on"
-    # bash
-    ''
-      hyprctl keyword "general:gaps_in" 0
-      hyprctl keyword "general:gaps_out" 0
-      hyprpanel-hide
-      hyprctl keyword "general:border_size" 1
-      hyprctl keyword "decoration:rounding" 0
-      hyprctl keyword "decoration:drop_shadow" false
-      hyprctl keyword "decoration:inactive_opacity" 0.98
-      hyprctl keyword "decoration:active_opacity" 1
-      echo "1" > /tmp/hyprfocus
-    '';
-
-  hyprfocus-off = pkgs.writeShellScriptBin "hyprfocus-off"
-    # bash
-    ''
-      hyprctl reload
-      hyprpanel-show
-      rm /tmp/hyprfocus
-    '';
-
-  hyprfocus-toggle = pkgs.writeShellScriptBin "hyprfocus-toggle"
-    # bash 
-    ''
-      if [ -f /tmp/hyprfocus ]; then
-        hyprfocus-off
-      else
-        hyprfocus-on
-      fi
-    '';
-in { home.packages = [ hyprfocus-on hyprfocus-off hyprfocus-toggle ]; }

home/scripts/hyprpanel/default.nix

@@ -1,46 +0,0 @@
-# - ## Hyprpanel
-#- 
-#- Quick scripts to toggle, reload and kill hyprpanel.
-#-
-#- - `hyprpanel-toggle` - Toggle hyprpanel.
-#- - `hyprpanel-reload` - Reload hyprpanel.
-#- - `hyprpanel-kill` - Kill hyprpanel.
-{ pkgs, ... }:
-let
-  hyprpanel-toggle = pkgs.writeShellScriptBin "hyprpanel-toggle" ''
-    hyprpanel -t bar-0
-    hyprpanel -t bar-1
-    hyprpanel -t bar-2
-    hyprpanel -t bar-3
-  '';
-
-  hyprpanel-hide = pkgs.writeShellScriptBin "hyprpanel-hide" ''
-    status=$(hyprpanel -r "isWindowVisible('bar-0')")
-    if [[ $status == "true" ]]; then
-      hyprpanel -t bar-0
-    fi
-    status=$(hyprpanel -r "isWindowVisible('bar-1')")
-    if [[ $status == "true" ]]; then
-      hyprpanel -t bar-1
-    fi
-  '';
-
-  hyprpanel-show = pkgs.writeShellScriptBin "hyprpanel-show" ''
-    status=$(hyprpanel -r "isWindowVisible('bar-0')")
-    if [[ $status == "false" ]]; then
-      hyprpanel -t bar-0
-    fi
-    status=$(hyprpanel -r "isWindowVisible('bar-1')")
-    if [[ $status == "false" ]]; then
-      hyprpanel -t bar-1
-    fi
-  '';
-
-  hyprpanel-reload = pkgs.writeShellScriptBin "hyprpanel-reload" ''
-    [ $(pgrep "ags") ] && pkill ags
-    hyprctl dispatch exec hyprpanel
-  '';
-in {
-  home.packages =
-    [ hyprpanel-toggle hyprpanel-reload hyprpanel-hide hyprpanel-show ];
-}

home/scripts/nerdfont_fzf/default.nix

@@ -1,29 +1,28 @@
-# - ## Nerdfont FZF
-#-
-#- This module provides a script to search for Nerd Fonts icons using fzf.
-#-
-#- - `nerdfont-fzf` - Search for Nerd Fonts icons using fzf.
 { pkgs, config, ... }:
 let
+  homedir = config.home.homeDirectory;
+
   nerdfont-fzf = pkgs.writeShellScriptBin "nerdfont-fzf" ''
-    icons=$(${pkgs.jq}/bin/jq -r 'to_entries[] | "\(.key):\(.value.char)"' "/home/${config.var.username}/.config/nerdfont_glyphnames.json" | awk -F: '{print "\033[95m "$2" \033[0m "$1}')
-    fzf_result=$(echo "$icons" | ${pkgs.fzf}/bin/fzf --ansi --border none | awk '{print $1}')
+    # Dependencies: jq, fzf, wl-copy, wget
+    icons=$(jq -r 'to_entries[] | "\(.key):\(.value.char)"' "${homedir}/.config/nerdfont_glyphnames.json" | awk -F: '{print "\033[95m "$2" \033[0m "$1}')
+    fzf_result=$(echo "$icons" | fzf --ansi --border none | awk '{print $1}')
     if [ -z "$fzf_result" ]; then
       echo "No icon selected"
       exit 1
     fi
 
     echo "Copied to clipboard: $fzf_result"
-    ${pkgs.wl-clipboard}/bin/wl-copy "$fzf_result"
+    ${pkgs.wl-clipboard}/bin/wl-copy "$fzf_result" # wait for paste before exiting.. not cool
+  '';
+
+  nerdfont-fzf-fetch = pkgs.writeShellScriptBin "nerdfont-fzf-fetch" ''
+    wget "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/glyphnames.json" -O "glyphnames.json" || exit 1
+    jq 'del(.METADATA)' "glyphnames.json"
   '';
 in {
-  home.packages = [ nerdfont-fzf ];
+  home.packages = [ nerdfont-fzf nerdfont-fzf-fetch ];
 
   xdg.configFile."nerdfont_glyphnames.json" = {
-    source = pkgs.fetchurl {
-      url =
-        "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/384b1825ea0037b0314f7f9c660a80c1ecdb219a/glyphnames.json";
-      hash = "sha256-Ps0dyFcMs51RMTthBOVSOf/lafPV/53JxuNSKlmZ7cc=";
-    };
+    source = ./nerdfont_glyphnames.json;
   };
 }

home/scripts/night-shift/default.nix

@@ -1,17 +1,10 @@
-# - ## Night-Shift
-#-
-#- Night-Shift is a feature that reduces the amount of blue light emitted by your screen, which can help reduce eye strain and improve sleep quality. This module provides a set of scripts to control Night-Shift on your system.
-#-
-#- - `night-shift-on` activates Night-Shift.
-#- - `night-shift-off` deactivates Night-Shift.
-#- - `night-shift` toggles Night-Shift.
-#- - `night-shift-status` checks if Night-Shift is active. (0/1)
-#- - `night-shift-status-icon` checks if Night-Shift is active. (icon)
 { pkgs, ... }:
+
 let
+  default = "4000";
 
   night-shift-on = pkgs.writeShellScriptBin "night-shift-on" ''
-    ${pkgs.hyprshade}/bin/hyprshade on blue-light-filter
+    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.gammastep}/bin/gammastep -O ${default}"
     title="󰖔  Night-Shift Activated"
     description="Night-Shift is now activated! Your screen will be warmer and easier on the eyes."
 
@@ -19,7 +12,7 @@ let
   '';
 
   night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
-    ${pkgs.hyprshade}/bin/hyprshade off
+    pkill gammastep
     title="󰖕  Night-Shift Deactivated"
     description="Night-Shift is now deactivated! Your screen will return to normal."
 
@@ -27,7 +20,7 @@ let
   '';
 
   night-shift = pkgs.writeShellScriptBin "night-shift" ''
-    if [[ $(${pkgs.hyprshade}/bin/hyprshade current) ]]; then
+    if pgrep gammastep; then
       night-shift-off
     else
       night-shift-on
@@ -35,7 +28,7 @@ let
   '';
 
   night-shift-status = pkgs.writeShellScriptBin "night-shift-status" ''
-    if [[ $(${pkgs.hyprshade}/bin/hyprshade current) ]]; then
+    if [[ $(pgrep gammastep) ]]; then
       echo "1"
     else
       echo "0"
@@ -44,14 +37,15 @@ let
 
   night-shift-status-icon =
     pkgs.writeShellScriptBin "night-shift-status-icon" ''
-      if [[ $(hyprshade current) ]]; then
-          echo "󰖔"
-        else
-          echo "󰖕"
-        fi
+      if [[ $(pgrep gammastep) ]]; then
+        echo "󰖔"
+      else
+        echo "󰖕"
+      fi
     '';
 in {
   home.packages = [
+    pkgs.gammastep
     night-shift-on
     night-shift-off
     night-shift

home/scripts/nixy/default.nix

@@ -1,70 +1,55 @@
-# - ## Nixy
-#- 
-#- Nixy is a simple script that I use to manage my NixOS system. It's a simple script that provides a menu to rebuild, upgrade, update, collect garbage, clean boot menu, etc. 
-#-
-#- - `nixy` - UI wizard to manage the system.
-#- - `nixy rebuild` - Rebuild the system.
-#- - `nixy ...` - ... see the script for more commands.
-{ pkgs, config, inputs, ... }:
+{ pkgs, config, ... }:
 let
+  nixy = pkgs.writeShellScriptBin "nixy" ''
+    function exec() {
+      $@
+    }
 
-  configDirectory = config.var.configDirectory;
-  hostname = config.var.hostname;
+    function ui(){
+      DEFAULT_ICON="󰘳"
 
-  nixy = pkgs.writeShellScriptBin "nixy"
-    # bash
-    ''
-      function exec() {
-        $@
-      }
+      # "icon;name;command"[]
+      apps=(
+        ";Rebuild;nixy rebuild"
+        ";Upgrade;nixy upgrade"
+        ";Update;nixy update"
+        ";Collect Garbage;nixy gc"
+        ";Clean Boot Menu;nixy cb"
+      )
 
-      function ui(){
-        DEFAULT_ICON="󰘳"
+      # Apply default icons if empty:
+      for i in "''${!apps[@]}"; do
+        apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/')
+      done
 
-        # "icon;name;command"[]
-        apps=(
-          "󰑓;Rebuild;nixy rebuild"
-          "󰦗;Upgrade;nixy upgrade"
-          "󰚰;Update;nixy update"
-          ";Collect Garbage;nixy gc"
-          "󰍜;Clean Boot Menu;nixy cb"
-          "󰌌;Hyprland Keybindings;nvim ${configDirectory}/docs/KEYBINDINGS-HYPRLAND.md"
-          "󰋩;Wallpapers;nvim ${inputs.nixy-wallpapers}/docs/MOBILE-VIEW.md"
-        )
+      fzf_result=$(printf "%s\n" "''${apps[@]}" | awk -F ';' '{print $1" "$2}' | fzf)
+      [[ -z $fzf_result ]] && exit 0
+      fzf_result=''${fzf_result/ /;}
+      line=$(printf "%s\n" "''${apps[@]}" | grep "$fzf_result")
+      command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')
 
-        # Apply default icons if empty:
-        for i in "''${!apps[@]}"; do
-          apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/')
-        done
+      exec "$command"
+      exit 0
+    }
 
-        fzf_result=$(printf "%s\n" "''${apps[@]}" | awk -F ';' '{print $1" "$2}' | fzf)
-        [[ -z $fzf_result ]] && exit 0
-        fzf_result=''${fzf_result/ /;}
-        line=$(printf "%s\n" "''${apps[@]}" | grep "$fzf_result")
-        command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')
+    [[ $1 == "" ]] && ui
 
-        exec "$command"
-        exit 0
-      }
-
-      [[ $1 == "" ]] && ui
-
-      if [[ $1 == "rebuild" ]];then
-        sudo nixos-rebuild switch --flake ${configDirectory}#${hostname}
-      elif [[ $1 == "upgrade" ]];then
-        sudo nixos-rebuild switch --upgrade --flake ${configDirectory}#${hostname}
-      elif [[ $1 == "update" ]];then
-        cd ${configDirectory} && nix flake update
-      elif [[ $1 == "gc" ]];then
-        cd ${configDirectory} && sudo nix-collect-garbage -d
-      elif [[ $1 == "cb" ]];then
-        sudo /run/current-system/bin/switch-to-configuration boot
-      elif [[ $1 == "remote" ]];then
-        cd ~/.config/nixos && git add . && git commit -m "update" && git push
-        ssh jack -S -C "cd /home/hadi/.config/nixos && git pull && sudo -S nixos-rebuild switch --flake ~/.config/nixos#jack"
-      else
-        echo "Unknown argument"
-      fi
-    '';
+    if [[ $1 == "rebuild" ]];then
+      sudo nixos-rebuild switch --flake ${config.var.configDirectory}#${config.var.hostname}
+    elif [[ $1 == "upgrade" ]];then
+      sudo nixos-rebuild switch --upgrade --flake ${config.var.configDirectory}#${config.var.hostname}
+    elif [[ $1 == "update" ]];then
+      cd ${config.var.configDirectory} && sudo nix flake update
+    elif [[ $1 == "gc" ]];then
+      cd ${config.var.configDirectory} && sudo nix-collect-garbage -d
+    elif [[ $1 == "cb" ]];then
+      sudo /run/current-system/bin/switch-to-configuration boot
+    elif [[ $1 == "remote" ]];then
+      cd ~/.config/nixos && git add . && git commit -m "update" && git push
+      ssh jack -S -C "cd /home/hadi/.config/nixos && git pull && sudo -S nixos-rebuild switch --flake ~/.config/nixos#jack"
+    else
+      echo "Unknown argument"
+    fi
+  '';
 
 in { home.packages = [ nixy ]; }

home/scripts/screenshot/default.nix

@@ -1,34 +1,32 @@
-# - ## Screenshot
-#-
-#- This module provides a script to take screenshots using `grimblast` and `swappy`.
-#-
-#- - `screenshot [region|window|monitor] [swappy]` - Take a screenshot of the region, window, or monitor. Optionally, use `swappy` to copy the screenshot to the clipboard.
 { pkgs, ... }:
+
 let
   screenshot = pkgs.writeShellScriptBin "screenshot" ''
     if [[ $2 == "swappy" ]];then
       folder="/tmp"
     else
-      folder="$HOME/Pictures"
+      folder="$HOME/Pictures/screenshots"
     fi
     filename="$(date +%Y-%m-%d_%H:%M:%S).png"
+    mode="region" # Default to region
 
     if [[ $1 == "window" ]];then
-      mode="active"
-    elif [[ $1 == "region" ]];then
-      mode="area"
+      mode="window"
     elif [[ $1 == "monitor" ]];then
       mode="output"
     fi
 
-    ${pkgs.grimblast}/bin/grimblast --notify --freeze save $mode "$folder/$filename" || exit 1
+    ${pkgs.hyprshot}/bin/hyprshot -m $mode -o $folder -f $filename -s || exit 1
 
     if [[ $2 == "swappy" ]];then
-      ${pkgs.swappy}/bin/swappy -f "$folder/$filename" -o "$HOME/Pictures/$filename"
+      ${pkgs.swappy}/bin/swappy -f "$folder/$filename" -o "$HOME/Pictures/screenshots/$filename"
       exit 0
     fi
+
+    message="  Screenshot saved"
+
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+                --icon="$folder/$filename" \
+                --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
   '';
-in {
-  home.packages =
-    [ pkgs.hyprshot screenshot pkgs.slurp pkgs.grim pkgs.grimblast ];
-}
+in { home.packages = [ pkgs.hyprshot screenshot ]; }

home/scripts/sounds/default.nix

@@ -1,11 +1,3 @@
-# - ## Sound
-#-
-#- This module provides a set of scripts to control the volume of the default audio sink using `wpctl`.
-#-
-#- - `sound-up` increases the volume by 5%.
-#- - `sound-down` decreases the volume by 5%.
-#- - `sound-set [value]` sets the volume to the given value.
-#- - `sound-toggle` toggles the mute state of the default audio sink.
 { pkgs, ... }:
 
 let

home/scripts/system/default.nix

@@ -1,64 +1,24 @@
-# - ## System
-#- 
-#- Usefull quick scripts
-#-
-#- - `menu` - Open wofi with drun mode. (wofi)
-#- - `powermenu` - Open power dropdown menu. (wofi)
-#- - `lock` - Lock the screen. (hyprlock)
 { pkgs, ... }:
 
 let
-  menu = pkgs.writeShellScriptBin "menu"
-    # bash
-    ''
-      if pgrep wofi; then
-      	pkill wofi
-      else
-      	wofi --show drun
-      fi
-    '';
+  menu = pkgs.writeShellScriptBin "menu" ''
+    if pgrep wofi; then
+    	pkill wofi
+    else
+    	wofi --show drun
+    fi
+  '';
 
-  powermenu = pkgs.writeShellScriptBin "powermenu"
-    # bash
-    ''
-      if pgrep wofi; then
-      	pkill wofi
-      else
-        options=(
-          "󰌾 Lock"
-          "󰍃 Logout"
-          " Suspend"
-          "󰑐 Reboot"
-          "󰿅 Shutdown"
-        )
+  powermenu = pkgs.writeShellScriptBin "powermenu" ''
+    if pgrep wlogout; then
+    	pkill wlogout
+    else
+      ${pkgs.wlogout}/bin/wlogout
+    fi
+  '';
 
-        selected=$(printf '%s\n' "''${options[@]}" | wofi --dmenu)
-        selected=''${selected:2}
-
-        case $selected in
-          "Lock")
-            ${pkgs.hyprlock}/bin/hyprlock
-            ;;
-          "Logout")
-            hyprctl dispatch exit
-            ;;
-          "Suspend")
-            systemctl suspend
-            ;;
-          "Reboot")
-            systemctl reboot
-            ;;
-          "Shutdown")
-            systemctl poweroff
-            ;;
-        esac
-      fi
-    '';
-
-  lock = pkgs.writeShellScriptBin "lock"
-    # bash
-    ''
-      ${pkgs.hyprlock}/bin/hyprlock
-    '';
+  lock = pkgs.writeShellScriptBin "lock" ''
+    ${pkgs.hyprlock}/bin/hyprlock
+  '';
 
 in { home.packages = [ menu powermenu lock ]; }

home/system/batsignal/default.nix

@@ -1,7 +1,6 @@
-# Batsignal is a simple utility to send battery notifications.
 {
   services.batsignal = {
     enable = true;
-    extraArgs = [ "-c 10" "-w 30" "-f disabled" ];
+    extraArgs = [ "-c 10" "-w 30" "-f 97" ];
   };
 }

home/system/clipman/default.nix

@@ -1,6 +1,6 @@
-# Clipman allows you to save and retrieve clipboard history.
 { pkgs, ... }:
 let
+
   clipboard-clear = pkgs.writeShellScriptBin "clipboard-clear" ''
     clipman clear --all
   '';
@@ -14,4 +14,5 @@ in {
     [ "${clipboard-clear}" "wl-paste -t text --watch clipman store" ];
   home.packages = with pkgs; [ clipman clipboard clipboard-clear ];
   services.clipman.enable = true;
+
 }

home/system/gtk/default.nix

@@ -1,29 +1,4 @@
-# GTK & QT theme configuration
-{ config, pkgs, lib, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  foreground = "#${config.lib.stylix.colors.base05}";
-  background = "#${config.lib.stylix.colors.base00}";
-  background-alt = "#${config.lib.stylix.colors.base01}";
-
-  c0 = "#${config.lib.stylix.colors.base00}";
-  c1 = "#${config.lib.stylix.colors.base08}";
-  c2 = "#${config.lib.stylix.colors.base0B}";
-  c3 = "#${config.lib.stylix.colors.base0A}";
-  c4 = "#${config.lib.stylix.colors.base0D}";
-  c5 = "#${config.lib.stylix.colors.base0E}";
-  c6 = "#${config.lib.stylix.colors.base0C}";
-  c7 = "#${config.lib.stylix.colors.base05}";
-  c8 = "#${config.lib.stylix.colors.base03}";
-  c9 = "#${config.lib.stylix.colors.base08}";
-  c10 = "#${config.lib.stylix.colors.base0B}";
-  c11 = "#${config.lib.stylix.colors.base0A}";
-  c12 = "#${config.lib.stylix.colors.base0D}";
-  c13 = "#${config.lib.stylix.colors.base0E}";
-  c14 = "#${config.lib.stylix.colors.base0C}";
-  c15 = "#${config.lib.stylix.colors.base07}";
-
-in {
+{ config, pkgs, ... }: {
 
   qt = {
     enable = true;
@@ -34,18 +9,24 @@ in {
   gtk = {
     enable = true;
 
-    theme = lib.mkForce { name = "FlatColor"; };
+    theme = { name = "FlatColor"; };
 
     iconTheme = {
-      package = pkgs.kora-icon-theme;
-      name = "Kora";
+      package = pkgs.moka-icon-theme;
+      name = "Moka";
     };
 
-    font = { name = config.stylix.fonts.serif.name; };
+    font = {
+      name = config.var.theme.font;
+      size = config.var.theme.font-size;
+    };
+  };
 
-    gtk3.extraConfig = { gtk-application-prefer-dark-theme = 1; };
-
-    gtk4.extraConfig = { gtk-application-prefer-dark-theme = 1; };
+  home.pointerCursor = {
+    gtk.enable = true;
+    package = pkgs.bibata-cursors;
+    name = "Bibata-Modern-Classic";
+    size = 14;
   };
 
   home.file = {
@@ -82,61 +63,62 @@ in {
     };
 
     ".local/share/themes/FlatColor/colors2".text = ''
-      bg_color:${background}
-      color0:${c0}
-      color1:${c1}
-      color2:${c2}
-      color3:${c3}
-      color4:${c4}
-      color5:${c5}
-      color6:${c6}
-      color7:${c7}
-      color8:${c8}
-      color9:${c9}
-      color10:${c10}
-      color11:${c11}
-      color12:${c12}
-      color13:${c13}
-      color14:${c14}
-      color15:${c15}
-      text_color:${foreground}
-      selected_bg_color:${accent}
-      selected_fg_color:${foreground}
-      tooltip_bg_color:${background-alt}
-      tooltip_fg_color:${foreground}
-      titlebar_bg_color:${background}
-      titlebar_fg_color:${foreground}
-      menu_bg_color:${background-alt}
-      menu_fg_color:${foreground}
-      link_color:${accent}
+      bg_color:#${config.var.theme.colors.bg}
+      color0:#${config.var.theme.colors.c0}
+      color1:#${config.var.theme.colors.c1}
+      color2:#${config.var.theme.colors.c2}
+      color3:#${config.var.theme.colors.c3}
+      color4:#${config.var.theme.colors.c4}
+      color5:#${config.var.theme.colors.c5}
+      color6:#${config.var.theme.colors.c6}
+      color7:#${config.var.theme.colors.c7}
+      color8:#${config.var.theme.colors.c8}
+      color9:#${config.var.theme.colors.c9}
+      color10:#${config.var.theme.colors.c10}
+      color11:#${config.var.theme.colors.c11}
+      color12:#${config.var.theme.colors.c12}
+      color13:#${config.var.theme.colors.c13}
+      color14:#${config.var.theme.colors.c14}
+      color15:#${config.var.theme.colors.c15}
+      text_color:#${config.var.theme.colors.fg}
+      selected_bg_color:#${config.var.theme.colors.accent}
+      selected_fg_color:#${config.var.theme.colors.accentFg}
+      tooltip_bg_color:#${config.var.theme.colors.bgalt}
+      tooltip_fg_color:#${config.var.theme.colors.fgalt}
+      titlebar_bg_color:#${config.var.theme.colors.bgalt}
+      titlebar_fg_color:#${config.var.theme.colors.fgalt}
+      menu_bg_color:#${config.var.theme.colors.bgalt}
+      menu_fg_color:#${config.var.theme.colors.fgalt}
+      link_color:#${config.var.theme.colors.accent}
     '';
 
     ".local/share/themes/FlatColor/colors3".text = ''
-      @define-color color0 ${c0};
-      @define-color color1 ${c1};
-      @define-color color2 ${c2};
-      @define-color color3 ${c3};
-      @define-color color4 ${c4};
-      @define-color color5 ${c5};
-      @define-color color6 ${c6};
-      @define-color color7 ${c7};
-      @define-color color8 ${c8};
-      @define-color color9 ${c9};
-      @define-color color10 ${c10};
-      @define-color color11 ${c11};
-      @define-color color12 ${c12};
-      @define-color color13 ${c13};
-      @define-color color14 ${c14};
-      @define-color color15 ${c15};
-      @define-color selected_bg_color ${accent};
-      @define-color selected_fg_color ${foreground};
-      @define-color bg_color ${background};
-      @define-color fg_color ${foreground};
+      @define-color color0 #${config.var.theme.colors.c0};
+      @define-color color1 #${config.var.theme.colors.c1};
+      @define-color color2 #${config.var.theme.colors.c2};
+      @define-color color3 #${config.var.theme.colors.c3};
+      @define-color color4 #${config.var.theme.colors.c4};
+      @define-color color5 #${config.var.theme.colors.c5};
+      @define-color color6 #${config.var.theme.colors.c6};
+      @define-color color7 #${config.var.theme.colors.c7};
+      @define-color color8 #${config.var.theme.colors.c8};
+      @define-color color9 #${config.var.theme.colors.c9};
+      @define-color color10 #${config.var.theme.colors.c10};
+      @define-color color11 #${config.var.theme.colors.c11};
+      @define-color color12 #${config.var.theme.colors.c12};
+      @define-color color13 #${config.var.theme.colors.c13};
+      @define-color color14 #${config.var.theme.colors.c14};
+      @define-color color15 #${config.var.theme.colors.c15};
+      @define-color selected_bg_color #${config.var.theme.colors.accent};
+      @define-color selected_fg_color #${config.var.theme.colors.accentFg};
+
+      @define-color bg_color #${config.var.theme.colors.bg};
+      @define-color fg_color #${config.var.theme.colors.fg};
       @define-color base_color @bg_color;
       @define-color text_color @fg_color;
       @define-color text_color_disabled mix(@text_color, @base_color, 0.4);
-      @define-color tooltip_bg_color ${background-alt};
-      @define-color tooltip_fg_color ${foreground};
+      @define-color tooltip_bg_color #${config.var.theme.colors.bgalt};
+      @define-color tooltip_fg_color #${config.var.theme.colors.fgalt};
     '';
   };
 }

home/system/hyprland/animations.nix

@@ -1,53 +0,0 @@
-{ config, ... }:
-let
-  animationSpeed = config.var.theme.animation-speed;
-
-  animationDuration = if animationSpeed == "slow" then
-    "4"
-  else if animationSpeed == "medium" then
-    "2.5"
-  else
-    "1.5";
-  borderDuration = if animationSpeed == "slow" then
-    "10"
-  else if animationSpeed == "medium" then
-    "6"
-  else
-    "3";
-in {
-  wayland.windowManager.hyprland.settings = {
-    animations = {
-      enabled = true;
-      bezier = [
-        "linear, 0, 0, 1, 1"
-        "md3_standard, 0.2, 0, 0, 1"
-        "md3_decel, 0.05, 0.7, 0.1, 1"
-        "md3_accel, 0.3, 0, 0.8, 0.15"
-        "overshot, 0.05, 0.9, 0.1, 1.1"
-        "crazyshot, 0.1, 1.5, 0.76, 0.92"
-        "hyprnostretch, 0.05, 0.9, 0.1, 1.0"
-        "menu_decel, 0.1, 1, 0, 1"
-        "menu_accel, 0.38, 0.04, 1, 0.07"
-        "easeInOutCirc, 0.85, 0, 0.15, 1"
-        "easeOutCirc, 0, 0.55, 0.45, 1"
-        "easeOutExpo, 0.16, 1, 0.3, 1"
-        "softAcDecel, 0.26, 0.26, 0.15, 1"
-        "md2, 0.4, 0, 0.2, 1"
-      ];
-
-      animation = [
-        "windows, 1, ${animationDuration}, md3_decel, popin 60%"
-        "windowsIn, 1, ${animationDuration}, md3_decel, popin 60%"
-        "windowsOut, 1, ${animationDuration}, md3_accel, popin 60%"
-        "border, 1, ${borderDuration}, default"
-        "fade, 1, ${animationDuration}, md3_decel"
-        "layersIn, 1, ${animationDuration}, menu_decel, slide"
-        "layersOut, 1, ${animationDuration}, menu_accel"
-        "fadeLayersIn, 1, ${animationDuration}, menu_decel"
-        "fadeLayersOut, 1, ${animationDuration}, menu_accel"
-        "workspaces, 1, ${animationDuration}, menu_decel, slide"
-        "specialWorkspace, 1, ${animationDuration}, md3_decel, slidevert"
-      ];
-    };
-  };
-}

home/system/hyprland/bindings.nix

@@ -1,60 +0,0 @@
-{ pkgs, ... }: {
-  wayland.windowManager.hyprland.settings = {
-    bind = [
-      "$mod,RETURN, exec, ${pkgs.kitty}/bin/kitty" # Kitty
-      "$mod,E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Thunar
-      "$mod,B, exec, ${pkgs.qutebrowser}/bin/qutebrowser" # Qutebrowser
-      "$mod,K, exec, ${pkgs.bitwarden}/bin/bitwarden" # Bitwarden
-      "$mod,L, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock
-      "$mod,X, exec, powermenu" # Powermenu
-      "$mod,SPACE, exec, menu" # Launcher
-      "$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus
-
-      "$mod,Q, killactive," # Close window
-      "$mod,T, togglefloating," # Toggle Floating
-      "$mod,F, fullscreen" # Toggle Fullscreen
-      "$mod,left, movefocus, l" # Move focus left
-      "$mod,right, movefocus, r" # Move focus Right
-      "$mod,up, movefocus, u" # Move focus Up
-      "$mod,down, movefocus, d" # Move focus Down
-      "$shiftMod,up, focusmonitor, -1" # Focus previous monitor
-      "$shiftMod,down, focusmonitor, 1" # Focus next monitor
-      "$shiftMod,left, layoutmsg, addmaster" # Add to master
-      "$shiftMod,right, layoutmsg, removemaster" # Remove from master
-
-      "$mod,PRINT, exec, screenshot window" # Screenshot window
-      ",PRINT, exec, screenshot monitor" # Screenshot monitor
-      "$shiftMod,PRINT, exec, screenshot region" # Screenshot region
-      "ALT,PRINT, exec, screenshot region swappy" # Screenshot region then edit
-
-      "$shiftMod,S, exec, ${pkgs.qutebrowser}/bin/qutebrowser :open $(wofi --show dmenu -L 1 -p ' Search on internet')" # Search on internet with wofi
-      "$shiftMod,C, exec, clipboard" # Clipboard picker with wofi
-      "$shiftMod,E, exec, ${pkgs.wofi-emoji}/bin/wofi-emoji" # Emoji picker with wofi
-      "$mod,F2, exec, night-shift" # Toggle night shift
-      "$mod,F3, exec, night-shift" # Toggle night shift
-    ] ++ (builtins.concatLists (builtins.genList (i:
-      let ws = i + 1;
-      in [
-        "$mod,code:1${toString i}, workspace, ${toString ws}"
-        "$mod SHIFT,code:1${toString i}, movetoworkspace, ${toString ws}"
-      ]) 9));
-
-    bindm = [
-      "$mod,mouse:272, movewindow" # Move Window (mouse)
-      "$mod,R, resizewindow" # Resize Window (mouse)
-    ];
-
-    bindl = [
-      ",XF86AudioMute, exec, sound-toggle" # Toggle Mute
-      ",switch:Lid Switch, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock when closing Lid
-    ];
-
-    bindle = [
-      ",XF86AudioRaiseVolume, exec, sound-up" # Sound Up
-      ",XF86AudioLowerVolume, exec, sound-down" # Sound Down
-      ",XF86MonBrightnessUp, exec, brightness-up" # Brightness Up
-      ",XF86MonBrightnessDown, exec, brightness-down" # Brightness Down
-    ];
-
-  };
-}