change the way workflow works

Former-commit-id: de125e21a7

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: anotherhadi
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: # Replace with a single Buy Me a Coffee username
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/assets/README_template.md

@@ -0,0 +1,110 @@
+<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. The `stylix` folder contains the [stylix](https://github.com/danth/stylix) defined themes, the `var` folder contains the variables not handled by 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

@@ -0,0 +1,20 @@
+#!/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

@@ -0,0 +1,26 @@
+#!/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/scripts/keybindings_to_markdown.sh

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

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

@@ -0,0 +1,24 @@
+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
+          ./.github/scripts/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
+          exit 0

.github/workflows/update-readme.yml

@@ -0,0 +1,31 @@
+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
+          exit 0

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

@@ -0,0 +1,24 @@
+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
+          exit 0

.gitignore

@@ -1 +1,2 @@
 todolist.md
+.sops.yaml

.sops.yaml

@@ -1,11 +0,0 @@
-keys:
-  - &primary age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
-creation_rules:
-  - path_regex: hosts/laptop/secrets/secrets.yaml$
-    key_groups:
-      - age:
-        - *primary
-  - path_regex: hosts/server/secrets/secrets.yaml$
-    key_groups:
-      - age:
-        - *primary

README.md

@@ -1,11 +1,6 @@
-[//]: # (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)
-
+[//]: # (This file is autogenerated)
 <div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
+    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
 </div>
 
 <br>
@@ -14,20 +9,17 @@
 
 <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=89b4fa&labelColor=181825&style=for-the-badge&logo=starship&logoColor=89b4fa">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=A594FD&labelColor=0b0b0b&style=for-the-badge&logo=starship&logoColor=A594FD">
     </a>
     <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=github&logoColor=89b4fa">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=A594FD&labelColor=0b0b0b&style=for-the-badge&logo=github&logoColor=A594FD">
     </a>
     <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=181825&logo=NixOS&logoColor=89b4fa&color=89b4fa">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=0b0b0b&logo=NixOS&logoColor=A594FD&color=A594FD">
     </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=181825&colorB=89b4fa&logo=unlicense&logoColor=89b4fa"/>
+        <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"/>
     </a>
 </div>
 <br>
@@ -35,25 +27,38 @@
 **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)
-    - [💻 `hosts`](#-hosts)
+  - [🏠 home](#-home)
+  - [🐧 nixos](#-nixos)
+  - [🎨 themes](#-themes)
+  - [💻 hosts](#-hosts)
 - [Installation](#installation)
 - [Documentation](#documentation)
 
 ## Gallery
 
-![nixy1](docs/src/nixy/1.png)
-![nixy2](docs/src/nixy/2.png)
-![nixy3](docs/src/nixy/3.png)
+![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`
+### 🏠 home
 
 Those are the dotfiles and configuration files for user-level configuration
 
@@ -62,45 +67,53 @@ 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
 
-### 💻 `hosts`
+### 🐧 nixos
 
-Those are the host-specific configurations
+Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
+
+### 🎨 themes
+
+Those are the themes used in the system configuration. The `stylix` folder contains the [stylix](https://github.com/danth/stylix) defined themes, the `var` folder contains the variables not handled by 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.
 
-**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
 
+1. Clone the repo
+
 ```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')
+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`
 
-> [!NOTE]
+> [!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.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
+- [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.md](docs/TODO.md): What's next (feel free to contribute)
-- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
+- [TODO](docs/TODO.md): What's next (feel free to contribute)
+- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License

docs/APPS.md

@@ -1,41 +0,0 @@
-# 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,9 +9,6 @@ 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

@@ -0,0 +1,51 @@
+[//]: # (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 |
+| Zen Browser | SUPER + B |
+| Bitwarden | SUPER + K |
+| Lock | SUPER + L |
+| Powermenu | SUPER + X |
+| Launcher | SUPER + SPACE |
+| Quickmenu | SUPER + C |
+| Toggle HyprFocus | SHIFT + SUPER + SPACE |
+| Planify | SUPER + P |
+| 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 region | SUPER + PRINT |
+| Screenshot monitor | PRINT |
+| Screenshot window | SHIFT + SUPER + PRINT |
+| Screenshot region then edit | ALTPRINT |
+| Toggle hyprpanel | SHIFT + SUPER + T |
+| 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 |
+| Play/Pause Song | XF86AudioPlay |
+| Next Song | XF86AudioNext |
+| Previous Song | XF86AudioPrev |
+| Lock when closing Lid | switch:Lid Switch |
+| Sound Up | XF86AudioRaiseVolume |
+| Sound Down | XF86AudioLowerVolume |
+| Brightness Up | XF86MonBrightnessUp |
+| Brightness Down | XF86MonBrightnessDown |

docs/KEYBINDINGS.md

@@ -1,42 +0,0 @@
-# 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,55 +1,98 @@
+[//]: # (This file is autogenerated)
 # Scripts
 
-Scripts are located in the `home/scripts` folder. Home-manager add those in the user's path.
+Scripts are located in the 'home/scripts' folder. Home-manager add those in the user's path.
 
-## Nix/NixOs shortcuts
+## Brightness
 
-> [!TIP]
-> The `hostname` variable in `hosts/yourhost/variables.nix` should be also the name of the `nixosConfiguration` in `flake.nix` file.
+This module provides a set of scripts to control the brightness of the screen.
 
-- `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>`
+- `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` # Toggle caffeine
-- `caffeine-status` # Return 1/0
-- `caffeine-status-icon` # Return 󰅶/󰾪
+- `caffeine-status` - Check if hypridle is running. (0/1)
+- `caffeine-status-icon` - Check if hypridle is running. (icon)
+- `caffeine` - Toggle hypridle.
 
-## Night-Shift
+## Hyprfocus
 
-Blue light filter, using wlsunset
+A simple script to toggle focus on few windows in Hyprland.
+(disable gaps, border, shadow, opacity, etc.)
 
-- `night-shift` # Toggle night shift
-- `night-shift-status` # Return 1/0
-- `night-shift-status-icon` # Return 󰖕/󰖔
-- `night-shift-on`
-- `night-shift-off`
+- `hyprfocus-on` - Enable hyprfocus.
+- `hyprfocus-off` - Disable hyprfocus.
+- `hyprfocus-toggle` - Toggle hyprfocus.
+
+## Hyprpanel
+
+Quick scripts to toggle, reload, hide & show hyprpanel.
+
+- `hyprpanel-toggle` - Toggle hyprpanel (hide/show).
+- `hyprpanel-show` - Show hyprpanel.
+- `hyprpanel-hide` - Hide hyprpanel.
+- `hyprpanel-reload` - Reload hyprpanel.
 
 ## Nerdfont FZF
 
-Nerdfont fzf is a quick way to search for nerdfont icons locally.
-It will copy the selected icon to the clipboard.
+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.
+It use hyprsunset to control the screen temperature.
+
+- `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.
+
+
+
+## OpenVPN
+
+OpenVPN allows you to connect/disconnect quickly to a openVPN server
+
+- `openvpn-up` turn on the vpn
+- `openvpn-down` turn down the vpn
+- `openvpn-toggle` toggle the vpn
+
+## 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.
+
+## 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. (wofi)
+- `powermenu` - Open power dropdown menu. (wofi)
+- `lock` - Lock the screen. (hyprlock)
 
-- `nerdfont-fzf`

docs/THEMES.md

@@ -1,7 +1,7 @@
 # Themes
 
-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.
+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.
 
 > [!TIP]
 > To apply the theme to DuckDuckGo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`
@@ -9,12 +9,13 @@ 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 `home/wallpapers` folder.
+Wallpapers are loaded from the [nixy-wallpapers](https://github.com/anotherhadi/nixy-wallpapers) repo.
 
 ## Gallery
 
 ### Nixy
 
-![nixy1](src/nixy/1.png)
-![nixy2](src/nixy/2.png)
-![nixy3](src/nixy/3.png)
+![nixy1](../.github/assets/nixy/1.png)
+![nixy2](../.github/assets/nixy/2.png)
+![nixy3](../.github/assets/nixy/3.png)
+![nixy4](../.github/assets/nixy/4.png)

docs/TODO.md

@@ -1,33 +1,5 @@
-# Todolist {
+# Todolist
 
 feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
 
-- [ ] 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
-  - [ ] Keymaps:
-    - Trouble
-    - Tagbar (actually not working)
-
-- [ ] 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
+- [ ] <https://github.com/isabelroses/dotfiles/blob/main/home/comfy/system/xdg.nix>

docs/WALLPAPERS.md

@@ -1,39 +0,0 @@
-# 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

@@ -1,20 +0,0 @@
-#!/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

@@ -1,24 +0,0 @@
-#!/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

@@ -1,27 +0,0 @@
-#!/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/new_tag.sh

@@ -1,26 +0,0 @@
-#!/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

@@ -1,42 +0,0 @@
-#!/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

@@ -1,67 +0,0 @@
-
-**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

@@ -1,33 +0,0 @@
-[//]: # (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

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

flake.nix

@@ -7,6 +7,7 @@
 
   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";
@@ -15,7 +16,6 @@
       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";
@@ -24,37 +24,35 @@
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    hyprland-plugins = {
-      url = "github:hyprwm/hyprland-plugins";
+    hyprspace = {
+      url = "github:KZDKM/Hyprspace";
       inputs.hyprland.follows = "hyprland";
     };
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
     hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
+    stylix.url = "github:danth/stylix";
+    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
+    nur.url = "github:nix-community/NUR";
+    zen-browser.url =
+      "git+https://git.sr.ht/~canasta/zen-browser-flake/"; # updated flake
   };
 
   outputs = inputs@{ nixpkgs, ... }: {
     nixosConfigurations = {
-      nixy = nixpkgs.lib.nixosSystem { # CHANGEME
+      nixy = # CHANGEME: This should match the 'hostname' in your variables.nix file
+        nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             {
-            nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
+              nixpkgs.overlays =
+                [ inputs.hyprpanel.overlay inputs.nur.overlays.default ];
               _module.args = { inherit inputs; };
             }
-          inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
+            inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware
             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
+            inputs.stylix.nixosModules.stylix
+            ./hosts/laptop/configuration.nix # CHANGEME: change the path to match your host folder
           ];
         };
 

home/programs/btop/default.nix

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

home/programs/cava/default.nix

@@ -1,13 +0,0 @@
-{ 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/duckduckgo-colorscheme/default.nix

@@ -0,0 +1,44 @@
+# 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};';
+
+      // 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];
+        });
+
+        return cookieJson;
+      };
+
+      // 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));
+
+      // All done, reload page for changes to take effect :)
+      location.reload();
+    '';
+}

home/programs/fetch/neofetch/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }: {
+{ pkgs, ... }: {
   home.packages = with pkgs; [ neofetch ];
 
   xdg.configFile."neofetch/ascii.txt".text = ''
@@ -109,9 +109,6 @@
     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, config, ... }:
+{ pkgs, ... }:
 let
   nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''
           ostype="$(uname)"
@@ -345,9 +345,9 @@ let
 
           ## USER VARIABLES -- YOU CAN CHANGE THESE
 
-          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
+          lc="$reset$bold$magenta" # labels
+          nc="$reset$bold$magenta" # labels
+          hn="$reset$bold$magenta" # labels
           ic="$reset$white"          # info
           c0="$reset$grey"           # first color
           c1="$reset$white"          # second color

home/programs/git/default.nix

@@ -1,8 +1,12 @@
-{ config, ... }: {
+{ config, ... }:
+let
+  username = config.var.git.username;
+  email = config.var.git.email;
+in {
   programs.git = {
     enable = true;
-    userName = config.var.git.username;
-    userEmail = config.var.git.email;
+    userName = username;
+    userEmail = email;
     ignores = [
       ".cache/"
       ".DS_Store"
@@ -18,6 +22,7 @@
     extraConfig = {
       init.defaultBranch = "main";
       push.autoSetupRemote = true;
+      color.ui = "1";
     };
     aliases = {
       essa = "push --force";

home/programs/kitty/default.nix

@@ -1,6 +1,15 @@
-{ 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;
@@ -10,39 +19,10 @@
       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 = 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;
+      cursor_underline_thickness = 3;
+      window_padding_width = 10;
     };
   };
 }

home/programs/lazygit/default.nix

@@ -0,0 +1,22 @@
+{ 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/nextcloud/default.nix

@@ -1,3 +1,4 @@
+# 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;

home/programs/nvim/autocmds.nix

@@ -0,0 +1,187 @@
+{
+  programs.nixvim = {
+    autoGroups = {
+      auto_quit.clear = true;
+      autoview.clear = true;
+      bufferline.clear = true;
+      checktime.clear = true;
+      create_dir.clear = true;
+      editorconfig_filetype.clear = true;
+      file_user_events.clear = true;
+      highlighturl.clear = true;
+      highlightyank.clear = true;
+      large_buf_settings.clear = true;
+      q_close_windows.clear = true;
+      terminal_settings.clear = true;
+      unlist_quickfix.clear = true;
+    };
+
+    autoCmd = [
+      # auto_quit
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L18-L46
+      {
+        desc =
+          "Quit neovim if more than one window is open and only sidebar windows are list";
+        event = "BufEnter";
+        group = "auto_quit";
+
+        callback.__raw = ''
+          function()
+            local wins = vim.api.nvim_tabpage_list_wins(0)
+            -- Both neo-tree and aerial will auto-quit if there is only a single window left
+            if #wins <= 1 then return end
+            local sidebar_fts = { aerial = true, ["neo-tree"] = true }
+            for _, winid in ipairs(wins) do
+              if vim.api.nvim_win_is_valid(winid) then
+                local bufnr = vim.api.nvim_win_get_buf(winid)
+                local filetype = vim.bo[bufnr].filetype
+                -- If any visible windows are not sidebars, early return
+                if not sidebar_fts[filetype] then
+                  return
+                -- If the visible window is a sidebar
+                else
+                  -- only count filetypes once, so remove a found sidebar from the detection
+                  sidebar_fts[filetype] = nil
+                end
+              end
+            end
+            if #vim.api.nvim_list_tabpages() > 1 then
+              vim.cmd.tabclose()
+            else
+              vim.cmd.qall()
+            end
+          end
+        '';
+      }
+
+      # autoview
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L49-L70
+      {
+        desc = "Save view with mkview for real files";
+        event = [ "BufWinLeave" "BufWritePost" "WinLeave" ];
+        group = "autoview";
+
+        callback.__raw = ''
+          function(event)
+            if vim.b[event.buf].view_activated then vim.cmd.mkview { mods = { emsg_silent = true } } end
+          end
+        '';
+      }
+      {
+        desc =
+          "Try to load file view if available and enable view saving for real files";
+        event = "BufWinEnter";
+        group = "autoview";
+
+        callback.__raw = ''
+          function(event)
+            if not vim.b[event.buf].view_activated then
+              local filetype = vim.bo[event.buf].filetype
+              local buftype = vim.bo[event.buf].buftype
+              local ignore_filetypes = { "gitcommit", "gitrebase", "svg", "hgcommit" }
+              if buftype == "" and filetype and filetype ~= "" and not vim.tbl_contains(ignore_filetypes, filetype) then
+                vim.b[event.buf].view_activated = true
+                vim.cmd.loadview { mods = { emsg_silent = true } }
+              end
+            end
+          end
+        '';
+      }
+
+      # checktime
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L118-L122
+      {
+        desc = "Check if buffers changed on editor focus";
+        event = [ "FocusGained" "TermClose" "TermLeave" ];
+        group = "checktime";
+        command = "checktime";
+      }
+
+      # editorconfig_filetype
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L135-L144
+      {
+        desc =
+          "Configure editorconfig after filetype detection to override `ftplugin`s";
+        event = "FileType";
+        group = "editorconfig_filetype";
+
+        callback.__raw = ''
+          function(args)
+            if vim.F.if_nil(vim.b.editorconfig, vim.g.editorconfig, true) then
+              local editorconfig_avail, editorconfig = pcall(require, "editorconfig")
+              if editorconfig_avail then editorconfig.config(args.buf) end
+            end
+          end
+        '';
+      }
+
+      # highlightyank
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L206-L211
+      {
+        desc = "Highlight yanked text";
+        event = "TextYankPost";
+        group = "highlightyank";
+        pattern = "*";
+
+        callback.__raw = ''
+          function()
+            vim.highlight.on_yank()
+          end
+        '';
+      }
+
+      # q_close_windows
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L242-L255
+      {
+        desc = "Make q close help, man, quickfix, dap floats";
+        event = "BufWinEnter";
+        group = "q_close_windows";
+
+        callback.__raw = ''
+          function(event)
+            if vim.tbl_contains({ "help", "nofile", "quickfix" }, vim.bo[event.buf].buftype) then
+              vim.keymap.set("n", "q", "<Cmd>close<CR>", {
+                desc = "Close window",
+                buffer = event.buf,
+                silent = true,
+                nowait = true,
+              })
+            end
+          end
+        '';
+      }
+
+      # terminal_settings
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L258-L266
+      {
+        desc = "Disable line number/fold column/sign column for terminals";
+        event = "TermOpen";
+        group = "terminal_settings";
+
+        callback.__raw = ''
+          function()
+            vim.opt_local.number = false
+            vim.opt_local.relativenumber = false
+            vim.opt_local.foldcolumn = "0"
+            vim.opt_local.signcolumn = "no"
+          end
+        '';
+      }
+
+      # unlist_quickfix
+      # https://github.com/AstroNvim/AstroNvim/blob/v4.7.7/lua/astronvim/plugins/_astrocore_autocmds.lua#L270-L275
+      {
+        desc = "Unlist quickfix buffers";
+        event = "FileType";
+        group = "unlist_quickfix";
+        pattern = "qf";
+
+        callback.__raw = ''
+          function()
+            vim.opt_local.buflisted = false
+          end
+        '';
+      }
+    ];
+  };
+}

home/programs/nvim/colorscheme.nix

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

home/programs/nvim/default.nix

@@ -1,17 +1,21 @@
+# Nixvim is a NixOS module that installs and configures Neovim
 { inputs, ... }: {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
-    ./plugins/cmp.nix
-    ./plugins/dashboard.nix
     ./plugins/lsp.nix
-    ./plugins/markdown.nix
     ./plugins/tree.nix
+    ./plugins/telescope.nix
+    ./plugins/cmp.nix
     ./plugins/ui.nix
+    ./plugins/lualine.nix
     ./plugins/utils.nix
-    ./plugins/zen-mode.nix
+    ./plugins/dashboard.nix
+    ./plugins/markdown.nix
 
     ./options.nix
-    ./colorscheme.nix
     ./keymaps.nix
+    ./autocmds.nix
   ];
+
+  programs.nixvim.enable = true;
 }

home/programs/nvim/keymaps.nix

@@ -1,24 +1,310 @@
 {
-  programs.nixvim.keymaps = [
+  programs.nixvim = {
+    plugins.which-key = {
+      enable = true;
+      settings = {
+        delay = 600;
+        icons = {
+          breadcrumb = "»";
+          group = "+";
+          separator = ""; # ➜
+          mappings = false;
+        };
+        spec = [
+          # General Mappings
           {
-      key = "<leader>fm";
-      action = "<cmd>lua vim.lsp.buf.format()<cr>";
-      options.desc = "LSP Format";
+            __unkeyed-1 = "<leader>c";
+            mode = [ "n" "v" ];
+            group = "+code";
           }
           {
-      key = "<leader>w";
+            __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>W";
+        key = "<leader>ul";
         action = "<cmd>set linebreak!<cr>";
         options.desc = "Toggle linebreak";
       }
       {
-      key = "<leader>z";
-      action = "<cmd>ZenMode<cr>";
-      options.desc = "ZenMode";
+        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";
       }
     ];
+  };
 }

home/programs/nvim/options.nix

@@ -1,37 +1,151 @@
 {
-
-  programs.nixvim.globals.mapleader = " ";
-  programs.nixvim.opts = {
-    updatetime = 50; # Faster completion
-
-    number = true;
-    relativenumber = true;
-
+  programs.nixvim = {
+    globals.mapleader = " ";
+    opts = {
       autoindent = true;
-    clipboard = "unnamed,unnamedplus";
 
-    expandtab = true;
-    tabstop = 2;
-    softtabstop = 2;
-    shiftwidth = 2;
       smartindent = true;
-    breakindent = true;
 
-    ignorecase = true;
       incsearch = true;
       hlsearch = true;
-    smartcase = true;
       wildmode = "list:longest";
-    completeopt = [ "menuone" "noselect" ];
-    signcolumn = "yes";
-    cursorline = false;
       scrolloff = 8;
-    mouse = "a";
-
-    wrap = false;
 
       swapfile = false;
-    undofile = true;
       conceallevel = 3;
+      clipboard = "unnamed,unnamedplus";
+
+      # Don't stop backspace at insert
+      backspace.__raw = ''
+        vim.list_extend(vim.opt.backspace:get(), { "nostop" })
+      '';
+
+      # Keep visual indentation on wrapped lines
+      breakindent = true;
+
+      # Hide command line unless needed
+      cmdheight = 0;
+
+      # Insert mode completion options
+      completeopt = [ "menu" "menuone" "noselect" ];
+
+      # Raise a dialog asking if you wish to save the current file(s)
+      confirm = true;
+
+      # Copy previous indentation on autoindenting
+      copyindent = true;
+
+      # Highlight current line
+      cursorline = true;
+
+      # Enable linematch diff algorithm
+      diffopt.__raw = ''
+        vim.list_extend(vim.opt.diffopt:get(), { "algorithm:histogram", "linematch:60" })
+      '';
+
+      # Expand <Tab> to spaces
+      expandtab = true;
+
+      # Disable `~` on nonexistent lines
+      fillchars = { eob = " "; };
+
+      # Enable fold with all code unfolded
+      foldcolumn = "1";
+      foldenable = true;
+      foldlevel = 99;
+      foldlevelstart = 99;
+
+      # Ignore case in search patterns
+      ignorecase = true;
+
+      # Show substitution preview in split window
+      inccommand = "split";
+
+      # Infer casing on word completion
+      infercase = true;
+
+      # Global statusline
+      laststatus = 3;
+
+      # Wrap lines at 'breakat'
+      linebreak = true;
+
+      # Enable mouse support
+      mouse = "a";
+
+      # Show line numbers
+      number = true;
+
+      # Preserve indentation as much as possible
+      preserveindent = true;
+
+      # Height of the popup menu
+      pumheight = 10;
+
+      # Display line numbers relative to current line
+      relativenumber = true;
+
+      # Minimal number of lines to keep around the cursor
+      # This has the effect to move the view along with current line
+      #scrolloff = 999;
+
+      # Number of spaces to use for indentation
+      shiftwidth = 2;
+
+      # Disable search count wrap and startup messages
+      shortmess.__raw = ''
+        vim.tbl_deep_extend("force", vim.opt.shortmess:get(), { s = true, I = true })
+      '';
+
+      # Disable showing modes in command line
+      showmode = false;
+
+      # Always show tabline
+      showtabline = 2;
+
+      # Show signs column
+      signcolumn = "yes";
+
+      # Override ignorecase if search pattern contains uppercase characters
+      smartcase = true;
+
+      # Number of spaces input on <Tab>
+      softtabstop = 2;
+
+      # Open horizontal split below (:split)
+      splitbelow = true;
+
+      # Open vertical split to the right (:vsplit)
+      splitright = true;
+
+      # Number of spaces to represent a <Tab>
+      tabstop = 2;
+
+      # Enables 24-bit RGB color
+      termguicolors = true;
+
+      # Shorter timeout duration
+      timeoutlen = 500;
+
+      # Set window title to the filename
+      title = true;
+
+      # Save undo history to undo file (in $XDG_STATE_HOME/nvim/undo)
+      undofile = true;
+
+      viewoptions.__raw = ''
+        vim.tbl_filter(function(val) return val ~= "curdir" end, vim.opt.viewoptions:get())
+      '';
+
+      # Enable virtual edit in visual block mode
+      # This has the effect of selecting empty cells beyond lines boundaries
+      virtualedit = "block";
+
+      # Disable line wrapping
+      wrap = false;
+
+      # Disable making a backup before overwriting a file
+      writebackup = false;
+    };
   };
 }

home/programs/nvim/plugins/cmp.nix

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

home/programs/nvim/plugins/dashboard.nix

@@ -1,9 +1,15 @@
-{ config, ... }: {
+{ 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 {
 
   programs.nixvim.highlight = {
-    AlphaHeaderColor.fg = "#${config.var.theme.colors.accent}";
-    AlphaTextColor.fg = "#${config.var.theme.colors.fg}";
-    AlphaShortcutColor.fg = "#${config.var.theme.colors.fgalt}";
+    AlphaHeaderColor.fg = accent;
+    AlphaTextColor.fg = foreground;
+    AlphaShortcutColor.fg = muted;
   };
 
   programs.nixvim.plugins.alpha = {
@@ -44,6 +50,16 @@
             val = "󰭎  Find file";
             on_press.__raw = "function() vim.cmd[[Telescope find_files]] end";
             opts = {
+              keymap = [
+                "n"
+                "nf"
+                ":Telescope find_files <CR>"
+                {
+                  noremap = true;
+                  silent = true;
+                  nowait = true;
+                }
+              ];
               shortcut = "nf";
               position = "center";
               cursor = 3;
@@ -58,6 +74,16 @@
             val = "  New file";
             on_press.__raw = "function() vim.cmd[[ene]] end";
             opts = {
+              keymap = [
+                "n"
+                "nn"
+                ":ene <CR>"
+                {
+                  noremap = true;
+                  silent = true;
+                  nowait = true;
+                }
+              ];
               shortcut = "nn";
               position = "center";
               cursor = 3;
@@ -70,9 +96,18 @@
           {
             type = "button";
             val = "  NixOs Config";
-            on_press.__raw =
-              "function() vim.cmd[[Neotree ${config.var.configDirectory}]] end";
+            on_press.__raw = "function() vim.cmd[[Neotree ${configDir}]] end";
             opts = {
+              keymap = [
+                "n"
+                "nc"
+                ":Neotree ${configDir} <CR>"
+                {
+                  noremap = true;
+                  silent = true;
+                  nowait = true;
+                }
+              ];
               shortcut = "nc";
               position = "center";
               cursor = 3;
@@ -86,9 +121,19 @@
             type = "button";
             val = "  Keybindings";
             on_press.__raw =
-              "function() vim.cmd[[e ${config.var.configDirectory}/docs/KEYBINDINGS.md]] end";
+              "function() vim.cmd[[e ${configDir}/docs/KEYBINDINGS.md]] end";
             opts = {
-              shortcut = "nc";
+              shortcut = "nk";
+              keymap = [
+                "n"
+                "nk"
+                ":e ${configDir}/docs/KEYBINDINGS-HYPRLAND.md <CR>"
+                {
+                  noremap = true;
+                  silent = true;
+                  nowait = true;
+                }
+              ];
               position = "center";
               cursor = 3;
               width = 50;
@@ -103,6 +148,16 @@
             on_press.__raw = "function() vim.cmd[[Telescope oldfiles]] end";
             opts = {
               shortcut = "no";
+              keymap = [
+                "n"
+                "no"
+                ":Telescope oldfiles <CR>"
+                {
+                  noremap = true;
+                  silent = true;
+                  nowait = true;
+                }
+              ];
               position = "center";
               cursor = 3;
               width = 50;
@@ -116,7 +171,17 @@
             val = "󰱽  Find text";
             on_press.__raw = "function() vim.cmd[[Telescope live_grep]] end";
             opts = {
-              shortcut = "nt";
+              shortcut = "ng";
+              keymap = [
+                "n"
+                "ng"
+                ":Telescope live_grep <CR>"
+                {
+                  noremap = true;
+                  silent = true;
+                  nowait = true;
+                }
+              ];
               position = "center";
               cursor = 3;
               width = 50;
@@ -131,6 +196,16 @@
             on_press.__raw = "function() vim.cmd[[qa]] end";
             opts = {
               shortcut = "nq";
+              keymap = [
+                "n"
+                "nq"
+                ":qa <CR>"
+                {
+                  noremap = true;
+                  silent = true;
+                  nowait = true;
+                }
+              ];
               position = "center";
               cursor = 3;
               width = 50;

home/programs/nvim/plugins/lsp.nix

@@ -7,18 +7,20 @@
         bashls.enable = true;
         clangd.enable = true;
         gopls.enable = true;
-        nixd.enable = true;
+        eslint.enable = true;
+        ts_ls.enable = true;
+        nixd = {
+          enable = true;
+          extraOptions = {
+            expr = "import <nixpkgs> {}";
+            # fix- encoding: https://github.com/nix-community/nixvim/issues/2390
+            offset_encoding = "utf-8";
+          };
+        };
         tailwindcss.enable = true;
-        # html.enable = true; # FIXME: broken for some reason
+        html.enable = true;
         svelte.enable = true;
         marksman.enable = true;
-        ltex = {
-          enable = false;
-          settings = {
-            enabled = false;
-            language = "en";
-          };
-        };
       };
       keymaps.lspBuf = {
         "gd" = "definition";
@@ -43,6 +45,8 @@
           tidy.enable = true;
           shellharden.enable = true;
           shfmt.enable = true;
+          golines.enable = true;
+          gofumpt.enable = true;
         };
       };
     };

home/programs/nvim/plugins/lualine.nix

@@ -0,0 +1,30 @@
+{
+  programs.nixvim.plugins.lualine = {
+    enable = true;
+    settings = {
+      options.disabled_filetypes.statusline =
+        [ "dashboard" "alpha" "neo-tree" ];
+
+      alwaysDivideMiddle = true;
+      globalstatus = true;
+      ignoreFocus = [ "neo-tree" ];
+      extensions = [ "fzf" ];
+      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")'' ];
+      };
+    };
+  };
+}

home/programs/nvim/plugins/markdown.nix

@@ -1,72 +1,149 @@
-{
-  programs.nixvim.plugins = {
+{ config, ... }:
+let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  muted = "#${config.lib.stylix.colors.base03}";
+in {
+  programs.nixvim = {
+    # Markdown settings
+    extraFiles."after/ftplugin/markdown.lua".text = ''
+      vim.bo.tabstop = 2
+      vim.bo.shiftwidth = 2
+      vim.bo.expandtab = true 
+    '';
+
+    # Highlight colors
+    highlight = {
+      Headline1 = {
+        bg = "#4B4266";
+        fg = accent;
+      };
+      Headline2 = {
+        bg = "#3B575E";
+        fg = "#9FFEFE";
+      };
+      Headline3 = {
+        bg = "#3B5742";
+        fg = "#9FFE9F";
+      };
+      Headline4 = {
+        bg = "#574842";
+        fg = "#FECB9F";
+      };
+
+      RenderMarkdownTodo.fg = "#f78c6c";
+      RenderMarkdownWarning.fg = "#ff5370";
+      RenderMarkdownDone.fg = muted;
+    };
+
+    # Plugins
+    plugins = {
+      # Paste images from clipboard
+      clipboard-image = {
+        enable = true;
+        settings = { default.img_dir = [ "%:p:h" "img" ]; };
+      };
+
+      # Zen mode
+      zen-mode = {
+        enable = true;
+        settings = {
+          on_close = ''
+            function()
+            end
+          '';
+          on_open = ''
+            function()
+            end
+          '';
+          plugins = {
+            gitsigns = { enabled = false; };
+            options = {
+              enabled = true;
+              ruler = false;
+              showcmd = false;
+              laststatus = "0";
+              kitty = {
+                enabled = true;
+                font = "+4";
+              };
+            };
+          };
+          window = {
+            backdrop = 0.95;
+            height = 1;
+            options = {
+              signcolumn = "no";
+              number = false;
+              relativenumber = false;
+            };
+            width = 0.8;
+          };
+        };
+      };
+
+      # Display images in markdown
+      image = {
+        enable = true;
+        integrations.markdown = {
+          clearInInsertMode = true;
+          onlyRenderImageAtCursor = true;
+        };
+      };
+
+      # This one takes care of the markdown titles
+      headlines = {
+        enable = true;
+        settings = {
+          markdown = {
+            headline_highlights =
+              [ "Headline1" "Headline2" "Headline3" "Headline4" ];
+          };
+        };
+      };
+
+      # MkdnFlow is a plugin that helps you navigate markdown files
       mkdnflow = {
         enable = true;
+        modules = { conceal = false; };
+        toDo.symbols = [ " " "-" "x" "!" "/" ];
         mappings = {
-
-        # Main
-        MkdnEnter = {
-          key = "<CR>";
-          modes = [ "n" "v" "i" ];
-        };
-
-        # Links
           MkdnCreateLink = false;
           MkdnCreateLinkFromClipboard = {
-          key = "<leader>lc";
+            key = "<leader>ml";
             modes = [ "n" "v" ];
           };
-        MkdnDestroyLink = {
-          key = "<leader>dl";
+          MkdnDecreaseHeading = {
+            key = "<leader>m-";
             modes = "n";
           };
-        MkdnFollowLink = false;
-        MkdnNextLink = {
-          key = "<Tab>";
-          modes = "n";
+          MkdnDestroyLink = false;
+          MkdnEnter = {
+            key = "<CR>";
+            modes = [ "v" ];
           };
-        MkdnYankAnchorLink = {
-          key = "ya";
-          modes = "n";
-        };
-        MkdnYankFileAnchorLink = {
-          key = "yfa";
-          modes = "n";
-        };
-        MkdnPrevLink = {
-          key = "<S-Tab>";
+          MkdnExtendList = false;
+
+          MkdnFoldSection = {
+            key = "<leader>mf";
             modes = "n";
           };
 
-        MkdnDecreaseHeading = {
-          key = "-";
-          modes = "n";
-        };
-        MkdnExtendList = false;
-        MkdnFoldSection = {
-          key = "<leader>ff";
-          modes = "n";
-        };
           MkdnUnfoldSection = {
-          key = "<leader>fu";
+            key = "<leader>mF";
             modes = "n";
           };
-        MkdnGoBack = {
-          key = "<BS>";
-          modes = "n";
-        };
-        MkdnGoForward = {
-          key = "<Del>";
+
+          MkdnFollowLink = {
+            key = "gd";
             modes = "n";
           };
+          MkdnGoBack = false;
+          MkdnGoForward = false;
           MkdnIncreaseHeading = {
-          key = "+";
-          modes = "n";
-        };
-        MkdnMoveSource = {
-          key = "<F2>";
+            key = "<leader>m+";
             modes = "n";
           };
+          MkdnMoveSource = false;
           MkdnNewListItem = false;
           MkdnNewListItemAboveInsert = {
             key = "O";
@@ -77,56 +154,89 @@
             modes = "n";
           };
           MkdnNextHeading = {
-          key = "]]";
+            key = "<leader>m#";
             modes = "n";
           };
+          MkdnNextLink = false;
+          MkdnPrevLink = false;
           MkdnPrevHeading = {
-          key = "[[";
+            key = "<leader>m*";
             modes = "n";
           };
           MkdnSTab = false;
           MkdnTab = false;
-        MkdnTableFormat = {
-          key = "<leader>ft";
-          modes = "n";
-        };
           MkdnTableNewColAfter = {
-          key = "<leader>ic";
+            key = "<leader>mc";
             modes = "n";
           };
           MkdnTableNewColBefore = {
-          key = "<leader>iC";
+            key = "<leader>mC";
             modes = "n";
           };
           MkdnTableNewRowAbove = {
-          key = "<leader>iR";
+            key = "<leader>mR";
             modes = "n";
           };
           MkdnTableNewRowBelow = {
-          key = "<leader>ir";
+            key = "<leader>mr";
             modes = "n";
           };
           MkdnTableNextCell = {
             key = "<S-Tab>";
-          modes = "i";
+            modes = "n";
           };
           MkdnTableNextRow = false;
           MkdnTablePrevCell = {
-          key = "<M-Tab>";
-          modes = "i";
-        };
-        MkdnTablePrevRow = {
-          key = "<M-CR>";
-          modes = "i";
+            key = "<S-Tab>";
+            modes = "n";
           };
+          MkdnTablePrevRow = false;
           MkdnToggleToDo = {
             key = "<C-Space>";
             modes = [ "n" "v" ];
           };
           MkdnUpdateNumbering = {
-          key = "<leader>nn";
+            key = "<leader>mn";
             modes = "n";
           };
+          MkdnYankAnchorLink = {
+            key = "ya";
+            modes = "n";
+          };
+          MkdnYankFileAnchorLink = {
+            key = "yfa";
+            modes = "n";
+          };
+        };
+      };
+
+      # Render UI elements
+      render-markdown = {
+        enable = true;
+        settings = {
+          heading = { enabled = false; };
+          checkbox = {
+            unchecked = { highlight = "RenderMarkdownTodo"; };
+            checked = { highlight = "RenderMarkdownDone"; };
+            custom = {
+              pending = {
+                raw = "[-]";
+                rendered = " ";
+                highlight = "RenderMarkdownTodo";
+              };
+              important = {
+                raw = "[!]";
+                rendered = "󰰱 ";
+                highlight = "RenderMarkdownWarning";
+              };
+              cancel = {
+                raw = "[/]";
+                rendered = "󱋬 ";
+                highlight = "RenderMarkdownWarning";
+              };
+            };
+          };
+        };
       };
     };
   };

home/programs/nvim/plugins/telescope.nix

@@ -0,0 +1,31 @@
+{ 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

@@ -7,6 +7,11 @@
         settings = {
           default_file_explorer = false;
           skip_confirm_for_simple_edits = true;
+          view_options.is_hidden_file = ''
+            function(name, bufnr)
+              return vim.startswith(name, ".") or name == "img"
+            end
+          '';
           win_options = {
             concealcursor = "ncv";
             conceallevel = 3;
@@ -40,22 +45,5 @@
         };
       };
     };
-    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,43 +1,14 @@
-{ pkgs, config, ... }: {
+{ pkgs, ... }: {
   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;
+  programs.nixvim.plugins = {
+    web-devicons.enable = true;
     noice.enable = true;
     gitsigns = {
       enable = true;
       settings.current_line_blame = false;
     };
-      bufferline.enable = true;
     trouble.enable = true;
-      indent-blankline.enable = true;
-      which-key.enable = true;
-      headlines = {
-        enable = true;
-        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";
-    }];
+    bufferline.enable = true;
   };
 }

home/programs/nvim/plugins/utils.nix

@@ -1,51 +1,25 @@
 { config, ... }: {
   programs.nixvim = {
     highlightOverride = {
-      FloatBorder.fg = "#${config.var.theme.colors.accent}";
+      FloatBorder.fg = "#${config.lib.stylix.colors.base0D}";
     };
+    nixpkgs.config = { allowUnfree = true; };
     plugins = {
       copilot-vim.enable = true;
       flash.enable = true;
-      # image.enable = true;
       tmux-navigator.enable = true;
       comment.enable = true;
       nvim-autopairs.enable = true;
-      friendly-snippets.enable = true;
-      telescope = {
-        enable = true;
-        keymaps = {
-          "<leader>fg" = "live_grep";
-          "<leader> " = "find_files";
-        };
-        extensions.fzf-native = { enable = true; };
-      };
+      todo-comments.enable = true;
       treesitter = {
         enable = true;
         nixGrammars = true;
         settings = {
+          ensure_installed = "all";
           indent.enable = true;
           highlight.enable = true;
         };
       };
-      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

@@ -1,31 +0,0 @@
-{
-  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/qutebrowser/default.nix

@@ -1,5 +1,12 @@
+# 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": {
@@ -7,10 +14,10 @@ let
         "openLinksInNewTab": false,
         "locale": "fr-FR",
         "colors": {
-          "primary": "#${config.var.theme.colors.accent}",
-          "background": "#${config.var.theme.colors.bg}",
-          "foreground": "#${config.var.theme.colors.fg}",
-          "muted": "#${config.var.theme.colors.c8}"
+          "primary": "${accent}",
+          "background": "${background}",
+          "foreground": "${foreground}",
+          "muted": "#${muted}"
         },
         "folders": [
           {
@@ -117,98 +124,12 @@ 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" ];
@@ -235,10 +156,7 @@ in {
         remove_finished = 0;
       };
 
-      hints = {
-        border = "none";
-        radius = 1;
-      };
+      hints = { radius = 1; };
 
       scrolling = {
         bar = "never";

home/programs/qutebrowser/duckduckgo-colorscheme.nix

@@ -1,9 +1,19 @@
-{ config, ... }: {
-  home.file.".duckduckgo-colorscheme.js".text = ''
+# 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=${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};';
+      const cookie = '7=${background}; j=${background}; 9=${foreground}; aa=${foreground-alt}; 8=${foreground}; x=${accent}; 21=${background-alt};';
 
       // Converts cookie string into formatted JSON
       const cookieToJSON = (cookieRaw) => {
@@ -25,8 +35,6 @@
         });
       };
 
-    alert('The Nixy theme will be applied.');
-
       // Call set cookies, passing in formated cookie data
       setCookies(cookieToJSON(cookie));
 

home/programs/shell/default.nix

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

home/programs/shell/eza.nix

@@ -1,7 +1,8 @@
+# Eza is a ls replacement
 {
   programs.eza = {
     enable = true;
-    icons = true;
+    icons = "auto";
 
     extraOptions = [
       "--group-directories-first"

home/programs/shell/fzf.nix

@@ -1,14 +1,20 @@
-{ config, ... }: {
+# 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 {
   programs.fzf = {
     enable = true;
     enableZshIntegration = true;
-    colors = {
-      "fg+" = config.var.theme.colors.accentName;
+    colors = lib.mkForce {
+      "fg+" = accent;
       "bg+" = "-1";
-      "fg" = "white";
+      "fg" = foreground;
       "bg" = "-1";
-      "prompt" = "grey";
-      "pointer" = config.var.theme.colors.accentName;
+      "prompt" = muted;
+      "pointer" = accent;
     };
     defaultOptions = [
       "--margin=1"

home/programs/shell/lazygit.nix

@@ -1,13 +0,0 @@
-{ 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,4 +1,9 @@
-{ config, lib, ... }: {
+# 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 {
   programs.starship = {
     enable = true;
     settings = {
@@ -10,17 +15,18 @@
         "$git_status"
         "$character"
       ];
-      directory = { style = "#${config.var.theme.colors.accent}"; };
+      directory = { style = accent; };
 
       character = {
-        success_symbol = "[❯](#${config.var.theme.colors.accent})";
+        success_symbol = "[❯](${accent})";
         error_symbol = "[❯](red)";
         vimcmd_symbol = "[❮](cyan)";
       };
 
       git_branch = {
-        format = "[$branch]($style)";
-        style = "bright-black";
+        symbol = "[](${background-alt}) ";
+        style = "fg:${accent} bg:${background-alt}";
+        format = "on [$symbol$branch]($style)[](${background-alt}) ";
       };
 
       git_status = {

home/programs/shell/tmux.nix

@@ -1,4 +1,30 @@
-{ pkgs, ... }: {
+# Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window.
+{ pkgs, ... }:
+let
+  Config = pkgs.writeShellScriptBin "Config" ''
+    SESSION="Nixy Config"
+
+    tmux has-session -t "$SESSION" 2>/dev/null
+
+    if [ $? == 0 ]; then
+      tmux attach -t "$SESSION"
+      exit 0
+    fi
+
+    tmux new-session -d -s "$SESSION"
+    tmux send-keys -t "$SESSION" "sleep 0.2 && clear && cd ~/.config/nixos/ && vim" C-m
+
+    tmux new-window -t "$SESSION" -n "nixy"
+    tmux send-keys -t "$SESSION":1 "sleep 0.2 && clear && cd ~/.config/nixos/ && nixy loop" C-m
+
+    tmux new-window -t "$SESSION" -n "lazygit"
+    tmux send-keys -t "$SESSION":2 "sleep 0.2 && clear && cd ~/.config/nixos/ && lazygit" C-m
+
+    tmux select-window -t "$SESSION":0
+    tmux select-pane -t 0
+    tmux attach -t "$SESSION"
+  '';
+in {
   programs.tmux = {
     enable = true;
     mouse = true;
@@ -12,37 +38,21 @@
       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
+
+      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
-      {
-        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"
-        '';
-      }
+      # tmuxPlugins.resurrect
+      tmuxPlugins.sensible
+      tmuxPlugins.tokyo-night-tmux
     ];
   };
+  home.packages = [ Config ];
 }

home/programs/shell/zoxide.nix

@@ -1,3 +1,4 @@
+# Zoxide is a cd replacement
 {
   programs.zoxide = {
     enable = true;

home/programs/shell/zsh.nix

@@ -1,6 +1,9 @@
-{ pkgs, lib, config, ... }: {
+# My shell configuration
+{ pkgs, lib, config, ... }:
+let fetch = config.var.theme.fetch; # neofetch, nerdfetch, pfetch
+in {
 
-  home.packages = with pkgs; [ bat ripgrep tldr ];
+  home.packages = with pkgs; [ bat ripgrep tldr sesh ];
 
   home.sessionPath = [ "$HOME/go/bin" ];
 
@@ -13,20 +16,31 @@
 
     initExtraFirst = ''
       bindkey -e
-      ${if config.var.theme.fetch == "neofetch" then
+      ${if fetch == "neofetch" then
         pkgs.neofetch + "/bin/neofetch"
-      else if config.var.theme.fetch == "nerdfetch" then
+      else if fetch == "nerdfetch" then
         "nerdfetch"
-      else if config.var.theme.fetch == "pfetch" then
+      else if 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 = 1000000;
-      size = 1000000;
+      save = 10000;
+      size = 10000;
     };
 
     profileExtra = lib.optionalString (config.home.sessionPath != [ ]) ''
@@ -35,6 +49,18 @@
       }"
     '';
 
+    #NOTE- for btop to show gpu usage 
+    #may want to check the driver version with:
+    #nix path-info -r /run/current-system | grep nvidia-x11
+    #and 
+    #nix search nixpkgs nvidia_x11
+    sessionVariables = {
+      LD_LIBRARY_PATH = lib.concatStringsSep ":" [
+        "${pkgs.linuxPackages_latest.nvidia_x11_beta}/lib" # change the package name according to nix search result
+        "$LD_LIBRARY_PATH"
+      ];
+    };
+
     shellAliases = {
       vim = "nvim";
       vi = "nvim";
@@ -47,19 +73,20 @@
       ls = "eza --icons=always --no-quotes";
       tree = "eza --icons=always --tree --no-quotes";
       sl = "ls";
-      open = "${pkgs.xdg_utils}/bin/xdg-open";
+      open = "${pkgs.xdg-utils}/bin/xdg-open";
       icat = "${pkgs.kitty}/bin/kitty +kitten icat";
+      ssh = "kitty +kitten ssh";
+
       wireguard-import = "nmcli connection import type wireguard file";
-      neorg =
-        "cd ~/nextcloud/neorg && vim -c ':ZenMode' -c ':Telescope find_files' index.norg";
+
       notes =
-        "cd ~/nextcloud/Notes && vim -c ':ZenMode' -c ':Telescope find_files' index.md";
+        "nvim ~/nextcloud/notes/index.md --cmd 'cd ~/nextcloud/notes' -c ':Telescope find_files'";
       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";
@@ -68,6 +95,11 @@
       gco = "git checkout";
       gcb = "git checkout -b";
       gbr = "git branch";
+      grs = "git reset HEAD~1";
+      grh = "git reset --hard HEAD~1";
+
+      gaa = "git add .";
+      gcm = "git commit -m";
     };
   };
 }

home/programs/spicetify/default.nix

@@ -1,31 +1,23 @@
+# Spicetify is a spotify client customizer
 { pkgs, config, lib, inputs, ... }:
-let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+let
+  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+  accent = "${config.lib.stylix.colors.base0D}";
 in {
-
   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 = spicePkgs.themes.text;
+    theme = lib.mkForce spicePkgs.themes.text;
+
     colorScheme = "custom";
 
     customColorScheme = {
-      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}";
+      button = accent;
+      button-active = accent;
+      tab-active = accent;
     };
 
     enabledExtensions = with spicePkgs.extensions; [

home/programs/thunar/default.nix

@@ -0,0 +1,47 @@
+# 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"/>
+      <property name="last-toolbar-items" type="string" value="menu:1,back:1,forward:0,open-parent:0,open-home:0,undo:0,redo:0,zoom-in:0,zoom-out:0,zoom-reset:0,view-as-icons:0,view-as-detailed-list:0,view-as-compact-list:0,toggle-split-view:0,location-bar:1,reload:0,search:1,uca-action-1710183590071525-1:0,new-tab:0,new-window:0,view-switcher:0"/>
+    </channel>
+  '';
+}

home/programs/yazi/default.nix

@@ -1,39 +0,0 @@
-{
-  programs.yazi = {
-    enable = true;
-    enableZshIntegration = true;
-
-    settings = {
-      log = { enabled = false; };
-      manager = {
-        show_hidden = false;
-        sort_by = "modified";
-        sort_dir_first = true;
-        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/programs/zen/default.nix

@@ -0,0 +1,86 @@
+{ pkgs, config, inputs, ... }:
+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": {
+        "title" : "Welcome Home",
+        "openLinksInNewTab": false,
+        "locale": "fr-FR",
+        "colors": {
+          "primary": "${accent}",
+          "background": "${background}",
+          "foreground": "${foreground}",
+          "muted": "#${muted}"
+        },
+        "folders": [
+          {
+            "name": "Bookmarks",
+            "links": [
+              {"title": "MyNixOs", "url": "https://mynixos.com", "icon": "󱄅"},
+              {"title": "Github", "url": "https://github.com", "icon": ""},
+              {"title": "Proton", "url": "https://mail.proton.me/u/0/inbox", "icon": ""},
+              {"title": "Cloudflare One", "url": "https://one.dash.cloudflare.com/", "icon": ""},
+              {"title": "Chat GPT", "url": "https://chat.openai.com/", "icon": "󰭹"},
+              {"title": "Nixvim", "url": "https://nix-community.github.io/nixvim/", "icon": ""},
+              {"title": "Hyprland Wiki", "url": "https://wiki.hyprland.org/", "icon": "󰖬"},
+              {"title": "Youtube", "url": "https://youtube.com", "icon": "󰗃"},
+              {"title": "Figma", "url": "https://figma.com", "icon": ""},
+              {"title": "Server", "url": "https://home.anotherhadi.com", "icon": ""}
+            ]
+          },
+          {
+            "name": "Work",
+            "links": [
+              {"title": "Outlook", "url": "https://outlook.office.com/mail/", "icon": "󰴢"},
+              {"title": "Office", "url": "https://www.office.com/?auth=2", "icon": "󰏆"},
+              {"title": "Teams", "url": "https://teams.microsoft.com/_", "icon": "󰊻"}
+            ]
+          }
+        ]
+      }
+    }
+  '';
+
+  homepage = pkgs.buildNpmPackage {
+    pname = "homepage";
+    version = "0.0.0";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "anotherhadi";
+      repo = "homepage";
+      rev = "b77d35ed3596eb451bd2ec78063d7cc6e73c773d";
+      hash = "sha256-j/40922kfAh6zqJ4IRYpr66YXNNYsxuXwZ0aiJFJea0=";
+    };
+
+    # npmDepsHash = lib.fakeHash;
+    npmDepsHash = "sha256-bG+CHTq2Rst3JMxsjAC81KhK+G7WwsTVD1eyP87g0z4=";
+
+    buildPhase = ''
+      npm install
+      cp ${
+        pkgs.writeText "src/routes/config.json" settings
+      } src/routes/config.json
+      npm run build
+      mkdir $out
+      mv build $out
+    '';
+
+    meta = {
+      description = "homepage";
+      homepage = "https://github.com/anotherhadi/homepage";
+    };
+  };
+in {
+  home.file.".config/homepage" = {
+    source = "${homepage}/build";
+    recursive = true;
+  };
+
+  home.packages = with pkgs;
+    [ inputs.zen-browser.packages."${system}".default ];
+}

home/scripts/brightness/default.nix

@@ -1,3 +1,12 @@
+# - ## 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,3 +1,11 @@
+# - ## 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" ''
@@ -10,11 +18,11 @@ let
 
   caffeine = pkgs.writeShellScriptBin "caffeine" ''
     if [[ $(pidof "hypridle") ]]; then
-      pkill hypridle
+      systemctl --user stop hypridle.service
       title="󰅶  Caffeine Activated"
       description="Caffeine is now active! Your screen will not turn off automatically."
     else
-      ${pkgs.hyprland}/bin/hyprctl dispatch exec ${pkgs.hypridle}/bin/hypridle
+      systemctl --user start hypridle.service
       title="󰾪  Caffeine Deactivated"
       description="Caffeine is now deactivated! Your screen will turn off automatically."
     fi

home/scripts/default.nix

@@ -4,10 +4,13 @@
     ./sounds
     ./brightness
     ./caffeine
+    ./hyprpanel
+    ./hyprfocus
     ./night-shift
     ./screenshot
-    ./nerdfont_fzf
+    ./nerdfont-fzf
     ./notification
     ./system
+    ./openvpn
   ];
 }

home/scripts/hyprfocus/default.nix

@@ -0,0 +1,47 @@
+# - ## 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
+    ''
+      hyprpanel-hide
+
+      hyprctl --batch "\
+          keyword animations:enabled 0;\
+          keyword decoration:shadow:enabled 0;\
+          keyword decoration:blur:enabled 0;\
+          keyword general:gaps_in 0;\
+          keyword general:gaps_out 0;\
+          keyword general:border_size 1;\
+          keyword decoration:rounding 0;\
+          keyword decoration:inactive_opacity 1;\
+          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

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

home/scripts/nerdfont-fzf/default.nix

@@ -0,0 +1,29 @@
+# - ## 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
+  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}')
+    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"
+  '';
+in {
+  home.packages = [ nerdfont-fzf ];
+
+  xdg.configFile."nerdfont_glyphnames.json" = {
+    source = pkgs.fetchurl {
+      url =
+        "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/384b1825ea0037b0314f7f9c660a80c1ecdb219a/glyphnames.json";
+      hash = "sha256-Ps0dyFcMs51RMTthBOVSOf/lafPV/53JxuNSKlmZ7cc=";
+    };
+  };
+}

home/scripts/nerdfont_fzf/default.nix

@@ -1,28 +0,0 @@
-{ pkgs, config, ... }:
-let
-  homedir = config.home.homeDirectory;
-
-  nerdfont-fzf = pkgs.writeShellScriptBin "nerdfont-fzf" ''
-    # 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" # 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 nerdfont-fzf-fetch ];
-
-  xdg.configFile."nerdfont_glyphnames.json" = {
-    source = ./nerdfont_glyphnames.json;
-  };
-}

home/scripts/night-shift/default.nix

@@ -1,43 +1,61 @@
+# - ## 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.
+#- It use hyprsunset to control the screen temperature.
+#-
+#- - `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";
+  value = "4500"; # Default value for night-shift temperature
 
-  night-shift-on = pkgs.writeShellScriptBin "night-shift-on" ''
-    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.gammastep}/bin/gammastep -O ${default}"
+  night-shift-on = pkgs.writeShellScriptBin "night-shift-on"
+    # bash 
+    ''
+      ${pkgs.hyprsunset}/bin/hyprsunset -t ${value} &
       title="󰖔  Night-Shift Activated"
       description="Night-Shift is now activated! Your screen will be warmer and easier on the eyes."
 
       notif "night-shift" "$title" "$description"
     '';
 
-  night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
-    pkill gammastep
+  night-shift-off = pkgs.writeShellScriptBin "night-shift-off"
+    # bash 
+    ''
+      pkill hyprsunset
       title="󰖕  Night-Shift Deactivated"
       description="Night-Shift is now deactivated! Your screen will return to normal."
 
       notif "night-shift" "$title" "$description"
     '';
 
-  night-shift = pkgs.writeShellScriptBin "night-shift" ''
-    if pgrep gammastep; then
+  night-shift = pkgs.writeShellScriptBin "night-shift"
+    # bash
+    ''
+      if pidof "hyprsunset"; then
         night-shift-off
       else
         night-shift-on
       fi
     '';
 
-  night-shift-status = pkgs.writeShellScriptBin "night-shift-status" ''
-    if [[ $(pgrep gammastep) ]]; then
+  night-shift-status = pkgs.writeShellScriptBin "night-shift-status"
+    # bash
+    ''
+      if pidof "hyprsunset"; then
         echo "1"
       else
         echo "0"
       fi
     '';
 
-  night-shift-status-icon =
-    pkgs.writeShellScriptBin "night-shift-status-icon" ''
-      if [[ $(pgrep gammastep) ]]; then
+  night-shift-status-icon = pkgs.writeShellScriptBin "night-shift-status-icon"
+    # bash
+    ''
+      if pidof "hyprsunset"; then
           echo "󰖔"
         else
           echo "󰖕"
@@ -45,7 +63,7 @@ let
     '';
 in {
   home.packages = [
-    pkgs.gammastep
+    pkgs.hyprsunset
     night-shift-on
     night-shift-off
     night-shift

home/scripts/nixy/default.nix

@@ -1,6 +1,19 @@
-{ pkgs, config, ... }:
+# - ## 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, ... }:
 let
-  nixy = pkgs.writeShellScriptBin "nixy" ''
+
+  configDirectory = config.var.configDirectory;
+  hostname = config.var.hostname;
+
+  nixy = pkgs.writeShellScriptBin "nixy"
+    # bash
+    ''
       function exec() {
         $@
       }
@@ -10,11 +23,13 @@ let
 
         # "icon;name;command"[]
         apps=(
-        ";Rebuild;nixy rebuild"
-        ";Upgrade;nixy upgrade"
-        ";Update;nixy update"
-        ";Collect Garbage;nixy gc"
-        ";Clean Boot Menu;nixy cb"
+          "󰑓;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;zen https://github.com/anotherhadi/nixy-wallpapers"
         )
 
         # Apply default icons if empty:
@@ -35,18 +50,26 @@ let
       [[ $1 == "" ]] && ui
 
       if [[ $1 == "rebuild" ]];then
-      sudo nixos-rebuild switch --flake ${config.var.configDirectory}#${config.var.hostname}
+        sudo nixos-rebuild switch --flake ${configDirectory}#${hostname}
       elif [[ $1 == "upgrade" ]];then
-      sudo nixos-rebuild switch --upgrade --flake ${config.var.configDirectory}#${config.var.hostname}
+        sudo nixos-rebuild switch --upgrade --flake '${configDirectory}#${hostname}'
       elif [[ $1 == "update" ]];then
-      cd ${config.var.configDirectory} && sudo nix flake update
+        cd ${configDirectory} && nix flake update
       elif [[ $1 == "gc" ]];then
-      cd ${config.var.configDirectory} && sudo nix-collect-garbage -d
+        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"
+      elif [[ $1 == "loop" ]];then
+        while true; do
+          nixy
+          echo "Press enter to continue, e to exit" 
+          read -n 1 REPLY
+          clear
+          [[ $REPLY == "e" ]] && exit 0
+        done
       else
         echo "Unknown argument"
       fi

home/scripts/openvpn/default.nix

@@ -0,0 +1,37 @@
+# - ## OpenVPN
+#-
+#- OpenVPN allows you to connect/disconnect quickly to a openVPN server
+#-
+#- - `openvpn-up` turn on the vpn
+#- - `openvpn-down` turn down the vpn
+#- - `openvpn-toggle` toggle the vpn
+{ pkgs, ... }:
+let
+  id = "home"; # ID of the connection
+  password-file = "/home/hadi/.config/vpn-password";
+
+  openvpn-up = pkgs.writeShellScriptBin "openvpn-up"
+    # bash 
+    ''
+      nmcli con up id ${id} passwd-file ${password-file}
+      notif "VPN" "VPN activated" "The OpenVPN connection to ${id} has been activated"
+    '';
+
+  openvpn-down = pkgs.writeShellScriptBin "openvpn-down"
+    # bash 
+    ''
+      nmcli con down id ${id}
+      notif "VPN" "VPN deactivated" "The OpenVPN connection to ${id} has been deactivated"
+    '';
+
+  openvpn-toggle = pkgs.writeShellScriptBin "openvpn-toggle"
+    # bash 
+    ''
+      if nmcli connection show --active | grep -q "${id}"; then
+        openvpn-down
+      else
+        openvpn-up
+      fi
+    '';
+
+in { home.packages = [ openvpn-up openvpn-down openvpn-toggle ]; }

home/scripts/screenshot/default.nix

@@ -1,32 +1,34 @@
+# - ## 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/screenshots"
+      folder="$HOME/Pictures"
     fi
     filename="$(date +%Y-%m-%d_%H:%M:%S).png"
-    mode="region" # Default to region
 
     if [[ $1 == "window" ]];then
-      mode="window"
+      mode="active"
+    elif [[ $1 == "region" ]];then
+      mode="area"
     elif [[ $1 == "monitor" ]];then
       mode="output"
     fi
 
-    ${pkgs.hyprshot}/bin/hyprshot -m $mode -o $folder -f $filename -s || exit 1
+    ${pkgs.grimblast}/bin/grimblast --notify --freeze copysave $mode "$folder/$filename" || exit 1
 
     if [[ $2 == "swappy" ]];then
-      ${pkgs.swappy}/bin/swappy -f "$folder/$filename" -o "$HOME/Pictures/screenshots/$filename"
+      ${pkgs.swappy}/bin/swappy -f "$folder/$filename" -o "$HOME/Pictures/$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 ]; }
+in {
+  home.packages =
+    [ pkgs.hyprshot screenshot pkgs.slurp pkgs.grim pkgs.grimblast ];
+}

home/scripts/sounds/default.nix

@@ -1,3 +1,11 @@
+# - ## 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,24 +1,112 @@
+# - ## 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" ''
+  menu = pkgs.writeShellScriptBin "menu"
+    # bash
+    ''
       if pgrep wofi; then
       	pkill wofi
       else
-    	wofi --show drun
+      	wofi -p " Apps" --show drun
       fi
+      # if pgrep tofi; then
+      # 	pkill tofi
+      # else
+      # 	tofi-drun --drun-launch=true
+      # fi
     '';
 
-  powermenu = pkgs.writeShellScriptBin "powermenu" ''
-    if pgrep wlogout; then
-    	pkill wlogout
+  powermenu = pkgs.writeShellScriptBin "powermenu"
+    # bash
+    ''
+      if pgrep wofi; then
+      	pkill wofi
+      # if pgrep tofi; then
+      #   pkill tofi
       else
-      ${pkgs.wlogout}/bin/wlogout
+        options=(
+          "󰌾 Lock"
+          "󰍃 Logout"
+          " Suspend"
+          "󰑐 Reboot"
+          "󰿅 Shutdown"
+        )
+
+        selected=$(printf '%s\n' "''${options[@]}" | wofi -p " Powermenu" --dmenu)
+        # selected=$(printf '%s\n' "''${options[@]}" | tofi --prompt-text "> ")
+        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" ''
+  quickmenu = pkgs.writeShellScriptBin "quickmenu"
+    # bash
+    ''
+      if pgrep wofi; then
+      	pkill wofi
+      # if pgrep tofi; then
+      #   pkill tofi
+      else
+        options=(
+          "󰅶 Caffeine"
+          "󰖔 Night-shift"
+          " Nixy"
+          "󰈊 Hyprpicker"
+          "󰖂 Toggle VPN"
+        )
+
+        selected=$(printf '%s\n' "''${options[@]}" | wofi -p " Quickmenu" --dmenu)
+        # selected=$(printf '%s\n' "''${options[@]}" | tofi --prompt-text "> ")
+        selected=''${selected:2}
+
+        case $selected in
+          "Caffeine")
+            caffeine
+            ;;
+          "Night-shift")
+            night-shift
+            ;;
+          "Nixy")
+            kitty zsh -c nixy
+            ;;
+          "Hyprpicker")
+            sleep 0.2 && ${pkgs.hyprpicker}/bin/hyprpicker -a
+            ;;
+          "Toggle VPN")
+            openvpn-toggle
+            ;;
+        esac
+      fi
+    '';
+
+  lock = pkgs.writeShellScriptBin "lock"
+    # bash
+    ''
       ${pkgs.hyprlock}/bin/hyprlock
     '';
 
-in { home.packages = [ menu powermenu lock ]; }
+in { home.packages = [ menu powermenu lock quickmenu ]; }

home/system/batsignal/default.nix

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

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,5 +14,4 @@ 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,124 +0,0 @@
-{ config, pkgs, ... }: {
-
-  qt = {
-    enable = true;
-    platformTheme.name = "gtk2";
-    style.name = "gtk2";
-  };
-
-  gtk = {
-    enable = true;
-
-    theme = { name = "FlatColor"; };
-
-    iconTheme = {
-      package = pkgs.moka-icon-theme;
-      name = "Moka";
-    };
-
-    font = {
-      name = config.var.theme.font;
-      size = config.var.theme.font-size;
-    };
-  };
-
-  home.pointerCursor = {
-    gtk.enable = true;
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Classic";
-    size = 14;
-  };
-
-  home.file = {
-    ".local/share/themes/FlatColor" = {
-      recursive = true;
-      source = pkgs.stdenv.mkDerivation {
-        name = "FlatColor";
-
-        src = pkgs.fetchFromGitHub {
-          owner = "jasperro";
-          repo = "FlatColor";
-          rev = "0a56c50e8c5e2ad35f6174c19a00e01b30874074";
-          hash = "sha256-P8RnYTk9Z1rCBEEMLTVRrNr5tUM/Pc9dsdMtpHd1Y18=";
-        };
-
-        buildPhase = ''
-          mkdir -p $out
-          # delete the default gtk-color-scheme:
-          file="./gtk-2.0/gtkrc"
-          sed -i '3,29d' $file
-          sed -i '3i include "../colors2"' $file
-
-          file="./gtk-3.0/gtk.css"
-          sed -i '2,10d' $file
-          sed -i '2i @import url("../colors3");' $file
-
-          file="./gtk-3.20/gtk.css"
-          sed -i '2,26d' $file
-          sed -i '2i @import url("../colors3");' $file
-
-          cp -r . $out 
-        '';
-      };
-    };
-
-    ".local/share/themes/FlatColor/colors2".text = ''
-      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 #${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 #${config.var.theme.colors.bgalt};
-      @define-color tooltip_fg_color #${config.var.theme.colors.fgalt};
-    '';
-  };
-}

home/system/hypridle/default.nix

@@ -1,7 +1,5 @@
+# Hypridle is a daemon that listens for user activity and runs commands when the user is idle.
 { pkgs, ... }: {
-  # wayland.windowManager.hyprland.settings.exec-once =
-  #   [ "${pkgs.hypridle}/bin/hypridle" ];
-
   services.hypridle = {
     enable = true;
     settings = {

home/system/hyprland/animations.nix

@@ -0,0 +1,53 @@
+{ 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

@@ -0,0 +1,65 @@
+{ 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, zen" # Zen Browser
+      "$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
+      "$mod,C, exec, quickmenu" # Quickmenu
+      "$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus
+      "$mod,P, exec, ${pkgs.planify}/bin/io.github.alainm23.planify" # Planify
+
+      "$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 region" # Screenshot region
+      ",PRINT, exec, screenshot monitor" # Screenshot monitor
+      "$shiftMod,PRINT, exec, screenshot window" # Screenshot window
+      "ALT,PRINT, exec, screenshot region swappy" # Screenshot region then edit
+
+      "$shiftMod,T, exec, hyprpanel-toggle" # Toggle hyprpanel
+      "$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
+      ",XF86AudioPlay, exec, ${pkgs.playerctl}/bin/playerctl play-pause" # Play/Pause Song
+      ",XF86AudioNext, exec, ${pkgs.playerctl}/bin/playerctl next" # Next Song
+      ",XF86AudioPrev, exec, ${pkgs.playerctl}/bin/playerctl previous" # Previous Song
+      ",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
+    ];
+
+  };
+}