Release v2.1.0

Former-commit-id: a134abdea3

.gitignore

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

.sops.yaml

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

README.md

@@ -1,157 +1,66 @@
-<h1 align="center">
+[//]: # (Title: Nixy)  
-   <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
+[//]: # (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.)  
-   <br>
+[//]: # (Author: Hadi)  
-      Nixy
+[//]: # (Date: 08/18/24)
-   <br>
+[//]: # (Version: v2.0.1)
-      <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" /> <br>
-   <div align="center">
 
-   <div align="center">
+<div align="center">
-      <p></p>
+    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
-      <div align="center">
+</div>
-         <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">
-         </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">
-         </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">
-         </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&"/>
-         </a>
-      </div>
-      <br>
-   </div>
-</h1>
 
-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.
+<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.0.1&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/stargazers">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=starship&logoColor=89b4fa">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=github&logoColor=89b4fa">
+    </a>
+    <a href="https://nixos.org">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=181825&logo=NixOS&logoColor=89b4fa&color=89b4fa">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=181825&colorB=89b4fa&logo=unlicense&logoColor=89b4fa"/>
+    </a>
+</div>
+<br>
+
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
+It's a simple way to manage your system configuration and dotfiles.
+
+## Table of Content
+
+  - [Table of Content](#table-of-content)
+  - [Gallery](#gallery)
+  - [Architecture](#architecture)
+  - [Installation](#installation)
+  - [Documentation](#documentation)
 
 ## Gallery
 
-![neofetch](https://image.nostr.build/c208c164ae04e4c58e01adb9fab584b163a565155865833851275f89c9270b7a.jpg)
+![catppuccin1](docs/src/catppuccin/1.png)
-![qutebrowser](https://image.nostr.build/8cc32d981e6be256bdc37a2571c31bb76d7c3335ce7c76fa6eca89a03019bfc9.jpg)
+![catppuccin2](docs/src/catppuccin/2.png)
-![spotify](https://image.nostr.build/76b18bcbcdf1d911a2dbdff7bfac6652044d45602a3dce9d9c53feb295d13245.jpg)
+![catppuccin3](docs/src/catppuccin/3.png)
-![wofi](https://image.nostr.build/90d69ffe6251c17e25b0fb44abadaeb0dfe6db8210d935fca14bf8b00be49fa6.jpg)
 
-## Apps
+## Architecture
 
-<details>
+- 🏠 `home` are the dotfiles and configuration files for the users
-<summary>Click to expand</summary>
+  - 'programs' is a collection of apps configured with home-manager
-
+  - 'scripts' is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
-| Category       | Software      |
+  - 'system' is some desktop environment like configuration
-|----------------|---------------|
+  - 'wallpapers' are... wallpapers
-| WM             | Hyprland      |
+- 💻 `hosts` are the system configuration files
-|                | hyprlock      |
+  - 'laptop' is my configuration for my laptop with Nvidia that you can copy
-|                | hyprpaper     |
+  - 'server' is for my homeserver (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
-|                | hypridle      |
+  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
-|                | wlogout       |
+  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
-| 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          |
-|                | ...           |
-
-</details>
-
-## Themes & Colors
-
-Themes and colors are managed by the `home/themes` folder. You can copy the default `nixy.nix` theme and make your own.
-
-To apply the theme to duckduckgo, follow the instructions in `$HOME/.config/duckduckgo-colorscheme.js`.
-
-## Scripts
-
-### 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>
 
 ## Installation
 
@@ -159,11 +68,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
+- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
-- Remove the hardware module in flake.nix line 30
+- Add your `hardware-configuration.nix` to your new host's folder
-- Change the `nixos/configuration.nix` file to match your system
+- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
-- Copy your `hardware-configuration.nix` file to the `nixos` folder
+
+> [!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

docs/APPS.md

@@ -0,0 +1,56 @@
+# 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       |
+|                                         | wlogout        |
+| Bar                                     | waybar         |
+| Terminal                                | kitty          |
+| Shell                                   | zsh            |
+|                                         | tmux           |
+|                                         | starship       |
+|                                         | bat            |
+|                                         | eza            |
+|                                         | zoxide         |
+|                                         | fzf            |
+| Editor                                  | neovim(nixvim) |
+| File manager                            | lf             |
+|                                         | thunar         |
+| Browser                                 | qutebrowser    |
+| Music                                   | spicetify      |
+| Notifications                           | dunst          |
+| Launcher                                | wofi           |
+| DM                                      | tuigreet       |
+| Secrets                                 | sops-nix       |
+| Misc                                    | lazygit        |
+|                                         | neofetch       |
+|                                         | cava           |
+| 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, ...
+I exposed some services to the internet using a reverse proxy (Nginx) and cloudflare-dyndns, others are accessed through a tailscale network
+
+### Apps
+
+- Nextcloud
+- Vaultwarden
+- Adguard Home
+- Unifi Controler
+- Uptime Kuma
+- "Jackflix"
+  - Jellyfin, Transmission, *arr
+- See [hosts/server](../hosts/server/)...

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

docs/KEYBINDINGS.md

@@ -0,0 +1,38 @@
+# Keybindings
+
+The list of the keybindings working on Hyprland:
+
+| Description                 | Keybinding             | Command                                                            |
+| --------------------------- | ---------------------- | ------------------------------------------------------------------ |
+| Switch Workspace            | SUPER + {Number}       | workspace {Number}                                                 |
+| Move app to Workspace       | SUPER SHIFT + {Number} | movetoworkspace {Number}                                           |
+| Kitty                       | SUPER + RETURN         | exec \${pkgs.kitty}/bin/kitty                                      |
+| Thunar                      | SUPER + E              | exec \${pkgs.xfce.thunar}/bin/thunar                               |
+| Qutebrowser                 | SUPER + B              | exec \${pkgs.qutebrowser}/bin/qutebrowser                          |
+| Bitwarden                   | SUPER + K              | exec \${pkgs.bitwarden}/bin/bitwarden                              |
+| Peaclock                    | SUPER + C              | exec \${pkgs.kitty}/bin/kitty --class peaclock peaclock            |
+| Lock                        | SUPER + L              | exec \${pkgs.hyprlock}/bin/hyprlock                                |
+| Powermenu                   | SUPER + X              | exec powermenu                                                     |
+| Launcher                    | SUPER + SPACE          | exec menu                                                          |
+| Close window                | SUPER + Q              | killactive                                                         |
+| Toggle Floating             | SUPER + T              | togglefloating                                                     |
+| Toggle Fullscreen           | SUPER + F              | fullscreen                                                         |
+| Move focus left             | SUPER + left           | movefocus l                                                        |
+| Move focus Right            | SUPER + right          | movefocus r                                                        |
+| Move focus Up               | SUPER + up             | movefocus u                                                        |
+| Move focus Down             | SUPER + down           | movefocus d                                                        |
+| Screenshot window           | SUPER + PRINT          | exec screenshot window                                             |
+| Screenshot monitor          | PRINT                  | exec screenshot monitor                                            |
+| Screenshot region           | SUPER SHIFT + PRINT    | exec screenshot region                                             |
+| Screenshot region then edit | ALT PRINT              | exec screenshot region swappy                                      |
+| Turn off night shift        | SUPER + F2             | exec night-shift-off                                               |
+| Turn on night shift         | SUPER + F3             | exec night-shift-on                                                |
+| Choose sound output         | SUPER + F5             | exec \${pkgs.kitty}/bin/kitty --class floating zsh -c sound-output |
+| Move Window (mouse)         | SUPER + mouse:272      | movewindow                                                         |
+| Resize Window (mouse)       | SUPER + R              | resizewindow                                                       |
+| Toggle Mute                 | XF86AudioMute          | exec sound-toggle                                                  |
+| Lock when closing Lid       | switch:Lid Switch      | exec \${pkgs.hyprlock}/bin/hyprlock                                |
+| Sound Up                    | XF86AudioRaiseVolume   | exec sound-up                                                      |
+| Sound Down                  | XF86AudioLowerVolume   | exec sound-down                                                    |
+| Brightness Up               | XF86MonBrightnessUp    | exec brightness-up                                                 |
+| Brightness Down             | XF86MonBrightnessDown  | exec brightness-down                                               |

docs/SCRIPTS.md

@@ -0,0 +1,59 @@
+# Scripts
+
+Scripts are located in the `home/scripts` folder. Home-manager add those in the 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-change <up/down> <increment>`
+
+## Sound control
+
+- `sound-up`
+- `sound-down`
+- `sound-toggle`
+- `sound-output`
+- `sound-change [up/down/mute] <increment>`
+
+## Caffeine
+
+Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
+
+- `caffeine` # Toggle caffeine
+- `caffeine-status` # Return active/inactive
+
+## Night-Shift
+
+Blue light filter, using wlsunset
+
+- `night-shift` # Toggle night shift
+- `night-shift-status` # Return active/inactive
+- `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`
+
+## Compress/Extract
+
+Some shortcuts to compress and extract files.
+
+- `compress` ...
+- `extract` ...

docs/THEMES.md

@@ -0,0 +1,32 @@
+# 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)
+
+### Catppuccin
+
+![catppuccin1](src/catppuccin/1.png)
+![catppuccin2](src/catppuccin/2.png)
+![catppuccin3](src/catppuccin/3.png)
+
+### Windows
+
+![windows1](src/windows/1.png)
+![windows2](src/windows/2.png)
+![windows3](src/windows/3.png)

docs/TODO.md

@@ -0,0 +1,44 @@
+# Todolist
+
+feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
+
+- [ ] Jackflix V2
+  - Backup Radarr, Prowlarr, Sonarr config
+
+- [ ] Nixy
+  - [~] Installation script ([install.sh](./scripts/install.sh) to test on a fresh install)
+  - [~] Variables-template with defaults
+  - [ ] Themes
+    - [ ] macOS theme
+  - [ ] Tofi (Wofi, but terminal based)
+
+- [ ] Qutebrowser
+  - [ ] !!! Bitwarden integration (I need this.)
+
+- [ ] Hyprland
+  - [-] Implement Hyprcursor (see home/system/hyprland/hyprcursor.nix: Not working, small cursor on some apps, big one on others)
+  - [ ] Animations based on app name
+    - [ ] Wofi: popin
+    - [ ] Wlogout: fade in
+  - [ ] Fix screenshots
+  - [ ] Fix hyprlock
+  - [ ] Hyprlock tty theme
+
+- [ ] Nixvim
+  - [ ] Keymaps:
+    - Trouble
+    - Tagbar
+  - [ ] Disable background color for headlines.nvim for titles
+
+- [ ] Backup system for some folders ($home/dev, $home/pictures, ...)
+  - [ ] Exclude file pattern (nodes modules, ...)
+  - [ ] Auto backup when a specific usb key is plugged
+  - [ ] Pika backup?
+
+- [ ] Markdown to pdf tool
+
+- [ ] Server
+  - [ ] Bitcoin-git
+  - [ ] ServerFetch: Neofetch like, but for server: CPU, RAM, Disk, Network, Uptime, status (check with uptime kuma API)
+  - [ ] Ntfy auth file
+  - [ ] Launch transmission-openvpn on boot (see hosts/server/modules/jackflix/transmission.nix)

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)               |
+| sea.png             | ![sea.png](../home/wallpapers/sea.png)                         |
+| see.png             | ![see.png](../home/wallpapers/see.png)                         |
+| space2.png          | ![space2.png](../home/wallpapers/space2.png)                   |
+| space.png           | ![space.png](../home/wallpapers/space.png)                     |
+| street.png          | ![street.png](../home/wallpapers/street.png)                   |
+| sun.png             | ![sun.png](../home/wallpapers/sun.png)                         |
+| tokyo.png           | ![tokyo.png](../home/wallpapers/tokyo.png)                     |
+| train.png           | ![train.png](../home/wallpapers/train.png)                     |
+| windows.png         | ![windows.png](../home/wallpapers/windows.png)                 |

docs/scripts/compress_png.sh

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

docs/scripts/create_preview_wallpapers.sh

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

docs/scripts/create_readme.sh

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

docs/scripts/keybindings_to_markdown.sh

@@ -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"

docs/scripts/new_tag.sh

@@ -0,0 +1,22 @@
+#!/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
+
+echo "Compresing png files..."
+bash ./docs/scripts/compress_png.sh
+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/create_keybindings.sh
+
+git add .
+git commit -m "Release $NEW_TAG"
+git tag -a "$NEW_TAG" -m "Release $NEW_TAG"
+git push origin "$NEW_TAG"

docs/scripts/take_rice_screenshot.sh

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

docs/src/README_template.md

@@ -0,0 +1,55 @@
+
+**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
+
+![catppuccin1](docs/src/catppuccin/1.png)
+![catppuccin2](docs/src/catppuccin/2.png)
+![catppuccin3](docs/src/catppuccin/3.png)
+
+## Architecture
+
+- 🏠 `home` are the dotfiles and configuration files for the users
+  - '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 like configuration
+  - 'wallpapers' are... wallpapers
+- 💻 `hosts` are the system configuration files
+  - 'laptop' is my configuration for my laptop with Nvidia that you can copy
+  - 'server' is for my homeserver (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
+  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
+  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
+
+## Installation
+
+```sh
+git clone https://github.com/anotherhadi/nixy ~/.config/nixos
+```
+
+- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+- Add your `hardware-configuration.nix` to your new host's folder
+- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
+
+> [!NOTE]
+> When you add new files, don't forget to run `git add .` to add them to the git repository
+
+```sh
+sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+```
+
+## Documentation
+
+- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
+- [APPS.md](docs/APPS.md): Which apps are installed
+- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
+- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
+
+- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
+- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
+- [LICENSE](LICENSE): MIT License

docs/src/header.md

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

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

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

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

@@ -0,0 +1 @@
+62b52ad02a886c19a8cfe1ea17e8aaad50f23632

flake.lock

@@ -11,11 +11,11 @@
         "sf-pro": "sf-pro"
       },
       "locked": {
-        "lastModified": 1705496891,
+        "lastModified": 1719591391,
-        "narHash": "sha256-lLX87aJ9oUT3u0Iaf60xKIJ2RQNt3v4Ne2cvSWyaS7U=",
+        "narHash": "sha256-sVTFewitXIYe5vBihbCFQGdBPdnT26kES1T05umBBnE=",
         "owner": "Lyndeno",
         "repo": "apple-fonts.nix",
-        "rev": "e6ffbc887752ba0fe035fbcc8b282555804dd3f6",
+        "rev": "0e21619dad5b0d9ca2e050155e32448380547b06",
         "type": "github"
       },
       "original": {
@@ -24,20 +24,52 @@
         "type": "github"
       }
     },
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723920171,
+        "narHash": "sha256-dVCMrAe+D/5S91erhwQj2DSzHOVzAanWqoy+vPWB9DY=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "71d49670fe246cdaff4860b0effba0ab9f163b72",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1713532798,
+        "lastModified": 1722113426,
-        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
         "type": "github"
       },
       "original": {
@@ -60,22 +92,6 @@
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
-    "flake-compat_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -84,11 +100,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714641030,
+        "lastModified": 1722555600,
-        "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
         "type": "github"
       },
       "original": {
@@ -97,61 +113,10 @@
         "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=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "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"
-      },
       "locked": {
         "lastModified": 1710146030,
         "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
@@ -166,9 +131,27 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
+    "flake-utils_2": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_3"
+      },
+      "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"
+      }
+    },
+    "flake-utils_3": {
+      "inputs": {
+        "systems": "systems_4"
       },
       "locked": {
         "lastModified": 1685518550,
@@ -184,11 +167,41 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723202784,
+        "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "c7012d0c18567c889b948781bc74a501e92275d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
           "nixvim",
-          "pre-commit-hooks",
+          "git-hooks",
           "nixpkgs"
         ]
       },
@@ -213,11 +226,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715077503,
+        "lastModified": 1723986931,
-        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
+        "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
+        "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
         "type": "github"
       },
       "original": {
@@ -234,11 +247,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715077503,
+        "lastModified": 1723399884,
-        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
+        "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
+        "rev": "086f619dd991a4d355c07837448244029fc2d9ab",
         "type": "github"
       },
       "original": {
@@ -263,11 +276,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713612213,
+        "lastModified": 1722623071,
-        "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
+        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
+        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
         "type": "github"
       },
       "original": {
@@ -278,19 +291,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,
+        "lastModified": 1724014641,
-        "narHash": "sha256-yWsrCPhBpin7AXVI66/EAE+YPJTweS8CDCZJQliB10k=",
+        "narHash": "sha256-ub/HCvrxuvvqmnWpNdcyi/mp0G9+rNjtKHrA7cwyuis=",
         "ref": "refs/heads/main",
-        "rev": "e4e84064f2d07810e0c150bce1369a0a00503e9a",
+        "rev": "f4045ab8d032186b7c5409cd9f05eeaa813320ba",
-        "revCount": 4638,
+        "revCount": 5109,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -315,11 +330,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714869498,
+        "lastModified": 1721326555,
-        "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
+        "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
+        "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
         "type": "github"
       },
       "original": {
@@ -329,6 +344,35 @@
       }
     },
     "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1721324361,
+        "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
       "inputs": {
         "nixpkgs": [
           "hyprland",
@@ -340,38 +384,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1713121246,
+        "lastModified": 1722869141,
-        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
+        "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
         "owner": "hyprwm",
-        "repo": "hyprlang",
+        "repo": "hyprutils",
-        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
+        "rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "repo": "hyprlang",
+        "repo": "hyprutils",
-        "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",
         "type": "github"
       }
     },
@@ -387,11 +409,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715090986,
+        "lastModified": 1721324119,
-        "narHash": "sha256-FXpQvmS9R7alwZ47XK5UIcAbC9YKSxc0+GOVYqwa0jM=",
+        "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "94e32ec37e7215b16d5c1b41b1773ff6742e704b",
+        "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
         "type": "github"
       },
       "original": {
@@ -408,11 +430,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713946171,
+        "lastModified": 1722924007,
-        "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
+        "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
+        "rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
         "type": "github"
       },
       "original": {
@@ -423,11 +445,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1715148395,
+        "lastModified": 1723310128,
-        "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
+        "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
+        "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf",
         "type": "github"
       },
       "original": {
@@ -439,11 +461,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1696375444,
+        "lastModified": 1717786204,
-        "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=",
+        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "81e8f48ebdecf07aab321182011b067aafc78896",
+        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
         "type": "github"
       },
       "original": {
@@ -455,27 +477,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1714858427,
+        "lastModified": 1721524707,
-        "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=",
+        "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,
+        "lastModified": 1723637854,
-        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
+        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
+        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
         "type": "github"
       },
       "original": {
@@ -487,11 +509,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1715087517,
+        "lastModified": 1723637854,
-        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
+        "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
+        "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9",
         "type": "github"
       },
       "original": {
@@ -502,22 +524,6 @@
       }
     },
     "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1710272261,
-        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
       "locked": {
         "lastModified": 1686020360,
         "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
@@ -538,21 +544,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,
+        "lastModified": 1724010176,
-        "narHash": "sha256-oREqXPEtuYbOdBKbsDQzr2V01EzK4kD8MTdwO9ljTnU=",
+        "narHash": "sha256-26fas5WqF8w1PMrMuJNde4bH6WSXFfRbh+L4krgPOzY=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "f7f255afe22fcca0c07177c3707fd61fa0c85835",
+        "rev": "c52ba6785661f095221aa1e1eb24f57e89d7b2de",
         "type": "github"
       },
       "original": {
@@ -561,10 +567,47 @@
         "type": "github"
       }
     },
+    "nurpkgs": {
+      "locked": {
+        "lastModified": 1724012881,
+        "narHash": "sha256-lqn4UX+tvtwOmBZ2Dxh6euXKNcXGEYqPolEdjtONDVY=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "8c7136cb22fd96cde881225863b450df75876ebc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
+        "type": "github"
+      }
+    },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723367906,
+        "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d",
+        "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,34 +616,6 @@
         "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",
@@ -609,35 +624,15 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
-        "rose-pine-hyprcursor": "rose-pine-hyprcursor",
+        "nurpkgs": "nurpkgs",
         "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 +644,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 +656,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 +668,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 +685,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1715244550,
+        "lastModified": 1723501126,
-        "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=",
+        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f",
+        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
         "type": "github"
       },
       "original": {
@@ -705,8 +700,8 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1704167711,
@@ -782,51 +777,6 @@
         "type": "github"
       }
     },
-    "systems_5": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "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": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -835,11 +785,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714058656,
+        "lastModified": 1723454642,
-        "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
+        "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
+        "rev": "349de7bc435bdff37785c2466f054ed1766173be",
         "type": "github"
       },
       "original": {
@@ -848,24 +798,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 +815,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714060055,
+        "lastModified": 1722365976,
-        "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
+        "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
+        "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
         "type": "github"
       },
       "original": {

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";
@@ -17,38 +21,52 @@
       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";
+    nurpkgs.url = "github:nix-community/NUR";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
-  outputs = inputs@{ nixpkgs, home-manager, sops-nix, hyprland, spicetify-nix
+  outputs = inputs@{ nixpkgs, ... }: {
-    , nixos-hardware, ... }: {
+    nixosConfigurations = {
-      nixosConfigurations = {
+
-        nixy = nixpkgs.lib.nixosSystem {
+      nixy = nixpkgs.lib.nixosSystem { # CHANGE ME
-          system = "x86_64-linux";
+        system = "x86_64-linux";
-          modules = [
+        modules = [
-            nixos-hardware.nixosModules.omen-16-n0005ne # REMOVE
+          ./hosts/laptop/configuration.nix # CHANGE ME
-            ./nixos/configuration.nix
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGE ME
-            ./nixos/fonts.nix
+          inputs.home-manager.nixosModules.home-manager
-            ./nixos/tuigreet.nix
+          {
-            { _module.args = { inherit inputs; }; }
+            nixpkgs.overlays = [ inputs.nurpkgs.overlay ];
-            home-manager.nixosModules.home-manager
+            _module.args = { inherit inputs; };
-            {
+            home-manager = {
-              home-manager = {
+              useGlobalPkgs = true;
-                useGlobalPkgs = true;
+              useUserPackages = true;
-                useUserPackages = true;
+              users."hadi" = import ./hosts/laptop/home.nix; # CHANGE ME
-                users."hadi" = import ./home/home.nix;
+              extraSpecialArgs = { inherit inputs; };
-                extraSpecialArgs = {
+            };
-                  inherit inputs;
+          }
-                  inherit spicetify-nix;
+        ];
-                  inherit sops-nix;
-                  inherit hyprland;
-                };
-              };
-            }
-          ];
-        };
       };
+
+      jack = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          inputs.sops-nix.nixosModules.sops
+          ./hosts/server/configuration.nix
+          inputs.home-manager.nixosModules.home-manager
+          {
+            nixpkgs.overlays = [ inputs.nurpkgs.overlay ];
+            _module.args = { inherit inputs; };
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users."hadi" = import ./hosts/server/home.nix;
+              extraSpecialArgs = { inherit inputs; };
+            };
+          }
+        ];
+      };
+
     };
+  };
 }

home/apps/default.nix

@@ -1,14 +0,0 @@
-{
-  imports = [
-    ./kitty
-    ./lf
-    ./neofetch
-    ./nvim
-    ./qutebrowser
-    ./spicetify
-    ./wofi
-    ./cava
-    ./tmux
-    ./lazygit
-  ];
-}

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;
-    };
-  };
-}

home/apps/nvim/auto-pairs.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.nvim-autopairs = { enable = true; }; }

home/apps/nvim/bufferline.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.bufferline = { enable = true; }; }

home/apps/nvim/comment.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.comment = { enable = true; }; }

home/apps/nvim/copilot.nix

@@ -1,5 +0,0 @@
-{
-  programs.nixvim.plugins.copilot-vim = {
-    enable = true;
-  };
-}

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; };
-    };
-  };
-
-}

home/apps/nvim/git.nix

@@ -1,6 +0,0 @@
-{
-  programs.nixvim.plugins.gitsigns = {
-    enable = true;
-    settings = { current_line_blame = false; };
-  };
-}

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>";
-    }
-  ];
-}

home/apps/nvim/lazygit.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.lazygit = { enable = true; }; }

home/apps/nvim/lightline.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.lualine = { enable = true; }; }

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";
-      };
-    };
-  };
-}

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;
-      };
-    };
-  };
-}

home/apps/nvim/nvim-tree.nix

@@ -1,5 +0,0 @@
-{
-  programs.nixvim.plugins.neo-tree = {
-    enable = true;
-  };
-}

home/apps/nvim/obsidian.nix

@@ -1,9 +0,0 @@
-{
-  programs.nixvim.plugins.obsidian = {
-    enable = true;
-    settings = {
-      dir = "~/Nextcloud/obsidian";
-      disable_frontmatter = true;
-    };
-  };
-}

home/apps/nvim/oil.nix

@@ -1,6 +0,0 @@
-{
-  programs.nixvim.plugins.oil = {
-    enable = true;
-    settings = { default_file_explorer = false; };
-  };
-}

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; };
-  };
-}

home/apps/nvim/tmux-navigator.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.tmux-navigator = { enable = true; }; }

home/apps/nvim/toggleterm.nix

@@ -1,9 +0,0 @@
-{
-  programs.nixvim.plugins.toggleterm = {
-    enable = true;
-    settings = {
-      open_mapping = "[[<c-t>]]";
-      direction = "horizontal";
-    };
-  };
-}

home/apps/nvim/treesitter.nix

@@ -1,10 +0,0 @@
-{
-  programs.nixvim.plugins = {
-    treesitter = {
-      enable = true;
-      nixGrammars = true;
-      indent = true;
-    };
-    treesitter-context.enable = true;
-  };
-}

home/apps/nvim/trouble.nix

@@ -1 +0,0 @@
-{ programs.nixvim.plugins.trouble = { enable = true; }; }

home/apps/nvim/whichkey.nix

@@ -1,3 +0,0 @@
-{
-  programs.nixvim.plugins.which-key.enable=true;
-}

home/apps/nvim/wilder.nix

@@ -1,6 +0,0 @@
-{
-  programs.nixvim.plugins.wilder = {
-    enable = true;
-    modes = [ ":" "/" "?" ];
-  };
-}

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)
-    '';
-  };
-}

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>
-  '';
-}

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
-    ];
-  };
-}

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;
-}

home/programs/btop/default.nix

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

home/programs/cava/default.nix

@@ -5,8 +5,8 @@
       general.framerate = 60;
       smoothing.noise_reduction = 88;
       color = {
-        background = "'#${config.theme.colors.bg}'";
+        background = "'#${config.var.theme.colors.bg}'";
-        foreground = "'#${config.theme.colors.primary-bg}'";
+        foreground = "'#${config.var.theme.colors.accent}'";
       };
     };
   };

home/programs/fetch/default.nix

@@ -0,0 +1 @@
+{ imports = [ ./neofetch ./nerdfetch ]; }

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 ${
+    colors=(${toString config.var.theme.colors.accentNumber} 1 ${
-      toString config.theme.colors.primary-ansi-16-number
+      toString config.var.theme.colors.accentNumber
-    } ${toString config.theme.colors.primary-ansi-16-number} 7)
+    } ${toString config.var.theme.colors.accentNumber} 7)
     bold="on"
     underline_enabled="on"
     underline_char="-"

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
+          lc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
-          nc="$reset$bold''$${config.theme.colors.primary-ansi-16}" # labels
+          nc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
-          hn="$reset$bold''$${config.theme.colors.primary-ansi-16}" # 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 ]; }

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`";
+    };
+  };
+}

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;
+    };
+  };
+}

home/programs/nextcloud/default.nix

@@ -0,0 +1,6 @@
+{
+    services.nextcloud-client = {
+        enable = true;
+        startInBackground = true;
+    };
+}

home/programs/nvim/colorscheme.nix

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

home/programs/nvim/default.nix

@@ -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
+  ];
+}

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";
+    }
+  ];
+}

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;
   };
 }

home/programs/nvim/plugins/dashboard.nix

@@ -1,9 +1,9 @@
 { config, ... }: {
 
   programs.nixvim.highlight = {
-    AlphaHeaderColor.fg = "#${config.theme.colors.primary-bg}";
+    AlphaHeaderColor.fg = "#${config.var.theme.colors.accent}";
-    AlphaTextColor.fg = "#${config.theme.colors.fg}";
+    AlphaTextColor.fg = "#${config.var.theme.colors.fg}";
-    AlphaShortcutColor.fg = "#${config.theme.colors.alt-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";

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;
+        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;
+        };
+      };
+    };
+  };
+}

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";
+        };
+      };
+    };
+  };
+}

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";
+      }
+    ];
+  };
+}

