update

Former-commit-id: bbaf52b496

.github/FUNDING.yml

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

.github/assets/README_template.md

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

.github/scripts/create_readme.sh

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

.github/scripts/create_scripts_docs.sh

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

.github/scripts/keybindings_to_markdown.sh

@@ -1,60 +0,0 @@
-#!/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-HYPRLAND.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/bindings.nix" ]] || (echo "File ./home/system/hyprland/bindings.nix not found" && exit 1)
-
-config=$(cat "./home/system/hyprland/bindings.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 "[//]: # (This file is autogenerated)" >"$KEYBINDINGS_FILE"
-echo "# Keybindings for Hyprland" >>"$KEYBINDINGS_FILE"
-echo "" >>"$KEYBINDINGS_FILE"
-echo "> [!NOTE]" >>"$KEYBINDINGS_FILE"
-echo "> SUPER is the windows key by default" >>"$KEYBINDINGS_FILE"
-echo "" >>"$KEYBINDINGS_FILE"
-
-echo "| Description | Keybinding |" >>"$KEYBINDINGS_FILE"
-echo "| -- | -- |" >>"$KEYBINDINGS_FILE"
-echo "| Switch Workspace | SUPER + {Number} |" >>"$KEYBINDINGS_FILE"
-echo "| Move app to Workspace | SHIFT + SUPER + {Number} |" >>"$KEYBINDINGS_FILE"
-echo "$keybindings" | while read -r line; do
-  comment=$(echo "$line" | cut -d\# -f2)
-  line=$(echo "$line" | cut -d\# -f1)
-  line=${line:1:${#line}-3}
-  mod=$(echo "$line" | cut -d, -f1)
-  key=$(echo "$line" | cut -d, -f2)
-  # dispatcher=$(echo "$line" | cut -d, -f3)
-  # params=$(echo "$line" | cut -d, -f4)
-
-  [[ $mod == '$mod' ]] && mod="SUPER + "
-  [[ $mod == '$shiftMod' ]] && mod="SHIFT + SUPER + "
-
-  echo "| ${comment:1} | $mod$key |" >>"$KEYBINDINGS_FILE"
-done

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

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

.github/workflows/update-readme.yml

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

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

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

.gitignore

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

.sops.yaml

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

README.md

@@ -1,119 +1,87 @@
-[//]: # (This file is autogenerated)
-<div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
-</div>
-
-<br>
-
-# Nixy
-
-<br>
-<div align="center">
-    <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=A594FD&labelColor=0b0b0b&style=for-the-badge&logo=starship&logoColor=A594FD">
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=A594FD&labelColor=0b0b0b&style=for-the-badge&logo=github&logoColor=A594FD">
-    </a>
-    <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=0b0b0b&logo=NixOS&logoColor=A594FD&color=A594FD">
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=0b0b0b&colorB=A594FD&logo=unlicense&logoColor=A594FD"/>
-    </a>
-</div>
-<br>
-
-**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
-It's a simple way to manage your system configuration and dotfiles.
-
-I'm Hadi, a french developer, student in infosec, enthusiastic about nix, golang & blockchains.
-This is my own, **keyboard-centric**, and **minimalistic** NixOS configuration.
-I enable vim-like keybindings everywhere I can, and I use a lot of custom scripts to make my life easier.
-
-**Nixy key points:**
-
-- Hypr-ecosystem first (hyprland, hyprlock, hyprpanel, hypridle, ...)
-- Stylix/base16 themes
-- Vim-like keybindings everywhere (hyprland, qutebrowser, nvim, ...)
-
-## Table of Content
-
-- [Table of Content](#table-of-content)
-- [Gallery](#gallery)
-- [Architecture](#architecture)
-  - [🏠 home](#-home)
-  - [🐧 nixos](#-nixos)
-  - [🎨 themes](#-themes)
-  - [💻 hosts](#-hosts)
-- [Installation](#installation)
-- [Documentation](#documentation)
-
-## Gallery
-
-![Nixy helper, peaclock](.github/assets/nixy/1.png)
-![Qutebrowser, pipes, shell](.github/assets/nixy/2.png)
-![nvim, lazygit](.github/assets/nixy/3.png)
-![spotify, cava](.github/assets/nixy/4.png)
-
-## Architecture
-
-### 🏠 home
-
-Those are the dotfiles and configuration files for user-level configuration
-
-**Subfolders:**
-
-- `programs` is a collection of apps configured with home-manager
-- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
-- `system` is some "desktop environment" configuration
-
-### 🐧 nixos
-
-Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
-
-### 🎨 themes
-
-Those are the themes used in the system configuration. The `stylix` folder contains the [stylix](https://github.com/danth/stylix) defined themes, the `var` folder contains the variables not handled by stylix.
-See avaiable themes in [THEMES.md](docs/THEMES.md)
-
-### 💻 hosts
-
-Those are the host-specific configurations.
-Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
-
-## Installation
-
-1. Clone the repo
-
-```sh
-git clone https://github.com/anotherhadi/nixy ~/.config/nixos
-```
-
-2. Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
-3. Add your `hardware-configuration.nix` to your new host's folder
-4. Add your 'nixosConfigurations' inside `flake.nix`
-
-> [!Important]
-> I added few `# CHANGEME` comments in the files to help you find what to change. Be sure to check them up.
-> You can use `rg "CHANGEME"` to find them all with ripgrep.
-
-> [!TIP]
-> When you add new files, don't forget to run `git add .` to add them to the git repository
-
-5. Build the system
-
-```sh
-sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
-```
-
-## Documentation
-
-- [THEMES](docs/THEMES.md): How themes work and how to create your own
-- [SCRIPTS](docs/SCRIPTS.md): Scripts that are available
-- [KEYBINDINGS-HYPRLAND](docs/KEYBINDINGS-HYPRLAND.md): Keybindings available in Hyprland
-- [WALLPAPERS](https://github.com/anotherhadi/nixy-wallpapers): A collection of wallpapers for Nixy.
-
-- [TODO](docs/TODO.md): What's next (feel free to contribute)
-- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
-- [LICENSE](LICENSE): MIT License
+[//]: # (Title: 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.)  
+[//]: # (Author: Hadi)  
+[//]: # (Date: 06/17/24)
+
+<div align="center">
+    <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
+</div>
+
+<br><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=2.0.0&colorA=040409&colorB=a158ff&logo=githubactions&logoColor=a158ff&"/>
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/stargazers">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=starship&logoColor=a158ff">
+    </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><br>
+
+<div align="center">
+    <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" />
+</div>
+
+# Nixy
+
+**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.
+
+## Table of Content
+
+- [Nixy](#nixy)
+  - [Table of Content](#table-of-content)
+  - [Gallery](#gallery)
+  - [Architecture](#architecture)
+  - [Installation](#installation)
+  - [Documentation](#documentation)
+
+## Gallery
+
+![nixy1](docs/src/nixy/1.png)
+![nixy2](docs/src/nixy/2.png)
+![nixy3](docs/src/nixy/3.png)
+
+## Architecture
+
+- 🏠 `home` are the dotfiles and configuration files for the user
+- 💻 `hosts` are the system configuration files
+  - `laptop` is mine
+  - `guest` is a template that you can copy and modify for your own system
+  - `themes` contains all the themes available (see [THEMES.md](docs/THEMES.md))
+  - `shared` are some nix files that you can import (nvidia, prime, fonts, ...)
+- 🤫 `secrets` are the secrets files encrypted with sops
+
+## Installation
+
+```sh
+git clone https://github.com/anotherhadi/nixy ~/.config/nixos
+```
+
+- Change the username in the flake.nix file
+- import the guest configuration instead of the `hosts/laptop` one
+- import your hardware-configuration.nix into the `hosts/guest` folder
+
+```sh
+sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
+```
+
+## 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
+- [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,33 @@
+# APPS
+
+*non-exhaustive list*
+
+| Category       | Software      |
+|----------------|---------------|
+| 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          |
+|                | ...           |

docs/CONTRIBUTING.md

@@ -1,16 +1,10 @@
 # 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!
+Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the `docs/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, ...).
+- Write your changes (new theme, bug fixes, ...).
 - Create a Pull Request against the main branch of Nixy.
-
-> [!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-HYPRLAND.md

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

docs/SCRIPTS.md

@@ -1,98 +1,51 @@
-[//]: # (This file is autogenerated)
-# Scripts
-
-Scripts are located in the 'home/scripts' folder. Home-manager add those in the user's path.
-
-## Brightness
-
-This module provides a set of scripts to control the brightness of the screen.
-
-- `brightness-up` increases the brightness by 5%.
-- `brightness-down` decreases the brightness by 5%.
-- `brightness-set [value]` sets the brightness to the given value.
-- `brightness-change [up|down] [value]` increases or decreases the brightness by the given value.
-
-## Caffeine
-
-Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
-
-- `caffeine-status` - Check if hypridle is running. (0/1)
-- `caffeine-status-icon` - Check if hypridle is running. (icon)
-- `caffeine` - Toggle hypridle.
-
-## Hyprfocus
-
-A simple script to toggle focus on few windows in Hyprland.
-(disable gaps, border, shadow, opacity, etc.)
-
-- `hyprfocus-on` - Enable hyprfocus.
-- `hyprfocus-off` - Disable hyprfocus.
-- `hyprfocus-toggle` - Toggle hyprfocus.
-
-## Hyprpanel
-
-Quick scripts to toggle, reload, hide & show hyprpanel.
-
-- `hyprpanel-toggle` - Toggle hyprpanel (hide/show).
-- `hyprpanel-show` - Show hyprpanel.
-- `hyprpanel-hide` - Hide hyprpanel.
-- `hyprpanel-reload` - Reload hyprpanel.
-
-## Nerdfont FZF
-
-This module provides a script to search for Nerd Fonts icons using fzf.
-
-- `nerdfont-fzf` - Search for Nerd Fonts icons using fzf.
-
-## Night-Shift
-
-Night-Shift is a feature that reduces the amount of blue light emitted by your screen, which can help reduce eye strain and improve sleep quality. This module provides a set of scripts to control Night-Shift on your system.
-It use hyprsunset to control the screen temperature.
-
-- `night-shift-on` activates Night-Shift.
-- `night-shift-off` deactivates Night-Shift.
-- `night-shift` toggles Night-Shift.
-- `night-shift-status` checks if Night-Shift is active. (0/1)
-- `night-shift-status-icon` checks if Night-Shift is active. (icon)
-
-## Nixy
-
-Nixy is a simple script that I use to manage my NixOS system. It's a simple script that provides a menu to rebuild, upgrade, update, collect garbage, clean boot menu, etc. 
-
-- `nixy` - UI wizard to manage the system.
-- `nixy rebuild` - Rebuild the system.
-- `nixy ...` - ... see the script for more commands.
-
-
-
-## OpenVPN
-
-OpenVPN allows you to connect/disconnect quickly to a openVPN server
-
-- `openvpn-up` turn on the vpn
-- `openvpn-down` turn down the vpn
-- `openvpn-toggle` toggle the vpn
-
-## Screenshot
-
-This module provides a script to take screenshots using `grimblast` and `swappy`.
-
-- `screenshot [region|window|monitor] [swappy]` - Take a screenshot of the region, window, or monitor. Optionally, use `swappy` to copy the screenshot to the clipboard.
-
-## Sound
-
-This module provides a set of scripts to control the volume of the default audio sink using `wpctl`.
-
-- `sound-up` increases the volume by 5%.
-- `sound-down` decreases the volume by 5%.
-- `sound-set [value]` sets the volume to the given value.
-- `sound-toggle` toggles the mute state of the default audio sink.
-
-## System
-
-Usefull quick scripts
-
-- `menu` - Open wofi with drun mode. (wofi)
-- `powermenu` - Open power dropdown menu. (wofi)
-- `lock` - Lock the screen. (hyprlock)
-
+# Scripts
+
+## Nix/NixOs shortcuts
+
+- `nixy-edit`
+- `nixy-rebuild`
+- `nixy-update`
+- `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-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 shortcut to compress and extract files.
+
+- `compress` ...
+- `extract` ...

docs/THEMES.md

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

@@ -1,5 +1,10 @@
-# Todolist
-
-feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
-
-- [ ] <https://github.com/isabelroses/dotfiles/blob/main/home/comfy/system/xdg.nix>
+# Todolist
+
+- [ ] Installation script
+- [ ] Themes
+  - [ ] MacOS theme
+- [ ] Make hyprcursor work
+- [ ] Nixvim
+  - [ ] Telescope shortcut for file content
+  - [ ] Markdown snippets
+  - [ ] Make whichkey better

docs/scripts/compress_src_png.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+# Compress png files in ./docs/src
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+for file in ./docs/src/*/*.png; do
+  optipng "$file"
+done

docs/scripts/create_guest_config.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# This script is used to copy my own configuration to the `./hosts/guest` one, and changing some settings
+
+[[ -d "./hosts" ]] || (
+  echo "Folder ./hosts not found"
+  exit 1
+)
+
+LAPTOP_CONFIG="./hosts/laptop"
+GUEST_CONFIG="./hosts/guest"
+
+cp "$LAPTOP_CONFIG/configuration.nix" "$GUEST_CONFIG/configuration.nix"
+cp "$LAPTOP_CONFIG/variables.nix" "$GUEST_CONFIG/variables.nix"
+
+# Remove the NVIDIA driver import
+config=$(cat "$LAPTOP_CONFIG/configuration.nix")
+config=$(echo "$config" | sed 's/..\/shared\/nvidia/# ..\/shared\/nvidia/')
+config=$(echo "$config" | sed 's/..\/shared\/prime/# ..\/shared\/prime/')
+echo "$config" >"$GUEST_CONFIG/configuration.nix"
+
+variables=$(cat "$LAPTOP_CONFIG/variables.nix")
+variables=$(echo "$variables" | sed 's/112569860+anotherhadi@users.noreply.github.com/your_email/')
+variables=$(echo "$variables" | sed 's/hadi/your_username/')
+variables=$(echo "$variables" | sed 's/Hadi/your_username/')
+variables=$(echo "$variables" | sed 's/sops = true/sops = false/')
+variables=$(echo "$variables" | sed 's/nextcloud = true/nextcloud = false/')
+variables=$(echo "$variables" | sed 's/obsidian = true/obsidian = false/')
+echo "$variables" >"$GUEST_CONFIG/variables.nix"

docs/scripts/create_readme.sh

@@ -0,0 +1,14 @@
+#!/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=$(~/go/bin/md-table-of-contents ./docs/src/README_template.md)
+readme_content=$(cat "./docs/src/README_template.md")
+
+echo "${header//\{date\}/$(date '+%D')}" >"$README_FILE"
+echo "${readme_content//\{md_table_of_content\}/$table_of_content}" >>"$README_FILE"

docs/scripts/install.sh

@@ -0,0 +1,10 @@
+# installation script...
+
+# check if on nixos
+# check if ./hosts exist
+# check if gum is installed (dependencie)
+# save path
+# remove .git
+# git init and initial commit
+# create custom configuration
+# save it to ./hosts

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,48 @@
+
+# Nixy
+
+**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.
+
+## Table of Content
+
+{md_table_of_content}
+
+## Gallery
+
+![nixy1](docs/src/nixy/1.png)
+![nixy2](docs/src/nixy/2.png)
+![nixy3](docs/src/nixy/3.png)
+
+## Architecture
+
+- 🏠 `home` are the dotfiles and configuration files for the user
+- 💻 `hosts` are the system configuration files
+  - `laptop` is mine
+  - `guest` is a template that you can copy and modify for your own system
+  - `themes` contains all the themes available (see [THEMES.md](docs/THEMES.md))
+  - `shared` are some nix files that you can import (nvidia, prime, fonts, ...)
+- 🤫 `secrets` are the secrets files encrypted with sops
+
+## Installation
+
+```sh
+git clone https://github.com/anotherhadi/nixy ~/.config/nixos
+```
+
+- Change the username in the flake.nix file
+- import the guest configuration instead of the `hosts/laptop` one
+- import your hardware-configuration.nix into the `hosts/guest` folder
+
+```sh
+sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
+```
+
+## 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
+- [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,34 @@
+[//]: # (Title: 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.)  
+[//]: # (Author: Hadi)  
+[//]: # (Date: {date})
+
+<div align="center">
+    <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
+</div>
+
+<br><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=2.0.0&colorA=040409&colorB=a158ff&logo=githubactions&logoColor=a158ff&"/>
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/stargazers">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=starship&logoColor=a158ff">
+    </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><br>
+
+<div align="center">
+    <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" />
+</div>

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.nix

@@ -7,7 +7,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -16,45 +15,38 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    spicetify-nix = {
-      url = "github:Gerg-L/spicetify-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
+    spicetify-nix.url = "github:the-argus/spicetify-nix";
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprspace = {
-      url = "github:KZDKM/Hyprspace";
-      inputs.hyprland.follows = "hyprland";
-    };
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
-    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
-    stylix.url = "github:danth/stylix";
-    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
-    nur.url = "github:nix-community/NUR";
-    zen-browser.url =
-      "git+https://git.sr.ht/~canasta/zen-browser-flake/"; # updated flake
+    nurpkgs.url = "github:nix-community/NUR";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
-  outputs = inputs@{ nixpkgs, ... }: {
+  outputs = inputs@{ nixpkgs, nur, ... }: {
     nixosConfigurations = {
-      nixy = # CHANGEME: This should match the 'hostname' in your variables.nix file
-        nixpkgs.lib.nixosSystem {
-          system = "x86_64-linux";
-          modules = [
-            {
-              nixpkgs.overlays =
-                [ inputs.hyprpanel.overlay inputs.nur.overlays.default ];
-              _module.args = { inherit inputs; };
-            }
-            inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware
-            inputs.home-manager.nixosModules.home-manager
-            inputs.stylix.nixosModules.stylix
-            ./hosts/laptop/configuration.nix # CHANGEME: change the path to match your host folder
-          ];
-        };
+
+      nixy = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          ./hosts/laptop/configuration.nix
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne
+          inputs.home-manager.nixosModules.home-manager
+          {
+            nixpkgs.overlays = [ nur.overlay ];
+            _module.args = { inherit inputs; };
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users."hadi" = import ./home/laptop.nix; # CHANGE ME
+              extraSpecialArgs = { inherit inputs; };
+            };
+          }
+        ];
+      };
 
     };
   };

home/laptop.nix

@@ -0,0 +1,90 @@
+{ pkgs, config, ... }: {
+
+  imports = [
+    ../hosts/laptop/variables.nix
+
+    # Programs
+    ./programs/btop
+    ./programs/cava
+    ./programs/kitty
+    ./programs/nvim
+    ./programs/qutebrowser
+    ./programs/spicetify
+
+    # Scripts
+    ./scripts # All scripts
+
+    # System
+    ./system/dunst
+    ./system/git
+    ./system/gtk
+    ./system/hyprland
+    ./system/shell
+    ./system/sops/laptop.nix
+    ./system/waybar
+    ./system/wlogout
+    ./system/wofi
+  ];
+
+  home = {
+    inherit (config.var) username;
+    inherit (config.var) homeDirectory;
+
+    packages = with pkgs; [
+      swappy
+      imv
+      discord
+      obsidian
+      xfce.thunar
+      bitwarden
+      vlc
+
+      # Dev
+      go
+      cargo
+      nodejs
+      python3
+      jq
+
+      # Utils
+      fd
+      bc
+      gcc
+      blueman
+      zip
+      unzip
+      xdg_utils
+      wget
+      curl
+      wf-recorder
+      glow
+      nwg-displays
+      wireguard-tools
+      bitwarden-cli
+      optipng
+
+      # Just cool
+      peaclock
+      cbonsai
+      pipes
+      cmatrix
+
+      # Backup
+      vscode
+      tor-browser
+      firefox
+      neovide
+    ];
+
+    # Import wallpapers into $HOME/wallpapers
+    file."wallpapers" = {
+      recursive = true;
+      source = ./wallpapers;
+    };
+
+    stateVersion = "24.05";
+  };
+
+  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

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

home/programs/duckduckgo-colorscheme/default.nix

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

home/programs/kitty/default.nix

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

home/programs/lazygit/default.nix

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

home/programs/nextcloud/default.nix

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

home/programs/nvim/autocmds.nix

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

home/programs/nvim/colorscheme.nix

@@ -0,0 +1,9 @@
+{
+  programs.nixvim = {
+    enable = true;
+    colorschemes.catppuccin = {
+      enable = true;
+      settings = { transparent_background = true; };
+    };
+  };
+}

home/programs/nvim/default.nix

@@ -1,21 +1,30 @@
-# Nixvim is a NixOS module that installs and configures Neovim
 { inputs, ... }: {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
-    ./plugins/lsp.nix
-    ./plugins/tree.nix
+    ./plugins/auto-pairs.nix
+    ./plugins/bufferline.nix
+    ./plugins/lazygit.nix
     ./plugins/telescope.nix
+    ./plugins/nvim-tree.nix
+    ./plugins/lightline.nix
+    ./plugins/git.nix
     ./plugins/cmp.nix
-    ./plugins/ui.nix
-    ./plugins/lualine.nix
-    ./plugins/utils.nix
-    ./plugins/dashboard.nix
-    ./plugins/markdown.nix
-
+    ./plugins/none-ls.nix
+    ./plugins/wilder.nix
+    ./plugins/lsp.nix
+    ./plugins/treesitter.nix
+    ./plugins/toggleterm.nix
+    ./plugins/copilot.nix
+    ./plugins/whichkey.nix
+    ./plugins/alpha.nix
+    ./plugins/keymaps.nix
+    ./plugins/comment.nix
+    ./plugins/oil.nix
+    ./plugins/trouble.nix
+    ./plugins/tmux-navigator.nix
+    ./plugins/noice.nix
+    ./plugins/obsidian.nix
     ./options.nix
-    ./keymaps.nix
-    ./autocmds.nix
+    ./colorscheme.nix
   ];
-
-  programs.nixvim.enable = true;
 }

home/programs/nvim/keymaps.nix

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

home/programs/nvim/options.nix

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

home/programs/nvim/plugins/alpha.nix

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

home/programs/nvim/plugins/auto-pairs.nix

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

home/programs/nvim/plugins/bufferline.nix

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

home/programs/nvim/plugins/cmp.nix

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

home/programs/nvim/plugins/comment.nix

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

home/programs/nvim/plugins/copilot.nix

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

home/programs/nvim/plugins/git.nix

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

home/programs/nvim/plugins/keymaps.nix

@@ -0,0 +1,71 @@
+{
+  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/programs/nvim/plugins/lazygit.nix

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

home/programs/nvim/plugins/lightline.nix

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

home/programs/nvim/plugins/lsp.nix

@@ -7,20 +7,10 @@
         bashls.enable = true;
         clangd.enable = true;
         gopls.enable = true;
-        eslint.enable = true;
-        ts_ls.enable = true;
-        nixd = {
-          enable = true;
-          extraOptions = {
-            expr = "import <nixpkgs> {}";
-            # fix- encoding: https://github.com/nix-community/nixvim/issues/2390
-            offset_encoding = "utf-8";
-          };
-        };
+        nixd.enable = true;
         tailwindcss.enable = true;
         html.enable = true;
         svelte.enable = true;
-        marksman.enable = true;
       };
       keymaps.lspBuf = {
         "gd" = "definition";
@@ -30,25 +20,5 @@
         "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;
-          golines.enable = true;
-          gofumpt.enable = true;
-        };
-      };
-    };
   };
 }

home/programs/nvim/plugins/lualine.nix

@@ -1,30 +0,0 @@
-{
-  programs.nixvim.plugins.lualine = {
-    enable = true;
-    settings = {
-      options.disabled_filetypes.statusline =
-        [ "dashboard" "alpha" "neo-tree" ];
-
-      alwaysDivideMiddle = true;
-      globalstatus = true;
-      ignoreFocus = [ "neo-tree" ];
-      extensions = [ "fzf" ];
-      componentSeparators = {
-        left = "|";
-        right = "|";
-      };
-      sectionSeparators = {
-        left = "█"; # 
-        right = "█"; # 
-      };
-      sections = {
-        lualine_a = [ "mode" ];
-        lualine_b = [ "branch" "diff" "diagnostics" ];
-        lualine_c = [ "filename" ];
-        lualine_x = [ "filetype" ];
-        lualine_y = [ "progress" ];
-        lualine_z = [ ''" " .. os.date("%R")'' ];
-      };
-    };
-  };
-}

home/programs/nvim/plugins/markdown.nix

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

home/programs/nvim/plugins/noice.nix

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

home/programs/nvim/plugins/none-ls.nix

@@ -0,0 +1,20 @@
+{
+  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;
+        shellharden.enable = true;
+        shfmt.enable = true;
+      };
+    };
+  };
+}

home/programs/nvim/plugins/nvim-tree.nix

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

home/programs/nvim/plugins/obsidian.nix

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

home/programs/nvim/plugins/oil.nix

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

home/programs/nvim/plugins/telescope.nix

@@ -1,31 +1,13 @@
-{ config, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  background = "#${config.lib.stylix.colors.base00}";
-  background-alt = "#${config.lib.stylix.colors.base01}";
-in {
-  programs.nixvim = {
-    highlight = {
-      TelescopePromptPrefix.fg = accent;
-      TelescopeSelectionCaret = {
-        fg = accent;
-        bg = background-alt;
-      };
-      TelescopeSelection.bg = background-alt;
-      TelescopePromptTitle = {
-        bg = background;
-        fg = accent;
-      };
-      TelescopePromptNormal.bg = background;
-      TelescopePromptBorder = {
-        bg = background;
-        fg = accent;
-      };
-    };
-    plugins.telescope = {
-      enable = true;
-      extensions.fzf-native = { enable = true; };
-      settings.defaults = { selection_caret = "❚ "; };
+{
+  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/programs/nvim/plugins/tmux-navigator.nix

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

home/programs/nvim/plugins/toggleterm.nix

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

home/programs/nvim/plugins/tree.nix

@@ -1,49 +0,0 @@
-{
-  programs.nixvim = {
-    plugins = {
-      neo-tree.enable = true;
-      oil = {
-        enable = true;
-        settings = {
-          default_file_explorer = false;
-          skip_confirm_for_simple_edits = true;
-          view_options.is_hidden_file = ''
-            function(name, bufnr)
-              return vim.startswith(name, ".") or name == "img"
-            end
-          '';
-          win_options = {
-            concealcursor = "ncv";
-            conceallevel = 3;
-            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";
-          };
-        };
-      };
-    };
-  };
-}

home/programs/nvim/plugins/treesitter.nix

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

home/programs/nvim/plugins/trouble.nix

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

home/programs/nvim/plugins/ui.nix

@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ ctags ];
-
-  programs.nixvim.plugins = {
-    web-devicons.enable = true;
-    noice.enable = true;
-    gitsigns = {
-      enable = true;
-      settings.current_line_blame = false;
-    };
-    trouble.enable = true;
-    bufferline.enable = true;
-  };
-}

home/programs/nvim/plugins/utils.nix

@@ -1,25 +0,0 @@
-{ config, ... }: {
-  programs.nixvim = {
-    highlightOverride = {
-      FloatBorder.fg = "#${config.lib.stylix.colors.base0D}";
-    };
-    nixpkgs.config = { allowUnfree = true; };
-    plugins = {
-      copilot-vim.enable = true;
-      flash.enable = true;
-      tmux-navigator.enable = true;
-      comment.enable = true;
-      nvim-autopairs.enable = true;
-      todo-comments.enable = true;
-      treesitter = {
-        enable = true;
-        nixGrammars = true;
-        settings = {
-          ensure_installed = "all";
-          indent.enable = true;
-          highlight.enable = true;
-        };
-      };
-    };
-  };
-}

home/programs/nvim/plugins/whichkey.nix

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

home/programs/nvim/plugins/wilder.nix

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

home/programs/qutebrowser/default.nix

@@ -1,86 +1,6 @@
-# Qutebrowser is a keyboard-focused browser with a minimal GUI.
-# My homepage is generated using https://github.com/anotherhadi/homepage
-{ pkgs, config, ... }:
-let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  background = "#${config.lib.stylix.colors.base00}";
-  foreground = "#${config.lib.stylix.colors.base05}";
-  muted = "#${config.lib.stylix.colors.base03}";
+{ config, ... }: {
 
-  settings = ''
-    {
-      "config": {
-        "title" : "Welcome Home",
-        "openLinksInNewTab": false,
-        "locale": "fr-FR",
-        "colors": {
-          "primary": "${accent}",
-          "background": "${background}",
-          "foreground": "${foreground}",
-          "muted": "#${muted}"
-        },
-        "folders": [
-          {
-            "name": "Bookmarks",
-            "links": [
-              {"title": "MyNixOs", "url": "https://mynixos.com", "icon": "󱄅"},
-              {"title": "Github", "url": "https://github.com", "icon": ""},
-              {"title": "Proton", "url": "https://mail.proton.me/u/0/inbox", "icon": ""},
-              {"title": "Cloudflare One", "url": "https://one.dash.cloudflare.com/", "icon": ""},
-              {"title": "Chat GPT", "url": "https://chat.openai.com/", "icon": "󰭹"},
-              {"title": "Nixvim", "url": "https://nix-community.github.io/nixvim/", "icon": ""},
-              {"title": "Hyprland Wiki", "url": "https://wiki.hyprland.org/", "icon": "󰖬"},
-              {"title": "Youtube", "url": "https://youtube.com", "icon": "󰗃"},
-              {"title": "Figma", "url": "https://figma.com", "icon": ""},
-              {"title": "Server", "url": "https://home.anotherhadi.com", "icon": ""}
-            ]
-          },
-          {
-            "name": "Work",
-            "links": [
-              {"title": "Outlook", "url": "https://outlook.office.com/mail/", "icon": "󰴢"},
-              {"title": "Office", "url": "https://www.office.com/?auth=2", "icon": "󰏆"},
-              {"title": "Teams", "url": "https://teams.microsoft.com/_", "icon": "󰊻"}
-            ]
-          }
-        ]
-      }
-    }
-  '';
-
-  homepage = pkgs.buildNpmPackage {
-    pname = "homepage";
-    version = "0.0.0";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "anotherhadi";
-      repo = "homepage";
-      rev = "b77d35ed3596eb451bd2ec78063d7cc6e73c773d";
-      hash = "sha256-j/40922kfAh6zqJ4IRYpr66YXNNYsxuXwZ0aiJFJea0=";
-    };
-
-    # npmDepsHash = lib.fakeHash;
-    npmDepsHash = "sha256-bG+CHTq2Rst3JMxsjAC81KhK+G7WwsTVD1eyP87g0z4=";
-
-    buildPhase = ''
-      npm install
-      cp ${
-        pkgs.writeText "src/routes/config.json" settings
-      } src/routes/config.json
-      npm run build
-      mkdir $out
-      mv build $out
-    '';
-
-    meta = {
-      description = "homepage";
-      homepage = "https://github.com/anotherhadi/homepage";
-    };
-  };
-
-in {
-
-  imports = [ ./duckduckgo-colorscheme.nix ];
+  imports = [ ./duckduckgo-colorscheme.nix ./homepage ];
 
   programs.qutebrowser = {
     enable = true;
@@ -98,9 +18,8 @@ in {
     };
 
     quickmarks = {
-      home = "${homepage}/build/index.html";
-      server = "https://home.anotherhadi.com";
-      jack = "https://home.anotherhadi.com";
+      home = "${config.var.homeDirectory}/.config/startpage/index.html";
+      server = "${config.var.homeDirectory}/.config/serverpage/index.html";
       mynixos = "https://mynixos.com";
       github = "https://github.com";
       outlook = "https://outlook.office.com/mail/";
@@ -119,16 +38,102 @@ in {
 
     settings = {
       url = {
-        default_page = "${homepage}/build/index.html";
-        start_pages = [ "${homepage}/build/index.html" ];
+        default_page =
+          "${config.var.homeDirectory}/.config/startpage/index.html";
+        start_pages =
+          [ "${config.var.homeDirectory}/.config/startpage/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%";
@@ -147,7 +152,6 @@ in {
         autoplay = false;
         javascript.clipboard = "access";
         javascript.enabled = true;
-        webgl = true;
         pdfjs = true;
       };
 
@@ -156,7 +160,10 @@ in {
         remove_finished = 0;
       };
 
-      hints = { radius = 1; };
+      hints = {
+        border = "none";
+        radius = 1;
+      };
 
       scrolling = {
         bar = "never";
@@ -177,8 +184,8 @@ in {
 
     keyBindings = {
       normal = {
-        "gh" = "open ${homepage}/build/index.html";
-        "gs" = "open https://home.anotherhadi.com";
+        "gh" = "open ${config.var.homeDirectory}/.config/startpage/index.html";
+        "gs" = "open ${config.var.homeDirectory}/.config/serverpage/index.html";
 
         " p" = "tab-move -";
         " n" = "tab-move +";
@@ -249,7 +256,6 @@ in {
       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,44 +1,36 @@
-# A duckduckgo colorscheme generated for the Stylix theme used.
-{ config, ... }:
-let
-  accent = config.lib.stylix.colors.base0D;
-  background = config.lib.stylix.colors.base00;
-  foreground = config.lib.stylix.colors.base05;
-  background-alt = config.lib.stylix.colors.base01;
-  foreground-alt = config.lib.stylix.colors.base06;
-in {
-  home.file.".duckduckgo-colorscheme.js".text =
-    # js
-    ''
-      // Go to DuckDuckGo settings page, open the console, paste the code and hit enter.
-      // based on https://ddg.codingcodax.dev/
-      // Cookies string for your theme
-      const cookie = '7=${background}; j=${background}; 9=${foreground}; aa=${foreground-alt}; 8=${foreground}; x=${accent}; 21=${background-alt};';
+{ config, ... }: {
+  home.file.".duckduckgo-colorscheme.js".text = ''
+    // Go to DuckDuckGo settings page, open the console, paste the code and hit enter.
+    // based on https://ddg.codingcodax.dev/
+    // Cookies string for your theme
+    const cookie = '7=${config.var.theme.colors.bg}; j=${config.var.theme.colors.bg}; 9=${config.var.theme.colors.fg}; aa=${config.var.theme.colors.fgalt}; 8=${config.var.theme.colors.c7}; x=${config.var.theme.colors.accent}; 21=${config.var.theme.colors.bgalt};';
 
-      // Converts cookie string into formatted JSON
-      const cookieToJSON = (cookieRaw) => {
-        const cookieJson = {};
-        const items = cookieRaw.split(/[ ,]+/);
+    // Converts cookie string into formatted JSON
+    const cookieToJSON = (cookieRaw) => {
+      const cookieJson = {};
+      const items = cookieRaw.split(/[ ,]+/);
 
-        items.forEach((item) => {
-          const parts = item.split('=');
-          cookieJson[parts[0]] = parts[1];
-        });
+      items.forEach((item) => {
+        const parts = item.split('=');
+        cookieJson[parts[0]] = parts[1];
+      });
 
-        return cookieJson;
-      };
+      return cookieJson;
+    };
 
-      // Iterates over JSON, and adds to browser cookie store
-      const setCookies = (cookieJson) => {
-        Object.keys(cookieJson).forEach((key) => {
-          document.cookie = `''${key}=''${cookieJson [ key ]}`;
-        });
-      };
+    // Iterates over JSON, and adds to browser cookie store
+    const setCookies = (cookieJson) => {
+      Object.keys(cookieJson).forEach((key) => {
+        document.cookie = `''${key}=''${cookieJson [ key ]}`;
+      });
+    };
 
-      // Call set cookies, passing in formated cookie data
-      setCookies(cookieToJSON(cookie));
+    alert('The Nixy theme will be applied.');
 
-      // All done, reload page for changes to take effect :)
-      location.reload();
-    '';
+    // Call set cookies, passing in formated cookie data
+    setCookies(cookieToJSON(cookie));
+
+    // All done, reload page for changes to take effect :)
+    location.reload();
+  '';
 }

home/programs/qutebrowser/homepage/default.nix

@@ -0,0 +1,297 @@
+{ 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.var.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.var.theme.colors.bg}; color: #${config.var.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.var.theme.colors.accent};"></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.var.theme.colors.fgalt};"
+
+              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/programs/shell/default.nix

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

home/programs/shell/eza.nix

@@ -1,14 +0,0 @@
-# Eza is a ls replacement
-{
-  programs.eza = {
-    enable = true;
-    icons = "auto";
-
-    extraOptions = [
-      "--group-directories-first"
-      "--no-quotes"
-      "--git-ignore"
-      "--icons=always"
-    ];
-  };
-}

home/programs/shell/fzf.nix

@@ -1,30 +0,0 @@
-# Fzf is a general-purpose command-line fuzzy finder.
-{ config, lib, ... }:
-let
-  accent = "#" + config.lib.stylix.colors.base0D;
-  foreground = "#" + config.lib.stylix.colors.base05;
-  muted = "#" + config.lib.stylix.colors.base03;
-in {
-  programs.fzf = {
-    enable = true;
-    enableZshIntegration = true;
-    colors = lib.mkForce {
-      "fg+" = accent;
-      "bg+" = "-1";
-      "fg" = foreground;
-      "bg" = "-1";
-      "prompt" = muted;
-      "pointer" = accent;
-    };
-    defaultOptions = [
-      "--margin=1"
-      "--layout=reverse"
-      "--border=rounded"
-      "--info='hidden'"
-      "--header=''"
-      "--prompt='/ '"
-      "-i"
-      "--no-bold"
-    ];
-  };
-}

home/programs/shell/tmux.nix

@@ -1,58 +0,0 @@
-# Tmux is a terminal multiplexer that allows you to run multiple terminal sessions in a single window.
-{ pkgs, ... }:
-let
-  Config = pkgs.writeShellScriptBin "Config" ''
-    SESSION="Nixy Config"
-
-    tmux has-session -t "$SESSION" 2>/dev/null
-
-    if [ $? == 0 ]; then
-      tmux attach -t "$SESSION"
-      exit 0
-    fi
-
-    tmux new-session -d -s "$SESSION"
-    tmux send-keys -t "$SESSION" "sleep 0.2 && clear && cd ~/.config/nixos/ && vim" C-m
-
-    tmux new-window -t "$SESSION" -n "nixy"
-    tmux send-keys -t "$SESSION":1 "sleep 0.2 && clear && cd ~/.config/nixos/ && nixy loop" C-m
-
-    tmux new-window -t "$SESSION" -n "lazygit"
-    tmux send-keys -t "$SESSION":2 "sleep 0.2 && clear && cd ~/.config/nixos/ && lazygit" C-m
-
-    tmux select-window -t "$SESSION":0
-    tmux select-pane -t 0
-    tmux attach -t "$SESSION"
-  '';
-in {
-  programs.tmux = {
-    enable = true;
-    mouse = true;
-    shell = "${pkgs.zsh}/bin/zsh";
-    prefix = "C-s";
-    terminal = "kitty";
-    keyMode = "vi";
-
-    extraConfig = ''
-      bind-key h select-pane -L
-      bind-key j select-pane -D
-      bind-key k select-pane -U
-      bind-key l select-pane -R
-
-      set -gq allow-passthrough on
-      bind-key x kill-pane # skip "kill-pane 1? (y/n)" prompt
-
-      bind-key -n C-Tab next-window
-      bind-key -n C-S-Tab previous-window
-      bind-key -n M-Tab new-window
-    '';
-
-    plugins = with pkgs; [
-      tmuxPlugins.vim-tmux-navigator
-      # tmuxPlugins.resurrect
-      tmuxPlugins.sensible
-      tmuxPlugins.tokyo-night-tmux
-    ];
-  };
-  home.packages = [ Config ];
-}

home/programs/shell/zoxide.nix

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

home/programs/shell/zsh.nix

@@ -1,105 +0,0 @@
-# My shell configuration
-{ pkgs, lib, config, ... }:
-let fetch = config.var.theme.fetch; # neofetch, nerdfetch, pfetch
-in {
-
-  home.packages = with pkgs; [ bat ripgrep tldr sesh ];
-
-  home.sessionPath = [ "$HOME/go/bin" ];
-
-  programs.zsh = {
-    enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
-    historySubstringSearch.enable = true;
-
-    initExtraFirst = ''
-      bindkey -e
-      ${if fetch == "neofetch" then
-        pkgs.neofetch + "/bin/neofetch"
-      else if fetch == "nerdfetch" then
-        "nerdfetch"
-      else if fetch == "pfetch" then
-        "echo; ${pkgs.pfetch}/bin/pfetch"
-      else
-        ""}
-
-      function sesh-sessions() {
-        session=$(sesh list -t -c | fzf --height 70% --reverse)
-        [[ -z "$session" ]] && return
-        sesh connect $session
-      }
-
-      zle     -N             sesh-sessions
-      bindkey -M emacs '\es' sesh-sessions
-      bindkey -M vicmd '\es' sesh-sessions
-      bindkey -M viins '\es' sesh-sessions
-    '';
-
-    history = {
-      ignoreDups = true;
-      save = 10000;
-      size = 10000;
-    };
-
-    profileExtra = lib.optionalString (config.home.sessionPath != [ ]) ''
-      export PATH="$PATH''${PATH:+:}${
-        lib.concatStringsSep ":" config.home.sessionPath
-      }"
-    '';
-
-    #NOTE- for btop to show gpu usage 
-    #may want to check the driver version with:
-    #nix path-info -r /run/current-system | grep nvidia-x11
-    #and 
-    #nix search nixpkgs nvidia_x11
-    sessionVariables = {
-      LD_LIBRARY_PATH = lib.concatStringsSep ":" [
-        "${pkgs.linuxPackages_latest.nvidia_x11_beta}/lib" # change the package name according to nix search result
-        "$LD_LIBRARY_PATH"
-      ];
-    };
-
-    shellAliases = {
-      vim = "nvim";
-      vi = "nvim";
-      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";
-      ssh = "kitty +kitten ssh";
-
-      wireguard-import = "nmcli connection import type wireguard file";
-
-      notes =
-        "nvim ~/nextcloud/notes/index.md --cmd 'cd ~/nextcloud/notes' -c ':Telescope find_files'";
-      note = "notes";
-
-      # git
-      g = "lazygit";
-      ga = "git add";
-      gc = "git commit";
-      gcu = "git add . && git commit -m 'Update'";
-      gp = "git push";
-      gpl = "git pull";
-      gs = "git status";
-      gd = "git diff";
-      gco = "git checkout";
-      gcb = "git checkout -b";
-      gbr = "git branch";
-      grs = "git reset HEAD~1";
-      grh = "git reset --hard HEAD~1";
-
-      gaa = "git add .";
-      gcm = "git commit -m";
-    };
-  };
-}

home/programs/spicetify/default.nix

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

home/programs/thunar/default.nix

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

home/programs/zen/default.nix

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

home/scripts/brightness/default.nix

@@ -1,24 +1,21 @@
-# - ## Brightness
-#- 
-#- This module provides a set of scripts to control the brightness of the screen.
-#-
-#- - `brightness-up` increases the brightness by 5%.
-#- - `brightness-down` decreases the brightness by 5%.
-#- - `brightness-set [value]` sets the brightness to the given value.
-#- - `brightness-change [up|down] [value]` increases or decreases the brightness by the given value.
-
 { pkgs, ... }:
 
 let
   increments = "5";
 
   brightness-change = pkgs.writeShellScriptBin "brightness-change" ''
-    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%+
-    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%-
-  '';
+    sleep 0.05
 
-  brightness-set = pkgs.writeShellScriptBin "brightness-set" ''
-    ${pkgs.brightnessctl}/bin/brightnessctl set ''${1-100}%
+    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%+
+    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%-
+
+    brightness_level=$(${pkgs.brightnessctl}/bin/brightnessctl get)
+
+    message="󰃠  Brightness: $brightness_level%"
+
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+                -h int:value:"$brightness_level" \
+                --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
   '';
 
   brightness-up = pkgs.writeShellScriptBin "brightness-up" ''
@@ -30,11 +27,9 @@ let
   '';
 
 in {
-  home.packages = [
-    pkgs.brightnessctl
+  home.packages = with pkgs; [
     brightness-change
     brightness-up
     brightness-down
-    brightness-set
   ];
 }

home/scripts/caffeine/default.nix

@@ -1,33 +1,23 @@
-# - ## Caffeine
-#-
-#- Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
-#-
-#- - `caffeine-status` - Check if hypridle is running. (0/1)
-#- - `caffeine-status-icon` - Check if hypridle is running. (icon)
-#- - `caffeine` - Toggle hypridle.
-
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 let
-  caffeine-status = pkgs.writeShellScriptBin "caffeine-status" ''
-    [[ $(pidof "hypridle") ]] && echo "0" || echo "1"
-  '';
+  homedir = config.home.homeDirectory;
 
-  caffeine-status-icon = pkgs.writeShellScriptBin "caffeine-status-icon" ''
-    [[ $(pidof "hypridle") ]] && echo "󰾪" || echo "󰅶"
+  caffeine-status = pkgs.writeShellScriptBin "caffeine-status" ''
+    [[ -f /tmp/caffeine ]] && echo "active" || echo "inactive"
   '';
 
   caffeine = pkgs.writeShellScriptBin "caffeine" ''
-    if [[ $(pidof "hypridle") ]]; then
-      systemctl --user stop hypridle.service
-      title="󰅶  Caffeine Activated"
-      description="Caffeine is now active! Your screen will not turn off automatically."
+    if [[ -f /tmp/caffeine ]]; then
+      rm /tmp/caffeine
+      ${pkgs.hyprland}/bin/hyprctl dispatch exec ${pkgs.hypridle}/bin/hypridle
+      message="󰾪  Caffeine Deactivated"
     else
-      systemctl --user start hypridle.service
-      title="󰾪  Caffeine Deactivated"
-      description="Caffeine is now deactivated! Your screen will turn off automatically."
+      touch /tmp/caffeine
+      pkill hypridle
+      message="󰅶  Caffeine Activated"
     fi
-
-    notif "caffeine" "$title" "$description"
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
   '';
 
-in { home.packages = [ caffeine-status caffeine caffeine-status-icon ]; }
+in { home.packages = with pkgs; [ caffeine-status caffeine ]; }

home/scripts/compress/default.nix

@@ -0,0 +1,21 @@
+# From https://github.com/Frost-Phoenix/nixos-config
+{ pkgs, ... }:
+let
+  compress = pkgs.writeShellScriptBin "compress" ''
+    if (( $# == 1 )) then
+        # echo -ne "Archive name: "
+        # read name
+        # tar -cvzf "$name.tar.gz" $1
+        tar -cvzf "$1.tar.gz" $1
+    else
+        echo "Wrong number of arguments..."
+    fi
+  '';
+  extract = pkgs.writeShellScriptBin "extract" ''
+     for i in "$@" ; do
+        tar -xvzf $i
+        break
+    done 
+  '';
+
+in { home.packages = with pkgs; [ compress extract ]; }

home/scripts/default.nix

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

home/scripts/hyprfocus/default.nix

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

home/scripts/hyprpanel/default.nix

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

home/scripts/misc/default.nix

@@ -0,0 +1,30 @@
+{ pkgs, config, ... }:
+
+let
+  homedir = config.home.homeDirectory;
+
+  menu = pkgs.writeShellScriptBin "menu" ''
+    if pgrep wofi; then
+    	pkill wofi
+    else
+    	wofi --show drun
+    fi
+  '';
+
+  powermenu = pkgs.writeShellScriptBin "powermenu" ''
+    if pgrep wlogout; then
+    	pkill wlogout
+    else
+      ${pkgs.wlogout}/bin/wlogout
+    fi
+  '';
+
+  wireguard-import = pkgs.writeShellScriptBin "wireguard-import" ''
+    nmcli connection import type wireguard file "$1"
+  '';
+
+  vault = pkgs.writeShellScriptBin "vault" ''
+    nvim $HOME/Nextcloud/obsidian
+  '';
+
+in { home.packages = with pkgs; [ menu wireguard-import powermenu vault ]; }

home/scripts/nerdfont-fzf/default.nix

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

home/scripts/nerdfont_fzf/default.nix

@@ -0,0 +1,35 @@
+{ pkgs, config, ... }:
+let
+  homedir = config.home.homeDirectory;
+
+  nerdfont-fzf = pkgs.writeShellScriptBin "nerdfont-fzf" ''
+    # Dependencies: jq, fzf, wl-copy, wget
+    icons=$(jq -r 'to_entries[] | "\(.key):\(.value.char)"' "${homedir}/.config/nerdfont_glyphnames.json" | awk -F: '{print "\033[95m "$2" \033[0m "$1}')
+    fzf_result=$(echo "$icons" | fzf --ansi --border none | awk '{print $1}')
+    if [ -z "$fzf_result" ]; then
+      echo "No icon selected"
+      exit 1
+    fi
+
+    echo "Copied to clipboard: $fzf_result"
+    echo "Paste it to close the window"
+    ${pkgs.wl-clipboard}/bin/wl-copy -o "$fzf_result" # wait for paste before exiting.. not cool
+  '';
+
+  nerdfont-fzf-fetch = pkgs.writeShellScriptBin "nerdfont-fzf-fetch" ''
+    wget "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/glyphnames.json" -O "glyphnames.json" || exit 1
+    jq 'del(.METADATA)' "glyphnames.json"
+  '';
+
+  nerdfont-popup = pkgs.writeShellScriptBin "nerdfont-popup" ''
+    ${pkgs.kitty}/bin/kitty --class floating -o font_size=18 zsh -c nerdfont-fzf 2>/dev/null
+  '';
+
+in {
+  home.packages = with pkgs; [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
+
+  xdg.configFile."nerdfont_glyphnames.json" = {
+    source = ./nerdfont_glyphnames.json;
+  };
+
+}

home/scripts/night-shift/default.nix

@@ -1,73 +1,20 @@
-# - ## Night-Shift
-#-
-#- Night-Shift is a feature that reduces the amount of blue light emitted by your screen, which can help reduce eye strain and improve sleep quality. This module provides a set of scripts to control Night-Shift on your system.
-#- It use hyprsunset to control the screen temperature.
-#-
-#- - `night-shift-on` activates Night-Shift.
-#- - `night-shift-off` deactivates Night-Shift.
-#- - `night-shift` toggles Night-Shift.
-#- - `night-shift-status` checks if Night-Shift is active. (0/1)
-#- - `night-shift-status-icon` checks if Night-Shift is active. (icon)
-{ pkgs, ... }:
+{ pkgs, config, ... }:
+
 let
-  value = "4500"; # Default value for night-shift temperature
+  homedir = config.home.homeDirectory;
+  default = "4000";
 
-  night-shift-on = pkgs.writeShellScriptBin "night-shift-on"
-    # bash 
-    ''
-      ${pkgs.hyprsunset}/bin/hyprsunset -t ${value} &
-      title="󰖔  Night-Shift Activated"
-      description="Night-Shift is now activated! Your screen will be warmer and easier on the eyes."
+  night-shift-on = pkgs.writeShellScriptBin "night-shift-on" ''
+    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.wlsunset}/bin/wlsunset -t ${default}"
+    message="󰖔  Night-Shift Activated"
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+  '';
+  night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
+    pkill wlsunset
+    message="󰖔  Night-Shift Deactivated"
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+  '';
 
-      notif "night-shift" "$title" "$description"
-    '';
-
-  night-shift-off = pkgs.writeShellScriptBin "night-shift-off"
-    # bash 
-    ''
-      pkill hyprsunset
-      title="󰖕  Night-Shift Deactivated"
-      description="Night-Shift is now deactivated! Your screen will return to normal."
-
-      notif "night-shift" "$title" "$description"
-    '';
-
-  night-shift = pkgs.writeShellScriptBin "night-shift"
-    # bash
-    ''
-      if pidof "hyprsunset"; then
-        night-shift-off
-      else
-        night-shift-on
-      fi
-    '';
-
-  night-shift-status = pkgs.writeShellScriptBin "night-shift-status"
-    # bash
-    ''
-      if pidof "hyprsunset"; then
-        echo "1"
-      else
-        echo "0"
-      fi
-    '';
-
-  night-shift-status-icon = pkgs.writeShellScriptBin "night-shift-status-icon"
-    # bash
-    ''
-      if pidof "hyprsunset"; then
-          echo "󰖔"
-        else
-          echo "󰖕"
-        fi
-    '';
-in {
-  home.packages = [
-    pkgs.hyprsunset
-    night-shift-on
-    night-shift-off
-    night-shift
-    night-shift-status
-    night-shift-status-icon
-  ];
-}
+in { home.packages = with pkgs; [ night-shift-on night-shift-off ]; }

home/scripts/nixy/default.nix

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

home/scripts/notification/default.nix

@@ -1,26 +0,0 @@
-{ pkgs, ... }:
-let
-  notif = pkgs.writeShellScriptBin "notif" # bash
-    ''
-      # Shell script to send custom notifications
-      # Usage: notif "sender_id" "message" ["description"]
-      NOTIF_FOLDER="/tmp/notif"
-      sender_id=$1 # To overwrite existing notifications
-      title=$2
-      description=$3
-
-      [[ -d "$NOTIF_FOLDER" ]] || mkdir $NOTIF_FOLDER
-      [[ -f "$NOTIF_FOLDER/$sender_id" ]] || (echo "0" > "$NOTIF_FOLDER/$sender_id")
-
-      old_notification_id=$(cat "$NOTIF_FOLDER/$sender_id")
-      [[ -z "$old_notification_id" ]] && old_notification_id=0
-
-       ${pkgs.libnotify}/bin/notify-send \
-      --replace-id="$old_notification_id" --print-id \
-      --app-name="$sender_id" \
-      "$title" \
-      "$description" \
-      > "$NOTIF_FOLDER/$sender_id"
-    '';
-
-in { home.packages = [ pkgs.libnotify notif ]; }

home/scripts/openvpn/default.nix

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

home/scripts/screenshot/default.nix

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