Release v2.4.0

Former-commit-id: 7ddff66f00
Update
2026-04-02 11:12:09 +02:00 · 2024-09-04 10:11:28 +02:00 · 2024-09-04 10:10:52 +02:00 · 2024-09-04 10:10:32 +02:00 · 2024-09-04 09:34:42 +02:00 · 2024-09-04 02:02:57 +02:00
270 changed files with 4317 additions and 40852 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-.sops.yaml
 todolist.md
--- a/.sops.yaml
+++ b/.sops.yaml
@@ -0,0 +1,11 @@
+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
--- a/README.md
+++ b/README.md
@@ -1,157 +1,80 @@
-<h1 align="center">
-   <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
-   <br>
-      Nixy
-   <br>
-      <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" /> <br>
-   <div align="center">
+[//]: # (Title: Nixy)  
+[//]: # (Description: Nixy is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
+[//]: # (Author: Hadi)  
+[//]: # (Date: 09/04/24)
+[//]: # (Version: v2.3.0)

-   <div align="center">
-      <p></p>
-      <div align="center">
+<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=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=a158ff&labelColor=040409&style=for-the-badge&logo=starship&logoColor=a158ff">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=starship&logoColor=89b4fa">
    </a>
    <a href="https://github.com/anotherhadi/nixy/">
-            <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=github&logoColor=a158ff">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=github&logoColor=89b4fa">
    </a>
    <a href="https://nixos.org">
-            <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=040409&logo=NixOS&logoColor=a158ff&color=a158ff">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=181825&logo=NixOS&logoColor=89b4fa&color=89b4fa">
    </a>
    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-            <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=040409&colorB=a158ff&logo=unlicense&logoColor=a158ff&"/>
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=181825&colorB=89b4fa&logo=unlicense&logoColor=89b4fa"/>
    </a>
-      </div>
-      <br>
-   </div>
-</h1>
+</div>
+<br>

-Hello there! This is my **NixOs (w/home-manager) dotfiles** repo. It's still a *work in progress*, and I'm still learning how to use nix.
+**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
+
+  - [Table of Content](#table-of-content)
+  - [Gallery](#gallery)
+  - [Architecture](#architecture)
+    - [🏠 `home`](#-home)
+    - [💻 `hosts`](#-hosts)
+  - [Installation](#installation)
+  - [Documentation](#documentation)

 ## Gallery

-![neofetch](https://image.nostr.build/c208c164ae04e4c58e01adb9fab584b163a565155865833851275f89c9270b7a.jpg)
-![qutebrowser](https://image.nostr.build/8cc32d981e6be256bdc37a2571c31bb76d7c3335ce7c76fa6eca89a03019bfc9.jpg)
-![spotify](https://image.nostr.build/76b18bcbcdf1d911a2dbdff7bfac6652044d45602a3dce9d9c53feb295d13245.jpg)
-![wofi](https://image.nostr.build/90d69ffe6251c17e25b0fb44abadaeb0dfe6db8210d935fca14bf8b00be49fa6.jpg)
+![nixy1](docs/src/nixy/1.png)
+![nixy2](docs/src/nixy/2.png)
+![nixy3](docs/src/nixy/3.png)

-## Apps
+## Architecture

-<details>
-<summary>Click to expand</summary>
+### 🏠 `home`

-| Category       | Software      |
-|----------------|---------------|
-| WM             | Hyprland      |
-|                | hyprlock      |
-|                | hyprpaper     |
-|                | hypridle      |
-|                | wlogout       |
-| Bar            | waybar        |
-| Terminal       | kitty         |
-| Shell          | zsh           |
-|                | tmux          |
-|                | starship      |
-|                | bat           |
-|                | eza           |
-|                | zoxide        |
-|                | fzf           |
-| Editor         | nixvim        |
-| File manager   | lf            |
-|                | thunar        |
-| Browser        | qutebrowser   |
-| Music          | spicetify     |
-| Notifications  | dunst         |
-| Launcher       | wofi          |
-| DM             | tuigreet      |
-| Secrets        | sops-nix      |
-| Misc           | lazygit       |
-|                | neofetch      |
-|                | cava          |
-|                | ...           |
+Those are the dotfiles and configuration files for user-level configuration

-</details>
+**Subfolders:**

-## Themes & Colors
+- `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

-Themes and colors are managed by the `home/themes` folder. You can copy the default `nixy.nix` theme and make your own.
+### 💻 `hosts`

-To apply the theme to duckduckgo, follow the instructions in `$HOME/.config/duckduckgo-colorscheme.js`.
+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.

-## Scripts
+**Subfolders:**

-### Nix/NixOs shortcuts
-
-<details>
-<summary>Click to expand</summary>
-
- `nixy-edit`
- `nixy-rebuild`
- `nixy-update`
- `nixy-gc` # garbage collection
- `nixy-cb` # clean boot menu
-
-</details>
-
-### Brightness control
-
-<details>
-<summary>Click to expand</summary>
-
- `brightness-up`
- `brightness-down`
- `brightness-change <up/down> <increment>`
-
-</details>
-
-### Sound control
-
-<details>
-<summary>Click to expand</summary>
-
- `sound-up`
- `sound-down`
- `sound-toggle`
- `sound-output`
- `sound-change <up/down/mute> <increment>`
-
-</details>
-
-### Caffeine
-
-<details>
-<summary>Click to expand</summary>
-
-Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
-
- `caffeine` # Toggle caffeine
- `caffeine-status` # Return active/inactive
-
-</details>
-
-### Night-Shift
-
-<details>
-<summary>Click to expand</summary>
-
-Blue light filter, using wlsunset
-
- `night-shift-on`
- `night-shift-off`
-
-</details>
-
-### Nerdfont FZF
-
-<details>
-<summary>Click to expand</summary>
-
-Nerdfont fzf is a quick way to search for nerdfont icons locally.
-It will copy the selected icon to the clipboard.
-
- `nerdfont-fzf`
-
-</details>
+- 🎨 `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

@@ -159,11 +82,25 @@ It will copy the selected icon to the clipboard.
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```

- Change the `variables.nix` file to match your configuration
- Remove the hardware module in flake.nix line 30
- Change the `nixos/configuration.nix` file to match your system
- Copy your `hardware-configuration.nix` file to the `nixos` folder
+- 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#nixy
+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
--- a/docs/APPS.md
+++ b/docs/APPS.md
@@ -0,0 +1,41 @@
+# Apps and services
+
+*non-exhaustive lists*
+
+## Laptop
+
+The laptop configuration is used by an Omen 16 laptop w/ nvidia and an amd gpu running NixOS.
+The configurations files can be found in the `hosts/laptop` directory.
+
+| Category                                | Name           |
+| --------------------------------------- | -------------- |
+| WM                                      | Hyprland       |
+|                                         | hyprlock       |
+|                                         | hyprpaper      |
+|                                         | hypridle       |
+|                                         | hyprcursor     |
+|                                         | wlogout        |
+| Bar                                     | hyprpanel      |
+| Terminal                                | kitty          |
+| Shell                                   | zsh            |
+|                                         | tmux           |
+|                                         | starship       |
+|                                         | bat            |
+|                                         | eza            |
+|                                         | zoxide         |
+|                                         | fzf            |
+| Editor                                  | neovim(nixvim) |
+| File manager                            | thunar         |
+| Browser                                 | qutebrowser    |
+| Music                                   | spicetify      |
+| Launcher                                | wofi           |
+| DM                                      | tuigreet       |
+| Secrets                                 | sops-nix       |
+| See [hosts/laptop](../hosts/laptop/)... |                |
+
+## Server
+
+The server configuration is used by a home server running NixOS.
+The configurations files can be found in the `hosts/server` directory.
+I mainly use it for self-hosting websites and services such as Nextcloud, Vaultwarden, jellyfin, ...
+I exposed some services to the internet using a reverse proxy (Nginx) and cloudflare-dyndns, others are accessed through a tailscale network
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -0,0 +1,19 @@
+# Contributing to Nixy
+
+Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the [TODO.md](./TODO.md) file!
+
+The process is straight-forward.
+
+- Read [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#best-practices-for-faster-reviews) by Kubernetes (but skip step 0 and 1)
+- Fork Nixy [git repository](https://github.com/anotherhadi/nixy).
+- 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`
+
+> [!IMPORTANT]
+> Don't push your host's folder
--- a/docs/KEYBINDINGS.md
+++ b/docs/KEYBINDINGS.md
@@ -0,0 +1,42 @@
+# Keybindings
+
+The list of the keybindings working on Hyprland:
+
+| Description                                | Keybinding               |
+|--------------------------------------------|--------------------------|
+| Switch Workspace                           | SUPER + {Number}         |
+| Move app to Workspace                      | SHIFT + SUPER + {Number} |
+| Kitty                                      | SUPER + RETURN           |
+| Thunar                                     | SUPER + E                |
+| Qutebrowser                                | SUPER + B                |
+| Bitwarden                                  | SUPER + K                |
+| Lock                                       | SUPER + L                |
+| Powermenu                                  | SUPER + X                |
+| Launcher                                   | SUPER + SPACE            |
+| "\$shiftMod, SPACE, hyprexpo:expo, toggle" |                          |
+| Close window                               | SUPER + Q                |
+| Toggle Floating                            | SUPER + T                |
+| Toggle Fullscreen                          | SUPER + F                |
+| Move focus left                            | SUPER + left             |
+| Move focus Right                           | SUPER + right            |
+| Move focus Up                              | SUPER + up               |
+| Move focus Down                            | SUPER + down             |
+| Add to master                              | SHIFT + SUPER + left     |
+| Remove from master                         | SHIFT + SUPER + right    |
+| Screenshot window                          | SUPER + PRINT            |
+| Screenshot monitor                         | PRINT                    |
+| Screenshot region                          | SHIFT + SUPER + PRINT    |
+| Screenshot region then edit                | ALT PRINT                |
+| Search on internet with wofi               | SHIFT + SUPER + S        |
+| Clipboard picker with wofi                 | SHIFT + SUPER + C        |
+| Emoji picker with wofi                     | SHIFT + SUPER + E        |
+| Turn off night shift                       | SUPER + F2               |
+| Turn on night shift                        | SUPER + F3               |
+| Move Window (mouse)                        | SUPER + mouse:272        |
+| Resize Window (mouse)                      | SUPER + R                |
+| Toggle Mute                                | XF86AudioMute            |
+| Lock when closing Lid                      | switch:Lid Switch        |
+| Sound Up                                   | XF86AudioRaiseVolume     |
+| Sound Down                                 | XF86AudioLowerVolume     |
+| Brightness Up                              | XF86MonBrightnessUp      |
+| Brightness Down                            | XF86MonBrightnessDown    |
--- a/docs/SCRIPTS.md
+++ b/docs/SCRIPTS.md
@@ -0,0 +1,55 @@
+# Scripts
+
+Scripts are located in the `home/scripts` folder. Home-manager add those in the user's path.
+
+## Nix/NixOs shortcuts
+
+> [!TIP]
+> The `hostname` variable in `hosts/yourhost/variables.nix` should be also the name of the `nixosConfiguration` in `flake.nix` file.
+
+- `nixy` # UI
+- `nixy rebuild`
+- `nixy update`
+- `nixy upgrade`
+- `nixy gc` # garbage collection
+- `nixy cb` # clean boot menu
+
+## Brightness control
+
+- `brightness-up`
+- `brightness-down`
+- `brightness-set [value]`
+- `brightness-change [up/down] <increment>`
+
+## Sound control
+
+- `sound-up`
+- `sound-down`
+- `sound-toggle`
+- `sound-set [value]`
+- `sound-change [up/down/mute] <increment>`
+
+## Caffeine
+
+Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
+
+- `caffeine` # Toggle caffeine
+- `caffeine-status` # Return 1/0
+- `caffeine-status-icon` # Return 󰅶/󰾪
+
+## Night-Shift
+
+Blue light filter, using wlsunset
+
+- `night-shift` # Toggle night shift
+- `night-shift-status` # Return 1/0
+- `night-shift-status-icon` # Return 󰖕/󰖔
+- `night-shift-on`
+- `night-shift-off`
+
+## Nerdfont FZF
+
+Nerdfont fzf is a quick way to search for nerdfont icons locally.
+It will copy the selected icon to the clipboard.
+
+- `nerdfont-fzf`
--- a/docs/THEMES.md
+++ b/docs/THEMES.md
@@ -0,0 +1,20 @@
+# 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.
+
+> [!TIP]
+> To apply the theme to DuckDuckGo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`
+
+## Create your theme
+
+Create a copy of one of the existing themes and change the variables.
+Wallpapers are loaded from the `home/wallpapers` folder.
+
+## Gallery
+
+### Nixy
+
+![nixy1](src/nixy/1.png)
+![nixy2](src/nixy/2.png)
+![nixy3](src/nixy/3.png)
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -0,0 +1,33 @@
+# 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
--- a/docs/WALLPAPERS.md
+++ b/docs/WALLPAPERS.md
@@ -0,0 +1,39 @@
+# Wallpapers
+
+Wallpapers can be found in the `/home/wallpapers` folder.
+
+| Name                | Preview                                                        |
+|---------------------|----------------------------------------------------------------|
+| astronaut.png       | ![astronaut.png](../home/wallpapers/astronaut.png)             |
+| aurore.png          | ![aurore.png](../home/wallpapers/aurore.png)                   |
+| barcode.png         | ![barcode.png](../home/wallpapers/barcode.png)                 |
+| cat-leaves.png      | ![cat-leaves.png](../home/wallpapers/cat-leaves.png)           |
+| city.png            | ![city.png](../home/wallpapers/city.png)                       |
+| cloud.png           | ![cloud.png](../home/wallpapers/cloud.png)                     |
+| clouds2.png         | ![clouds2.png](../home/wallpapers/clouds2.png)                 |
+| clouds.png          | ![clouds.png](../home/wallpapers/clouds.png)                   |
+| coffee.png          | ![coffee.png](../home/wallpapers/coffee.png)                   |
+| dark_cloud.png      | ![dark_cloud.png](../home/wallpapers/dark_cloud.png)           |
+| dark.png            | ![dark.png](../home/wallpapers/dark.png)                       |
+| fuji-dark.png       | ![fuji-dark.png](../home/wallpapers/fuji-dark.png)             |
+| fuji-light.png      | ![fuji-light.png](../home/wallpapers/fuji-light.png)           |
+| galaxy.png          | ![galaxy.png](../home/wallpapers/galaxy.png)                   |
+| house-cloud.png     | ![house-cloud.png](../home/wallpapers/house-cloud.png)         |
+| key.png             | ![key.png](../home/wallpapers/key.png)                         |
+| lavender-cat.png    | ![lavender-cat.png](../home/wallpapers/lavender-cat.png)       |
+| lofi-computer.png   | ![lofi-computer.png](../home/wallpapers/lofi-computer.png)     |
+| lofi-urban.png      | ![lofi-urban.png](../home/wallpapers/lofi-urban.png)           |
+| magma.png           | ![magma.png](../home/wallpapers/magma.png)                     |
+| mountains-black.png | ![mountains-black.png](../home/wallpapers/mountains-black.png) |
+| mountains.png       | ![mountains.png](../home/wallpapers/mountains.png)             |
+| nix.png             | ![nix.png](../home/wallpapers/nix.png)                         |
+| problems.png        | ![problems.png](../home/wallpapers/problems.png)               |
+| sea2.png            | ![sea2.png](../home/wallpapers/sea2.png)                       |
+| sea.png             | ![sea.png](../home/wallpapers/sea.png)                         |
+| space2.png          | ![space2.png](../home/wallpapers/space2.png)                   |
+| space.png           | ![space.png](../home/wallpapers/space.png)                     |
+| street.png          | ![street.png](../home/wallpapers/street.png)                   |
+| sun.png             | ![sun.png](../home/wallpapers/sun.png)                         |
+| tokyo.png           | ![tokyo.png](../home/wallpapers/tokyo.png)                     |
+| train.png           | ![train.png](../home/wallpapers/train.png)                     |
+| windows.png         | ![windows.png](../home/wallpapers/windows.png)                 |
--- a/docs/scripts/compress_png.sh
+++ b/docs/scripts/compress_png.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Compress png files in ./docs/src and ./home/wallpapers
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+# Main images
+for file in ./docs/src/*.png; do
+  optipng "$file"
+done
+
+# Theme's images
+for file in ./docs/src/*/*.png; do
+  optipng "$file"
+done
+
+# Wallpapers
+for file in ./home/wallpapers/*.png; do
+  optipng "$file"
+done
--- a/docs/scripts/create_preview_wallpapers.sh
+++ b/docs/scripts/create_preview_wallpapers.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+# Create WALLPAPERS.md to preview wallpapers in ./home/wallpapers
+
+WALLPAPERS_FOLDER="./home/wallpapers"
+WALLPAPERS_MD="./docs/WALLPAPERS.md"
+[[ -d "$WALLPAPERS_FOLDER" ]] || (echo "Wallpapers folder not found" && exit 1)
+
+echo "# Wallpapers" >"$WALLPAPERS_MD"
+echo "" >>"$WALLPAPERS_MD"
+echo "Wallpapers can be found in the \`/home/wallpapers\` folder." >>"$WALLPAPERS_MD"
+echo "" >>"$WALLPAPERS_MD"
+echo "| Name | Preview |" >>"$WALLPAPERS_MD"
+echo "| -- | -- |" >>"$WALLPAPERS_MD"
+
+for file in "$WALLPAPERS_FOLDER"/*.png; do
+  filename=$(basename "$file")
+  echo "| $filename | ![$filename](../home/wallpapers/$filename) |" >>"$WALLPAPERS_MD"
+done
+
+pandoc -t commonmark_x "$WALLPAPERS_MD" -o "/tmp/wallpapers.md"
+mv "/tmp/wallpapers.md" "$WALLPAPERS_MD"
--- a/docs/scripts/create_readme.sh
+++ b/docs/scripts/create_readme.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# Create the README.md file from the docs/src/README_template.md file
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+README_FILE="./README.md"
+
+header=$(cat "./docs/src/header.md")
+table_of_content=$(md-table-of-contents ./docs/src/README_template.md) # https://github.com/anotherhadi/md-table-of-contents
+version=$(git describe --tags --abbrev=0)
+readme_content=$(cat "./docs/src/README_template.md")
+description=$(curl -s https://api.github.com/repos/anotherhadi/nixy | jq .description)
+description="${description%\"}"
+description="${description#\"}"
+
+header=${header//\{date\}/$(date '+%D')}
+header=${header//\{primarycolor\}/89b4fa}
+header=${header//\{backgroundcolor\}/181825}
+header=${header//\{version\}/$version}
+header=${header//\{description\}/$description}
+readme_content=${readme_content//\{md_table_of_content\}/$table_of_content}
+
+echo "$header" >"$README_FILE"
+echo "$readme_content" >>"$README_FILE"
+sed 's/\r//' "$README_FILE" >"/tmp/readme.md"
+mv "/tmp/readme.md" "$README_FILE"
--- a/docs/scripts/keybindings_to_markdown.sh
+++ b/docs/scripts/keybindings_to_markdown.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+# A script to parse the Hyprland configuration to store keybindings in a table
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+KEYBINDINGS_FILE="./docs/KEYBINDINGS.md"
+
+function getList() {
+  content=$1
+  name=$2
+  list_start=$(echo "$content" | sed "/$name = \[/!d;=;Q")
+  list=$(echo "$content" | tail +"$list_start")
+  list_end=$(echo "$list" | sed '/\]/!d;=;Q')
+  list=$(echo "$list" | head -n"$list_end")
+
+  echo "$list"
+}
+
+[[ -f "./home/system/hyprland/default.nix" ]] || (echo "File ./home/system/hyprland/default.nix not found" && exit 1)
+
+config=$(cat "./home/system/hyprland/default.nix")
+
+# Bind
+bind=$(getList "$config" "bind")
+# Bindm (mouse)
+bindm=$(getList "$config" "bindm")
+# Bindl (lock)
+bindl=$(getList "$config" "bindl")
+# Bindle (lock, repetition)
+bindle=$(getList "$config" "bindle")
+
+# Join the lists:
+keybindings=$(echo -e "$bind\n$bindm\n$bindl\n$bindle" | grep '"')
+
+echo "# Keybindings" >"$KEYBINDINGS_FILE"
+echo "" >>"$KEYBINDINGS_FILE"
+echo "The list of the keybindings working on Hyprland:" >>"$KEYBINDINGS_FILE"
+echo "" >>"$KEYBINDINGS_FILE"
+
+echo "| Description | Keybinding |" >>"$KEYBINDINGS_FILE"
+echo "| -- | -- |" >>"$KEYBINDINGS_FILE"
+echo "| Switch Workspace | SUPER + {Number} |" >>"$KEYBINDINGS_FILE"
+echo "| Move app to Workspace | SHIFT + SUPER + {Number} |" >>"$KEYBINDINGS_FILE"
+echo "$keybindings" | while read 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)
+
+  [[ $mod == '$mod' ]] && mod="SUPER + "
+  [[ $mod == '$shiftMod' ]] && mod="SHIFT + SUPER + "
+
+  echo "| $comment | $mod$key |" >>"$KEYBINDINGS_FILE"
+done
+
+pandoc -t commonmark_x "$KEYBINDINGS_FILE" -o "/tmp/keybindings.md"
+mv "/tmp/keybindings.md" "$KEYBINDINGS_FILE"
--- a/docs/scripts/new_tag.sh
+++ b/docs/scripts/new_tag.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+TAG=$(git describe --tags --abbrev=0)
+echo "Current tag: $TAG"
+
+read -rp "Enter the new tag name: " NEW_TAG
+
+read -rp "Do you want to compress the png files? [y/N]: " COMPRESS_PNG
+if [[ "$COMPRESS_PNG" == "y" || "$COMPRESS_PNG" == "Y" ]]; then
+  echo "Compresing png files..."
+  bash ./docs/scripts/compress_png.sh
+fi
+
+echo "Creating wallpapers preview..."
+bash ./docs/scripts/create_preview_wallpapers.sh
+echo "Creating README.md..."
+bash ./docs/scripts/create_readme.sh
+echo "Creating keybindings.md..."
+bash ./docs/scripts/keybindings_to_markdown.sh
+
+git add .
+git commit -m "Release $NEW_TAG"
+git tag -a "$NEW_TAG" -m "Release $NEW_TAG"
+git push origin "$NEW_TAG"
--- a/docs/scripts/take_rice_screenshot.sh
+++ b/docs/scripts/take_rice_screenshot.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env bash
+
+[ "$1" = "" ] && echo "Usage: $0 <theme_name>" && exit 1
+theme_name=$1
+
+# Switch to workspace 1
+sleep 2
+
+# Step 1
+kitty --class peaclock peaclock &
+sleep 1
+menu &
+sleep 1
+hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "1.png" -d
+sleep 2
+pkill peaclock
+menu
+sleep 2
+
+# Step 2
+kitty cmatrix &
+sleep 1
+kitty &
+sleep 1
+qutebrowser &
+sleep 3
+hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "2.png" -d
+sleep 2
+pkill cmatrix
+pkill --newest qutebrowser ""
+pkill --newest kitty
+sleep 2
+
+# Step 3
+kitty cava &
+sleep 1
+spotify &
+sleep 10
+brightness-down
+sleep 1
+hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "3.png" -d
+sleep 2
--- a/docs/src/README_template.md
+++ b/docs/src/README_template.md
@@ -0,0 +1,67 @@
+
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
+It's a simple way to manage your system configuration and dotfiles.
+
+## Table of Content
+
+{md_table_of_content}
+
+## Gallery
+
+![nixy1](docs/src/nixy/1.png)
+![nixy2](docs/src/nixy/2.png)
+![nixy3](docs/src/nixy/3.png)
+
+## Architecture
+
+### 🏠 `home`
+
+Those are the dotfiles and configuration files for user-level configuration
+
+**Subfolders:**
+
+- `programs` is a collection of apps configured with home-manager
+- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
+- `system` is some "desktop environment" configuration
+- `wallpapers` are... wallpapers
+
+### 💻 `hosts`
+
+Those are the host-specific configurations
+Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
+
+**Subfolders:**
+
+- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
+- 📦 `modules` are the nix modules that you can import
+- `laptop` is my configuration for my laptop with Nvidia that you can copy
+- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)
+
+## Installation
+
+```sh
+git clone https://github.com/anotherhadi/nixy ~/.config/nixos
+```
+
+- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+- Add your `hardware-configuration.nix` to your new host's folder
+- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
+
+> [!NOTE]
+> When you add new files, don't forget to run `git add .` to add them to the git repository
+
+```sh
+sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+```
+
+## Documentation
+
+- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
+- [APPS.md](docs/APPS.md): Which apps are installed
+- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
+- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
+
+- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
+- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
+- [LICENSE](LICENSE): MIT License
--- a/docs/src/header.md
+++ b/docs/src/header.md
@@ -0,0 +1,33 @@
+[//]: # (Title: Nixy)  
+[//]: # (Description: {description})  
+[//]: # (Author: Hadi)  
+[//]: # (Date: {date})
+[//]: # (Version: {version})
+
+<div align="center">
+    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
+</div>
+
+<br>
+
+# Nixy
+
+<br>
+<div align="center">
+    <a href="https://github.com/anotherhadi/nixy">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message={version}&colorA={backgroundcolor}&colorB={primarycolor}&logo=githubactions&logoColor={primarycolor}"/>
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/stargazers">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=starship&logoColor={primarycolor}">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=github&logoColor={primarycolor}">
+    </a>
+    <a href="https://nixos.org">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor={backgroundcolor}&logo=NixOS&logoColor={primarycolor}&color={primarycolor}">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA={backgroundcolor}&colorB={primarycolor}&logo=unlicense&logoColor={primarycolor}"/>
+    </a>
+</div>
+<br>
--- a/docs/src/large.png
+++ b/docs/src/large.png
--- a/docs/src/logo.png
+++ b/docs/src/logo.png
--- a/docs/src/nixy/1.png.REMOVED.git-id
+++ b/docs/src/nixy/1.png.REMOVED.git-id
@@ -0,0 +1 @@
+8c00e379ddd7f89e4bbf9f381a5721d980c8026f
--- a/docs/src/nixy/2.png
+++ b/docs/src/nixy/2.png
--- a/docs/src/nixy/3.png
+++ b/docs/src/nixy/3.png
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,24 @@
 {
  "nodes": {
+    "ags": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3",
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1721306136,
+        "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=",
+        "owner": "Aylur",
+        "repo": "ags",
+        "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Aylur",
+        "repo": "ags",
+        "type": "github"
+      }
+    },
    "apple-fonts": {
      "inputs": {
        "flake-utils": "flake-utils",
@@ -11,11 +30,11 @@
        "sf-pro": "sf-pro"
      },
      "locked": {
-        "lastModified": 1705496891,
-        "narHash": "sha256-lLX87aJ9oUT3u0Iaf60xKIJ2RQNt3v4Ne2cvSWyaS7U=",
+        "lastModified": 1719591391,
+        "narHash": "sha256-sVTFewitXIYe5vBihbCFQGdBPdnT26kES1T05umBBnE=",
        "owner": "Lyndeno",
        "repo": "apple-fonts.nix",
-        "rev": "e6ffbc887752ba0fe035fbcc8b282555804dd3f6",
+        "rev": "0e21619dad5b0d9ca2e050155e32448380547b06",
        "type": "github"
      },
      "original": {
@@ -24,20 +43,52 @@
        "type": "github"
      }
    },
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1725016199,
+        "narHash": "sha256-2TMk7F2a27ZtOUW/bftkDyZKp3OQ71E5XnfKSUT8HZQ=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "cff00196f0fcf734a2bf164eb0dfdb6e58c5c906",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
    "devshell": {
      "inputs": {
-        "flake-utils": "flake-utils_2",
        "nixpkgs": [
          "nixvim",
          "nixpkgs"
        ]
      },
      "locked": {
-        "lastModified": 1713532798,
-        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
        "type": "github"
      },
      "original": {
@@ -84,11 +135,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1714641030,
-        "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
        "type": "github"
      },
      "original": {
@@ -97,31 +148,16 @@
        "type": "github"
      }
    },
-    "flake-root": {
-      "locked": {
-        "lastModified": 1713493429,
-        "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
-        "owner": "srid",
-        "repo": "flake-root",
-        "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "repo": "flake-root",
-        "type": "github"
-      }
-    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
        "type": "github"
      },
      "original": {
@@ -131,24 +167,6 @@
      }
    },
    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
      "inputs": {
        "systems": "systems_4"
      },
@@ -166,21 +184,33 @@
        "type": "github"
      }
    },
-    "flake-utils_4": {
+    "git-hooks": {
      "inputs": {
-        "systems": "systems_7"
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "lastModified": 1724857454,
+        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
        "type": "github"
      },
      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
        "type": "github"
      }
    },
@@ -188,7 +218,7 @@
      "inputs": {
        "nixpkgs": [
          "nixvim",
-          "pre-commit-hooks",
+          "git-hooks",
          "nixpkgs"
        ]
      },
@@ -213,11 +243,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1715077503,
-        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
        "type": "github"
      },
      "original": {
@@ -234,11 +264,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1715077503,
-        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
        "type": "github"
      },
      "original": {
@@ -263,11 +293,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1713612213,
-        "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
+        "lastModified": 1722623071,
+        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
+        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
        "type": "github"
      },
      "original": {
@@ -278,19 +308,21 @@
    },
    "hyprland": {
      "inputs": {
+        "aquamarine": "aquamarine",
        "hyprcursor": "hyprcursor",
        "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
        "hyprwayland-scanner": "hyprwayland-scanner",
        "nixpkgs": "nixpkgs_2",
        "systems": "systems_2",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1715203037,
-        "narHash": "sha256-yWsrCPhBpin7AXVI66/EAE+YPJTweS8CDCZJQliB10k=",
+        "lastModified": 1725019943,
+        "narHash": "sha256-tAGs6TpIYkRUWjU0WYAavzHCPy4XLLMn63caFF7OCNc=",
        "ref": "refs/heads/main",
-        "rev": "e4e84064f2d07810e0c150bce1369a0a00503e9a",
-        "revCount": 4638,
+        "rev": "25e72949a1cc2368425ed81712a394cb277f514f",
+        "revCount": 5160,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -301,6 +333,36 @@
        "url": "https://github.com/hyprwm/Hyprland"
      }
    },
+    "hyprland-plugins": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ],
+        "nixpkgs": [
+          "hyprland-plugins",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-plugins",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723143591,
+        "narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=",
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "type": "github"
+      }
+    },
    "hyprland-protocols": {
      "inputs": {
        "nixpkgs": [
@@ -315,11 +377,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1714869498,
-        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
+        "lastModified": 1721326555,
+        "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
        "owner": "hyprwm",
        "repo": "hyprland-protocols",
-        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
+        "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
        "type": "github"
      },
      "original": {
@@ -329,6 +391,54 @@
      }
    },
    "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1724174162,
+        "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprpanel": {
+      "inputs": {
+        "ags": "ags",
+        "nixpkgs": "nixpkgs_4"
+      },
+      "locked": {
+        "lastModified": 1725006826,
+        "narHash": "sha256-DO9Sxg+HP7Iy/TguZtjwXRjlH35liWXEuG17ilcJejI=",
+        "owner": "Jas-SinghFSU",
+        "repo": "HyprPanel",
+        "rev": "4bd5c3ed30ae643ac1dee152f8b9332d0c5c3eb9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Jas-SinghFSU",
+        "repo": "HyprPanel",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
      "inputs": {
        "nixpkgs": [
          "hyprland",
@@ -340,38 +450,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1713121246,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "lastModified": 1724966483,
+        "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "repo": "hyprutils",
+        "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
        "type": "github"
      },
      "original": {
        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "hyprlang_2": {
-      "inputs": {
-        "nixpkgs": [
-          "rose-pine-hyprcursor",
-          "nixpkgs"
-        ],
-        "systems": "systems_5"
-      },
-      "locked": {
-        "lastModified": 1709914708,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
+        "repo": "hyprutils",
        "type": "github"
      }
    },
@@ -387,11 +475,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1715090986,
-        "narHash": "sha256-FXpQvmS9R7alwZ47XK5UIcAbC9YKSxc0+GOVYqwa0jM=",
+        "lastModified": 1721324119,
+        "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "94e32ec37e7215b16d5c1b41b1773ff6742e704b",
+        "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
        "type": "github"
      },
      "original": {
@@ -408,11 +496,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1713946171,
-        "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
+        "lastModified": 1724561770,
+        "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
+        "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
        "type": "github"
      },
      "original": {
@@ -423,11 +511,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1715148395,
-        "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
+        "lastModified": 1724878143,
+        "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
+        "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
        "type": "github"
      },
      "original": {
@@ -439,11 +527,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1696375444,
-        "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=",
+        "lastModified": 1717786204,
+        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "81e8f48ebdecf07aab321182011b067aafc78896",
+        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
        "type": "github"
      },
      "original": {
@@ -455,27 +543,27 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1714858427,
-        "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=",
+        "lastModified": 1721524707,
+        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76",
+        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
        "type": "github"
      },
      "original": {
        "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
        "repo": "nixpkgs",
        "type": "github"
      }
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1714253743,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+        "lastModified": 1724819573,
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
        "type": "github"
      },
      "original": {
@@ -487,15 +575,15 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1715087517,
-        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
-        "owner": "nixos",
+        "lastModified": 1718714799,
+        "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
+        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
+        "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
        "type": "github"
      },
      "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
@@ -503,15 +591,15 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1710272261,
-        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
-        "owner": "NixOS",
+        "lastModified": 1722185531,
+        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
+        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
+        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
@@ -519,15 +607,15 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1686020360,
-        "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
-        "owner": "NixOS",
+        "lastModified": 1724819573,
+        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
+        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
        "type": "github"
      },
      "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
        "ref": "nixos-unstable",
        "repo": "nixpkgs",
        "type": "github"
@@ -538,21 +626,21 @@
        "devshell": "devshell",
        "flake-compat": "flake-compat",
        "flake-parts": "flake-parts",
-        "flake-root": "flake-root",
+        "git-hooks": "git-hooks",
        "home-manager": "home-manager_2",
        "nix-darwin": "nix-darwin",
        "nixpkgs": [
          "nixpkgs"
        ],
-        "pre-commit-hooks": "pre-commit-hooks",
+        "nuschtosSearch": "nuschtosSearch",
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1715115147,
-        "narHash": "sha256-oREqXPEtuYbOdBKbsDQzr2V01EzK4kD8MTdwO9ljTnU=",
+        "lastModified": 1724968633,
+        "narHash": "sha256-eb2NCdLwfXL1MuTAkoDncSl2lCJwyylV5/NM1Ws2P/U=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "f7f255afe22fcca0c07177c3707fd61fa0c85835",
+        "rev": "2704133fe3ca616b22ed6685cc67180456eb4160",
        "type": "github"
      },
      "original": {
@@ -561,10 +649,32 @@
        "type": "github"
      }
    },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1724584782,
+        "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
    "ny": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-phACDdjI8RX6yD77PSmFcsriagt+2UuySD7+WEzdzGo=",
+        "narHash": "sha256-FkV8Z2fdUTwvcKeltFJVCisvAarcdnmlj/33exdyxnQ=",
        "type": "file",
        "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
      },
@@ -573,71 +683,24 @@
        "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
      }
    },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "flake-utils": "flake-utils_3",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1714478972,
-        "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "2849da033884f54822af194400f8dff435ada242",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "apple-fonts": "apple-fonts",
        "home-manager": "home-manager",
        "hyprland": "hyprland",
+        "hyprland-plugins": "hyprland-plugins",
+        "hyprpanel": "hyprpanel",
        "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_5",
        "nixvim": "nixvim",
-        "rose-pine-hyprcursor": "rose-pine-hyprcursor",
        "sops-nix": "sops-nix",
        "spicetify-nix": "spicetify-nix"
      }
    },
-    "rose-pine-hyprcursor": {
-      "inputs": {
-        "hyprlang": "hyprlang_2",
-        "nixpkgs": "nixpkgs_4",
-        "utils": "utils"
-      },
-      "locked": {
-        "lastModified": 1711302328,
-        "narHash": "sha256-wLuFLI6S5DOretqJN05+kvrs8cbnZKfVLXrJ4hvI/Tg=",
-        "owner": "ndom91",
-        "repo": "rose-pine-hyprcursor",
-        "rev": "7e0473876f0e6d2308813a78fe84a6c6430b112b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ndom91",
-        "repo": "rose-pine-hyprcursor",
-        "type": "github"
-      }
-    },
    "sf-arabic": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-CPewXMGI78xHsjdRU8ZJIBSYjh5UY6UW21ihE4B+Bkk=",
+        "narHash": "sha256-u+Q2Hd+JCiKhIQtbQqawg1lIEgGhjmdGye2cNdWlBG0=",
        "type": "file",
        "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg"
      },
@@ -649,7 +712,7 @@
    "sf-compact": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-nJkPlddKF2dIwj+6jiVvS60hDcGAMasEOWemUwBS2mQ=",
+        "narHash": "sha256-9kXXWmu2zg0LSE7SihItXmBltLvNwyG1Ba6QehvMh04=",
        "type": "file",
        "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
      },
@@ -661,7 +724,7 @@
    "sf-mono": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-KT1RXz3NcWPetyxVlgMfh/dsoznpI3lMnplz6V7PCUU=",
+        "narHash": "sha256-BVmYmgqq79ezgyqNClyHkj2L4N3/PRisPm8YFBQZQ98=",
        "type": "file",
        "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"
      },
@@ -673,7 +736,7 @@
    "sf-pro": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-cn8ae2UddF8Pru6i3fSG2Wki5sf1DmWKD2FmKMsoeAA=",
+        "narHash": "sha256-yQhtaEPTuYOIOaC6eSPdka/Jv5Ydw3Mnd8Prlcgjs90=",
        "type": "file",
        "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
      },
@@ -690,11 +753,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1715244550,
-        "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=",
+        "lastModified": 1723501126,
+        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f",
+        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
        "type": "github"
      },
      "original": {
@@ -705,19 +768,21 @@
    },
    "spicetify-nix": {
      "inputs": {
-        "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_5"
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
      },
      "locked": {
-        "lastModified": 1704167711,
-        "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=",
-        "owner": "the-argus",
+        "lastModified": 1724991403,
+        "narHash": "sha256-n0os3uymBUoGlikG87Yp7oisYGrkEwsm3nptS9FhdAk=",
+        "owner": "Gerg-L",
        "repo": "spicetify-nix",
-        "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4",
+        "rev": "0965e58aa38245b2105fec2949a9463fe34e3f05",
        "type": "github"
      },
      "original": {
-        "owner": "the-argus",
+        "owner": "Gerg-L",
        "repo": "spicetify-nix",
        "type": "github"
      }
@@ -753,36 +818,6 @@
      }
    },
    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_5": {
      "locked": {
        "lastModified": 1689347949,
        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -797,22 +832,7 @@
        "type": "github"
      }
    },
-    "systems_6": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_7": {
+    "systems_4": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -835,11 +855,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1714058656,
-        "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
+        "lastModified": 1724833132,
+        "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
+        "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
        "type": "github"
      },
      "original": {
@@ -848,24 +868,6 @@
        "type": "github"
      }
    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_6"
-      },
-      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
    "xdph": {
      "inputs": {
        "hyprland-protocols": "hyprland-protocols",
@@ -883,11 +885,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1714060055,
-        "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
+        "lastModified": 1724073926,
+        "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
+        "rev": "a08ecbbf33598924e93542f737fc6169a26b481e",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -1,5 +1,9 @@
 {
-  description = "Nixy - Hadi's NixOS configuration";
+  # https://github.com/anotherhadi/nixy
+  description = ''
+    Nixy is a 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.
+  '';

  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -12,43 +16,48 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };
    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
-    spicetify-nix.url = "github:the-argus/spicetify-nix";
+    spicetify-nix = {
+      url = "github:Gerg-L/spicetify-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
    sops-nix = {
      url = "github:Mic92/sops-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
  };

-  outputs = inputs@{ nixpkgs, home-manager, sops-nix, hyprland, spicetify-nix
-    , nixos-hardware, ... }: {
+  outputs = inputs@{ nixpkgs, ... }: {
    nixosConfigurations = {
-        nixy = nixpkgs.lib.nixosSystem {
+      nixy = nixpkgs.lib.nixosSystem { # CHANGEME
        system = "x86_64-linux";
        modules = [
-            nixos-hardware.nixosModules.omen-16-n0005ne # REMOVE
-            ./nixos/configuration.nix
-            ./nixos/fonts.nix
-            ./nixos/tuigreet.nix
-            { _module.args = { inherit inputs; }; }
-            home-manager.nixosModules.home-manager
          {
-              home-manager = {
-                useGlobalPkgs = true;
-                useUserPackages = true;
-                users."hadi" = import ./home/home.nix;
-                extraSpecialArgs = {
-                  inherit inputs;
-                  inherit spicetify-nix;
-                  inherit sops-nix;
-                  inherit hyprland;
-                };
-              };
+            nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
+            _module.args = { inherit inputs; };
          }
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
+          inputs.home-manager.nixosModules.home-manager
+          ./hosts/laptop/configuration.nix # CHANGEME
        ];
      };
+
+      jack = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          { _module.args = { inherit inputs; }; }
+          inputs.sops-nix.nixosModules.sops
+          inputs.home-manager.nixosModules.home-manager
+          ./hosts/server/configuration.nix
+        ];
+      };
+
    };
  };
 }
--- a/home/apps/default.nix
+++ b/home/apps/default.nix
@@ -1,14 +0,0 @@
-{
-  imports = [
-    ./kitty
-    ./lf
-    ./neofetch
-    ./nvim
-    ./qutebrowser
-    ./spicetify
-    ./wofi
-    ./cava
-    ./tmux
-    ./lazygit
-  ];
-}
--- a/home/apps/kitty/default.nix
+++ b/home/apps/kitty/default.nix
@@ -1,50 +0,0 @@
-{ config, pkgs, ... }: {
-
-  programs.kitty = {
-    enable = true;
-    settings = {
-
-      scrollback_lines = 10000;
-      enable_audio_bell = false;
-      update_check_interval = 0;
-      font_family = config.theme.font-mono;
-      font_size = 13;
-      cursor_shape = "Underline";
-      cursor_underline_thickness = 1;
-      window_padding_width = 10;
-      url_style = "curly";
-      confirm_os_window_close = "0";
-      remember_window_size = "no";
-      disable_ligatures = "never";
-      shell = "${pkgs.tmux}/bin/tmux";
-      initial_window_width = 1200;
-      initial_window_height = 600;
-
-      background = "#" + config.theme.colors.bg;
-      url_color = "#" + config.theme.colors.primary-fg;
-
-      color0 = "#" + config.theme.colors.color0;
-      color8 = "#" + config.theme.colors.color8;
-      color1 = "#" + config.theme.colors.color1;
-      color9 = "#" + config.theme.colors.color9;
-      color2 = "#" + config.theme.colors.color2;
-      color10 = "#" + config.theme.colors.color10;
-      color3 = "#" + config.theme.colors.color3;
-      color11 = "#" + config.theme.colors.color11;
-      color4 = "#" + config.theme.colors.color4;
-      color12 = "#" + config.theme.colors.color12;
-      color5 = "#" + config.theme.colors.color5;
-      color13 = "#" + config.theme.colors.color13;
-      color6 = "#" + config.theme.colors.color6;
-      color14 = "#" + config.theme.colors.color14;
-      color7 = "#" + config.theme.colors.color7;
-      color15 = "#" + config.theme.colors.color15;
-
-      cursor = "#" + config.theme.colors.fg;
-      cursor_text_color = "#" + config.theme.colors.bg;
-
-      selection_foreground = "#" + config.theme.colors.primary-fg;
-      selection_background = "#" + config.theme.colors.primary-bg;
-    };
-  };
-}
--- a/home/apps/lf/config/colors
+++ b/home/apps/lf/config/colors
@@ -1,174 +0,0 @@
-# vim:ft=dircolors
-# (This is not a dircolors file but it helps to highlight colors and comments)
-
-# default values from dircolors
-# (entries with a leading # are not implemented in lf)
-# #no     00              # NORMAL
-# fi      00              # FILE
-# #rs     0               # RESET
-# di      01;34           # DIR
-# ln      01;36           # LINK
-# #mh     00              # MULTIHARDLINK
-# pi      40;33           # FIFO
-# so      01;35           # SOCK
-# #do     01;35           # DOOR
-# bd      40;33;01        # BLK
-# cd      40;33;01        # CHR
-# or      40;31;01        # ORPHAN
-# #mi     00              # MISSING
-# su      37;41           # SETUID
-# sg      30;43           # SETGID
-# #ca     30;41           # CAPABILITY
-# tw      30;42           # STICKY_OTHER_WRITABLE
-# ow      34;42           # OTHER_WRITABLE
-# st      37;44           # STICKY
-# ex      01;32           # EXEC
-
-# default values from lf (with matching order)
-# ln      01;36   # LINK
-# or      31;01   # ORPHAN
-# tw      01;34   # STICKY_OTHER_WRITABLE
-# ow      01;34   # OTHER_WRITABLE
-# st      01;34   # STICKY
-# di      01;34   # DIR
-# pi      33      # FIFO
-# so      01;35   # SOCK
-# bd      33;01   # BLK
-# cd      33;01   # CHR
-# su      01;32   # SETUID
-# sg      01;32   # SETGID
-# ex      01;32   # EXEC
-# fi      00      # FILE
-
-# file types (with matching order)
-ln      01;36   # LINK
-or      31;01   # ORPHAN
-tw      34      # STICKY_OTHER_WRITABLE
-ow      34      # OTHER_WRITABLE
-st      01;34   # STICKY
-di      01;34   # DIR
-pi      33      # FIFO
-so      01;35   # SOCK
-bd      33;01   # BLK
-cd      33;01   # CHR
-su      01;32   # SETUID
-sg      01;32   # SETGID
-ex      01;32   # EXEC
-fi      00      # FILE
-
-# archives or compressed (dircolors defaults)
-*.tar   01;31
-*.tgz   01;31
-*.arc   01;31
-*.arj   01;31
-*.taz   01;31
-*.lha   01;31
-*.lz4   01;31
-*.lzh   01;31
-*.lzma  01;31
-*.tlz   01;31
-*.txz   01;31
-*.tzo   01;31
-*.t7z   01;31
-*.zip   01;31
-*.z     01;31
-*.dz    01;31
-*.gz    01;31
-*.lrz   01;31
-*.lz    01;31
-*.lzo   01;31
-*.xz    01;31
-*.zst   01;31
-*.tzst  01;31
-*.bz2   01;31
-*.bz    01;31
-*.tbz   01;31
-*.tbz2  01;31
-*.tz    01;31
-*.deb   01;31
-*.rpm   01;31
-*.jar   01;31
-*.war   01;31
-*.ear   01;31
-*.sar   01;31
-*.rar   01;31
-*.alz   01;31
-*.ace   01;31
-*.zoo   01;31
-*.cpio  01;31
-*.7z    01;31
-*.rz    01;31
-*.cab   01;31
-*.wim   01;31
-*.swm   01;31
-*.dwm   01;31
-*.esd   01;31
-
-# image formats (dircolors defaults)
-*.jpg   01;35
-*.jpeg  01;35
-*.mjpg  01;35
-*.mjpeg 01;35
-*.gif   01;35
-*.bmp   01;35
-*.pbm   01;35
-*.pgm   01;35
-*.ppm   01;35
-*.tga   01;35
-*.xbm   01;35
-*.xpm   01;35
-*.tif   01;35
-*.tiff  01;35
-*.png   01;35
-*.svg   01;35
-*.svgz  01;35
-*.mng   01;35
-*.pcx   01;35
-*.mov   01;35
-*.mpg   01;35
-*.mpeg  01;35
-*.m2v   01;35
-*.mkv   01;35
-*.webm  01;35
-*.ogm   01;35
-*.mp4   01;35
-*.m4v   01;35
-*.mp4v  01;35
-*.vob   01;35
-*.qt    01;35
-*.nuv   01;35
-*.wmv   01;35
-*.asf   01;35
-*.rm    01;35
-*.rmvb  01;35
-*.flc   01;35
-*.avi   01;35
-*.fli   01;35
-*.flv   01;35
-*.gl    01;35
-*.dl    01;35
-*.xcf   01;35
-*.xwd   01;35
-*.yuv   01;35
-*.cgm   01;35
-*.emf   01;35
-*.ogv   01;35
-*.ogx   01;35
-
-# audio formats (dircolors defaults)
-*.aac   00;36
-*.au    00;36
-*.flac  00;36
-*.m4a   00;36
-*.mid   00;36
-*.midi  00;36
-*.mka   00;36
-*.mp3   00;36
-*.mpc   00;36
-*.ogg   00;36
-*.ra    00;36
-*.wav   00;36
-*.oga   00;36
-*.opus  00;36
-*.spx   00;36
-*.xspf  00;36
--- a/home/apps/lf/config/icons
+++ b/home/apps/lf/config/icons
@@ -1,361 +0,0 @@
-# vim:ft=conf
-
-# These examples require Nerd Fonts or a compatible font to be used.
-# See https://www.nerdfonts.com for more information.
-
-# default values from lf (with matching order)
-# ln      l       # LINK
-# or      l       # ORPHAN
-# tw      t       # STICKY_OTHER_WRITABLE
-# ow      d       # OTHER_WRITABLE
-# st      t       # STICKY
-# di      d       # DIR
-# pi      p       # FIFO
-# so      s       # SOCK
-# bd      b       # BLK
-# cd      c       # CHR
-# su      u       # SETUID
-# sg      g       # SETGID
-# ex      x       # EXEC
-# fi      -       # FILE
-
-# file types (with matching order)
-ln             # LINK
-or             # ORPHAN
-tw      t       # STICKY_OTHER_WRITABLE
-ow             # OTHER_WRITABLE
-st      t       # STICKY
-di             # DIR
-pi      p       # FIFO
-so      s       # SOCK
-bd      b       # BLK
-cd      c       # CHR
-su      u       # SETUID
-sg      g       # SETGID
-ex             # EXEC
-fi             # FILE
-
-# file extensions (vim-devicons)
-*.styl          
-*.sass          
-*.scss          
-*.htm           
-*.html          
-*.slim          
-*.haml          
-*.ejs           
-*.css           
-*.less          
-*.md            
-*.mdx           
-*.markdown      
-*.rmd           
-*.json          
-*.webmanifest   
-*.js            
-*.mjs           
-*.jsx           
-*.rb            
-*.gemspec       
-*.rake          
-*.php           
-*.py            
-*.pyc           
-*.pyo           
-*.pyd           
-*.coffee        
-*.mustache      
-*.hbs           
-*.conf          
-*.ini           
-*.yml           
-*.yaml          
-*.toml          
-*.bat           
-*.mk            
-*.jpg           
-*.jpeg          
-*.bmp           
-*.png           
-*.webp          
-*.gif           
-*.ico           
-*.twig          
-*.cpp           
-*.c++           
-*.cxx           
-*.cc            
-*.cp            
-*.c             
-*.cs            󰌛
-*.h             
-*.hh            
-*.hpp           
-*.hxx           
-*.hs            
-*.lhs           
-*.nix           
-*.lua           
-*.java          
-*.sh            
-*.fish          
-*.bash          
-*.zsh           
-*.ksh           
-*.csh           
-*.awk           
-*.ps1           
-*.ml            λ
-*.mli           λ
-*.diff          
-*.db            
-*.sql           
-*.dump          
-*.clj           
-*.cljc          
-*.cljs          
-*.edn           
-*.scala         
-*.go            
-*.dart          
-*.xul           
-*.sln           
-*.suo           
-*.pl            
-*.pm            
-*.t             
-*.rss           
-'*.f#'          
-*.fsscript      
-*.fsx           
-*.fs            
-*.fsi           
-*.rs            
-*.rlib          
-*.d             
-*.erl           
-*.hrl           
-*.ex            
-*.exs           
-*.eex           
-*.leex          
-*.heex          
-*.vim           
-*.ai            
-*.psd           
-*.psb           
-*.ts            
-*.tsx           
-*.jl            
-*.pp            
-*.vue           
-*.elm           
-*.swift         
-*.xcplayground  
-*.tex           󰙩
-*.r             󰟔
-*.rproj         󰗆
-*.sol           󰡪
-*.pem           
-
-# file names (vim-devicons) (case-insensitive not supported in lf)
-*gruntfile.coffee       
-*gruntfile.js           
-*gruntfile.ls           
-*gulpfile.coffee        
-*gulpfile.js            
-*gulpfile.ls            
-*mix.lock               
-*dropbox                
-*.ds_store              
-*.gitconfig             
-*.gitignore             
-*.gitattributes         
-*.gitlab-ci.yml         
-*.bashrc                
-*.zshrc                 
-*.zshenv                
-*.zprofile              
-*.vimrc                 
-*.gvimrc                
-*_vimrc                 
-*_gvimrc                
-*.bashprofile           
-*favicon.ico            
-*license                
-*node_modules           
-*react.jsx              
-*procfile               
-*dockerfile             
-*docker-compose.yml     
-*docker-compose.yaml    
-*compose.yml            
-*compose.yaml           
-*rakefile               
-*config.ru              
-*gemfile                
-*makefile               
-*cmakelists.txt         
-*robots.txt             󰚩
-
-# file names (case-sensitive adaptations)
-*Gruntfile.coffee       
-*Gruntfile.js           
-*Gruntfile.ls           
-*Gulpfile.coffee        
-*Gulpfile.js            
-*Gulpfile.ls            
-*Dropbox                
-*.DS_Store              
-*LICENSE                
-*React.jsx              
-*Procfile               
-*Dockerfile             
-*Docker-compose.yml     
-*Docker-compose.yaml    
-*Rakefile               
-*Gemfile                
-*Makefile               
-*CMakeLists.txt         
-
-# file patterns (vim-devicons) (patterns not supported in lf)
-# .*jquery.*\.js$         
-# .*angular.*\.js$        
-# .*backbone.*\.js$       
-# .*require.*\.js$        
-# .*materialize.*\.js$    
-# .*materialize.*\.css$   
-# .*mootools.*\.js$       
-# .*vimrc.*               
-# Vagrantfile$            
-
-# file patterns (file name adaptations)
-*jquery.min.js          
-*angular.min.js         
-*backbone.min.js        
-*require.min.js         
-*materialize.min.js     
-*materialize.min.css    
-*mootools.min.js        
-*vimrc                  
-Vagrantfile             
-
-# archives or compressed (extensions from dircolors defaults)
-*.tar   
-*.tgz   
-*.arc   
-*.arj   
-*.taz   
-*.lha   
-*.lz4   
-*.lzh   
-*.lzma  
-*.tlz   
-*.txz   
-*.tzo   
-*.t7z   
-*.zip   
-*.z     
-*.dz    
-*.gz    
-*.lrz   
-*.lz    
-*.lzo   
-*.xz    
-*.zst   
-*.tzst  
-*.bz2   
-*.bz    
-*.tbz   
-*.tbz2  
-*.tz    
-*.deb   
-*.rpm   
-*.jar   
-*.war   
-*.ear   
-*.sar   
-*.rar   
-*.alz   
-*.ace   
-*.zoo   
-*.cpio  
-*.7z    
-*.rz    
-*.cab   
-*.wim   
-*.swm   
-*.dwm   
-*.esd   
-
-# image formats (extensions from dircolors defaults)
-*.jpg   
-*.jpeg  
-*.mjpg  
-*.mjpeg 
-*.gif   
-*.bmp   
-*.pbm   
-*.pgm   
-*.ppm   
-*.tga   
-*.xbm   
-*.xpm   
-*.tif   
-*.tiff  
-*.png   
-*.svg   
-*.svgz  
-*.mng   
-*.pcx   
-*.mov   
-*.mpg   
-*.mpeg  
-*.m2v   
-*.mkv   
-*.webm  
-*.ogm   
-*.mp4   
-*.m4v   
-*.mp4v  
-*.vob   
-*.qt    
-*.nuv   
-*.wmv   
-*.asf   
-*.rm    
-*.rmvb  
-*.flc   
-*.avi   
-*.fli   
-*.flv   
-*.gl    
-*.dl    
-*.xcf   
-*.xwd   
-*.yuv   
-*.cgm   
-*.emf   
-*.ogv   
-*.ogx   
-
-# audio formats (extensions from dircolors defaults)
-*.aac   
-*.au    
-*.flac  
-*.m4a   
-*.mid   
-*.midi  
-*.mka   
-*.mp3   
-*.mpc   
-*.ogg   
-*.ra    
-*.wav   
-*.oga   
-*.opus  
-*.spx   
-*.xspf  
-
-# other formats
-*.pdf   
--- a/home/apps/lf/default.nix
+++ b/home/apps/lf/default.nix
@@ -1,80 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ pistol ];
-
-  programs.lf = {
-    enable = true;
-
-    commands = {
-      dragon-out = ''%${pkgs.xdragon}/bin/xdragon -a -x "$fx"'';
-      editor-open = "$$EDITOR $f";
-      mkdir = ''
-        ''${{
-          printf "Directory Name: "
-          read DIR
-          mkdir $DIR
-        }}
-      '';
-    };
-
-    keybindings = {
-      d = "delete";
-      x = "cut";
-      "<enter>" = "open";
-      "<c-g>" = "quit";
-      "<esc>" = "quit";
-      "H" = "set hidden!";
-      "\\\"" = "";
-      o = "";
-      c = "mkdir";
-      "." = "set hidden!";
-      "`" = "mark-load";
-      "\\'" = "mark-load";
-      "g~" = "cd";
-      do = "dragon-out";
-      gh = "cd";
-      "g/" = "/";
-      ee = "editor-open";
-      V = ''$''${pkgs.bat}/bin/bat --paging=always "$f"'';
-    };
-
-    settings = {
-      ratios = [ 1 1 2 ];
-      preview = true;
-      hidden = true;
-      drawbox = true;
-      icons = true;
-      ignorecase = true;
-      incsearch = true;
-    };
-
-    previewer.source = "${pkgs.pistol}/bin/pistol";
-
-    extraConfig = let
-      previewer = pkgs.writeShellScriptBin "pv.sh" ''
-        file=$1
-        w=$2
-        h=$3
-        x=$4
-        y=$5
-
-        if [[ "$( ${pkgs.file}/bin/file -Lb --mime-type "$file")" =~ ^image ]]; then
-            ${pkgs.kitty}/bin/kitty +kitten icat --silent --stdin no --transfer-mode file --place "''${w}x''${h}@''${x}x''${y}" "$file" < /dev/null > /dev/tty
-            exit 1
-        fi
-
-        ${pkgs.pistol}/bin/pistol "$file"
-      '';
-      cleaner = pkgs.writeShellScriptBin "clean.sh" ''
-        ${pkgs.kitty}/bin/kitty +kitten icat --clear --stdin no --silent --transfer-mode file < /dev/null > /dev/tty
-      '';
-    in ''
-      set cleaner ${cleaner}/bin/clean.sh
-      set previewer ${previewer}/bin/pv.sh
-    '';
-  };
-
-  xdg.configFile."lf" = {
-    recursive = true;
-    source = ./config;
-  };
-}
--- a/home/apps/nvim/auto-pairs.nix
+++ b/home/apps/nvim/auto-pairs.nix
@@ -1 +0,0 @@
-{ programs.nixvim.plugins.nvim-autopairs = { enable = true; }; }
--- a/home/apps/nvim/bufferline.nix
+++ b/home/apps/nvim/bufferline.nix
@@ -1 +0,0 @@
-{ programs.nixvim.plugins.bufferline = { enable = true; }; }
--- a/home/apps/nvim/comment.nix
+++ b/home/apps/nvim/comment.nix
@@ -1 +0,0 @@
-{ programs.nixvim.plugins.comment = { enable = true; }; }
--- a/home/apps/nvim/copilot.nix
+++ b/home/apps/nvim/copilot.nix
@@ -1,5 +0,0 @@
-{
-  programs.nixvim.plugins.copilot-vim = {
-    enable = true;
-  };
-}
--- a/home/apps/nvim/default.nix
+++ b/home/apps/nvim/default.nix
@@ -1,37 +0,0 @@
-{ inputs, ... }: {
-  imports = [
-    inputs.nixvim.homeManagerModules.nixvim
-    ./auto-pairs.nix
-    ./options.nix
-    ./bufferline.nix
-    ./lazygit.nix
-    ./telescope.nix
-    ./nvim-tree.nix
-    ./lightline.nix
-    ./git.nix
-    ./cmp.nix
-    ./none-ls.nix
-    ./wilder.nix
-    ./lsp.nix
-    ./treesitter.nix
-    ./toggleterm.nix
-    ./copilot.nix
-    ./obsidian.nix
-    ./whichkey.nix
-    ./alpha.nix
-    ./keymaps.nix
-    ./comment.nix
-    ./oil.nix
-    ./trouble.nix
-    ./tmux-navigator.nix
-  ];
-
-  programs.nixvim = {
-    enable = true;
-    colorschemes.catppuccin = {
-      enable = true;
-      settings = { transparent_background = true; };
-    };
-  };
-
-}
--- a/home/apps/nvim/git.nix
+++ b/home/apps/nvim/git.nix
@@ -1,6 +0,0 @@
-{
-  programs.nixvim.plugins.gitsigns = {
-    enable = true;
-    settings = { current_line_blame = false; };
-  };
-}
--- a/home/apps/nvim/keymaps.nix
+++ b/home/apps/nvim/keymaps.nix
@@ -1,71 +0,0 @@
-{
-  programs.nixvim.keymaps = [
-    {
-      key = "<leader>e";
-      action = "<CMD>Neotree toggle<CR>";
-    }
-    {
-      key = "<space>fm";
-      action = "<CMD>lua vim.lsp.buf.format()<CR>";
-    }
-
-    {
-      key = "<leader>ot";
-      action = "<cmd>lua require('obsidian').util.toggle_checkbox()<cr>";
-    }
-
-    {
-      key = "<leader>oo";
-      action = "<cmd>ObsidianQuickSwitch<cr>";
-    }
-
-    {
-      key = "<leader>on";
-      action = "<cmd>ObsidianNew<cr>";
-    }
-
-    {
-      key = "<leader>of";
-      action = "<cmd>ObsidianSearch<cr>";
-    }
-
-    {
-      key = "<leader>oi";
-      action = "<cmd>ObsidianPasteImg<cr>";
-    }
-
-    {
-      key = "<leader>E";
-      action = "<cmd>Oil<cr>";
-    }
-
-    {
-      key = "<leader>t";
-      action = "<cmd>TroubleToggle<cr>";
-    }
-
-    {
-      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>";
-    }
-
-    # Terminal Mappings
-    {
-      mode = "t";
-      key = "<esc>";
-      action = "<C-\\><C-n>";
-    }
-  ];
-}
--- a/home/apps/nvim/lazygit.nix
+++ b/home/apps/nvim/lazygit.nix
@@ -1 +0,0 @@
-{ programs.nixvim.plugins.lazygit = { enable = true; }; }
--- a/home/apps/nvim/lightline.nix
+++ b/home/apps/nvim/lightline.nix
@@ -1 +0,0 @@
-{ programs.nixvim.plugins.lualine = { enable = true; }; }
--- a/home/apps/nvim/lsp.nix
+++ b/home/apps/nvim/lsp.nix
@@ -1,24 +0,0 @@
-{
-  programs.nixvim.plugins = {
-    lsp-format.enable = true;
-    lsp = {
-      enable = true;
-      servers = {
-        bashls.enable = true;
-        clangd.enable = true;
-        gopls.enable = true;
-        nixd.enable = true;
-        tailwindcss.enable = true;
-        html.enable = true;
-        svelte.enable = true;
-      };
-      keymaps.lspBuf = {
-        "gd" = "definition";
-        "gD" = "references";
-        "gt" = "type_definition";
-        "gi" = "implementation";
-        "K" = "hover";
-      };
-    };
-  };
-}
--- a/home/apps/nvim/none-ls.nix
+++ b/home/apps/nvim/none-ls.nix
@@ -1,18 +0,0 @@
-{
-  programs.nixvim.plugins.none-ls = {
-    enable = true;
-    sources = {
-      diagnostics = {
-        golangci_lint.enable = true;
-        statix.enable = true;
-      };
-      formatting = {
-        gofmt.enable = true;
-        goimports.enable = true;
-        nixfmt.enable = true;
-        markdownlint.enable = true;
-        tidy.enable = true;
-      };
-    };
-  };
-}
--- a/home/apps/nvim/nvim-tree.nix
+++ b/home/apps/nvim/nvim-tree.nix
@@ -1,5 +0,0 @@
-{
-  programs.nixvim.plugins.neo-tree = {
-    enable = true;
-  };
-}
--- a/home/apps/nvim/obsidian.nix
+++ b/home/apps/nvim/obsidian.nix
@@ -1,9 +0,0 @@
-{
-  programs.nixvim.plugins.obsidian = {
-    enable = true;
-    settings = {
-      dir = "~/Nextcloud/obsidian";
-      disable_frontmatter = true;
-    };
-  };
-}
--- a/home/apps/nvim/oil.nix
+++ b/home/apps/nvim/oil.nix
@@ -1,6 +0,0 @@
-{
-  programs.nixvim.plugins.oil = {
-    enable = true;
-    settings = { default_file_explorer = false; };
-  };
-}
--- a/home/apps/nvim/telescope.nix
+++ b/home/apps/nvim/telescope.nix
@@ -1,13 +0,0 @@
-{
-  programs.nixvim.plugins.telescope = {
-    enable = true;
-    keymaps = {
-      "<leader>fg" = "live_grep";
-      #"<C-p>" = {
-      #  action = "git_files";
-      #  desc = "Telescope Git Files";
-      #};
-    };
-    extensions.fzf-native = { enable = true; };
-  };
-}
--- a/home/apps/nvim/tmux-navigator.nix
+++ b/home/apps/nvim/tmux-navigator.nix
@@ -1 +0,0 @@
-{ programs.nixvim.plugins.tmux-navigator = { enable = true; }; }
--- a/home/apps/nvim/toggleterm.nix
+++ b/home/apps/nvim/toggleterm.nix
@@ -1,9 +0,0 @@
-{
-  programs.nixvim.plugins.toggleterm = {
-    enable = true;
-    settings = {
-      open_mapping = "[[<c-t>]]";
-      direction = "horizontal";
-    };
-  };
-}
--- a/home/apps/nvim/treesitter.nix
+++ b/home/apps/nvim/treesitter.nix
@@ -1,10 +0,0 @@
-{
-  programs.nixvim.plugins = {
-    treesitter = {
-      enable = true;
-      nixGrammars = true;
-      indent = true;
-    };
-    treesitter-context.enable = true;
-  };
-}
--- a/home/apps/nvim/trouble.nix
+++ b/home/apps/nvim/trouble.nix
@@ -1 +0,0 @@
-{ programs.nixvim.plugins.trouble = { enable = true; }; }
--- a/home/apps/nvim/whichkey.nix
+++ b/home/apps/nvim/whichkey.nix
@@ -1,3 +0,0 @@
-{
-  programs.nixvim.plugins.which-key.enable=true;
-}
--- a/home/apps/nvim/wilder.nix
+++ b/home/apps/nvim/wilder.nix
@@ -1,6 +0,0 @@
-{
-  programs.nixvim.plugins.wilder = {
-    enable = true;
-    modes = [ ":" "/" "?" ];
-  };
-}
--- a/home/apps/qutebrowser/default.nix
+++ b/home/apps/qutebrowser/default.nix
@@ -1,261 +0,0 @@
-{ config, ... }: {
-
-  imports = [ ./duckduckgo-colorscheme.nix ./homepage/default.nix ];
-
-  programs.qutebrowser = {
-    enable = true;
-
-    searchEngines = {
-      "DEFAULT" = "https://duckduckgo.com/?q={}&ia=web";
-      "d" = "https://duckduckgo.com/?q={}&ia=web";
-      "g" = "https://google.com/search?q={}";
-      "y" = "https://youtube.com/results?search_query={}";
-      "ya" = "https://yandex.com/search/?text={}";
-      "n" = "https://mynixos.com/search?q={}";
-      "nixo" = "https://search.nixos.org/options?channel=unstable&query={}";
-      "nixp" = "https://search.nixos.org/packages?channel=unstable&query={}";
-      "gt" = "https://github.com/search?q={}&type=repositories";
-    };
-
-    quickmarks = {
-      home = "${config.home.homeDirectory}/.config/startpage/index.html";
-      mynixos = "https://mynixos.com";
-      github = "https://github.com";
-      outlook = "https://outlook.office.com/mail/";
-      office = "https://www.office.com/?auth=2";
-      teams = "https://teams.microsoft.com/_";
-      casa = "http://192.168.2.16:8081/#/";
-      proton = "https://mail.proton.me/u/0/inbox";
-      cloudflare-one = "https://one.dash.cloudflare.com/";
-      chatgpt = "https://chat.openai.com/";
-      nixvim = "https://nix-community.github.io/nixvim/";
-      hyprland = "https://wiki.hyprland.org/";
-      nerdfont = "https://www.nerdfonts.com/cheat-sheet";
-      youtube = "https://youtube.com/";
-      cloudflare = "https://dash.cloudflare.com/";
-    };
-
-    settings = {
-      url = {
-        default_page =
-          "${config.home.homeDirectory}/.config/startpage/index.html";
-        start_pages =
-          [ "${config.home.homeDirectory}/.config/startpage/index.html" ];
-      };
-
-      colors = {
-        tabs = {
-          odd.bg = "#${config.theme.colors.bg}";
-          odd.fg = "#${config.theme.colors.fg}";
-          even.bg = "#${config.theme.colors.bg}";
-          even.fg = "#${config.theme.colors.fg}";
-          selected = {
-            odd = {
-              bg = "#${config.theme.colors.primary-bg}";
-              fg = "#${config.theme.colors.primary-fg}";
-            };
-            even = {
-              bg = "#${config.theme.colors.primary-bg}";
-              fg = "#${config.theme.colors.primary-fg}";
-            };
-          };
-          indicator = {
-            error = "#${config.theme.colors.color1}";
-            start = "#${config.theme.colors.alt-bg}";
-            stop = "#${config.theme.colors.alt-bg}";
-          };
-        };
-
-        hints = {
-          bg = "#${config.theme.colors.alt-bg}";
-          fg = "#${config.theme.colors.alt-fg}";
-          match.fg = "#${config.theme.colors.bg}";
-        };
-
-        completion = {
-          category = {
-            bg = "#${config.theme.colors.bg}";
-            fg = "#${config.theme.colors.fg}";
-            border = {
-              top = "#${config.theme.colors.bg}";
-              bottom = "#${config.theme.colors.bg}";
-            };
-          };
-
-          odd.bg = "#${config.theme.colors.bg}";
-          even.bg = "#${config.theme.colors.bg}";
-
-          fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ];
-
-          match.fg = "#${config.theme.colors.primary-bg}";
-
-          item.selected = {
-            bg = "#${config.theme.colors.primary-bg}";
-            border.top = "#${config.theme.colors.primary-bg}";
-            border.bottom = "#${config.theme.colors.primary-bg}";
-            fg = "#${config.theme.colors.primary-fg}";
-            match.fg = "#${config.theme.colors.primary-fg}";
-          };
-        };
-
-        statusbar = {
-          normal.bg = "#${config.theme.colors.bg}";
-          normal.fg = "#${config.theme.colors.fg}";
-          private.bg = "#${config.theme.colors.bg}";
-          private.fg = "#${config.theme.colors.fg}";
-          insert.bg = "#${config.theme.colors.primary-bg}";
-          insert.fg = "#${config.theme.colors.primary-fg}";
-          command = {
-            bg = "#${config.theme.colors.alt-bg}";
-            fg = "#${config.theme.colors.alt-fg}";
-            private.bg = "#${config.theme.colors.alt-bg}";
-            private.fg = "#${config.theme.colors.alt-fg}";
-          };
-        };
-
-        messages = {
-          info = {
-            bg = "#${config.theme.colors.alt-bg}";
-            fg = "#${config.theme.colors.alt-fg}";
-            border = "#${config.theme.colors.alt-bg}";
-          };
-
-          error = {
-            bg = "#${config.theme.colors.color1}";
-            fg = "#${config.theme.colors.alt-fg}";
-            border = "#${config.theme.colors.color1}";
-          };
-        };
-
-        #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
-      };
-
-      fonts = { default_family = "${config.theme.font}"; };
-
-      completion = {
-        height = "30%";
-        open_categories = [ "history" ];
-        scrollbar = {
-          padding = 0;
-          width = 0;
-        };
-        show = "always";
-        shrink = true;
-        timestamp_format = "";
-        web_history.max_items = 7;
-      };
-
-      content = {
-        autoplay = false;
-        javascript.clipboard = "access";
-        javascript.enabled = true;
-        pdfjs = true;
-      };
-
-      downloads = {
-        position = "bottom";
-        remove_finished = 0;
-      };
-
-      hints = {
-        border = "none";
-        radius = 1;
-      };
-
-      scrolling = {
-        bar = "never";
-        smooth = true;
-      };
-
-      tabs = {
-        show = "multiple";
-        last_close = "close";
-        mode_on_change = "restore";
-        close_mouse_button = "right";
-      };
-
-      zoom.default = "100%";
-
-      qt.force_software_rendering = "chromium";
-    };
-
-    keyBindings = {
-      normal = {
-        "gh" = "open ${config.home.homeDirectory}/.config/startpage/index.html";
-
-        " p" = "tab-move -";
-        " n" = "tab-move +";
-        " w" = "tab-close";
-
-        " 1" = "tab-focus 1";
-        " 2" = "tab-focus 2";
-        " 3" = "tab-focus 3";
-        " 4" = "tab-focus 4";
-        " 5" = "tab-focus 5";
-        " 6" = "tab-focus 6";
-        " 7" = "tab-focus 7";
-        " 8" = "tab-focus 8";
-        " 9" = "tab-focus 9";
-        " 0" = "tab-focus 10";
-
-        "<Ctrl-w>" = "tab-close";
-        "<Ctrl-n>" = "open -w";
-
-        "<Ctrl-1>" = "tab-focus 1";
-        "<Ctrl-2>" = "tab-focus 2";
-        "<Ctrl-3>" = "tab-focus 3";
-        "<Ctrl-4>" = "tab-focus 4";
-        "<Ctrl-5>" = "tab-focus 5";
-        "<Ctrl-6>" = "tab-focus 6";
-        "<Ctrl-7>" = "tab-focus 7";
-        "<Ctrl-8>" = "tab-focus 8";
-        "<Ctrl-9>" = "tab-focus 9";
-        "<Ctrl-0>" = "tab-focus 10";
-      };
-
-      command = {
-        "<Ctrl-w>" = "tab-close";
-        "<Ctrl-n>" = "open -w";
-        "<Ctrl-1>" = "tab-focus 1";
-        "<Ctrl-2>" = "tab-focus 2";
-        "<Ctrl-3>" = "tab-focus 3";
-        "<Ctrl-4>" = "tab-focus 4";
-        "<Ctrl-5>" = "tab-focus 5";
-        "<Ctrl-6>" = "tab-focus 6";
-        "<Ctrl-7>" = "tab-focus 7";
-        "<Ctrl-8>" = "tab-focus 8";
-        "<Ctrl-9>" = "tab-focus 9";
-        "<Ctrl-0>" = "tab-focus 10";
-      };
-
-      insert = {
-        "<Ctrl-w>" = "tab-close";
-        "<Ctrl-n>" = "open -w";
-        "<Ctrl-1>" = "tab-focus 1";
-        "<Ctrl-2>" = "tab-focus 2";
-        "<Ctrl-3>" = "tab-focus 3";
-        "<Ctrl-4>" = "tab-focus 4";
-        "<Ctrl-5>" = "tab-focus 5";
-        "<Ctrl-6>" = "tab-focus 6";
-        "<Ctrl-7>" = "tab-focus 7";
-        "<Ctrl-8>" = "tab-focus 8";
-        "<Ctrl-9>" = "tab-focus 9";
-        "<Ctrl-0>" = "tab-focus 10";
-      };
-    };
-
-    extraConfig = ''
-      config.unbind("gm")
-      config.unbind("gd")
-      config.unbind("gb")
-      config.unbind("tl")
-      config.unbind("gt")
-
-      c.tabs.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
-
-      config.load_autoconfig(True)
-    '';
-  };
-}
--- a/home/apps/qutebrowser/homepage/default.nix
+++ b/home/apps/qutebrowser/homepage/default.nix
@@ -1,297 +0,0 @@
-{ config, ... }:
-let
-  bookmarks = ''
-    Bookmarks: [
-      {text: "MyNixOs", url: "https://mynixos.com", icon: "󱄅"},
-      {text: "Github", url: "https://github.com", icon: ""},
-      {text: "Proton", url: "https://mail.proton.me/u/0/inbox", icon: ""},
-      {text: "Cloudflare One", url: "https://one.dash.cloudflare.com/", icon: ""},
-      {text: "Chat GPT", url: "https://chat.openai.com/", icon: "󰭹"},
-      {text: "Nixvim", url: "https://nix-community.github.io/nixvim/", icon: ""},
-      {text: "Hyprland Wiki", url: "https://wiki.hyprland.org/", icon: "󰖬"},
-      {text: "Nerdfont", url: "https://www.nerdfonts.com/cheat-sheet", icon: ""},
-      {text: "Youtube", url: "https://youtube.com", icon: "󰗃"},
-    ],
-    Home: [
-      {text: "Casa", url: "http://192.168.2.16:8081/#/", icon: "󰋜"},
-      {text: "Plex", url: "http://192.168.2.16:32400", icon: "󰚺"},
-      {text: "Nextcloud", url: "http://192.168.2.16:10081", icon: ""},
-    ],
-    Work: [
-      {text: "Outlook", url: "https://outlook.office.com/mail/", icon: "󰴢"},
-      {text: "Office", url: "https://www.office.com/?auth=2", icon: "󰏆"},
-      {text: "Teams", url: "https://teams.microsoft.com/_", icon: "󰊻"},
-    ],
-  '';
-in {
-
-  xdg.configFile."startpage/index.html".text = ''
-    <!DOCTYPE html>
-    <html lang="en">
-
-    <head>
-      <meta charset="UTF-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <title>Homepage</title>
-      <style>
-        h1,
-        h2,
-        h3,
-        p {
-          margin: 0;
-          padding: 0;
-          font-family: '${config.theme.font}', sans-serif;
-        }
-
-        .w-screen {
-          width: 100vw;
-        }
-
-        .overflow-hidden {
-          overflow: hidden;
-        }
-
-        .max-w-7xl {
-          max-width: 80rem;
-        }
-
-        .mx-auto {
-          margin-left: auto;
-          margin-right: auto;
-        }
-
-        .justify-between {
-          justify-content: space-between;
-        }
-
-        .items-center {
-          align-items: center;
-        }
-
-        .py-12 {
-          padding-top: 3rem;
-          padding-bottom: 3rem;
-        }
-
-        .px-2 {
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-        }
-
-        .text-5xl {
-          font-size: 3rem;
-          line-height: 1;
-        }
-
-        .font-bold {
-          font-weight: 700;
-        }
-
-        .mb-4 {
-          margin-bottom: 1rem;
-        }
-
-        .flex {
-          display: flex;
-        }
-
-        .flex-wrap {
-          flex-wrap: wrap;
-        }
-
-        .flex-col {
-          flex-direction: column;
-        }
-
-        .flex-grow {
-          flex-grow: 1;
-        }
-
-        .gap-5 {
-          gap: 1.25rem;
-        }
-
-        .gap-05 {
-          gap: 0.125rem;
-        }
-
-        .justify-start {
-          justify-content: flex-start;
-        }
-
-        .items-start {
-          align-items: flex-start;
-        }
-
-        .hover\:opacity-60:hover {
-          opacity: 0.6;
-        }
-
-        .pb-10 {
-          padding-bottom: 2.5rem;
-        }
-
-        .p-10 {
-          padding: 2.5rem;
-        }
-
-        .text-xl {
-          font-size: 1.25rem;
-          line-height: 1.75rem;
-        }
-
-        .text-lg {
-          font-size: 1.125rem;
-          line-height: 1.75rem;
-        }
-
-        .text-sm {
-          font-size: 0.875rem;
-          line-height: 1.25rem;
-        }
-
-        .text-4xl {
-          font-size: 2.25rem;
-          line-height: 2.5rem;
-        }
-
-        .px-5 {
-          padding-left: 1.25rem;
-          padding-right: 1.25rem;
-        }
-
-        .py-2 {
-          padding-top: 0.5rem;
-          padding-bottom: 0.5rem;
-        }
-
-        a {
-          text-decoration: none;
-        }
-
-        a, a:visited, a:hover, a:active {
-          color: inherit;
-        }
-        </style>
-    </head>
-
-    <body class="w-screen" style="background-color: #${config.theme.colors.bg}; color: #${config.theme.colors.fg};">
-      <div class="max-w-7xl mx-auto p-10">
-        <div class="w-full flex justify-between" id="date-time">
-          <p class="text-xl"></p>
-          <p class="text-xl"></p>
-        </div>
-        <div class="w-full py-12 px-2" id="greeting">
-          <h1 class="text-5xl font-bold mb-4" style="color: #${config.theme.colors.primary-bg};"></h1>
-        </div>
-        <div id="link-list" class="flex gap-5 flex-col justify-start items-start"></div>
-      </div>
-      <script defer>
-        const linkLists = {
-          ${bookmarks}
-        };
-
-        function getDomainFromUrl(url) {
-          let domain = url.replace(/(^\w+:|^)\/\//, "");
-          domain = domain.split('/')[0];
-          return domain;
-        }
-
-        const linkListContainer = document.getElementById('link-list');
-
-        for (const key in linkLists) {
-          if (Object.hasOwnProperty.call(linkLists, key)) {
-            const linkList = linkLists[key];
-            const title = document.createElement('h2');
-            title.textContent = key.charAt(0).toUpperCase() + key.slice(1);
-            title.className = "text-3xl font-bold"
-            linkListContainer.appendChild(title);
-
-            const list = document.createElement('div');
-            list.className = 'flex flex-wrap gap-5 justify-start';
-            linkList.forEach(link => {
-              const anchor = document.createElement('a');
-              anchor.href = link.url;
-              anchor.className = "px-5 py-2 hover:opacity-60 flex-grow"
-
-              const div = document.createElement('div');
-              div.className = 'flex flex-row gap-5 items-center';
-
-              let icon = document.createElement('p');
-              icon.textContent = link.icon || "";
-              icon.className = "text-4xl";
-              div.appendChild(icon);
-
-              const divNameUrl = document.createElement('div');
-              divNameUrl.className = 'flex flex-col gap-05';
-
-              const name = document.createElement('p');
-              name.textContent = link.text;
-              name.className = 'text-lg font-medium';
-
-              const url = document.createElement('p');
-              url.textContent = link.url;
-              url.className = 'text-sm';
-              url.style = "color: #${config.theme.colors.alt-fg};"
-
-              divNameUrl.appendChild(name);
-              divNameUrl.appendChild(url);
-              div.appendChild(divNameUrl);
-              anchor.appendChild(div);
-              list.appendChild(anchor);
-            });
-
-            linkListContainer.appendChild(list);
-            const spacer = document.createElement('div');
-            spacer.className = "pb-10"
-            linkListContainer.appendChild(spacer);
-          }
-        }
-
-        function updateDateTime() {
-          const dateTimeContainer = document.getElementById('date-time');
-          const currentDate = new Date();
-          const dateOptions = {weekday: 'long', year: 'numeric', month: 'long', day: 'numeric'};
-          const timeOptions = {hour: '2-digit', minute: '2-digit'};
-          const formattedDate = currentDate.toLocaleDateString('en-US', dateOptions);
-          const formattedTime = currentDate.toLocaleTimeString('en-US', timeOptions);
-          const dateParagraph = dateTimeContainer.querySelector('p:nth-child(1)');
-          const timeParagraph = dateTimeContainer.querySelector('p:nth-child(2)');
-          dateParagraph.textContent = formattedDate;
-          timeParagraph.textContent = formattedTime;
-        }
-
-        updateDateTime();
-        setInterval(updateDateTime, 60000);
-
-        function updateGreeting() {
-          const greetingContainer = document.getElementById('greeting');
-          const currentDate = new Date();
-          const currentHour = currentDate.getHours();
-          let greetingText;
-
-          if (currentHour < 2) {
-            greetingText = "Good night! ";
-          } else if (currentHour < 5) {
-            greetingText = "Hello, night owl! 󰏒";
-          } else if (currentHour < 12) {
-            greetingText = "Good morning! ";
-          } else if (currentHour < 17) {
-            greetingText = "Good afternoon! ️";
-          } else if (currentHour < 20) {
-            greetingText = "Good evening! ";
-          } else {
-            greetingText = "Good night! ";
-          }
-
-          const greetingHeader = greetingContainer.querySelector('h1');
-          greetingHeader.textContent = greetingText;
-        }
-
-        updateGreeting();
-      </script>
-    </body>
-
-    </html>
-  '';
-}
--- a/home/apps/spicetify/default.nix
+++ b/home/apps/spicetify/default.nix
@@ -1,40 +0,0 @@
-{ pkgs, config, lib, spicetify-nix, ... }:
-let spicePkgs = spicetify-nix.packages.${pkgs.system}.default;
-in {
-
-  imports = [ spicetify-nix.homeManagerModules.default ];
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [ "spotify" ];
-  programs.spicetify = {
-    enable = true;
-    theme = spicePkgs.themes.text;
-    colorScheme = "custom";
-
-    customColorScheme = {
-      text = "${config.theme.colors.fg}";
-      subtext = "${config.theme.colors.alt-fg}";
-      sidebar-text = "${config.theme.colors.alt-fg}";
-      main = "${config.theme.colors.bg}";
-      sidebar = "${config.theme.colors.bg}";
-      background = "${config.theme.colors.bg}";
-      player = "${config.theme.colors.bg}";
-      card = "${config.theme.colors.bg}";
-      shadow = "000000";
-      selected-row = "${config.theme.colors.alt-bg}";
-      button = "${config.theme.colors.primary-bg}";
-      button-active = "${config.theme.colors.primary-bg}";
-      button-disabled = "${config.theme.colors.alt-bg}";
-      tab-active = "${config.theme.colors.primary-bg}";
-      misc = "${config.theme.colors.alt-fg}";
-    };
-
-    enabledExtensions = with spicePkgs.extensions; [
-      playlistIcons
-      lastfm
-      historyShortcut
-      hidePodcasts
-      fullAppDisplay
-      shuffle
-    ];
-  };
-}
--- a/home/home.nix
+++ b/home/home.nix
@@ -1,61 +0,0 @@
-{ pkgs, ... }:
-let variable = import ../variables.nix;
-in {
-
-  imports = [ ./themes ./system ./scripts ./apps ];
-
-  home = {
-    username = variable.username;
-    homeDirectory = variable.homeDirectory;
-
-    packages = with pkgs; [
-      swappy
-      imv
-      discord
-      obsidian
-      btop
-      xfce.thunar
-      bitwarden
-      vlc
-
-      # Dev
-      go
-      cargo
-      nodejs
-      python3
-      jq
-
-      # Utils
-      sops # Secrets
-      age # Secrets
-      fd
-      bc
-      gcc
-      blueman
-      zip
-      unzip
-      xdg_utils
-      tldr
-      wget
-      curl
-      ripgrep
-      neovide
-      wf-recorder
-      tree # temp
-
-      # Just cool
-      peaclock
-      cbonsai
-      pipes
-      cmatrix
-
-      # Backup
-      vscode
-      firefox
-      tor-browser
-    ];
-
-    stateVersion = variable.stateVersion;
-  };
-  programs.home-manager.enable = true;
-}
--- a/home/programs/btop/default.nix
+++ b/home/programs/btop/default.nix
@@ -0,0 +1,9 @@
+{
+  programs.btop = {
+    enable = true;
+    settings = {
+      color_theme = "Default";
+      theme_background = false;
+    };
+  };
+}
--- a/home/programs/cava/default.nix
+++ b/home/programs/cava/default.nix
@@ -5,8 +5,8 @@
      general.framerate = 60;
      smoothing.noise_reduction = 88;
      color = {
-        background = "'#${config.theme.colors.bg}'";
-        foreground = "'#${config.theme.colors.primary-bg}'";
+        background = "'#${config.var.theme.colors.bg}'";
+        foreground = "'#${config.var.theme.colors.accent}'";
      };
    };
  };
--- a/home/programs/fetch/default.nix
+++ b/home/programs/fetch/default.nix
@@ -0,0 +1 @@
+{ imports = [ ./neofetch ./nerdfetch ]; }
--- a/home/programs/fetch/neofetch/default.nix
+++ b/home/programs/fetch/neofetch/default.nix
@@ -109,9 +109,9 @@
    song_format="%artist% - %album% - %title%"
    song_shorthand="off"
    mpc_args=()
-    colors=(${toString config.theme.colors.primary-ansi-16-number} 1 ${
-      toString config.theme.colors.primary-ansi-16-number
-    } ${toString config.theme.colors.primary-ansi-16-number} 7)
+    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="-"
--- a/home/programs/fetch/nerdfetch/default.nix
+++ b/home/programs/fetch/nerdfetch/default.nix
@@ -1,4 +1,3 @@
-# Nerdfetch: https://github.com/ThatOneCalculator/NerdFetch
 { pkgs, config, ... }:
 let
  nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''
@@ -346,9 +345,9 @@ let

          ## USER VARIABLES -- YOU CAN CHANGE THESE

-          lc="$reset$bold''$${config.theme.colors.primary-ansi-16}" # labels
-          nc="$reset$bold''$${config.theme.colors.primary-ansi-16}" # labels
-          hn="$reset$bold''$${config.theme.colors.primary-ansi-16}" # labels
+          lc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
+          nc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
+          hn="$reset$bold''$${config.var.theme.colors.accentName}" # labels
          ic="$reset$white"          # info
          c0="$reset$grey"           # first color
          c1="$reset$white"          # second color
@@ -367,4 +366,4 @@ let
        """
  '';

-in { home.packages = with pkgs; [ nerdfetch ]; }
+in { home.packages = [ nerdfetch ]; }
--- a/home/programs/git/default.nix
+++ b/home/programs/git/default.nix
@@ -0,0 +1,50 @@
+{ config, ... }: {
+  programs.git = {
+    enable = true;
+    userName = config.var.git.username;
+    userEmail = config.var.git.email;
+    ignores = [
+      ".cache/"
+      ".DS_Store"
+      ".idea/"
+      "*.swp"
+      "*.elc"
+      "auto-save-list"
+      ".direnv/"
+      "node_modules"
+      "result"
+      "result-*"
+    ];
+    extraConfig = {
+      init.defaultBranch = "main";
+      push.autoSetupRemote = true;
+    };
+    aliases = {
+      essa = "push --force";
+      co = "checkout";
+      fuck = "commit --amend -m";
+      c = "commit -m";
+      ca = "commit -am";
+      forgor = "commit --amend --no-edit";
+      graph = "log --all --decorate --graph --oneline";
+      oops = "checkout --";
+      l = "log";
+      r = "rebase";
+      s = "status --short";
+      ss = "status";
+      d = "diff";
+      ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
+      pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
+      af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
+      st = "status";
+      br = "branch";
+      df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
+      hist = ''
+        log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
+      llog = ''
+        log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
+      edit-unmerged =
+        "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
+    };
+  };
+}
--- a/home/programs/kitty/default.nix
+++ b/home/programs/kitty/default.nix
@@ -0,0 +1,48 @@
+{ config, pkgs, ... }: {
+  programs.kitty = {
+    enable = true;
+    settings = {
+      scrollback_lines = 10000;
+      initial_window_width = 1200;
+      initial_window_height = 600;
+      update_check_interval = 0;
+      enable_audio_bell = false;
+      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;
+    };
+  };
+}
--- a/home/programs/nextcloud/default.nix
+++ b/home/programs/nextcloud/default.nix
@@ -0,0 +1,6 @@
+{
+    services.nextcloud-client = {
+        enable = true;
+        startInBackground = true;
+    };
+}
--- a/home/programs/nvim/colorscheme.nix
+++ b/home/programs/nvim/colorscheme.nix
@@ -0,0 +1,12 @@
+{
+  programs.nixvim = {
+    enable = true;
+    colorschemes.catppuccin = {
+      enable = true;
+      settings = {
+        transparent_background = true;
+        flavour = "mocha";
+      };
+    };
+  };
+}
--- a/home/programs/nvim/default.nix
+++ b/home/programs/nvim/default.nix
@@ -0,0 +1,17 @@
+{ inputs, ... }: {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+    ./plugins/cmp.nix
+    ./plugins/dashboard.nix
+    ./plugins/lsp.nix
+    ./plugins/markdown.nix
+    ./plugins/tree.nix
+    ./plugins/ui.nix
+    ./plugins/utils.nix
+    ./plugins/zen-mode.nix
+
+    ./options.nix
+    ./colorscheme.nix
+    ./keymaps.nix
+  ];
+}
--- a/home/programs/nvim/keymaps.nix
+++ b/home/programs/nvim/keymaps.nix
@@ -0,0 +1,24 @@
+{
+  programs.nixvim.keymaps = [
+    {
+      key = "<leader>fm";
+      action = "<cmd>lua vim.lsp.buf.format()<cr>";
+      options.desc = "LSP Format";
+    }
+    {
+      key = "<leader>w";
+      action = "<cmd>set wrap!<cr>";
+      options.desc = "Toggle word wrapping";
+    }
+    {
+      key = "<leader>W";
+      action = "<cmd>set linebreak!<cr>";
+      options.desc = "Toggle linebreak";
+    }
+    {
+      key = "<leader>z";
+      action = "<cmd>ZenMode<cr>";
+      options.desc = "ZenMode";
+    }
+  ];
+}
--- a/home/programs/nvim/options.nix
+++ b/home/programs/nvim/options.nix
@@ -24,7 +24,7 @@
    wildmode = "list:longest";
    completeopt = [ "menuone" "noselect" ];
    signcolumn = "yes";
-    cursorline = true;
+    cursorline = false;
    scrolloff = 8;
    mouse = "a";

@@ -32,6 +32,6 @@

    swapfile = false;
    undofile = true;
-    conceallevel = 2;
+    conceallevel = 3;
  };
 }
--- a/home/programs/nvim/plugins/cmp.nix
+++ b/home/programs/nvim/plugins/cmp.nix
--- a/home/programs/nvim/plugins/dashboard.nix
+++ b/home/programs/nvim/plugins/dashboard.nix
@@ -1,9 +1,9 @@
 { config, ... }: {

  programs.nixvim.highlight = {
-    AlphaHeaderColor.fg = "#${config.theme.colors.primary-bg}";
-    AlphaTextColor.fg = "#${config.theme.colors.fg}";
-    AlphaShortcutColor.fg = "#${config.theme.colors.alt-fg}";
+    AlphaHeaderColor.fg = "#${config.var.theme.colors.accent}";
+    AlphaTextColor.fg = "#${config.var.theme.colors.fg}";
+    AlphaShortcutColor.fg = "#${config.var.theme.colors.fgalt}";
  };

  programs.nixvim.plugins.alpha = {
@@ -70,7 +70,23 @@
          {
            type = "button";
            val = "  NixOs Config";
-            on_press.__raw = "function() vim.cmd[[e ~/.config/nixos]] end";
+            on_press.__raw =
+              "function() vim.cmd[[Neotree ${config.var.configDirectory}]] end";
+            opts = {
+              shortcut = "nc";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "  Keybindings";
+            on_press.__raw =
+              "function() vim.cmd[[e ${config.var.configDirectory}/docs/KEYBINDINGS.md]] end";
            opts = {
              shortcut = "nc";
              position = "center";
--- a/home/programs/nvim/plugins/lsp.nix
+++ b/home/programs/nvim/plugins/lsp.nix
@@ -0,0 +1,50 @@
+{
+  programs.nixvim.plugins = {
+    lsp-format.enable = true;
+    lsp = {
+      enable = true;
+      servers = {
+        bashls.enable = true;
+        clangd.enable = true;
+        gopls.enable = true;
+        nixd.enable = true;
+        tailwindcss.enable = true;
+        # html.enable = true; # FIXME: broken for some reason
+        svelte.enable = true;
+        marksman.enable = true;
+        ltex = {
+          enable = false;
+          settings = {
+            enabled = false;
+            language = "en";
+          };
+        };
+      };
+      keymaps.lspBuf = {
+        "gd" = "definition";
+        "gD" = "references";
+        "gt" = "type_definition";
+        "gi" = "implementation";
+        "K" = "hover";
+      };
+    };
+    none-ls = {
+      enable = true;
+      sources = {
+        diagnostics = {
+          golangci_lint.enable = true;
+          statix.enable = true;
+        };
+        formatting = {
+          gofmt.enable = true;
+          goimports.enable = true;
+          nixfmt.enable = true;
+          markdownlint.enable = true;
+          tidy.enable = true;
+          shellharden.enable = true;
+          shfmt.enable = true;
+        };
+      };
+    };
+  };
+}
--- a/home/programs/nvim/plugins/markdown.nix
+++ b/home/programs/nvim/plugins/markdown.nix
@@ -0,0 +1,133 @@
+{
+  programs.nixvim.plugins = {
+    mkdnflow = {
+      enable = true;
+      mappings = {
+
+        # Main
+        MkdnEnter = {
+          key = "<CR>";
+          modes = [ "n" "v" "i" ];
+        };
+
+        # Links
+        MkdnCreateLink = false;
+        MkdnCreateLinkFromClipboard = {
+          key = "<leader>lc";
+          modes = [ "n" "v" ];
+        };
+        MkdnDestroyLink = {
+          key = "<leader>dl";
+          modes = "n";
+        };
+        MkdnFollowLink = false;
+        MkdnNextLink = {
+          key = "<Tab>";
+          modes = "n";
+        };
+        MkdnYankAnchorLink = {
+          key = "ya";
+          modes = "n";
+        };
+        MkdnYankFileAnchorLink = {
+          key = "yfa";
+          modes = "n";
+        };
+        MkdnPrevLink = {
+          key = "<S-Tab>";
+          modes = "n";
+        };
+
+        MkdnDecreaseHeading = {
+          key = "-";
+          modes = "n";
+        };
+        MkdnExtendList = false;
+        MkdnFoldSection = {
+          key = "<leader>ff";
+          modes = "n";
+        };
+        MkdnUnfoldSection = {
+          key = "<leader>fu";
+          modes = "n";
+        };
+        MkdnGoBack = {
+          key = "<BS>";
+          modes = "n";
+        };
+        MkdnGoForward = {
+          key = "<Del>";
+          modes = "n";
+        };
+        MkdnIncreaseHeading = {
+          key = "+";
+          modes = "n";
+        };
+        MkdnMoveSource = {
+          key = "<F2>";
+          modes = "n";
+        };
+        MkdnNewListItem = false;
+        MkdnNewListItemAboveInsert = {
+          key = "O";
+          modes = "n";
+        };
+        MkdnNewListItemBelowInsert = {
+          key = "o";
+          modes = "n";
+        };
+        MkdnNextHeading = {
+          key = "]]";
+          modes = "n";
+        };
+        MkdnPrevHeading = {
+          key = "[[";
+          modes = "n";
+        };
+        MkdnSTab = false;
+        MkdnTab = false;
+        MkdnTableFormat = {
+          key = "<leader>ft";
+          modes = "n";
+        };
+        MkdnTableNewColAfter = {
+          key = "<leader>ic";
+          modes = "n";
+        };
+        MkdnTableNewColBefore = {
+          key = "<leader>iC";
+          modes = "n";
+        };
+        MkdnTableNewRowAbove = {
+          key = "<leader>iR";
+          modes = "n";
+        };
+        MkdnTableNewRowBelow = {
+          key = "<leader>ir";
+          modes = "n";
+        };
+        MkdnTableNextCell = {
+          key = "<S-Tab>";
+          modes = "i";
+        };
+        MkdnTableNextRow = false;
+        MkdnTablePrevCell = {
+          key = "<M-Tab>";
+          modes = "i";
+        };
+        MkdnTablePrevRow = {
+          key = "<M-CR>";
+          modes = "i";
+        };
+        MkdnToggleToDo = {
+          key = "<C-Space>";
+          modes = [ "n" "v" ];
+        };
+        MkdnUpdateNumbering = {
+          key = "<leader>nn";
+          modes = "n";
+        };
+      };
+    };
+  };
+}
--- a/home/programs/nvim/plugins/tree.nix
+++ b/home/programs/nvim/plugins/tree.nix
@@ -0,0 +1,61 @@
+{
+  programs.nixvim = {
+    plugins = {
+      neo-tree.enable = true;
+      oil = {
+        enable = true;
+        settings = {
+          default_file_explorer = false;
+          skip_confirm_for_simple_edits = true;
+          win_options = {
+            concealcursor = "ncv";
+            conceallevel = 3;
+            cursorcolumn = false;
+            foldcolumn = "0";
+            list = false;
+            signcolumn = "no";
+            spell = false;
+            wrap = false;
+          };
+          float = { padding = 5; };
+          keymaps = {
+            "-" = "actions.parent";
+            "b" = "actions.parent";
+            "<C-c>" = "actions.close";
+            "<C-h>" = "actions.select_split";
+            "<C-l>" = "actions.refresh";
+            "<C-p>" = "actions.preview";
+            "<C-s>" = "actions.select_vsplit";
+            "<C-t>" = "actions.select_tab";
+            "<CR>" = "actions.select";
+            _ = "actions.open_cwd";
+            "`" = "actions.cd";
+            "g." = "actions.toggle_hidden";
+            "g?" = "actions.show_help";
+            "g\\" = "actions.toggle_trash";
+            gs = "actions.change_sort";
+            gx = "actions.open_external";
+            "~" = "actions.tcd";
+          };
+        };
+      };
+    };
+    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";
+      }
+    ];
+  };
+}
--- a/home/programs/nvim/plugins/ui.nix
+++ b/home/programs/nvim/plugins/ui.nix
@@ -0,0 +1,43 @@
+{ pkgs, config, ... }: {
+  home.packages = with pkgs; [ ctags ];
+
+  programs.nixvim = {
+    highlight = {
+      Headline.bg = "#${config.var.theme.colors.bgalt}";
+      Headline.bold = true;
+      Headline1.bg = "#${config.var.theme.colors.c0}";
+      Headline1.bold = true;
+    };
+    plugins = {
+      lualine.enable = true;
+      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";
+    }];
+  };
+}
--- a/home/programs/nvim/plugins/utils.nix
+++ b/home/programs/nvim/plugins/utils.nix
@@ -0,0 +1,51 @@
+{ config, ... }: {
+  programs.nixvim = {
+    highlightOverride = {
+      FloatBorder.fg = "#${config.var.theme.colors.accent}";
+    };
+    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; };
+      };
+      treesitter = {
+        enable = true;
+        nixGrammars = true;
+        settings = {
+          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>";
+      }
+    ];
+  };
+}
--- a/home/programs/nvim/plugins/zen-mode.nix
+++ b/home/programs/nvim/plugins/zen-mode.nix
@@ -0,0 +1,31 @@
+{
+  programs.nixvim.plugins.zen-mode = {
+    enable = true;
+    settings = {
+      on_open = ''
+        function()
+          require("gitsigns.actions").toggle_current_line_blame()
+          vim.opt.relativenumber = false
+          vim.opt.signcolumn = "no"
+          vim.opt.wrap = true
+          vim.opt.linebreak = true
+        end
+      '';
+      plugins = {
+        gitsigns = { enabled = true; };
+        options = {
+          enabled = true;
+          ruler = false;
+          showcmd = false;
+        };
+        tmux = { enabled = true; };
+      };
+      window = {
+        backdrop = 0.95;
+        height = 1;
+        options = { signcolumn = "no"; };
+        width = 0.9;
+      };
+    };
+  };
+}
--- a/home/programs/qutebrowser/default.nix
+++ b/home/programs/qutebrowser/default.nix
@@ -0,0 +1,339 @@
+{ pkgs, config, ... }:
+let
+  settings = ''
+    {
+      "config": {
+        "title" : "Welcome Home",
+        "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}"
+        },
+        "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 {
+
+  imports = [ ./duckduckgo-colorscheme.nix ];
+
+  programs.qutebrowser = {
+    enable = true;
+
+    searchEngines = {
+      "DEFAULT" = "https://duckduckgo.com/?q={}&ia=web";
+      "d" = "https://duckduckgo.com/?q={}&ia=web";
+      "g" = "https://google.com/search?q={}";
+      "y" = "https://youtube.com/results?search_query={}";
+      "ya" = "https://yandex.com/search/?text={}";
+      "n" = "https://mynixos.com/search?q={}";
+      "nixo" = "https://search.nixos.org/options?channel=unstable&query={}";
+      "nixp" = "https://search.nixos.org/packages?channel=unstable&query={}";
+      "gt" = "https://github.com/search?q={}&type=repositories";
+    };
+
+    quickmarks = {
+      home = "${homepage}/build/index.html";
+      server = "https://home.anotherhadi.com";
+      jack = "https://home.anotherhadi.com";
+      mynixos = "https://mynixos.com";
+      github = "https://github.com";
+      outlook = "https://outlook.office.com/mail/";
+      office = "https://www.office.com/?auth=2";
+      teams = "https://teams.microsoft.com/_";
+      casa = "http://192.168.2.16:8081/#/";
+      proton = "https://mail.proton.me/u/0/inbox";
+      cloudflare-one = "https://one.dash.cloudflare.com/";
+      chatgpt = "https://chat.openai.com/";
+      nixvim = "https://nix-community.github.io/nixvim/";
+      hyprland = "https://wiki.hyprland.org/";
+      nerdfont = "https://www.nerdfonts.com/cheat-sheet";
+      youtube = "https://youtube.com/";
+      cloudflare = "https://dash.cloudflare.com/";
+    };
+
+    settings = {
+      url = {
+        default_page = "${homepage}/build/index.html";
+        start_pages = [ "${homepage}/build/index.html" ];
+      };
+
+      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" ];
+        scrollbar = {
+          padding = 0;
+          width = 0;
+        };
+        show = "always";
+        shrink = true;
+        timestamp_format = "";
+        web_history.max_items = 7;
+      };
+
+      content = {
+        autoplay = false;
+        javascript.clipboard = "access";
+        javascript.enabled = true;
+        webgl = true;
+        pdfjs = true;
+      };
+
+      downloads = {
+        position = "bottom";
+        remove_finished = 0;
+      };
+
+      hints = {
+        border = "none";
+        radius = 1;
+      };
+
+      scrolling = {
+        bar = "never";
+        smooth = true;
+      };
+
+      tabs = {
+        show = "multiple";
+        last_close = "close";
+        mode_on_change = "restore";
+        close_mouse_button = "right";
+      };
+
+      zoom.default = "100%";
+
+      qt.force_software_rendering = "chromium";
+    };
+
+    keyBindings = {
+      normal = {
+        "gh" = "open ${homepage}/build/index.html";
+        "gs" = "open https://home.anotherhadi.com";
+
+        " p" = "tab-move -";
+        " n" = "tab-move +";
+        " w" = "tab-close";
+
+        " 1" = "tab-focus 1";
+        " 2" = "tab-focus 2";
+        " 3" = "tab-focus 3";
+        " 4" = "tab-focus 4";
+        " 5" = "tab-focus 5";
+        " 6" = "tab-focus 6";
+        " 7" = "tab-focus 7";
+        " 8" = "tab-focus 8";
+        " 9" = "tab-focus 9";
+        " 0" = "tab-focus 10";
+
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+
+      command = {
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+
+      insert = {
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+    };
+
+    extraConfig = ''
+      config.unbind("gm")
+      config.unbind("gd")
+      config.unbind("gb")
+      config.unbind("tl")
+      config.unbind("gt")
+
+      c.tabs.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
+      c.statusbar.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
+
+      config.load_autoconfig(True)
+    '';
+  };
+}
--- a/home/programs/qutebrowser/duckduckgo-colorscheme.nix
+++ b/home/programs/qutebrowser/duckduckgo-colorscheme.nix
@@ -1,10 +1,9 @@
 { config, ... }: {
-
-  xdg.configFile."duckduckgo-colorscheme.js".text = ''
+  home.file.".duckduckgo-colorscheme.js".text = ''
    // Go to DuckDuckGo settings page, open the console, paste the code and hit enter.
    // based on https://ddg.codingcodax.dev/
    // Cookies string for your theme
-    const cookie = '7=${config.theme.colors.bg}; j=${config.theme.colors.bg}; 9=${config.theme.colors.fg}; aa=${config.theme.colors.alt-fg}; 8=${config.theme.colors.color7}; x=${config.theme.colors.primary-bg}; 21=${config.theme.colors.alt-bg};';
+    const cookie = '7=${config.var.theme.colors.bg}; j=${config.var.theme.colors.bg}; 9=${config.var.theme.colors.fg}; aa=${config.var.theme.colors.fgalt}; 8=${config.var.theme.colors.c7}; x=${config.var.theme.colors.accent}; 21=${config.var.theme.colors.bgalt};';

    // Converts cookie string into formatted JSON
    const cookieToJSON = (cookieRaw) => {
--- a/home/programs/shell/default.nix
+++ b/home/programs/shell/default.nix
@@ -4,5 +4,8 @@
    ./zsh.nix
    ./starship.nix
    ./zoxide.nix
+    ./tmux.nix
+    ./lazygit.nix
+    ./eza.nix
  ];
 }
--- a/home/programs/shell/eza.nix
+++ b/home/programs/shell/eza.nix
@@ -0,0 +1,13 @@
+{
+  programs.eza = {
+    enable = true;
+    icons = true;
+
+    extraOptions = [
+      "--group-directories-first"
+      "--no-quotes"
+      "--git-ignore"
+      "--icons=always"
+    ];
+  };
+}
--- a/home/programs/shell/fzf.nix
+++ b/home/programs/shell/fzf.nix
@@ -3,12 +3,12 @@
    enable = true;
    enableZshIntegration = true;
    colors = {
-      "fg+" = config.theme.colors.primary-ansi-16;
+      "fg+" = config.var.theme.colors.accentName;
      "bg+" = "-1";
      "fg" = "white";
      "bg" = "-1";
      "prompt" = "grey";
-      "pointer" = config.theme.colors.primary-ansi-16;
+      "pointer" = config.var.theme.colors.accentName;
    };
    defaultOptions = [
      "--margin=1"
--- a/home/programs/shell/lazygit.nix
+++ b/home/programs/shell/lazygit.nix
@@ -4,7 +4,7 @@
    settings = {
      gui.theme = {
        ligthTheme = false;
-        activeBorderColor = [ "${config.theme.colors.primary-ansi-16}" "bold" ];
+        activeBorderColor = [ "${config.var.theme.colors.accentName}" "bold" ];
        inactiveBorderColor = [ "black" ];
        selectedLineBgColor = [ "default" ];
      };
--- a/home/programs/shell/starship.nix
+++ b/home/programs/shell/starship.nix
@@ -10,10 +10,10 @@
        "$git_status"
        "$character"
      ];
-      directory = { style = "#${config.theme.colors.primary-bg}"; };
+      directory = { style = "#${config.var.theme.colors.accent}"; };

      character = {
-        success_symbol = "[❯](#${config.theme.colors.primary-bg})";
+        success_symbol = "[❯](#${config.var.theme.colors.accent})";
        error_symbol = "[❯](red)";
        vimcmd_symbol = "[❮](cyan)";
      };
--- a/home/programs/shell/tmux.nix
+++ b/home/programs/shell/tmux.nix
@@ -12,6 +12,7 @@
      bind-key j select-pane -D
      bind-key k select-pane -U
      bind-key l select-pane -R
+      set -gq allow-passthrough on
    '';

    plugins = with pkgs; [
@@ -31,7 +32,7 @@
          set -g @catppuccin_window_current_fill "number"
          set -g @catppuccin_window_current_text "#W"

-          set -g @catppuccin_status_modules_right "directory session"
+          set -g @catppuccin_status_modules_right ""
          set -g @catppuccin_status_left_separator  " "
          set -g @catppuccin_status_right_separator ""
          set -g @catppuccin_status_fill "icon"
@@ -39,6 +40,7 @@

          set -g @catppuccin_directory_text "#{pane_current_path}"
          set -g @catppuccin_status_background "default"
+          set-option -g default-terminal "screen-256color"
        '';
      }
    ];
--- a/home/programs/shell/zoxide.nix
+++ b/home/programs/shell/zoxide.nix
--- a/home/programs/shell/zsh.nix
+++ b/home/programs/shell/zsh.nix
@@ -0,0 +1,73 @@
+{ pkgs, lib, config, ... }: {
+
+  home.packages = with pkgs; [ bat ripgrep tldr ];
+
+  home.sessionPath = [ "$HOME/go/bin" ];
+
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+    historySubstringSearch.enable = true;
+
+    initExtraFirst = ''
+      bindkey -e
+      ${if config.var.theme.fetch == "neofetch" then
+        pkgs.neofetch + "/bin/neofetch"
+      else if config.var.theme.fetch == "nerdfetch" then
+        "nerdfetch"
+      else if config.var.theme.fetch == "pfetch" then
+        "echo; ${pkgs.pfetch}/bin/pfetch"
+      else
+        ""}
+    '';
+
+    history = {
+      ignoreDups = true;
+      save = 1000000;
+      size = 1000000;
+    };
+
+    profileExtra = lib.optionalString (config.home.sessionPath != [ ]) ''
+      export PATH="$PATH''${PATH:+:}${
+        lib.concatStringsSep ":" config.home.sessionPath
+      }"
+    '';
+
+    shellAliases = {
+      vim = "nvim";
+      vi = "nvim";
+      v = "nvim";
+      c = "clear";
+      clera = "clear";
+      celar = "clear";
+      e = "exit";
+      cd = "z";
+      ls = "eza --icons=always --no-quotes";
+      tree = "eza --icons=always --tree --no-quotes";
+      sl = "ls";
+      open = "${pkgs.xdg_utils}/bin/xdg-open";
+      icat = "${pkgs.kitty}/bin/kitty +kitten icat";
+      wireguard-import = "nmcli connection import type wireguard file";
+      neorg =
+        "cd ~/nextcloud/neorg && vim -c ':ZenMode' -c ':Telescope find_files' index.norg";
+      notes =
+        "cd ~/nextcloud/Notes && vim -c ':ZenMode' -c ':Telescope find_files' index.md";
+      note = "notes";
+
+      # git
+      ga = "git add";
+      gc = "git commit";
+      gcm = "git commit -m";
+      gcu = "git add . && git commit -m 'Update'";
+      gp = "git push";
+      gpl = "git pull";
+      gs = "git status";
+      gd = "git diff";
+      gco = "git checkout";
+      gcb = "git checkout -b";
+      gbr = "git branch";
+    };
+  };
+}
--- a/home/programs/spicetify/default.nix
+++ b/home/programs/spicetify/default.nix
@@ -0,0 +1,41 @@
+{ pkgs, config, lib, inputs, ... }:
+let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
+in {
+
+  imports = [ inputs.spicetify-nix.homeManagerModules.default ];
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [ "spotify" ];
+  programs.spicetify = {
+    enable = true;
+    theme = 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}";
+    };
+
+    enabledExtensions = with spicePkgs.extensions; [
+      playlistIcons
+      lastfm
+      historyShortcut
+      hidePodcasts
+      adblock
+      fullAppDisplay
+      shuffle
+    ];
+  };
+}
--- a/home/programs/yazi/default.nix
+++ b/home/programs/yazi/default.nix
@@ -0,0 +1,39 @@
+{
+  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";
+          }
+        ];
+      };
+    };
+  };
+}
--- a/home/scripts/brightness/default.nix
+++ b/home/scripts/brightness/default.nix
@@ -1,21 +1,15 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:

 let
  increments = "5";

  brightness-change = pkgs.writeShellScriptBin "brightness-change" ''
-    sleep 0.05
+    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%+
+    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%-
+  '';

-    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%+
-    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%-
-
-    brightness_level=$(${pkgs.brightnessctl}/bin/brightnessctl get)
-
-    message="󰃠  Brightness: $brightness_level%"
-
-    ${pkgs.libnotify}/bin/notify-send "$message" \
-                -h int:value:"$brightness_level" \
-                --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+  brightness-set = pkgs.writeShellScriptBin "brightness-set" ''
+    ${pkgs.brightnessctl}/bin/brightnessctl set ''${1-100}%
  '';

  brightness-up = pkgs.writeShellScriptBin "brightness-up" ''
@@ -27,9 +21,11 @@ let
  '';

 in {
-  home.packages = with pkgs; [
+  home.packages = [
+    pkgs.brightnessctl
    brightness-change
    brightness-up
    brightness-down
+    brightness-set
  ];
 }
--- a/home/scripts/caffeine/default.nix
+++ b/home/scripts/caffeine/default.nix
@@ -1,23 +1,25 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
-  homedir = config.home.homeDirectory;
-
  caffeine-status = pkgs.writeShellScriptBin "caffeine-status" ''
-    [[ -f /tmp/caffeine ]] && echo "active" || echo "inactive"
+    [[ $(pidof "hypridle") ]] && echo "0" || echo "1"
+  '';
+
+  caffeine-status-icon = pkgs.writeShellScriptBin "caffeine-status-icon" ''
+    [[ $(pidof "hypridle") ]] && echo "󰾪" || echo "󰅶"
  '';

  caffeine = pkgs.writeShellScriptBin "caffeine" ''
-    if [[ -f /tmp/caffeine ]]; then
-      rm /tmp/caffeine
-      ${pkgs.hyprland}/bin/hyprctl dispatch exec ${pkgs.hypridle}/bin/hypridle
-      message="󰾪  Caffeine Deactivated"
-    else
-      touch /tmp/caffeine
+    if [[ $(pidof "hypridle") ]]; then
      pkill hypridle
-      message="󰅶  Caffeine Activated"
+      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
+      title="󰾪  Caffeine Deactivated"
+      description="Caffeine is now deactivated! Your screen will turn off automatically."
    fi
-    ${pkgs.libnotify}/bin/notify-send "$message" \
-      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+
+    notif "caffeine" "$title" "$description"
  '';

-in { home.packages = with pkgs; [ caffeine-status caffeine ]; }
+in { home.packages = [ caffeine-status caffeine caffeine-status-icon ]; }
--- a/home/scripts/default.nix
+++ b/home/scripts/default.nix
@@ -1,17 +1,13 @@
 {
  imports = [
    ./nixy
-    ./nerdfetch
    ./sounds
    ./brightness
    ./caffeine
    ./night-shift
    ./screenshot
-    ./startup
    ./nerdfont_fzf
+    ./notification
    ./system
-    ./zip
-
-    ./misc.nix
  ];
 }
--- a/home/scripts/misc.nix
+++ b/home/scripts/misc.nix
@@ -1,30 +0,0 @@
-{ pkgs, config, ... }:
-
-let
-  homedir = config.home.homeDirectory;
-
-  menu = pkgs.writeShellScriptBin "menu" ''
-    if pgrep wofi; then
-    	pkill wofi
-    else
-    	wofi --show drun
-    fi
-  '';
-
-  powermenu = pkgs.writeShellScriptBin "powermenu" ''
-    if pgrep wlogout; then
-    	pkill wlogout
-    else
-      ${pkgs.wlogout}/bin/wlogout
-    fi
-  '';
-
-  wireguard-import = pkgs.writeShellScriptBin "wireguard-import" ''
-    nmcli connection import type wireguard file "$1"
-  '';
-
-  vault = pkgs.writeShellScriptBin "vault" ''
-    nvim $HOME/Nextcloud/obsidian
-  '';
-
-in { home.packages = with pkgs; [ menu wireguard-import powermenu vault ]; }
--- a/home/scripts/nerdfont_fzf/default.nix
+++ b/home/scripts/nerdfont_fzf/default.nix
@@ -12,24 +12,17 @@ let
    fi

    echo "Copied to clipboard: $fzf_result"
-    echo "Paste it to close the window"
-    ${pkgs.wl-clipboard}/bin/wl-copy -o "$fzf_result" # wait for paste before exiting.. not cool
+    ${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"
  '';
-
-  nerdfont-popup = pkgs.writeShellScriptBin "nerdfont-popup" ''
-    ${pkgs.kitty}/bin/kitty --class floating -o font_size=18 zsh -c nerdfont-fzf 2>/dev/null
-  '';
-
 in {
-  home.packages = with pkgs; [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
+  home.packages = [ nerdfont-fzf nerdfont-fzf-fetch ];

  xdg.configFile."nerdfont_glyphnames.json" = {
    source = ./nerdfont_glyphnames.json;
  };
-
 }
--- a/home/scripts/nerdfont_fzf/nerdfont_glyphnames.json
+++ b/home/scripts/nerdfont_fzf/nerdfont_glyphnames.json
--- a/home/scripts/night-shift/default.nix
+++ b/home/scripts/night-shift/default.nix
@@ -1,20 +1,55 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:

 let
-  homedir = config.home.homeDirectory;
  default = "4000";

  night-shift-on = pkgs.writeShellScriptBin "night-shift-on" ''
-    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.wlsunset}/bin/wlsunset -t ${default}"
-    message="󰖔  Night-Shift Activated"
-    ${pkgs.libnotify}/bin/notify-send "$message" \
-      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
-  '';
-  night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
-    pkill wlsunset
-    message="󰖔  Night-Shift Deactivated"
-    ${pkgs.libnotify}/bin/notify-send "$message" \
-      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.gammastep}/bin/gammastep -O ${default}"
+    title="󰖔  Night-Shift Activated"
+    description="Night-Shift is now activated! Your screen will be warmer and easier on the eyes."
+
+    notif "night-shift" "$title" "$description"
  '';

-in { home.packages = with pkgs; [ night-shift-on night-shift-off ]; }
+  night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
+    pkill gammastep
+    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-off
+    else
+      night-shift-on
+    fi
+  '';
+
+  night-shift-status = pkgs.writeShellScriptBin "night-shift-status" ''
+    if [[ $(pgrep gammastep) ]]; then
+      echo "1"
+    else
+      echo "0"
+    fi
+  '';
+
+  night-shift-status-icon =
+    pkgs.writeShellScriptBin "night-shift-status-icon" ''
+      if [[ $(pgrep gammastep) ]]; then
+        echo "󰖔"
+      else
+        echo "󰖕"
+      fi
+    '';
+in {
+  home.packages = [
+    pkgs.gammastep
+    night-shift-on
+    night-shift-off
+    night-shift
+    night-shift-status
+    night-shift-status-icon
+  ];
+}
--- a/home/scripts/nixy/default.nix
+++ b/home/scripts/nixy/default.nix
@@ -1,39 +1,55 @@
 { pkgs, config, ... }:
-
 let
-  homedir = config.home.homeDirectory;
+  nixy = pkgs.writeShellScriptBin "nixy" ''
+    function exec() {
+      $@
+    }

-  nixy-rebuild = pkgs.writeShellScriptBin "nixy-rebuild" ''
-    sudo nixos-rebuild switch --flake ${homedir}/.config/nixos#nixy
-  '';
+    function ui(){
+      DEFAULT_ICON="󰘳"

-  nixy-edit = pkgs.writeShellScriptBin "nixy-edit" ''
-    $EDITOR ${homedir}/.config/nixos/
-  '';
+      # "icon;name;command"[]
+      apps=(
+        ";Rebuild;nixy rebuild"
+        ";Upgrade;nixy upgrade"
+        ";Update;nixy update"
+        ";Collect Garbage;nixy gc"
+        ";Clean Boot Menu;nixy cb"
+      )

-  nixy-upgrade = pkgs.writeShellScriptBin "nixy-upgrade" ''
-    sudo nixos-rebuild switch --upgrade --flake ${homedir}/.config/nixos#nixy
-  '';
+      # Apply default icons if empty:
+      for i in "''${!apps[@]}"; do
+        apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/')
+      done

-  nixy-update = pkgs.writeShellScriptBin "nixy-update" ''
-    cd ${homedir}/.config/nixos && sudo nix flake update
-  '';
+      fzf_result=$(printf "%s\n" "''${apps[@]}" | awk -F ';' '{print $1" "$2}' | fzf)
+      [[ -z $fzf_result ]] && exit 0
+      fzf_result=''${fzf_result/ /;}
+      line=$(printf "%s\n" "''${apps[@]}" | grep "$fzf_result")
+      command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')

-  nixy-gc = pkgs.writeShellScriptBin "nixy-gc" ''
-    cd ${homedir}/.config/nixos && sudo nix-collect-garbage -d
-  '';
+      exec "$command"
+      exit 0
+    }

-  nixy-cb = pkgs.writeShellScriptBin "nixy-cb" ''
+    [[ $1 == "" ]] && ui
+
+    if [[ $1 == "rebuild" ]];then
+      sudo nixos-rebuild switch --flake ${config.var.configDirectory}#${config.var.hostname}
+    elif [[ $1 == "upgrade" ]];then
+      sudo nixos-rebuild switch --upgrade --flake ${config.var.configDirectory}#${config.var.hostname}
+    elif [[ $1 == "update" ]];then
+      cd ${config.var.configDirectory} && sudo nix flake update
+    elif [[ $1 == "gc" ]];then
+      cd ${config.var.configDirectory} && sudo nix-collect-garbage -d
+    elif [[ $1 == "cb" ]];then
      sudo /run/current-system/bin/switch-to-configuration boot
+    elif [[ $1 == "remote" ]];then
+      cd ~/.config/nixos && git add . && git commit -m "update" && git push
+      ssh jack -S -C "cd /home/hadi/.config/nixos && git pull && sudo -S nixos-rebuild switch --flake ~/.config/nixos#jack"
+    else
+      echo "Unknown argument"
+    fi
  '';

-in {
-  home.packages = with pkgs; [
-    nixy-rebuild
-    nixy-edit
-    nixy-upgrade
-    nixy-update
-    nixy-gc
-    nixy-cb
-  ];
-}
+in { home.packages = [ nixy ]; }
--- a/home/scripts/notification/default.nix
+++ b/home/scripts/notification/default.nix
@@ -0,0 +1,26 @@
+{ pkgs, ... }:
+let
+  notif = pkgs.writeShellScriptBin "notif" # bash
+    ''
+      # Shell script to send custom notifications
+      # Usage: notif "sender_id" "message" ["description"]
+      NOTIF_FOLDER="/tmp/notif"
+      sender_id=$1 # To overwrite existing notifications
+      title=$2
+      description=$3
+
+      [[ -d "$NOTIF_FOLDER" ]] || mkdir $NOTIF_FOLDER
+      [[ -f "$NOTIF_FOLDER/$sender_id" ]] || (echo "0" > "$NOTIF_FOLDER/$sender_id")
+
+      old_notification_id=$(cat "$NOTIF_FOLDER/$sender_id")
+      [[ -z "$old_notification_id" ]] && old_notification_id=0
+
+       ${pkgs.libnotify}/bin/notify-send \
+      --replace-id="$old_notification_id" --print-id \
+      --app-name="$sender_id" \
+      "$title" \
+      "$description" \
+      > "$NOTIF_FOLDER/$sender_id"
+    '';
+
+in { home.packages = [ pkgs.libnotify notif ]; }
--- a/home/scripts/screenshot/default.nix
+++ b/home/scripts/screenshot/default.nix
@@ -1,8 +1,6 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:

 let
-  homedir = config.home.homeDirectory;
-
  screenshot = pkgs.writeShellScriptBin "screenshot" ''
    if [[ $2 == "swappy" ]];then
      folder="/tmp"
@@ -31,4 +29,4 @@ let
                --icon="$folder/$filename" \
                --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
  '';
-in { home.packages = with pkgs; [ hyprshot screenshot ]; }
+in { home.packages = [ pkgs.hyprshot screenshot ]; }
--- a/home/scripts/sounds/default.nix
+++ b/home/scripts/sounds/default.nix
@@ -1,40 +1,23 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:

 let
-  homedir = config.home.homeDirectory;
  increments = "5";

  sound-change = pkgs.writeShellScriptBin "sound-change" ''
-    sleep 0.05
-
    [[ $1 == "mute" ]] && wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-    [[ $1 == "up" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2%+"
-    [[ $1 == "down" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2%-"
-
-    sink_info=$(wpctl get-volume @DEFAULT_AUDIO_SINK@)
-
-    volume=$(echo "$(echo "$sink_info" | awk '{print $2}' | sed 's/%//')*100" | bc -l | xargs printf "%.0f")
-    muted=false
-    if [[ $sink_info == *"MUTED"* ]]; then
-      muted=true
-    fi
-
-    message=""
-    if [ $muted = true ]; then
-      message="󰖁 Muted"
-    else
-      message="󰕾 Volume: $volume%"
-    fi
-
-    ${pkgs.libnotify}/bin/notify-send "$message" \
-      -h int:value:"$volume" \
-      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+    [[ $1 == "up" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-${increments}}%+
+    [[ $1 == "down" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-${increments}}%-
+    [[ $1 == "set" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-100}%
  '';

  sound-up = pkgs.writeShellScriptBin "sound-up" ''
    sound-change up ${increments}
  '';

+  sound-set = pkgs.writeShellScriptBin "sound-set" ''
+    sound-change set ''${1-100}
+  '';
+
  sound-down = pkgs.writeShellScriptBin "sound-down" ''
    sound-change down ${increments}
  '';
@@ -42,52 +25,6 @@ let
  sound-toggle = pkgs.writeShellScriptBin "sound-toggle" ''
    sound-change mute
  '';
-
-  sound-output = pkgs.writeShellScriptBin "sound-output" ''
-      function parse_sinks(){
-        output=$(wpctl status)
-        sinks=($(echo "$output" | sed 's/ │  //' | awk '/Sinks:/ {flag=1; next} /^$/ {flag=0} flag' | sed 's/ /-/g'))
-
-        for sink in "''${sinks[@]}"; do
-
-          id=""
-          default=false
-          sink=$(echo "$sink" | sed 's/-/ /g')
-          sink_name=$(echo "$sink" | sed 's/\[vol:.*$//')
-
-          if [[ $sink_name == "*"* ]]; then
-            sink_name=$(echo "$sink_name" | sed 's/*//')
-            default=true
-          fi
-
-          id=$(echo "$sink_name" | cut -d'.' -f1)
-          sink_name=$(echo "$sink_name" | sed 's/^[ ]*//;s/[ ]*$//' )
-          sink_name=$(echo "$sink_name" | cut -d'.' -f2 )
-
-          if [[ $default == true ]];then
-            printf "*%s (%d)" "$sink_name" "$id"
-          else
-            printf " %s (%d)" "$sink_name" "$id"
-          fi
-          printf "\n"
-        done
-    }
-
-
-    choosed_sink=$(echo "$(parse_sinks)" | ${pkgs.fzf}/bin/fzf \
-      --border-label "Choose sound output" ) || exit 1
-
-    choosed_sink_id=$(echo "$choosed_sink" | sed 's/.*(\(.*\))/\1/')
-
-    wpctl set-default $choosed_sink_id
-  '';
-
 in {
-  home.packages = with pkgs; [
-    sound-output
-    sound-change
-    sound-up
-    sound-down
-    sound-toggle
-  ];
+  home.packages = [ sound-change sound-up sound-down sound-toggle sound-set ];
 }
--- a/home/scripts/startup/default.nix
+++ b/home/scripts/startup/default.nix
@@ -1,43 +0,0 @@
-# File runned at startup by Hyprland
-{ pkgs, ... }:
-let
-  variable = import ../../../variables.nix;
-
-  nextcloud-watch = pkgs.writeShellScriptBin "nextcloud-watch" ''
-    # Start nextcloud if I'm on my networks
-    while true;do
-      ssid=$(nmcli -t -f name connection show --active | head -n1)
-      status=$(pgrep -n nextcloud)
-      if [[ -z $status ]]; then
-        service_status="inactive"
-      else
-        service_status="active"
-      fi
-
-      if [[ $ssid == "inthecloud" || $ssid == "Wired connection 2" ]]; then
-        if [[ $service_status == "inactive" ]]; then
-            ${pkgs.nextcloud-client}/bin/nextcloud --background
-        fi
-      else
-        if [[ $service_status == "active" ]]; then
-            pkill nextcloud
-        fi
-      fi
-      sleep 120
-    done
-  '';
-
-  startup = pkgs.writeShellScriptBin "startup" ''
-    # Because HM enabling services suck.
-
-    [[ ${
-      toString variable.enableSops
-    } == "1" ]] && systemctl --user start sops-nix
-
-    [[ ${toString variable.enableNextcloud} == "1" ]] && nextcloud-watch &
-
-    system-notif &
-    ${pkgs.waybar}/bin/waybar &
-  '';
-
-in { home.packages = with pkgs; [ startup nextcloud-watch nextcloud-client ]; }
--- a/home/scripts/system/default.nix
+++ b/home/scripts/system/default.nix
@@ -1,43 +1,24 @@
 { pkgs, ... }:

 let
-  notify-system = pkgs.writeShellScriptBin "notify-system" ''
-    function minute() {
-      while true;do
-        battery-plugged &
-        battery-level &
-        sleep 60
-      done
-    }
-
-    minute &
-  '';
-
-  battery-plugged = pkgs.writeShellScriptBin "battery-plugged" ''
-    BATTERY_STATUS=$(cat /sys/class/power_supply/BAT*/status | head -n1)
-    OLD_BATTERY_STATUS=$(cat /tmp/old_battery_status 2>/dev/null || echo "Unknown")
-    if [[ $BATTERY_STATUS != $OLD_BATTERY_STATUS ]]; then
-      if [[ $BATTERY_STATUS == "Discharging" ]]; then
-        ${pkgs.libnotify}/bin/notify-send "󰚦  " "Battery is unplugged"
+  menu = pkgs.writeShellScriptBin "menu" ''
+    if pgrep wofi; then
+    	pkill wofi
    else
-        ${pkgs.libnotify}/bin/notify-send "󰚥  " "Battery is plugged in"
-      fi
-    fi
-    echo $BATTERY_STATUS > /tmp/old_battery_status
-  '';
-
-  battery-level = pkgs.writeShellScriptBin "battery-level" ''
-    BATTERY_LEVEL=$(cat /sys/class/power_supply/BAT*/capacity | head -n1)
-    BATTERY_STATUS=$(cat /sys/class/power_supply/BAT*/status | head -n1)
-    if [[ $BATTERY_LEVEL -le 20 ]] && [[ $BATTERY_STATUS == "Discharging" ]]; then
-      ${pkgs.libnotify}/bin/notify-send "󰁻  Low battery" "Battery level is $BATTERY_LEVEL%"
-    elif [[ $BATTERY_LEVEL -le 10 ]] && [[ $BATTERY_STATUS == "Discharging" ]]; then
-      ${pkgs.libnotify}/bin/notify-send --urgency=critical "󰁺  Very low battery" "Battery level is $BATTERY_LEVEL%"
-    elif [[ $BATTERY_LEVEL -eq 100 ]] && [[ $BATTERY_STATUS -ne "Discharging" ]]; then
-      ${pkgs.libnotify}/bin/notify-send "󰁹  Fully charged"
+    	wofi --show drun
    fi
  '';

-in {
-  home.packages = with pkgs; [ notify-system battery-plugged battery-level ];
-}
+  powermenu = pkgs.writeShellScriptBin "powermenu" ''
+    if pgrep wlogout; then
+    	pkill wlogout
+    else
+      ${pkgs.wlogout}/bin/wlogout
+    fi
+  '';
+
+  lock = pkgs.writeShellScriptBin "lock" ''
+    ${pkgs.hyprlock}/bin/hyprlock
+  '';
+
+in { home.packages = [ menu powermenu lock ]; }
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`{ programs.nixvim.plugins.nvim-autopairs = { enable = true; }; }`
				`@@ -1 +0,0 @@`
				`{ programs.nixvim.plugins.bufferline = { enable = true; }; }`
				`@@ -1 +0,0 @@`
				`{ programs.nixvim.plugins.comment = { enable = true; }; }`
				`@@ -1 +0,0 @@`
				`{ programs.nixvim.plugins.lazygit = { enable = true; }; }`
				`@@ -1 +0,0 @@`
				`{ programs.nixvim.plugins.lualine = { enable = true; }; }`
				`@@ -1 +0,0 @@`
				`{ programs.nixvim.plugins.tmux-navigator = { enable = true; }; }`
				`@@ -1 +0,0 @@`
				`{ programs.nixvim.plugins.trouble = { enable = true; }; }`