home/programs/nvim/plugins/ui.nix

@@ -0,0 +1,31 @@
+{ pkgs, ... }: {
+  home.packages = with pkgs; [ ctags ];
+  programs.nixvim = {
+    plugins = {
+      lualine.enable = true;
+      noice.enable = true;
+      gitsigns = {
+        enable = true;
+        settings.current_line_blame = false;
+      };
+      bufferline.enable = true;
+      trouble.enable = true;
+      which-key.enable = true;
+      headlines = {
+        enable = true;
+        settings = {
+          markdown = {
+            codeblock_highlight = false;
+          };
+        };
+      };
+      nvim-colorizer.enable = true;
+      # tagbar.enable = true;
+    };
+    keymaps = [{
+      key = "<leader>t";
+      action = "<cmd>TroubleToggle<cr>";
+      options.desc = "Trouble";
+    }];
+  };
+}

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>";
+      }
+    ];
+  };
+}

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

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

home/programs/qutebrowser/default.nix

@@ -0,0 +1,342 @@
+{ 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
+    # ./userscripts.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)
+    '';
+  };
+}

home/programs/qutebrowser/duckduckgo-colorscheme.nix

@@ -1,10 +1,9 @@
 { config, ... }: {
-
+  home.file.".duckduckgo-colorscheme.js".text = ''
-  xdg.configFile."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) => {

home/programs/qutebrowser/userscripts.nix

@@ -0,0 +1,14 @@
+{ pkgs, ... }: {
+
+  home.packages = with pkgs; [
+    keyutils
+    python3
+    python311Packages.pyperclip
+    python312Packages.tldextract
+  ];
+
+  xdg.configFile."qutebrowser/userscripts/bitwarden" = {
+    source = ./userscripts/qute-bitwarden.py;
+    executable = true;
+  };
+}

home/programs/qutebrowser/userscripts/qute-bitwarden.py

@@ -0,0 +1,291 @@
+#!/usr/bin/env python3
+
+# SPDX-FileCopyrightText: Chris Braun (cryzed) <cryzed@googlemail.com>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+"""
+Insert login information using Bitwarden CLI and a dmenu-compatible application
+(e.g. dmenu, rofi -dmenu, ...).
+"""
+
+USAGE = """The domain of the site has to be in the name of the Bitwarden entry, for example: "github.com/cryzed" or
+"websites/github.com".  The login information is inserted by emulating key events using qutebrowser's fake-key command in this manner:
+[USERNAME]<Tab>[PASSWORD], which is compatible with almost all login forms.
+
+If enabled, with the `--totp` flag, it will also move the TOTP code to the
+clipboard, much like the Firefox add-on.
+
+You must log into Bitwarden CLI using `bw login` prior to use of this script.
+The session key will be stored using keyctl for the number of seconds passed to
+the --auto-lock option.
+
+To use in qutebrowser, run: `spawn --userscript qute-bitwarden`
+"""
+
+EPILOG = """Dependencies: tldextract (Python 3 module), pyperclip (optional
+Python module, used for TOTP codes), Bitwarden CLI (1.7.4 is known to work
+but older versions may well also work)
+
+WARNING: The login details are viewable as plaintext in qutebrowser's debug log
+(qute://log) and might be shared if you decide to submit a crash report!"""
+
+import argparse
+import enum
+import functools
+import os
+import shlex
+import subprocess
+import sys
+import json
+import tldextract
+
+argument_parser = argparse.ArgumentParser(
+    description=__doc__,
+    usage=USAGE,
+    epilog=EPILOG,
+)
+argument_parser.add_argument('url', nargs='?', default=os.getenv('QUTE_URL'))
+argument_parser.add_argument('--dmenu-invocation', '-d', default='wofi --dmenu -i',
+                             help='Invocation used to execute a dmenu-provider')
+argument_parser.add_argument('--password-prompt-invocation', '-p', default='rofi -dmenu -p "Master Password" -password -lines 0',
+                             help='Invocation used to prompt the user for their Bitwarden password')
+argument_parser.add_argument('--no-insert-mode', '-n', dest='insert_mode', action='store_false',
+                             help="Don't automatically enter insert mode")
+argument_parser.add_argument('--totp', '-t', action='store_true',
+                             help="Copy TOTP key to clipboard")
+argument_parser.add_argument('--io-encoding', '-i', default='UTF-8',
+                             help='Encoding used to communicate with subprocesses')
+argument_parser.add_argument('--merge-candidates', '-m', action='store_true',
+                             help='Merge pass candidates for fully-qualified and registered domain name')
+argument_parser.add_argument('--auto-lock', type=int, default=900,
+                             help='Automatically lock the vault after this many seconds')
+group = argument_parser.add_mutually_exclusive_group()
+group.add_argument('--username-only', '-e',
+                   action='store_true', help='Only insert username')
+group.add_argument('--password-only', '-w',
+                   action='store_true', help='Only insert password')
+group.add_argument('--totp-only', '-T',
+                   action='store_true', help='Only insert totp code')
+
+stderr = functools.partial(print, file=sys.stderr)
+
+
+class ExitCodes(enum.IntEnum):
+    SUCCESS = 0
+    FAILURE = 1
+    # 1 is automatically used if Python throws an exception
+    NO_PASS_CANDIDATES = 2
+    COULD_NOT_MATCH_USERNAME = 3
+    COULD_NOT_MATCH_PASSWORD = 4
+
+
+def qute_command(command):
+    with open(os.environ['QUTE_FIFO'], 'w') as fifo:
+        fifo.write(command + '\n')
+        fifo.flush()
+
+
+def ask_password(password_prompt_invocation):
+    process = subprocess.run(
+        shlex.split(password_prompt_invocation),
+        text=True,
+        stdout=subprocess.PIPE,
+    )
+    if process.returncode > 0:
+        raise Exception('Could not unlock vault')
+    master_pass = process.stdout.strip()
+    return subprocess.check_output(
+        ['bw', 'unlock', '--raw', master_pass],
+        text=True,
+    ).strip()
+
+
+def get_session_key(auto_lock, password_prompt_invocation):
+    if auto_lock == 0:
+        subprocess.call(['keyctl', 'purge', 'user', 'bw_session'])
+        return ask_password(password_prompt_invocation)
+    else:
+        process = subprocess.run(
+            ['keyctl', 'request', 'user', 'bw_session'],
+            text=True,
+            stdout=subprocess.PIPE,
+        )
+        key_id = process.stdout.strip()
+        if process.returncode > 0:
+            session = ask_password(password_prompt_invocation)
+            if not session:
+                raise Exception('Could not unlock vault')
+            key_id = subprocess.check_output(
+                ['keyctl', 'add', 'user', 'bw_session', session, '@u'],
+                text=True,
+            ).strip()
+
+        if auto_lock > 0:
+            subprocess.call(['keyctl', 'timeout', str(key_id), str(auto_lock)])
+        return subprocess.check_output(
+            ['keyctl', 'pipe', str(key_id)],
+            text=True,
+        ).strip()
+
+
+def pass_(domain, encoding, auto_lock, password_prompt_invocation):
+    session_key = get_session_key(auto_lock, password_prompt_invocation)
+    process = subprocess.run(
+        ['bw', 'list', 'items', '--session', session_key, '--url', domain],
+        capture_output=True,
+    )
+
+    err = process.stderr.decode(encoding).strip()
+    if err:
+        msg = 'Bitwarden CLI returned for {:s} - {:s}'.format(domain, err)
+        stderr(msg)
+
+    if process.returncode:
+        return '[]'
+
+    out = process.stdout.decode(encoding).strip()
+
+    return out
+
+
+def get_totp_code(selection_id, domain_name, encoding, auto_lock, password_prompt_invocation):
+    session_key = get_session_key(auto_lock, password_prompt_invocation)
+    process = subprocess.run(
+        ['bw', 'get', 'totp', '--session', session_key, selection_id],
+        capture_output=True,
+    )
+
+    err = process.stderr.decode(encoding).strip()
+    if err:
+        # domain_name instead of selection_id to make it more user-friendly
+        msg = 'Bitwarden CLI returned for {:s} - {:s}'.format(domain_name, err)
+        stderr(msg)
+
+    if process.returncode:
+        return '[]'
+
+    out = process.stdout.decode(encoding).strip()
+
+    return out
+
+
+def dmenu(items, invocation, encoding):
+    command = shlex.split(invocation)
+    process = subprocess.run(command, input='\n'.join(
+        items).encode(encoding), stdout=subprocess.PIPE)
+    return process.stdout.decode(encoding).strip()
+
+
+def fake_key_raw(text):
+    for character in text:
+        # Escape all characters by default, space requires special handling
+        sequence = '" "' if character == ' ' else r'\{}'.format(character)
+        qute_command('fake-key {}'.format(sequence))
+
+
+def main(arguments):
+    if not arguments.url:
+        argument_parser.print_help()
+        return ExitCodes.FAILURE
+
+    extract_result = tldextract.extract(arguments.url)
+
+    # Try to find candidates using targets in the following order: fully-qualified domain name (includes subdomains),
+    # the registered domain name and finally: the IPv4 address if that's what
+    # the URL represents
+    candidates = []
+    for target in filter(None, [
+                extract_result.fqdn,
+                extract_result.registered_domain,
+                extract_result.subdomain + '.' + extract_result.domain,
+                extract_result.domain,
+                extract_result.ipv4]):
+        target_candidates = json.loads(
+            pass_(
+                target,
+                arguments.io_encoding,
+                arguments.auto_lock,
+                arguments.password_prompt_invocation,
+            )
+        )
+        if not target_candidates:
+            continue
+
+        candidates = candidates + target_candidates
+        if not arguments.merge_candidates:
+            break
+    else:
+        if not candidates:
+            stderr('No pass candidates for URL {!r} found!'.format(
+                arguments.url))
+            return ExitCodes.NO_PASS_CANDIDATES
+
+    if len(candidates) == 1:
+        selection = candidates.pop()
+    else:
+        choices = ['{:s} | {:s}'.format(c['name'], c['login']['username']) for c in candidates]
+        choice = dmenu(choices, arguments.dmenu_invocation, arguments.io_encoding)
+        choice_tokens = choice.split('|')
+        choice_name = choice_tokens[0].strip()
+        choice_username = choice_tokens[1].strip()
+        selection = next((c for (i, c) in enumerate(candidates)
+                          if c['name'] == choice_name
+                          and c['login']['username'] == choice_username),
+                         None)
+
+    # Nothing was selected, simply return
+    if not selection:
+        return ExitCodes.SUCCESS
+
+    username = selection['login']['username']
+    password = selection['login']['password']
+    totp = selection['login']['totp']
+
+    if arguments.username_only:
+        fake_key_raw(username)
+    elif arguments.password_only:
+        fake_key_raw(password)
+    elif arguments.totp_only:
+        # No point in moving it to the clipboard in this case
+        fake_key_raw(
+            get_totp_code(
+                selection['id'],
+                selection['name'],
+                arguments.io_encoding,
+                arguments.auto_lock,
+                arguments.password_prompt_invocation,
+            )
+        )
+    else:
+        # Enter username and password using fake-key and <Tab> (which seems to work almost universally), then switch
+        # back into insert-mode, so the form can be directly submitted by
+        # hitting enter afterwards
+        fake_key_raw(username)
+        qute_command('fake-key <Tab>')
+        fake_key_raw(password)
+
+    if arguments.insert_mode:
+        qute_command('mode-enter insert')
+
+    # If it finds a TOTP code, it copies it to the clipboard,
+    # which is the same behavior as the Firefox add-on.
+    if not arguments.totp_only and totp and arguments.totp:
+        # The import is done here, to make pyperclip an optional dependency
+        import pyperclip
+        pyperclip.copy(
+            get_totp_code(
+                selection['id'],
+                selection['name'],
+                arguments.io_encoding,
+                arguments.auto_lock,
+                arguments.password_prompt_invocation,
+            )
+        )
+
+    return ExitCodes.SUCCESS
+
+
+if __name__ == '__main__':
+    arguments = argument_parser.parse_args()
+    sys.exit(main(arguments))

home/programs/shell/default.nix

@@ -4,5 +4,8 @@
     ./zsh.nix
     ./starship.nix
     ./zoxide.nix
+    ./tmux.nix
+    ./lazygit.nix
+    ./eza.nix
   ];
 }

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"
+    ];
+  };
+}

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"

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" ];
       };

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)";
       };

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"
         '';
       }
     ];

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 commit -am 'Update'";
+      gp = "git push";
+      gpl = "git pull";
+      gs = "git status";
+      gd = "git diff";
+      gco = "git checkout";
+      gcb = "git checkout -b";
+      gbr = "git branch";
+    };
+  };
+}

home/programs/spicetify/default.nix

@@ -0,0 +1,40 @@
+{ pkgs, config, lib, inputs, ... }:
+let spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
+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
+      fullAppDisplay
+      shuffle
+    ];
+  };
+}

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";
+          }
+        ];
+      };
+    };
+  };
+}

home/programs/zathura/default.nix

@@ -0,0 +1,17 @@
+# PDF viewer
+{
+  programs.zathura = {
+    enable = true;
+
+    options = {
+      guioptions = "v";
+      adjust-open = "width";
+      statusbar-basename = true;
+      render-loading = false;
+      scroll-step = 120;
+
+      # highlight-color = ");
+      # highlight-active-color = mkForce (rgba "base0D");
+    };
+  };
+}

home/scripts/battery/default.nix

@@ -0,0 +1,36 @@
+{ pkgs, ... }:
+let
+  battery-watch = pkgs.writeShellScriptBin "battery-watch" ''
+    while true;do
+      battery-plugged &
+      battery-level &
+      sleep 60
+    done
+  '';
+
+  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 && $OLD_BATTERY_STATUS != "Unknown" ]]; then
+      if [[ $BATTERY_STATUS == "Discharging" ]]; then
+        notif "battery" "󰚦 Battery is unplugged"
+      else
+        notif "battery" "󰚥 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
+      notif "battery" "󰁻  Low battery" "Battery level is $BATTERY_LEVEL%"
+    elif [[ $BATTERY_LEVEL -le 10 ]] && [[ $BATTERY_STATUS == "Discharging" ]]; then
+      notif "battery" "󰁺  Very low battery" "Battery level is $BATTERY_LEVEL%"
+    # elif [[ $BATTERY_LEVEL -eq 100 ]] && [[ $BATTERY_STATUS -ne "Discharging" ]]; then
+    #   notif "battery" "󰁹 Fully charged"
+    fi
+  '';
+
+in { home.packages = [ battery-watch battery-plugged battery-level ]; }

home/scripts/brightness/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 let
   increments = "5";
@@ -13,9 +13,7 @@ let
 
     message="󰃠  Brightness: $brightness_level%"
 
-    ${pkgs.libnotify}/bin/notify-send "$message" \
+    notif "brightness" "$message" "extraargs=-h int:value:$brightness_level"
-                -h int:value:"$brightness_level" \
-                --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
   '';
 
   brightness-up = pkgs.writeShellScriptBin "brightness-up" ''
@@ -26,10 +24,4 @@ let
     brightness-change down ${increments}
   '';
 
-in {
+in { home.packages = [ brightness-change brightness-up brightness-down ]; }
-  home.packages = with pkgs; [
-    brightness-change
-    brightness-up
-    brightness-down
-  ];
-}

home/scripts/caffeine/default.nix

@@ -1,9 +1,7 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
-  homedir = config.home.homeDirectory;
-
   caffeine-status = pkgs.writeShellScriptBin "caffeine-status" ''
-    [[ -f /tmp/caffeine ]] && echo "active" || echo "inactive"
+    [[ -f /tmp/caffeine ]] && echo "1" || echo "0"
   '';
 
   caffeine = pkgs.writeShellScriptBin "caffeine" ''
@@ -16,8 +14,16 @@ let
       pkill hypridle
       message="󰅶  Caffeine Activated"
     fi
-    ${pkgs.libnotify}/bin/notify-send "$message" \
+    notif "caffeine" "$message"
-      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
   '';
 
-in { home.packages = with pkgs; [ caffeine-status caffeine ]; }
+  caffeine-status-icon = pkgs.writeShellScriptBin "caffeine-status-icon" ''
+    status=$(caffeine-status)
+    if [[ $status == "1" ]]; then
+      echo "󰅶"
+    else
+      echo "󰾪"
+    fi
+  '';
+
+in { home.packages = [ caffeine-status caffeine caffeine-status-icon ]; }

home/scripts/compress/default.nix

@@ -11,6 +11,7 @@ let
         echo "Wrong number of arguments..."
     fi
   '';
+
   extract = pkgs.writeShellScriptBin "extract" ''
      for i in "$@" ; do
         tar -xvzf $i
@@ -18,4 +19,4 @@ let
     done 
   '';
 
-in { home.packages = with pkgs; [ compress extract ]; }
+in { home.packages = [ compress extract ]; }