Release v2.4.0

Former-commit-id: 7ddff66f00

.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,124 +0,0 @@
-<div align="center">
-    <img alt="nixy logo" 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 simplifies and unifies** the Hyprland ecosystem with a modular, easily
-customizable setup. It provides a structured way to manage your system
-configuration and dotfiles with minimal effort. It includes _home-manager_,
-_secrets_, and _custom theming_ all in one place.
-
-**Features:**
-
-- 💻 Hyprland & Caelestia: Preconfigured Hyprland ecosystem with Caelestia-shell (Ty to both projects!)
-- 🎨 Consistent Theming: Base16 & Stylix-powered themes
-- ⌨️ Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
-
-## Table of Content
-
-{md_table_of_content}
-
-## Screenshots
-
-![Home](.github/assets/rose-pine/home.png)
-![Flake & Spotify](.github/assets/rose-pine/flake-spotify.png)
-![Browser and notification center](.github/assets/rose-pine/browser-and-notifications.png)
-
-## Architecture
-
-### 🏠 /home (User-level configuration)
-
-Contains **dotfiles and settings** that apply to your user environment.
-
-**Subfolders:**
-
-- `programs` is a collection of apps configured with home-manager
-- `system` is some "desktop environment" configuration
-
-### 🐧 /nixos
-
-Those are the system-level configurations. (audio, bluetooth, gpu, bootloader,
-...)
-
-### 🎨 /themes
-
-This folder contains all system themes. Mainly
-[stylix](https://stylix.danth.me/) configurations. Check out the available
-themes and learn how to create your own in [THEMES.md](docs/THEMES.md)
-
-### 💻 /hosts
-
-This directory contains host-specific configurations. Each host includes:
-
-- `configuration.nix` for system-wide settings
-- `home.nix` for user-level configuration
-- `variables.nix` for global variables
-- `secrets/` for sensitive data
-
-### 🖥️ /server-modules
-
-This folder contains server-related nixos modules. (bitwarden, nextcloud, ...)
-
-## Installation
-
-1. [Fork](https://github.com/anotherhadi/nixy/fork) this repo and clone it to
-   your system:
-
-```sh
-git clone https://github.com/anotherhadi/nixy ~/.config/nixos
-```
-
-2. Copy the `hosts/laptop` folder, rename it to match your system’s hostname,
-   and update `variables.nix` with your machine’s settings.
-3. Copy your `hardware-configuration.nix` into your new host's folder to ensure
-   proper hardware support.
-4. Register your new host in `flake.nix` by adding it under nixosConfigurations.
-
-> [!IMPORTANT]
-> `# CHANGEME` comments are placed throughout the config to
-> indicate necessary modifications. Use the following command to quickly locate
-> them:
->
-> ```sh
-> rg "CHANGEME" ~/.config/nixos
-> ```
-
-> [!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
-
-- [SERVER](docs/SERVER.md): Check out the server documentation
-- [THEMES](docs/THEMES.md): How themes work and how to create your own
-- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome
-  collection of wallpapers
-
-- [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\}/A89AD1}
-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/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

.gitignore

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

.sops.yaml

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

README.md

@@ -1,6 +1,11 @@
-[//]: # (This file is autogenerated)
+[//]: # (Title: Nixy)  
+[//]: # (Description: Nixy is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
+[//]: # (Author: Hadi)  
+[//]: # (Date: 09/04/24)
+[//]: # (Version: v2.3.0)
+
 <div align="center">
-    <img alt="nixy logo" src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
+    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
 </div>
 
 <br>
@@ -9,115 +14,80 @@
 
 <br>
 <div align="center">
+    <a href="https://github.com/anotherhadi/nixy">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=v2.3.0&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
+    </a>
     <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=A89AD1&labelColor=0b0b0b&style=for-the-badge&logo=starship&logoColor=A89AD1">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=starship&logoColor=89b4fa">
     </a>
     <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=A89AD1&labelColor=0b0b0b&style=for-the-badge&logo=github&logoColor=A89AD1">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=github&logoColor=89b4fa">
     </a>
     <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=0b0b0b&logo=NixOS&logoColor=A89AD1&color=A89AD1">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=181825&logo=NixOS&logoColor=89b4fa&color=89b4fa">
     </a>
     <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=0b0b0b&colorB=A89AD1&logo=unlicense&logoColor=A89AD1"/>
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=181825&colorB=89b4fa&logo=unlicense&logoColor=89b4fa"/>
     </a>
 </div>
 <br>
 
-**Nixy simplifies and unifies** the Hyprland ecosystem with a modular, easily
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
-customizable setup. It provides a structured way to manage your system
+It's a simple way to manage your system configuration and dotfiles.
-configuration and dotfiles with minimal effort. It includes _home-manager_,
-_secrets_, and _custom theming_ all in one place.
-
-**Features:**
-
-- 💻 Hyprland & Caelestia: Preconfigured Hyprland ecosystem with Caelestia-shell (Ty to both projects!)
-- 🎨 Consistent Theming: Base16 & Stylix-powered themes
-- ⌨️ Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
 
 ## Table of Content
 
   - [Table of Content](#table-of-content)
-- [Screenshots](#screenshots)
+  - [Gallery](#gallery)
   - [Architecture](#architecture)
-  - [🏠 /home (User-level configuration)](#-home-user-level-configuration)
+    - [🏠 `home`](#-home)
-  - [🐧 /nixos](#-nixos)
+    - [💻 `hosts`](#-hosts)
-  - [🎨 /themes](#-themes)
-  - [💻 /hosts](#-hosts)
-  - [🖥️ /server-modules](#-server-modules)
   - [Installation](#installation)
   - [Documentation](#documentation)
 
-## Screenshots
+## Gallery
 
-![Home](.github/assets/rose-pine/home.png)
+![nixy1](docs/src/nixy/1.png)
-![Flake & Spotify](.github/assets/rose-pine/flake-spotify.png)
+![nixy2](docs/src/nixy/2.png)
-![Browser and notification center](.github/assets/rose-pine/browser-and-notifications.png)
+![nixy3](docs/src/nixy/3.png)
 
 ## Architecture
 
-### 🏠 /home (User-level configuration)
+### 🏠 `home`
 
-Contains **dotfiles and settings** that apply to your user environment.
+Those are the dotfiles and configuration files for user-level configuration
 
 **Subfolders:**
 
 - `programs` is a collection of apps configured with home-manager
+- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
 - `system` is some "desktop environment" configuration
+- `wallpapers` are... wallpapers
 
-### 🐧 /nixos
+### 💻 `hosts`
 
-Those are the system-level configurations. (audio, bluetooth, gpu, bootloader,
+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.
 
-### 🎨 /themes
+**Subfolders:**
 
-This folder contains all system themes. Mainly
+- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
-[stylix](https://stylix.danth.me/) configurations. Check out the available
+- 📦 `modules` are the nix modules that you can import
-themes and learn how to create your own in [THEMES.md](docs/THEMES.md)
+- `laptop` is my configuration for my laptop with Nvidia that you can copy
-
+- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)
-### 💻 /hosts
-
-This directory contains host-specific configurations. Each host includes:
-
-- `configuration.nix` for system-wide settings
-- `home.nix` for user-level configuration
-- `variables.nix` for global variables
-- `secrets/` for sensitive data
-
-### 🖥️ /server-modules
-
-This folder contains server-related nixos modules. (bitwarden, nextcloud, ...)
 
 ## Installation
 
-1. [Fork](https://github.com/anotherhadi/nixy/fork) this repo and clone it to
-   your system:
-
 ```sh
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```
 
-2. Copy the `hosts/laptop` folder, rename it to match your system’s hostname,
+- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
-   and update `variables.nix` with your machine’s settings.
+- Add your `hardware-configuration.nix` to your new host's folder
-3. Copy your `hardware-configuration.nix` into your new host's folder to ensure
+- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
-   proper hardware support.
-4. Register your new host in `flake.nix` by adding it under nixosConfigurations.
 
-> [!IMPORTANT]
+> [!NOTE]
-> `# CHANGEME` comments are placed throughout the config to
+> When you add new files, don't forget to run `git add .` to add them to the git repository
-> indicate necessary modifications. Use the following command to quickly locate
-> them:
->
-> ```sh
-> rg "CHANGEME" ~/.config/nixos
-> ```
-
-> [!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
@@ -125,10 +95,12 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 
 ## Documentation
 
-- [SERVER](docs/SERVER.md): Check out the server documentation
+- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
-- [THEMES](docs/THEMES.md): How themes work and how to create your own
+- [APPS.md](docs/APPS.md): Which apps are installed
-- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome
+- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
-  collection of wallpapers
+- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
+- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
 
-- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
+- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
+- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License

docs/APPS.md

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

docs/CONTRIBUTING.md

@@ -1,16 +1,19 @@
 # Contributing to Nixy
 
-Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the issues!
+Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the [TODO.md](./TODO.md) file!
 
 The process is straight-forward.
 
 - Read [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#best-practices-for-faster-reviews) by Kubernetes (but skip step 0 and 1)
 - Fork Nixy [git repository](https://github.com/anotherhadi/nixy).
-- Write your changes (new theme, bug fixes, issues fix, ...).
+- Write your changes (new theme, bug fixes, task in to-do, ...).
 - Create a Pull Request against the main branch of Nixy.
 
 > [!TIP]
-> To update the README, change the `./.github/assets/README_template.md`
+> When wallpapers are added, run `./docs/scripts/compress_png.sh` and `./docs/scripts/create_preview_wallpapers.sh`
+
+> [!TIP]
+> To update the README, change the `./docs/src/README_template.md` and run `./docs/scripts/create_readme.sh`
 
 > [!IMPORTANT]
 > Don't push your host's folder

docs/KEYBINDINGS.md

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

docs/SCRIPTS.md

@@ -0,0 +1,55 @@
+# Scripts
+
+Scripts are located in the `home/scripts` folder. Home-manager add those in the user's path.
+
+## Nix/NixOs shortcuts
+
+> [!TIP]
+> The `hostname` variable in `hosts/yourhost/variables.nix` should be also the name of the `nixosConfiguration` in `flake.nix` file.
+
+- `nixy` # UI
+- `nixy rebuild`
+- `nixy update`
+- `nixy upgrade`
+- `nixy gc` # garbage collection
+- `nixy cb` # clean boot menu
+
+## Brightness control
+
+- `brightness-up`
+- `brightness-down`
+- `brightness-set [value]`
+- `brightness-change [up/down] <increment>`
+
+## Sound control
+
+- `sound-up`
+- `sound-down`
+- `sound-toggle`
+- `sound-set [value]`
+- `sound-change [up/down/mute] <increment>`
+
+## Caffeine
+
+Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
+
+- `caffeine` # Toggle caffeine
+- `caffeine-status` # Return 1/0
+- `caffeine-status-icon` # Return 󰅶/󰾪
+
+## Night-Shift
+
+Blue light filter, using wlsunset
+
+- `night-shift` # Toggle night shift
+- `night-shift-status` # Return 1/0
+- `night-shift-status-icon` # Return 󰖕/󰖔
+- `night-shift-on`
+- `night-shift-off`
+
+## Nerdfont FZF
+
+Nerdfont fzf is a quick way to search for nerdfont icons locally.
+It will copy the selected icon to the clipboard.
+
+- `nerdfont-fzf`

docs/SERVER.md

@@ -1,53 +0,0 @@
-# SERVER
-
-> Update in comming. Early 2026
-
-## Overview
-
-This document describes the architecture and setup of the self-hosted **NixOS server**, which is securely accessible via **Tailscale**. The server is designed for private, secure, and easily manageable self-hosting of various services.
-
-![server dashboard](../.github/assets/server_dashboard.png)
-
-## **Why This Setup?**
-
-- **Private & Secure**: Services are only accessible through Tailscale, preventing exposure to the public internet.
-- **Domain-based Access**: A custom domain (`example.org`) maps to the server's Tailscale IP, making service access simple and consistent.
-- **Automatic SSL Certificates**: Using DNS-01 challenges, valid SSL certificates are generated even though the services are not publicly exposed.
-- **Modular & Declarative**: Everything is managed through NixOS modules, ensuring reproducibility and easy configuration.
-
-## **Self-Hosted Services**
-
-The server hosts several key applications:
-
-### **Core Infrastructure**
-
-- **NGINX**: Reverse proxy for routing traffic to services via `example.org`.
-
-### **Networking & Security**
-
-- **AdGuard Home**: A self-hosted DNS ad blocker for network-wide ad and tracker filtering.
-
-### **Monitoring & Storage**
-
-- **Glance**: An awesome dashboard! (See the screenshot above)
-
-### **Media & Content Management**
-
-- **Arr Stack (Radarr, Sonarr, etc.)**: Automated media management tools for handling movies and TV shows. (legaly ofc)
-
-## **How It Works**
-
-1. **Domain Configuration**
-   - `example.org` is pointed to the Tailscale IP of the server. (cloudflare A record, not proxied)
-   - This allows for easy access without exposing services to the internet.
-
-2. **SSL Certificate Generation**
-   - Certificates are obtained using a **DNS-01 challenge**, verifying domain ownership without requiring public access.
-
-3. **NGINX Reverse Proxy**
-   - Routes incoming requests from `*.example.org` to the correct internal service.
-   - Ensures SSL termination and secure connections.
-
-4. **Access Control**
-   - Only devices within the Tailscale network can reach the services.
-   - Firewall rules restrict access further based on necessity.

docs/THEMES.md

@@ -1,17 +1,20 @@
 # Themes
 
-Themes are defined in `themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
+Themes are defined in `hosts/themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
 You can change the selected theme by changing the import statement of your host's variables.nix file.
 
+> [!TIP]
+> To apply the theme to DuckDuckGo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`
+
 ## Create your theme
 
 Create a copy of one of the existing themes and change the variables.
-Wallpapers are loaded from the [hadi's awesome-wallpapers](https://github.com/anotherhadi/awesome-wallpapers) repo.
+Wallpapers are loaded from the `home/wallpapers` folder.
 
 ## Gallery
 
-### Rose-pine
+### Nixy
 
-![Home](.github/assets/rose-pine/home.png)
+![nixy1](src/nixy/1.png)
-![Flake & Spotify](.github/assets/rose-pine/flake-spotify.png)
+![nixy2](src/nixy/2.png)
-![Browser and notification center](.github/assets/rose-pine/browser-and-notifications.png)
+![nixy3](src/nixy/3.png)

docs/TODO.md

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

docs/WALLPAPERS.md

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

docs/scripts/compress_png.sh

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

docs/scripts/create_preview_wallpapers.sh

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

docs/scripts/create_readme.sh

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

docs/scripts/keybindings_to_markdown.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+# A script to parse the Hyprland configuration to store keybindings in a table
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+KEYBINDINGS_FILE="./docs/KEYBINDINGS.md"
+
+function getList() {
+  content=$1
+  name=$2
+  list_start=$(echo "$content" | sed "/$name = \[/!d;=;Q")
+  list=$(echo "$content" | tail +"$list_start")
+  list_end=$(echo "$list" | sed '/\]/!d;=;Q')
+  list=$(echo "$list" | head -n"$list_end")
+
+  echo "$list"
+}
+
+[[ -f "./home/system/hyprland/default.nix" ]] || (echo "File ./home/system/hyprland/default.nix not found" && exit 1)
+
+config=$(cat "./home/system/hyprland/default.nix")
+
+# Bind
+bind=$(getList "$config" "bind")
+# Bindm (mouse)
+bindm=$(getList "$config" "bindm")
+# Bindl (lock)
+bindl=$(getList "$config" "bindl")
+# Bindle (lock, repetition)
+bindle=$(getList "$config" "bindle")
+
+# Join the lists:
+keybindings=$(echo -e "$bind\n$bindm\n$bindl\n$bindle" | grep '"')
+
+echo "# Keybindings" >"$KEYBINDINGS_FILE"
+echo "" >>"$KEYBINDINGS_FILE"
+echo "The list of the keybindings working on Hyprland:" >>"$KEYBINDINGS_FILE"
+echo "" >>"$KEYBINDINGS_FILE"
+
+echo "| Description | Keybinding |" >>"$KEYBINDINGS_FILE"
+echo "| -- | -- |" >>"$KEYBINDINGS_FILE"
+echo "| Switch Workspace | SUPER + {Number} |" >>"$KEYBINDINGS_FILE"
+echo "| Move app to Workspace | SHIFT + SUPER + {Number} |" >>"$KEYBINDINGS_FILE"
+echo "$keybindings" | while read line; do
+  comment=$(echo "$line" | cut -d\# -f2)
+  line=$(echo "$line" | cut -d\# -f1)
+  line=${line:1:${#line}-3}
+  mod=$(echo "$line" | cut -d, -f1)
+  key=$(echo "$line" | cut -d, -f2)
+  dispatcher=$(echo "$line" | cut -d, -f3)
+  params=$(echo "$line" | cut -d, -f4)
+
+  [[ $mod == '$mod' ]] && mod="SUPER + "
+  [[ $mod == '$shiftMod' ]] && mod="SHIFT + SUPER + "
+
+  echo "| $comment | $mod$key |" >>"$KEYBINDINGS_FILE"
+done
+
+pandoc -t commonmark_x "$KEYBINDINGS_FILE" -o "/tmp/keybindings.md"
+mv "/tmp/keybindings.md" "$KEYBINDINGS_FILE"

docs/scripts/new_tag.sh

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

docs/scripts/take_rice_screenshot.sh

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

docs/src/README_template.md

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

docs/src/header.md

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

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

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

flake.nix

@@ -1,70 +1,63 @@
 {
   # https://github.com/anotherhadi/nixy
   description = ''
-    Nixy simplifies and unifies the Hyprland ecosystem with a modular, easily customizable setup.
+    Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place.
-    It provides a structured way to manage your system configuration and dotfiles with minimal effort.
+    It's a simple way to manage your system configuration and dotfiles.
   '';
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    stylix.url = "github:danth/stylix";
-    nixcord.url = "github:kaylorben/nixcord";
-    sops-nix.url = "github:Mic92/sops-nix";
-    nvf.url = "github:notashelf/nvf";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    caelestia-shell = {
+    nixvim = {
-      url = "github:caelestia-dots/shell";
+      url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    caelestia-cli = {
-      url = "github:caelestia-dots/cli";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
     spicetify-nix = {
       url = "github:Gerg-L/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    # Server
+    sops-nix = {
-    eleakxir.url = "github:anotherhadi/eleakxir";
+      url = "github:Mic92/sops-nix";
-    nixarr.url = "github:rasmus-kirk/nixarr";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
   };
 
   outputs = inputs@{ nixpkgs, ... }: {
     nixosConfigurations = {
-      nixy =
+      nixy = nixpkgs.lib.nixosSystem { # CHANGEME
-        # CHANGEME: This should match the 'hostname' in your variables.nix file
+        system = "x86_64-linux";
-        nixpkgs.lib.nixosSystem {
         modules = [
           {
-              nixpkgs.overlays = [];
+            nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
-              _module.args = {
+            _module.args = { inherit inputs; };
-                inherit inputs;
-              };
           }
-            inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
           inputs.home-manager.nixosModules.home-manager
-            inputs.stylix.nixosModules.stylix
+          ./hosts/laptop/configuration.nix # CHANGEME
-            ./hosts/laptop/configuration.nix # CHANGEME: change the path to match your host folder
         ];
       };
-      # Jack is my server
+
       jack = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
         modules = [
           { _module.args = { inherit inputs; }; }
-          inputs.home-manager.nixosModules.home-manager
-          inputs.stylix.nixosModules.stylix
           inputs.sops-nix.nixosModules.sops
-          inputs.nixarr.nixosModules.default
+          inputs.home-manager.nixosModules.home-manager
-          inputs.eleakxir.nixosModules.eleakxir
           ./hosts/server/configuration.nix
         ];
       };
+
     };
   };
 }

home/programs/btop/default.nix

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

home/programs/cava/default.nix

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

home/programs/discord/default.nix

@@ -1,9 +0,0 @@
-# Discord is a popular chat application.
-{inputs, ...}: {
-  imports = [inputs.nixcord.homeModules.nixcord];
-
-  programs.nixcord = {
-    enable = true;
-    config = {frameless = true;};
-  };
-}

home/programs/fetch/default.nix

@@ -1,2 +1 @@
-# Import all fetch scripts
 { imports = [ ./neofetch ./nerdfetch ]; }

home/programs/fetch/neofetch/default.nix

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

home/programs/fetch/nerdfetch/default.nix

@@ -1,6 +1,5 @@
-# Nerdfetch, a simple system info script written in bash
+{ pkgs, config, ... }:
-# Source: https://github.com/ThatOneCalculator/NerdFetch
+let
-{pkgs, ...}: let
   nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''
           ostype="$(uname)"
 
@@ -196,7 +195,9 @@
           flatpak) packages="$(flatpak list --app | wc -l)" ;;
           brew) packages="$(printf '%s\n' "$(brew --cellar)/"* | wc -l)" ;;
           port) packages="$(port installed | wc -l)" ;;
-          dpkg-query) packages="$(dpkg-query -f '${"binary:Package"}\n' -W | wc -l)" ;;
+          dpkg-query) packages="$(dpkg-query -f '${
+            "binary:Package"
+          }\n' -W | wc -l)" ;;
           rpm) packages="$(rpm -qa --last | wc -l)" ;;
           yum) packages="$(yum list installed | wc -l)" ;;
           dnf) packages="$(dnf list installed | wc -l)" ;;
@@ -344,9 +345,9 @@
 
           ## USER VARIABLES -- YOU CAN CHANGE THESE
 
-          lc="$reset$bold$magenta" # labels
+          lc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
-          nc="$reset$bold$magenta" # labels
+          nc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
-          hn="$reset$bold$magenta" # labels
+          hn="$reset$bold''$${config.var.theme.colors.accentName}" # labels
           ic="$reset$white"          # info
           c0="$reset$grey"           # first color
           c1="$reset$white"          # second color
@@ -364,4 +365,5 @@
         ''${c2}  \/''${c0}-____''${c2}\/''${reset}   ''${lc}''${ci}  ''${red}███''${green}███''${yellow}███''${blue}███''${magenta}███''${cyan}███''${reset}
         """
   '';
+
 in { home.packages = [ nerdfetch ]; }

home/programs/ghostty/default.nix

@@ -1,22 +0,0 @@
-{
-  programs.ghostty = {
-    enable = true;
-    installVimSyntax = true;
-    enableZshIntegration = true;
-    settings = {
-      window-padding-x = 10;
-      window-padding-y = 10;
-      keybind = [
-        "ctrl+j=goto_split:left"
-        "ctrl+i=goto_split:up"
-        "ctrl+k=goto_split:down"
-        "ctrl+l=goto_split:right"
-        "shift+ctrl+j=new_split:left"
-        "shift+ctrl+i=new_split:up"
-        "shift+ctrl+k=new_split:down"
-        "shift+ctrl+l=new_split:right"
-        "shift+ctrl+tab=new_tab"
-      ];
-    };
-  };
-}

home/programs/git/default.nix

@@ -1,10 +1,8 @@
-# Git configuration
+{ config, ... }: {
-{config, ...}: let
-  username = config.var.git.username;
-  email = config.var.git.email;
-in {
   programs.git = {
     enable = true;
+    userName = config.var.git.username;
+    userEmail = config.var.git.email;
     ignores = [
       ".cache/"
       ".DS_Store"
@@ -17,14 +15,11 @@ in {
       "result"
       "result-*"
     ];
-    settings = {
+    extraConfig = {
-      user.name = username;
-      user.email = email;
       init.defaultBranch = "main";
-      pull.rebase = "false";
       push.autoSetupRemote = true;
-      color.ui = "1";
+    };
-      alias = {
+    aliases = {
       essa = "push --force";
       co = "checkout";
       fuck = "commit --amend -m";
@@ -48,8 +43,8 @@ in {
         log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
       llog = ''
         log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
-        edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
+      edit-unmerged =
-      };
+        "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
     };
   };
 }

home/programs/git/lazygit.nix

@@ -1,35 +0,0 @@
-# Lazygit is a simple terminal UI for git commands.
-{
-  config,
-  lib,
-  ...
-}: let
-  accent = "#${config.lib.stylix.colors.base0D}";
-  muted = "#${config.lib.stylix.colors.base03}";
-in {
-  programs.lazygit = {
-    enable = true;
-    settings = lib.mkForce {
-      disableStartupPopups = true;
-      notARepository = "skip";
-      promptToReturnFromSubprocess = false;
-      update.method = "never";
-      git = {
-        commit.signOff = true;
-        overrideGpg = true; 
-        parseEmoji = true;
-      };
-      gui = {
-        theme = {
-          activeBorderColor = [accent "bold"];
-          inactiveBorderColor = [muted];
-        };
-        showListFooter = false;
-        showRandomTip = false;
-        showCommandLog = false;
-        showBottomLine = false;
-        nerdFontsVersion = "3";
-      };
-    };
-  };
-}

home/programs/git/signing.nix

@@ -1,12 +0,0 @@
-# This file is used to sign git commits using an SSH key.
-{
-  # CHANGEME: change this to your own SSH key.
-  home.file.".ssh/allowed_signers".text = "* ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINhWby7lUUXQNKbRu9/UOrGjWDf3fvoAwGHomWv/+lL";
-
-  programs.git.settings = {
-    commit.gpgsign = true;
-    gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
-    gpg.format = "ssh";
-    user.signingkey = "~/.ssh/key.pub";
-  };
-}

home/programs/group/cybersecurity.nix

@@ -1,15 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  home.packages = with pkgs; [
-    wireshark
-    nmap
-    john
-    hashcat
-    inputs.eleakxir.packages.${stdenv.hostPlatform.system}.leak-utils
-    caido
-    nuclei
-  ];
-}

home/programs/kitty/default.nix

@@ -0,0 +1,48 @@
+{ config, pkgs, ... }: {
+  programs.kitty = {
+    enable = true;
+    settings = {
+      scrollback_lines = 10000;
+      initial_window_width = 1200;
+      initial_window_height = 600;
+      update_check_interval = 0;
+      enable_audio_bell = false;
+      confirm_os_window_close = "0";
+      remember_window_size = "no";
+      disable_ligatures = "never";
+      shell = "${pkgs.tmux}/bin/tmux";
+      url_style = "curly";
+      cursor_shape = "Underline";
+      cursor_underline_thickness = config.var.theme.border-size;
+      window_padding_width = config.var.theme.gaps-in;
+
+      # Font
+      font_family = config.var.theme.font-mono;
+      font_size = config.var.theme.font-size;
+
+      # Colors
+      background = "#" + config.var.theme.colors.bg;
+      url_color = "#" + config.var.theme.colors.accent;
+      color0 = "#" + config.var.theme.colors.c0;
+      color8 = "#" + config.var.theme.colors.c8;
+      color1 = "#" + config.var.theme.colors.c1;
+      color9 = "#" + config.var.theme.colors.c9;
+      color2 = "#" + config.var.theme.colors.c2;
+      color10 = "#" + config.var.theme.colors.c10;
+      color3 = "#" + config.var.theme.colors.c3;
+      color11 = "#" + config.var.theme.colors.c11;
+      color4 = "#" + config.var.theme.colors.c4;
+      color12 = "#" + config.var.theme.colors.c12;
+      color5 = "#" + config.var.theme.colors.c5;
+      color13 = "#" + config.var.theme.colors.c13;
+      color6 = "#" + config.var.theme.colors.c6;
+      color14 = "#" + config.var.theme.colors.c14;
+      color7 = "#" + config.var.theme.colors.c7;
+      color15 = "#" + config.var.theme.colors.c15;
+      cursor = "#" + config.var.theme.colors.fg;
+      cursor_text_color = "#" + config.var.theme.colors.bg;
+      selection_foreground = "#" + config.var.theme.colors.accentFg;
+      selection_background = "#" + config.var.theme.colors.accent;
+    };
+  };
+}

home/programs/nextcloud/default.nix

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

home/programs/nightshift/default.nix

@@ -1,19 +0,0 @@
-{pkgs, ...}: let
-  nightshift-toggle =
-    pkgs.writeShellScriptBin "nightshift-toggle"
-    # bash
-    ''
-      if pidof "hyprsunset"; then
-        pkill hyprsunset
-        ${pkgs.libnotify}/bin/notify-send "Night Shift Disabled" "Returning to full spectrum light. Filter disabled."
-      else
-        ${pkgs.hyprsunset}/bin/hyprsunset -t 4500 &
-        ${pkgs.libnotify}/bin/notify-send "Night Shift Activated" "Welcome to the warm side. Blue light filtering is now active."
-      fi
-    '';
-in {
-  home.packages = with pkgs; [
-    hyprsunset
-    nightshift-toggle
-  ];
-}

home/programs/nixy/default.nix

@@ -1,77 +0,0 @@
-# - ## 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, test, 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, ... }:
-let
-  configDirectory = config.var.configDirectory;
-
-  nixy = pkgs.writeShellScriptBin "nixy"
-    # bash
-    ''
-      function exec() {
-        $@
-      }
-
-      function ui(){
-        DEFAULT_ICON="󰘳"
-
-        # "icon;name;command"[]
-        apps=(
-          "󰑓;Rebuild;nixy rebuild"
-          "󰐊;Test;nixy test"
-          "󰚰;Update;nixy update"
-          ";Collect Garbage;nixy gc"
-          "󰍜;Clean Boot Menu;nixy cb"
-          ";List generation;nixy listgen"
-          "󰌌;Hyprland Keybindings;nvim ${configDirectory}/docs/KEYBINDINGS-HYPRLAND.md"
-          "󰋩;Wallpapers;zen https://github.com/anotherhadi/nixy-wallpapers"
-        )
-
-        # 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 $?
-      }
-
-      [[ $1 == "" ]] && ui
-
-      if [[ $1 == "rebuild" ]];then
-        cd ${configDirectory} && git add . && sudo nixos-rebuild switch --flake
-      elif [[ $1 == "test" ]];then
-        cd ${configDirectory} && git add . && sudo nixos-rebuild test --flake
-      elif [[ $1 == "update" ]];then
-        cd ${configDirectory} && nix flake update
-      elif [[ $1 == "gc" ]];then
-        echo "Starting Nix garbage collection..."
-        cd ${configDirectory} && \
-        echo "Cleaning up system garbage..." && \
-        sudo nix-collect-garbage -d && \
-        echo "Cleaning up user garbage..." && \
-        nix-collect-garbage -d && \
-        echo "Collecting garbage from Nix store..." && \
-        nix-store --gc && \
-        echo "Optimizing Nix store..." && \
-        nix-store --optimise
-        echo "Nix garbage collection complete."
-      elif [[ $1 == "cb" ]];then
-        sudo /run/current-system/bin/switch-to-configuration boot
-      elif [[ $1 == "listgen" ]];then
-        sudo nix-env -p /nix/var/nix/profiles/system --list-generations
-      else
-        echo "Unknown argument"
-      fi
-    '';
-in { home.packages = [ nixy ]; }

home/programs/nvf/default.nix

@@ -1,26 +0,0 @@
-# NVF is a Neovim configuration that provides a minimal setup with essential plugins and configurations.
-{
-  inputs,
-  pkgs,
-  ...
-}: {
-  imports = [
-    inputs.nvf.homeManagerModules.default
-    ./options.nix
-    ./languages.nix
-    ./picker.nix
-    ./snacks.nix
-    ./keymaps.nix
-    ./utils.nix
-    ./mini.nix
-  ];
-
-  programs.nvf = {
-    enable = true;
-    settings.vim = {
-      startPlugins = [
-        pkgs.vimPlugins.vim-kitty-navigator
-      ];
-    };
-  };
-}

home/programs/nvf/keymaps.nix

@@ -1,173 +0,0 @@
-{
-  programs.nvf.settings.vim = {
-    globals.mapleader = " ";
-    binds = {
-      whichKey = {
-        enable = true;
-        # TODO: registers
-        register = {};
-      };
-    };
-    keymaps = [
-      # General Mappings
-      {
-        key = "s";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua require('flash').jump()<cr>";
-        desc = "Flash";
-      }
-      {
-        key = "K";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua vim.lsp.buf.hover()<cr>";
-        desc = "LSP Hover";
-      }
-      {
-        key = "<C-tab>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>bnext<cr>";
-        desc = "Next Buffer";
-      }
-
-      # Kitty navigator
-      {
-        key = "<C-h>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateLeft<cr>";
-      }
-      {
-        key = "<C-j>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateDown<cr>";
-      }
-      {
-        key = "<C-k>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateUp<cr>";
-      }
-      {
-        key = "<C-l>";
-        mode = "n";
-        silent = true;
-        action = "<cmd>KittyNavigateRight<cr>";
-      }
-
-      # Disable Arrow Keys in Normal Mode
-      {
-        key = "<Up>";
-        mode = "n";
-        silent = true;
-        action = "<Nop>";
-        desc = "Disable Up Arrow";
-      }
-      {
-        key = "<Down>";
-        mode = "n";
-        silent = true;
-        action = "<Nop>";
-        desc = "Disable Down Arrow";
-      }
-      {
-        key = "<Left>";
-        mode = "n";
-        silent = true;
-        action = "<Nop>";
-        desc = "Disable Left Arrow";
-      }
-      {
-        key = "<Right>";
-        mode = "n";
-        silent = true;
-        action = "<Nop>";
-        desc = "Disable Right Arrow";
-      }
-
-      # UI
-      {
-        key = "<leader>uw";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set wrap!<cr>";
-        desc = "Toggle word wrapping";
-      }
-      {
-        key = "<leader>ul";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set linebreak!<cr>";
-        desc = "Toggle linebreak";
-      }
-      {
-        key = "<leader>us";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set spell!<cr>";
-        desc = "Toggle spellLazyGitcheck";
-      }
-      {
-        key = "<leader>uc";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set cursorline!<cr>";
-        desc = "Toggle cursorline";
-      }
-      {
-        key = "<leader>un";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set number!<cr>";
-        desc = "Toggle line numbers";
-      }
-      {
-        key = "<leader>ur";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set relativenumber!<cr>";
-        desc = "Toggle relative line numbers";
-      }
-      {
-        key = "<leader>ut";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set showtabline=2<cr>";
-        desc = "Show tabline";
-      }
-      {
-        key = "<leader>uT";
-        mode = "n";
-        silent = true;
-        action = "<cmd>set showtabline=0<cr>";
-        desc = "Hide tabline";
-      }
-
-      # Windows
-      {
-        key = "<leader>ws";
-        mode = "n";
-        silent = true;
-        action = "<cmd>split<cr>";
-        desc = "Split";
-      }
-      {
-        key = "<leader>wv";
-        mode = "n";
-        silent = true;
-        action = "<cmd>vsplit<cr>";
-        desc = "VSplit";
-      }
-      {
-        key = "<leader>wd";
-        mode = "n";
-        silent = true;
-        action = "<cmd>close<cr>";
-        desc = "Close";
-      }
-    ];
-  };
-}

home/programs/nvf/languages.nix

@@ -1,119 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
-  programs.nvf.settings.vim = {
-    diagnostics = {
-      enable = true;
-      config = {
-        signs = {
-          text = {
-            "vim.diagnostic.severity.Error" = " ";
-            "vim.diagnostic.severity.Warn" = " ";
-            "vim.diagnostic.severity.Hint" = " ";
-            "vim.diagnostic.severity.Info" = " ";
-          };
-        };
-        underline = true;
-        update_in_insert = true;
-        virtual_text = {
-          format =
-            lib.generators.mkLuaInline
-            /*
-            lua
-            */
-            ''
-              function(diagnostic)
-                return string.format("%s", diagnostic.message)
-                --return string.format("%s (%s)", diagnostic.message, diagnostic.source)
-              end
-            '';
-        };
-      };
-      nvim-lint = {
-        enable = true;
-      };
-    };
-    syntaxHighlighting = true;
-    treesitter = {
-      enable = true;
-      autotagHtml = true;
-      context.enable = true;
-      highlight.enable = true;
-      grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
-        typescript # in language settings only tsx gets enabled, not typescript
-      ];
-    };
-    lsp = {
-      enable = true;
-      trouble.enable = true;
-      lspSignature.enable = true;
-      lspconfig.enable = true;
-      formatOnSave = true;
-      inlayHints.enable = true;
-      null-ls.enable = true;
-      servers.nixd.settings.nil.nix.autoArchive = true;
-      otter-nvim = {
-        enable = true;
-        setupOpts = {
-          buffers.set_filetype = true;
-          lsp = {
-            diagnostic_update_event = [
-              "BufWritePost"
-              "InsertLeave"
-            ];
-          };
-        };
-      };
-      lspkind.enable = true;
-      lspsaga = {
-        enable = true;
-        setupOpts = {
-          ui = {
-            code_action = "";
-          };
-          lightbulb = {
-            sign = false;
-            virtual_text = true;
-          };
-          breadcrumbs.enable = false;
-        };
-      };
-    };
-    languages = {
-      enableDAP = true;
-      enableExtraDiagnostics = true;
-      enableFormat = true;
-      enableTreesitter = true;
-
-      astro.enable = true;
-      go.enable = true;
-      markdown = {
-        enable = true;
-        format.type = ["prettierd"];
-        extensions = {
-          markview-nvim = {
-            enable = true;
-          };
-        };
-        extraDiagnostics.enable = true;
-      };
-      ts = {
-        enable = true;
-        extensions.ts-error-translator.enable = true;
-      };
-      css.enable = true;
-      svelte.enable = true;
-      html.enable = true;
-      bash.enable = true;
-      nix.enable = true;
-      tailwind.enable = true;
-    };
-    formatter = {
-      conform-nvim = {
-        enable = true;
-      };
-    };
-  };
-}

home/programs/nvf/mini.nix

@@ -1,13 +0,0 @@
-{
-  programs.nvf.settings.vim.mini = {
-    starter.enable = true;
-    comment.enable = true;
-    # cursorword.enable = true;
-    icons.enable = true;
-    indentscope.enable = true;
-    notify.enable = true;
-    pairs.enable = true;
-    diff.enable = true;
-    git.enable = true;
-  };
-}

home/programs/nvf/options.nix

@@ -1,40 +0,0 @@
-{lib, ...}: {
-  programs.nvf.settings.vim = {
-    viAlias = false;
-    vimAlias = true;
-    withNodeJs = true;
-    # syntaxHighlighting = true;
-    options = {
-      autoindent = true;
-      smartindent = true;
-      shiftwidth = 2;
-      foldlevel = 99;
-      foldcolumn = "auto:1";
-      mousescroll = "ver:1,hor:1";
-      mousemoveevent = true;
-      fillchars = "eob:‿,fold: ,foldopen:▼,foldsep:⸽,foldclose:⏵";
-      signcolumn = "yes";
-      tabstop = 2;
-      softtabstop = 2;
-      wrap = false;
-    };
-    globals = {
-      navic_silence = true; # navic tries to attach multiple LSPs and fails
-      suda_smart_edit = 1; # use super user write automatically
-      neovide_scale_factor = 0.7;
-      neovide_cursor_animation_length = 0.1;
-      neovide_cursor_short_animation_length = 0;
-    };
-    clipboard = {
-      enable = true;
-      registers = "unnamedplus";
-      providers.wl-copy.enable = true;
-    };
-    theme = {
-      enable = true;
-      name = lib.mkForce "catppuccin";
-      style = lib.mkForce "mocha";
-      transparent = lib.mkForce true;
-    };
-  };
-}

home/programs/nvf/picker.nix

@@ -1,257 +0,0 @@
-{
-  programs.nvf.settings.vim = {
-    utility = {
-      oil-nvim.enable = true;
-      snacks-nvim = {
-        setupOpts = {
-          picker.enabled = true;
-          explorer.enabled = true;
-        };
-      };
-    };
-    keymaps = [
-      # Top Pickers & Explorer
-      {
-        key = "<leader> ";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.smart()<cr>";
-        desc = "Smart Find Files";
-      }
-      {
-        key = "<leader>,";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.buffers()<cr>";
-        desc = "Buffers";
-      }
-      {
-        key = "<leader>/";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.grep()<cr>";
-        desc = "Grep";
-      }
-      {
-        key = "<leader>:";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.command_history()<cr>";
-        desc = "Command History";
-      }
-      {
-        key = "<leader>e";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.explorer()<cr>";
-        desc = "File Explorer";
-      }
-      {
-        key = "-";
-        mode = "n";
-        silent = true;
-        action = "<cmd>Oil<cr>";
-        desc = "Oil";
-      }
-
-      # Find
-      {
-        key = "<leader>fb";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.buffers()<cr>";
-        desc = "Buffers";
-      }
-      {
-        key = "<leader>fc";
-        mode = "n";
-        silent = true;
-        action = ''
-          <cmd>lua Snacks.picker.files({ cwd = vim.fn.stdpath("config") })<cr>'';
-        desc = "Find Config File";
-      }
-      {
-        key = "<leader>ff";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.files()<cr>";
-        desc = "Find Files";
-      }
-      {
-        key = "<leader>fg";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_files()<cr>";
-        desc = "Find Git Files";
-      }
-      {
-        key = "<leader>fp";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.projects()<cr>";
-        desc = "Projects";
-      }
-      {
-        key = "<leader>fr";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.recent()<cr>";
-        desc = "Recent";
-      }
-      {
-        key = "<leader>fn";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.notifications()<cr>";
-        desc = "Notification History";
-      }
-      {
-        key = "<leader>fe";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.icons()<cr>";
-        desc = "Emoji";
-      }
-
-      # Git
-      {
-        key = "<leader>gb";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_branches()<cr>";
-        desc = "Git Branches";
-      }
-      {
-        key = "<leader>gL";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_log()<cr>";
-        desc = "Git Log Line";
-      }
-      {
-        key = "<leader>gs";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_status()<cr>";
-        desc = "Git Status";
-      }
-      {
-        key = "<leader>gS";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_stash()<cr>";
-        desc = "Git Stash";
-      }
-      {
-        key = "<leader>gd";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_diff()<cr>";
-        desc = "Git Diff (Hunks)";
-      }
-      {
-        key = "<leader>gf";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.git_log_file()<cr>";
-        desc = "Git Log File";
-      }
-
-      # Grep
-      {
-        key = "<leader>sb";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.lines()<cr>";
-        desc = "Buffer Lines";
-      }
-      {
-        key = "<leader>st";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.todo_comments()<cr>";
-        desc = "Todos";
-      }
-      {
-        key = "<leader>sB";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.grep_buffers()<cr>";
-        desc = "Grep Open Buffers";
-      }
-      {
-        key = "<leader>sg";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.grep()<cr>";
-        desc = "Grep";
-      }
-      {
-        key = "<leader>sw";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.grep_word()<cr>";
-        desc = "Visual selection or word";
-      }
-      {
-        key = "<leader>sr";
-        mode = "n";
-        silent = true;
-        action = "<cmd>nohlsearch<cr>";
-        desc = "Reset search";
-      }
-
-      # LSP
-      {
-        key = "gd";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.lsp_definitions()<cr>";
-        desc = "Goto Definition";
-      }
-      {
-        key = "gD";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.lsp_declarations()<cr>";
-        desc = "Goto Declaration";
-      }
-      {
-        key = "gr";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.lsp_references()<cr>";
-        desc = "References";
-        nowait = true;
-      }
-      {
-        key = "gI";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.lsp_implementations()<cr>";
-        desc = "Goto Implementation";
-      }
-      {
-        key = "gy";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.lsp_type_definitions()<cr>";
-        desc = "Goto Type Definition";
-      }
-      {
-        key = "<leader>ss";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.lsp_symbols()<cr>";
-        desc = "LSP Symbols";
-      }
-      {
-        key = "<leader>sS";
-        mode = "n";
-        silent = true;
-        action = "<cmd>lua Snacks.picker.lsp_workspace_symbols()<cr>";
-        desc = "LSP Workspace Symbols";
-      }
-    ];
-  };
-}

home/programs/nvf/snacks.nix

@@ -1,19 +0,0 @@
-{
-  programs.nvf.settings.vim.utility.snacks-nvim = {
-    enable = true;
-    setupOpts = {
-      image = {
-        enabled = true;
-        doc = {
-          inline = false;
-          float = true;
-        };
-      };
-      quickfile.enabled = true;
-      statuscolumn.enabled = true;
-      zen.enabled = true;
-      bufdelete.enabled = true;
-      gitsigns.enabled = true;
-    };
-  };
-}

home/programs/nvf/utils.nix

@@ -1,53 +0,0 @@
-{pkgs, ...}: {
-  programs.nvf.settings.vim = {
-    undoFile.enable = true;
-    utility = {
-      motion.flash-nvim.enable = true;
-      outline.aerial-nvim.enable = true;
-    };
-    tabline.nvimBufferline.enable = true;
-    notes.todo-comments.enable = true;
-    assistant.copilot = {
-      enable = true;
-      cmp.enable = true;
-    };
-    statusline.lualine.enable = true;
-
-    autocomplete = {
-      nvim-cmp = {
-        enable = true;
-        sources = {
-          buffer = "[Buffer]";
-          nvim-cmp = null;
-          path = "[Path]";
-        };
-        sourcePlugins = [
-          pkgs.vimPlugins.cmp-cmdline
-        ];
-      };
-    };
-
-    snippets.luasnip.enable = true;
-    ui = {
-      noice.enable = true;
-      colorizer.enable = true;
-    };
-    git = {
-      enable = true;
-      gitsigns.enable = true;
-    };
-    terminal.toggleterm = {
-      enable = true;
-      lazygit = {
-        enable = true;
-        mappings.open = "<leader>gl";
-      };
-    };
-    visuals = {
-      rainbow-delimiters.enable = true;
-      nvim-scrollbar = {
-        enable = false;
-      };
-    };
-  };
-}

home/programs/nvim/colorscheme.nix

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

home/programs/nvim/default.nix

@@ -0,0 +1,17 @@
+{ inputs, ... }: {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+    ./plugins/cmp.nix
+    ./plugins/dashboard.nix
+    ./plugins/lsp.nix
+    ./plugins/markdown.nix
+    ./plugins/tree.nix
+    ./plugins/ui.nix
+    ./plugins/utils.nix
+    ./plugins/zen-mode.nix
+
+    ./options.nix
+    ./colorscheme.nix
+    ./keymaps.nix
+  ];
+}

home/programs/nvim/keymaps.nix

@@ -0,0 +1,24 @@
+{
+  programs.nixvim.keymaps = [
+    {
+      key = "<leader>fm";
+      action = "<cmd>lua vim.lsp.buf.format()<cr>";
+      options.desc = "LSP Format";
+    }
+    {
+      key = "<leader>w";
+      action = "<cmd>set wrap!<cr>";
+      options.desc = "Toggle word wrapping";
+    }
+    {
+      key = "<leader>W";
+      action = "<cmd>set linebreak!<cr>";
+      options.desc = "Toggle linebreak";
+    }
+    {
+      key = "<leader>z";
+      action = "<cmd>ZenMode<cr>";
+      options.desc = "ZenMode";
+    }
+  ];
+}

home/programs/nvim/options.nix

@@ -0,0 +1,37 @@
+{
+
+  programs.nixvim.globals.mapleader = " ";
+  programs.nixvim.opts = {
+    updatetime = 50; # Faster completion
+
+    number = true;
+    relativenumber = true;
+
+    autoindent = true;
+    clipboard = "unnamed,unnamedplus";
+
+    expandtab = true;
+    tabstop = 2;
+    softtabstop = 2;
+    shiftwidth = 2;
+    smartindent = true;
+    breakindent = true;
+
+    ignorecase = true;
+    incsearch = true;
+    hlsearch = true;
+    smartcase = true;
+    wildmode = "list:longest";
+    completeopt = [ "menuone" "noselect" ];
+    signcolumn = "yes";
+    cursorline = false;
+    scrolloff = 8;
+    mouse = "a";
+
+    wrap = false;
+
+    swapfile = false;
+    undofile = true;
+    conceallevel = 3;
+  };
+}

home/programs/nvim/plugins/cmp.nix

@@ -0,0 +1,113 @@
+{
+  programs.nixvim.plugins = {
+    luasnip.enable = true;
+    cmp-buffer = { enable = true; };
+    cmp-emoji = { enable = true; };
+    cmp-nvim-lsp = { enable = true; };
+    cmp-path = { enable = true; };
+    cmp_luasnip = { enable = true; };
+
+    cmp = {
+      enable = true;
+      settings = {
+        snippet.expand =
+          "function(args) require('luasnip').lsp_expand(args.body) end";
+        sources = [
+          { name = "nvim_lsp"; }
+          { name = "luasnip"; }
+          { name = "buffer"; }
+          { name = "nvim_lua"; }
+          { name = "path"; }
+        ];
+
+        formatting = {
+          fields = [ "abbr" "kind" "menu" ];
+          format =
+            # lua
+            ''
+                function(_, item)
+                local icons = {
+                  Namespace = "󰌗",
+                  Text = "󰉿",
+                  Method = "󰆧",
+                  Function = "󰆧",
+                  Constructor = "",
+                  Field = "󰜢",
+                  Variable = "󰀫",
+                  Class = "󰠱",
+                  Interface = "",
+                  Module = "",
+                  Property = "󰜢",
+                  Unit = "󰑭",
+                  Value = "󰎠",
+                  Enum = "",
+                  Keyword = "󰌋",
+                  Snippet = "",
+                  Color = "󰏘",
+                  File = "󰈚",
+                  Reference = "󰈇",
+                  Folder = "󰉋",
+                  EnumMember = "",
+                  Constant = "󰏿",
+                  Struct = "󰙅",
+                  Event = "",
+                  Operator = "󰆕",
+                  TypeParameter = "󰊄",
+                  Table = "",
+                  Object = "󰅩",
+                  Tag = "",
+                  Array = "[]",
+                  Boolean = "",
+                  Number = "",
+                  Null = "󰟢",
+                  String = "󰉿",
+                  Calendar = "",
+                  Watch = "󰥔",
+                  Package = "",
+                  Copilot = "",
+                  Codeium = "",
+                  TabNine = "",
+                }
+
+              local icon = icons[item.kind] or ""
+                item.kind = string.format("%s %s", icon, item.kind or "")
+                return item
+                end
+            '';
+        };
+
+        window = {
+          completion = {
+            winhighlight =
+              "FloatBorder:CmpBorder,Normal:CmpPmenu,Search:PmenuSel";
+            scrollbar = true;
+            sidePadding = 0;
+            border = [ "╭" "─" "╮" "│" "╯" "─" "╰" "│" ];
+          };
+
+          documentation = {
+            border = [ "╭" "─" "╮" "│" "╯" "─" "╰" "│" ];
+            winhighlight =
+              "FloatBorder:CmpBorder,Normal:CmpPmenu,Search:PmenuSel";
+          };
+        };
+
+        mapping = {
+          "<C-n>" = "cmp.mapping.select_next_item()";
+          "<C-p>" = "cmp.mapping.select_prev_item()";
+          "<Down>" = "cmp.mapping.select_next_item()";
+          "<Up>" = "cmp.mapping.select_prev_item()";
+          "<C-j>" = "cmp.mapping.select_next_item()";
+          "<C-k>" = "cmp.mapping.select_prev_item()";
+          "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+          "<C-f>" = "cmp.mapping.scroll_docs(4)";
+          "<C-Space>" = "cmp.mapping.complete()";
+          "<C-e>" = "cmp.mapping.close()";
+          "<CR>" =
+            "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Insert, select = true })";
+        };
+      };
+    };
+
+  };
+}

home/programs/nvim/plugins/dashboard.nix

@@ -0,0 +1,148 @@
+{ config, ... }: {
+
+  programs.nixvim.highlight = {
+    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 = {
+    enable = true;
+    layout = [
+      {
+        type = "padding";
+        val = 4;
+      }
+      {
+        type = "text";
+        opts = {
+          position = "center";
+          hl = "AlphaHeaderColor";
+        };
+        val = [
+          "                                                                     "
+          "       ████ ██████           █████      ██                     "
+          "      ███████████             █████                             "
+          "      █████████ ███████████████████ ███   ███████████   "
+          "     █████████  ███    █████████████ █████ ██████████████   "
+          "    █████████ ██████████ █████████ █████ █████ ████ █████   "
+          "  ███████████ ███    ███ █████████ █████ █████ ████ █████  "
+          " ██████  █████████████████████ ████ █████ █████ ████ ██████ "
+          "                                                                       "
+        ];
+      }
+      {
+        type = "padding";
+        val = 4;
+      }
+      {
+        type = "group";
+
+        val = [
+          {
+            type = "button";
+            val = "󰭎  Find file";
+            on_press.__raw = "function() vim.cmd[[Telescope find_files]] end";
+            opts = {
+              shortcut = "nf";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "  New file";
+            on_press.__raw = "function() vim.cmd[[ene]] end";
+            opts = {
+              shortcut = "nn";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "  NixOs Config";
+            on_press.__raw =
+              "function() vim.cmd[[Neotree ${config.var.configDirectory}]] end";
+            opts = {
+              shortcut = "nc";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "  Keybindings";
+            on_press.__raw =
+              "function() vim.cmd[[e ${config.var.configDirectory}/docs/KEYBINDINGS.md]] end";
+            opts = {
+              shortcut = "nc";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "  Recently used";
+            on_press.__raw = "function() vim.cmd[[Telescope oldfiles]] end";
+            opts = {
+              shortcut = "no";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "󰱽  Find text";
+            on_press.__raw = "function() vim.cmd[[Telescope live_grep]] end";
+            opts = {
+              shortcut = "nt";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "󰩈  Quit Neovim";
+            on_press.__raw = "function() vim.cmd[[qa]] end";
+            opts = {
+              shortcut = "nq";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+        ];
+
+      }
+    ];
+  };
+
+}

home/programs/nvim/plugins/lsp.nix

@@ -0,0 +1,50 @@
+{
+  programs.nixvim.plugins = {
+    lsp-format.enable = true;
+    lsp = {
+      enable = true;
+      servers = {
+        bashls.enable = true;
+        clangd.enable = true;
+        gopls.enable = true;
+        nixd.enable = true;
+        tailwindcss.enable = true;
+        # html.enable = true; # FIXME: broken for some reason
+        svelte.enable = true;
+        marksman.enable = true;
+        ltex = {
+          enable = false;
+          settings = {
+            enabled = false;
+            language = "en";
+          };
+        };
+      };
+      keymaps.lspBuf = {
+        "gd" = "definition";
+        "gD" = "references";
+        "gt" = "type_definition";
+        "gi" = "implementation";
+        "K" = "hover";
+      };
+    };
+    none-ls = {
+      enable = true;
+      sources = {
+        diagnostics = {
+          golangci_lint.enable = true;
+          statix.enable = true;
+        };
+        formatting = {
+          gofmt.enable = true;
+          goimports.enable = true;
+          nixfmt.enable = true;
+          markdownlint.enable = true;
+          tidy.enable = true;
+          shellharden.enable = true;
+          shfmt.enable = true;
+        };
+      };
+    };
+  };
+}

home/programs/nvim/plugins/markdown.nix

@@ -0,0 +1,133 @@
+{
+  programs.nixvim.plugins = {
+    mkdnflow = {
+      enable = true;
+      mappings = {
+
+        # Main
+        MkdnEnter = {
+          key = "<CR>";
+          modes = [ "n" "v" "i" ];
+        };
+
+        # Links
+        MkdnCreateLink = false;
+        MkdnCreateLinkFromClipboard = {
+          key = "<leader>lc";
+          modes = [ "n" "v" ];
+        };
+        MkdnDestroyLink = {
+          key = "<leader>dl";
+          modes = "n";
+        };
+        MkdnFollowLink = false;
+        MkdnNextLink = {
+          key = "<Tab>";
+          modes = "n";
+        };
+        MkdnYankAnchorLink = {
+          key = "ya";
+          modes = "n";
+        };
+        MkdnYankFileAnchorLink = {
+          key = "yfa";
+          modes = "n";
+        };
+        MkdnPrevLink = {
+          key = "<S-Tab>";
+          modes = "n";
+        };
+
+        MkdnDecreaseHeading = {
+          key = "-";
+          modes = "n";
+        };
+        MkdnExtendList = false;
+        MkdnFoldSection = {
+          key = "<leader>ff";
+          modes = "n";
+        };
+        MkdnUnfoldSection = {
+          key = "<leader>fu";
+          modes = "n";
+        };
+        MkdnGoBack = {
+          key = "<BS>";
+          modes = "n";
+        };
+        MkdnGoForward = {
+          key = "<Del>";
+          modes = "n";
+        };
+        MkdnIncreaseHeading = {
+          key = "+";
+          modes = "n";
+        };
+        MkdnMoveSource = {
+          key = "<F2>";
+          modes = "n";
+        };
+        MkdnNewListItem = false;
+        MkdnNewListItemAboveInsert = {
+          key = "O";
+          modes = "n";
+        };
+        MkdnNewListItemBelowInsert = {
+          key = "o";
+          modes = "n";
+        };
+        MkdnNextHeading = {
+          key = "]]";
+          modes = "n";
+        };
+        MkdnPrevHeading = {
+          key = "[[";
+          modes = "n";
+        };
+        MkdnSTab = false;
+        MkdnTab = false;
+        MkdnTableFormat = {
+          key = "<leader>ft";
+          modes = "n";
+        };
+        MkdnTableNewColAfter = {
+          key = "<leader>ic";
+          modes = "n";
+        };
+        MkdnTableNewColBefore = {
+          key = "<leader>iC";
+          modes = "n";
+        };
+        MkdnTableNewRowAbove = {
+          key = "<leader>iR";
+          modes = "n";
+        };
+        MkdnTableNewRowBelow = {
+          key = "<leader>ir";
+          modes = "n";
+        };
+        MkdnTableNextCell = {
+          key = "<S-Tab>";
+          modes = "i";
+        };
+        MkdnTableNextRow = false;
+        MkdnTablePrevCell = {
+          key = "<M-Tab>";
+          modes = "i";
+        };
+        MkdnTablePrevRow = {
+          key = "<M-CR>";
+          modes = "i";
+        };
+        MkdnToggleToDo = {
+          key = "<C-Space>";
+          modes = [ "n" "v" ];
+        };
+        MkdnUpdateNumbering = {
+          key = "<leader>nn";
+          modes = "n";
+        };
+      };
+    };
+  };
+}

home/programs/nvim/plugins/tree.nix

@@ -0,0 +1,61 @@
+{
+  programs.nixvim = {
+    plugins = {
+      neo-tree.enable = true;
+      oil = {
+        enable = true;
+        settings = {
+          default_file_explorer = false;
+          skip_confirm_for_simple_edits = true;
+          win_options = {
+            concealcursor = "ncv";
+            conceallevel = 3;
+            cursorcolumn = false;
+            foldcolumn = "0";
+            list = false;
+            signcolumn = "no";
+            spell = false;
+            wrap = false;
+          };
+          float = { padding = 5; };
+          keymaps = {
+            "-" = "actions.parent";
+            "b" = "actions.parent";
+            "<C-c>" = "actions.close";
+            "<C-h>" = "actions.select_split";
+            "<C-l>" = "actions.refresh";
+            "<C-p>" = "actions.preview";
+            "<C-s>" = "actions.select_vsplit";
+            "<C-t>" = "actions.select_tab";
+            "<CR>" = "actions.select";
+            _ = "actions.open_cwd";
+            "`" = "actions.cd";
+            "g." = "actions.toggle_hidden";
+            "g?" = "actions.show_help";
+            "g\\" = "actions.toggle_trash";
+            gs = "actions.change_sort";
+            gx = "actions.open_external";
+            "~" = "actions.tcd";
+          };
+        };
+      };
+    };
+    keymaps = [
+      {
+        key = "-";
+        action = "<cmd>Oil<cr>";
+        options.desc = "Oil";
+      }
+      {
+        key = "<leader>e";
+        action = "<cmd>Oil --float<cr>";
+        options.desc = "Oil";
+      }
+      {
+        key = "<leader>E";
+        action = "<cmd>Neotree toggle<cr>";
+        options.desc = "Neotree";
+      }
+    ];
+  };
+}

home/programs/nvim/plugins/ui.nix

@@ -0,0 +1,43 @@
+{ pkgs, config, ... }: {
+  home.packages = with pkgs; [ ctags ];
+
+  programs.nixvim = {
+    highlight = {
+      Headline.bg = "#${config.var.theme.colors.bgalt}";
+      Headline.bold = true;
+      Headline1.bg = "#${config.var.theme.colors.c0}";
+      Headline1.bold = true;
+    };
+    plugins = {
+      lualine.enable = true;
+      noice.enable = true;
+      gitsigns = {
+        enable = true;
+        settings.current_line_blame = false;
+      };
+      bufferline.enable = true;
+      trouble.enable = true;
+      indent-blankline.enable = true;
+      which-key.enable = true;
+      headlines = {
+        enable = true;
+        settings = {
+          markdown = {
+            headline_highlights = [ "Headline1" "Headline" ];
+            fat_headlines = false;
+            bullets = [ "" "◉" "○" "✸" ];
+            dash_string = "";
+            codeblock_highlight = "Headline";
+          };
+        };
+      };
+      nvim-colorizer.enable = true;
+      tagbar.enable = true; # FIXME: Tagbar is not working
+    };
+    keymaps = [{
+      key = "<leader>t";
+      action = "<cmd>TroubleToggle<cr>";
+      options.desc = "Trouble";
+    }];
+  };
+}

home/programs/nvim/plugins/utils.nix

@@ -0,0 +1,51 @@
+{ config, ... }: {
+  programs.nixvim = {
+    highlightOverride = {
+      FloatBorder.fg = "#${config.var.theme.colors.accent}";
+    };
+    plugins = {
+      copilot-vim.enable = true;
+      flash.enable = true;
+      # image.enable = true;
+      tmux-navigator.enable = true;
+      comment.enable = true;
+      nvim-autopairs.enable = true;
+      friendly-snippets.enable = true;
+      telescope = {
+        enable = true;
+        keymaps = {
+          "<leader>fg" = "live_grep";
+          "<leader> " = "find_files";
+        };
+        extensions.fzf-native = { enable = true; };
+      };
+      treesitter = {
+        enable = true;
+        nixGrammars = true;
+        settings = {
+          indent.enable = true;
+          highlight.enable = true;
+        };
+      };
+      treesitter-context.enable = true;
+    };
+    keymaps = [
+      {
+        key = "<C-h>";
+        action = "<cmd>TmuxNavigateLeft<cr>";
+      }
+      {
+        key = "<C-j>";
+        action = "<cmd>TmuxNavigateDown<cr>";
+      }
+      {
+        key = "<C-k>";
+        action = "<cmd>TmuxNavigateUp<cr>";
+      }
+      {
+        key = "<C-l>";
+        action = "<cmd>TmuxNavigateRight<cr>";
+      }
+    ];
+  };
+}

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

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

home/programs/proton/default.nix

@@ -1,19 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs; [
-    protonvpn-gui
-    proton-pass
-    proton-authenticator
-  ];
-
-  # Fix Proton Authenticator desktop entry
-  xdg.desktopEntries = {
-    "Proton Authenticator" = {
-      name = "Proton Authenticator";
-      exec = "env WEBKIT_DISABLE_COMPOSITING_MODE=1 ${pkgs.proton-authenticator}/bin/proton-authenticator";
-      icon = "proton-authenticator";
-      type = "Application";
-      categories = ["Utility"];
-      terminal = false;
-    };
-  };
-}

home/programs/qutebrowser/default.nix

@@ -0,0 +1,339 @@
+{ pkgs, config, ... }:
+let
+  settings = ''
+    {
+      "config": {
+        "title" : "Welcome Home",
+        "openLinksInNewTab": false,
+        "locale": "fr-FR",
+        "colors": {
+          "primary": "#${config.var.theme.colors.accent}",
+          "background": "#${config.var.theme.colors.bg}",
+          "foreground": "#${config.var.theme.colors.fg}",
+          "muted": "#${config.var.theme.colors.c8}"
+        },
+        "folders": [
+          {
+            "name": "Bookmarks",
+            "links": [
+              {"title": "MyNixOs", "url": "https://mynixos.com", "icon": "󱄅"},
+              {"title": "Github", "url": "https://github.com", "icon": ""},
+              {"title": "Proton", "url": "https://mail.proton.me/u/0/inbox", "icon": ""},
+              {"title": "Cloudflare One", "url": "https://one.dash.cloudflare.com/", "icon": ""},
+              {"title": "Chat GPT", "url": "https://chat.openai.com/", "icon": "󰭹"},
+              {"title": "Nixvim", "url": "https://nix-community.github.io/nixvim/", "icon": ""},
+              {"title": "Hyprland Wiki", "url": "https://wiki.hyprland.org/", "icon": "󰖬"},
+              {"title": "Youtube", "url": "https://youtube.com", "icon": "󰗃"},
+              {"title": "Figma", "url": "https://figma.com", "icon": ""},
+              {"title": "Server", "url": "https://home.anotherhadi.com", "icon": ""}
+            ]
+          },
+          {
+            "name": "Work",
+            "links": [
+              {"title": "Outlook", "url": "https://outlook.office.com/mail/", "icon": "󰴢"},
+              {"title": "Office", "url": "https://www.office.com/?auth=2", "icon": "󰏆"},
+              {"title": "Teams", "url": "https://teams.microsoft.com/_", "icon": "󰊻"}
+            ]
+          }
+        ]
+      }
+    }
+  '';
+
+  homepage = pkgs.buildNpmPackage {
+    pname = "homepage";
+    version = "0.0.0";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "anotherhadi";
+      repo = "homepage";
+      rev = "b77d35ed3596eb451bd2ec78063d7cc6e73c773d";
+      hash = "sha256-j/40922kfAh6zqJ4IRYpr66YXNNYsxuXwZ0aiJFJea0=";
+    };
+
+    # npmDepsHash = lib.fakeHash;
+    npmDepsHash = "sha256-bG+CHTq2Rst3JMxsjAC81KhK+G7WwsTVD1eyP87g0z4=";
+
+    buildPhase = ''
+      npm install
+      cp ${
+        pkgs.writeText "src/routes/config.json" settings
+      } src/routes/config.json
+      npm run build
+      mkdir $out
+      mv build $out
+    '';
+
+    meta = {
+      description = "homepage";
+      homepage = "https://github.com/anotherhadi/homepage";
+    };
+  };
+
+in {
+
+  imports = [ ./duckduckgo-colorscheme.nix ];
+
+  programs.qutebrowser = {
+    enable = true;
+
+    searchEngines = {
+      "DEFAULT" = "https://duckduckgo.com/?q={}&ia=web";
+      "d" = "https://duckduckgo.com/?q={}&ia=web";
+      "g" = "https://google.com/search?q={}";
+      "y" = "https://youtube.com/results?search_query={}";
+      "ya" = "https://yandex.com/search/?text={}";
+      "n" = "https://mynixos.com/search?q={}";
+      "nixo" = "https://search.nixos.org/options?channel=unstable&query={}";
+      "nixp" = "https://search.nixos.org/packages?channel=unstable&query={}";
+      "gt" = "https://github.com/search?q={}&type=repositories";
+    };
+
+    quickmarks = {
+      home = "${homepage}/build/index.html";
+      server = "https://home.anotherhadi.com";
+      jack = "https://home.anotherhadi.com";
+      mynixos = "https://mynixos.com";
+      github = "https://github.com";
+      outlook = "https://outlook.office.com/mail/";
+      office = "https://www.office.com/?auth=2";
+      teams = "https://teams.microsoft.com/_";
+      casa = "http://192.168.2.16:8081/#/";
+      proton = "https://mail.proton.me/u/0/inbox";
+      cloudflare-one = "https://one.dash.cloudflare.com/";
+      chatgpt = "https://chat.openai.com/";
+      nixvim = "https://nix-community.github.io/nixvim/";
+      hyprland = "https://wiki.hyprland.org/";
+      nerdfont = "https://www.nerdfonts.com/cheat-sheet";
+      youtube = "https://youtube.com/";
+      cloudflare = "https://dash.cloudflare.com/";
+    };
+
+    settings = {
+      url = {
+        default_page = "${homepage}/build/index.html";
+        start_pages = [ "${homepage}/build/index.html" ];
+      };
+
+      colors = {
+        tabs = {
+          odd.bg = "#${config.var.theme.colors.bg}";
+          odd.fg = "#${config.var.theme.colors.fg}";
+          even.bg = "#${config.var.theme.colors.bg}";
+          even.fg = "#${config.var.theme.colors.fg}";
+          selected = {
+            odd = {
+              bg = "#${config.var.theme.colors.accent}";
+              fg = "#${config.var.theme.colors.accentFg}";
+            };
+            even = {
+              bg = "#${config.var.theme.colors.accent}";
+              fg = "#${config.var.theme.colors.accentFg}";
+            };
+          };
+          indicator = {
+            error = "#${config.var.theme.colors.c1}";
+            start = "#${config.var.theme.colors.bgalt}";
+            stop = "#${config.var.theme.colors.bgalt}";
+          };
+        };
+
+        hints = {
+          bg = "#${config.var.theme.colors.bgalt}";
+          fg = "#${config.var.theme.colors.fgalt}";
+          match.fg = "#${config.var.theme.colors.bg}";
+        };
+
+        completion = {
+          category = {
+            bg = "#${config.var.theme.colors.bg}";
+            fg = "#${config.var.theme.colors.fg}";
+            border = {
+              top = "#${config.var.theme.colors.bg}";
+              bottom = "#${config.var.theme.colors.bg}";
+            };
+          };
+
+          odd.bg = "#${config.var.theme.colors.bg}";
+          even.bg = "#${config.var.theme.colors.bg}";
+
+          fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ];
+
+          match.fg = "#${config.var.theme.colors.accent}";
+
+          item.selected = {
+            bg = "#${config.var.theme.colors.accent}";
+            border.top = "#${config.var.theme.colors.accent}";
+            border.bottom = "#${config.var.theme.colors.accent}";
+            fg = "#${config.var.theme.colors.accentFg}";
+            match.fg = "#${config.var.theme.colors.accentFg}";
+          };
+        };
+
+        statusbar = {
+          normal.bg = "#${config.var.theme.colors.bg}";
+          normal.fg = "#${config.var.theme.colors.fg}";
+          private.bg = "#${config.var.theme.colors.bg}";
+          private.fg = "#${config.var.theme.colors.fg}";
+          insert.bg = "#${config.var.theme.colors.accent}";
+          insert.fg = "#${config.var.theme.colors.accentFg}";
+          command = {
+            bg = "#${config.var.theme.colors.bgalt}";
+            fg = "#${config.var.theme.colors.fgalt}";
+            private.bg = "#${config.var.theme.colors.bgalt}";
+            private.fg = "#${config.var.theme.colors.fgalt}";
+          };
+        };
+
+        messages = {
+          info = {
+            bg = "#${config.var.theme.colors.bgalt}";
+            fg = "#${config.var.theme.colors.fgalt}";
+            border = "#${config.var.theme.colors.bgalt}";
+          };
+
+          error = {
+            bg = "#${config.var.theme.colors.c1}";
+            fg = "#${config.var.theme.colors.fgalt}";
+            border = "#${config.var.theme.colors.c1}";
+          };
+        };
+
+        #webpage.darkmode.enabled = true; # Enable dark mode for all websites (Weird on images)
+        webpage.preferred_color_scheme =
+          "dark"; # Enable dark mode for websites that support it
+      };
+
+      statusbar.show = "in-mode";
+
+      fonts = { default_family = "${config.var.theme.font}"; };
+
+      completion = {
+        height = "30%";
+        open_categories = [ "history" ];
+        scrollbar = {
+          padding = 0;
+          width = 0;
+        };
+        show = "always";
+        shrink = true;
+        timestamp_format = "";
+        web_history.max_items = 7;
+      };
+
+      content = {
+        autoplay = false;
+        javascript.clipboard = "access";
+        javascript.enabled = true;
+        webgl = true;
+        pdfjs = true;
+      };
+
+      downloads = {
+        position = "bottom";
+        remove_finished = 0;
+      };
+
+      hints = {
+        border = "none";
+        radius = 1;
+      };
+
+      scrolling = {
+        bar = "never";
+        smooth = true;
+      };
+
+      tabs = {
+        show = "multiple";
+        last_close = "close";
+        mode_on_change = "restore";
+        close_mouse_button = "right";
+      };
+
+      zoom.default = "100%";
+
+      qt.force_software_rendering = "chromium";
+    };
+
+    keyBindings = {
+      normal = {
+        "gh" = "open ${homepage}/build/index.html";
+        "gs" = "open https://home.anotherhadi.com";
+
+        " p" = "tab-move -";
+        " n" = "tab-move +";
+        " w" = "tab-close";
+
+        " 1" = "tab-focus 1";
+        " 2" = "tab-focus 2";
+        " 3" = "tab-focus 3";
+        " 4" = "tab-focus 4";
+        " 5" = "tab-focus 5";
+        " 6" = "tab-focus 6";
+        " 7" = "tab-focus 7";
+        " 8" = "tab-focus 8";
+        " 9" = "tab-focus 9";
+        " 0" = "tab-focus 10";
+
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+
+      command = {
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+
+      insert = {
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+    };
+
+    extraConfig = ''
+      config.unbind("gm")
+      config.unbind("gd")
+      config.unbind("gb")
+      config.unbind("tl")
+      config.unbind("gt")
+
+      c.tabs.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
+      c.statusbar.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
+
+      config.load_autoconfig(True)
+    '';
+  };
+}

home/programs/qutebrowser/duckduckgo-colorscheme.nix

@@ -0,0 +1,36 @@
+{ 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(/[ ,]+/);
+
+      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 ]}`;
+      });
+    };
+
+    alert('The Nixy theme will be applied.');
+
+    // Call set cookies, passing in formated cookie data
+    setCookies(cookieToJSON(cookie));
+
+    // All done, reload page for changes to take effect :)
+    location.reload();
+  '';
+}

home/programs/shell/default.nix

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

home/programs/shell/eza.nix

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

home/programs/shell/fzf.nix

@@ -1,28 +1,19 @@
-# Fzf is a general-purpose command-line fuzzy finder.
+{ config, ... }: {
-{
-  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 {
+    colors = {
-      "fg+" = accent;
+      "fg+" = config.var.theme.colors.accentName;
       "bg+" = "-1";
-      "fg" = foreground;
+      "fg" = "white";
       "bg" = "-1";
-      "prompt" = muted;
+      "prompt" = "grey";
-      "pointer" = accent;
+      "pointer" = config.var.theme.colors.accentName;
     };
     defaultOptions = [
       "--margin=1"
       "--layout=reverse"
-      "--border=none"
+      "--border=rounded"
       "--info='hidden'"
       "--header=''"
       "--prompt='/ '"

home/programs/shell/lazygit.nix

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

home/programs/shell/starship.nix

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

home/programs/shell/tmux.nix

@@ -0,0 +1,48 @@
+{ pkgs, ... }: {
+  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
+    '';
+
+    plugins = with pkgs; [
+      tmuxPlugins.vim-tmux-navigator
+      {
+        plugin = tmuxPlugins.catppuccin;
+        extraConfig = ''
+          set-option -g status-position top
+          set -g @catppuccin_window_left_separator ""
+          set -g @catppuccin_window_right_separator " "
+          set -g @catppuccin_window_middle_separator " █"
+          set -g @catppuccin_window_number_position "right"
+
+          set -g @catppuccin_window_default_fill "number"
+          set -g @catppuccin_window_default_text "#W"
+
+          set -g @catppuccin_window_current_fill "number"
+          set -g @catppuccin_window_current_text "#W"
+
+          set -g @catppuccin_status_modules_right ""
+          set -g @catppuccin_status_left_separator  " "
+          set -g @catppuccin_status_right_separator ""
+          set -g @catppuccin_status_fill "icon"
+          set -g @catppuccin_status_connect_separator "no"
+
+          set -g @catppuccin_directory_text "#{pane_current_path}"
+          set -g @catppuccin_status_background "default"
+          set-option -g default-terminal "screen-256color"
+        '';
+      }
+    ];
+  };
+}

home/programs/shell/zoxide.nix

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

home/programs/shell/zsh.nix

@@ -1,31 +1,32 @@
-# My shell configuration
+{ pkgs, lib, config, ... }: {
-{
+
-  pkgs,
+  home.packages = with pkgs; [ bat ripgrep tldr ];
-  lib,
-  config,
-  ...
-}: let
-  fetch = config.theme.fetch; # neofetch, nerdfetch, pfetch
-in {
-  home.packages = with pkgs; [bat ripgrep tldr sesh];
 
-  # Add go binaries to the PATH
   home.sessionPath = [ "$HOME/go/bin" ];
 
   programs.zsh = {
     enable = true;
     enableCompletion = true;
     autosuggestion.enable = true;
-    syntaxHighlighting = {
+    syntaxHighlighting.enable = true;
-      enable = true;
-      highlighters = ["main" "brackets" "pattern" "regexp" "root" "line"];
-    };
     historySubstringSearch.enable = true;
 
+    initExtraFirst = ''
+      bindkey -e
+      ${if config.var.theme.fetch == "neofetch" then
+        pkgs.neofetch + "/bin/neofetch"
+      else if config.var.theme.fetch == "nerdfetch" then
+        "nerdfetch"
+      else if config.var.theme.fetch == "pfetch" then
+        "echo; ${pkgs.pfetch}/bin/pfetch"
+      else
+        ""}
+    '';
+
     history = {
       ignoreDups = true;
-      save = 10000;
+      save = 1000000;
-      size = 10000;
+      size = 1000000;
     };
 
     profileExtra = lib.optionalString (config.home.sessionPath != [ ]) ''
@@ -46,24 +47,19 @@ in {
       ls = "eza --icons=always --no-quotes";
       tree = "eza --icons=always --tree --no-quotes";
       sl = "ls";
-      open = "${pkgs.xdg-utils}/bin/xdg-open";
+      open = "${pkgs.xdg_utils}/bin/xdg-open";
       icat = "${pkgs.kitty}/bin/kitty +kitten icat";
-      cat = "bat --theme=base16 --color=always --paging=never --tabs=2 --wrap=never --plain";
-      mkdir = "mkdir -p";
-
-      obsidian-no-gpu = "env ELECTRON_OZONE_PLATFORM_HINT=auto obsidian --ozone-platform=x11";
       wireguard-import = "nmcli connection import type wireguard file";
-
+      neorg =
-      notes = "nvim ~/notes/index.md --cmd 'cd ~/notes' -c ':lua Snacks.picker.smart()'";
+        "cd ~/nextcloud/neorg && vim -c ':ZenMode' -c ':Telescope find_files' index.norg";
+      notes =
+        "cd ~/nextcloud/Notes && vim -c ':ZenMode' -c ':Telescope find_files' index.md";
       note = "notes";
-      tmp = "nvim /tmp/$(date | sed 's/ //g;s/\\.//g').md";
-
-      nix-shell = "nix-shell --command zsh";
 
       # git
-      g = "lazygit";
       ga = "git add";
       gc = "git commit";
+      gcm = "git commit -m";
       gcu = "git add . && git commit -m 'Update'";
       gp = "git push";
       gpl = "git pull";
@@ -72,132 +68,6 @@ in {
       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";
     };
-
-    initContent =
-      # bash
-      ''
-        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
-        }
-
-        function chatgptfolder(){
-          echo "################################"
-          echo "###         TREE             ###"
-          echo "################################"
-          ${pkgs.eza}/bin/eza --tree -aF --icons never
-          echo -e "\n\n"
-          echo "##############################"
-          echo "###        CONTENT         ###"
-          echo "##############################"
-          find . -type f -not -path '*/.git/*' -print0 | while IFS= read -r -d "" file; do
-              echo -e "\n--- DEBUT: $file ---\n"
-              cat "$file"
-              echo -e "\n--- FIN: $file ---\n"
-          done
-        }
-
-
-        function n4c() {
-          category=''${1:-all}
-          shift
-          args=''${*}
-          nix develop "github:nix4cyber/n4c#''${category}" ''${args} -c zsh
-        }
-
-        zle     -N             sesh-sessions
-        bindkey -M emacs '\es' sesh-sessions
-        bindkey -M vicmd '\es' sesh-sessions
-        bindkey -M viins '\es' sesh-sessions
-
-        # search history based on what's typed in the prompt
-        autoload -U history-search-end
-        zle -N history-beginning-search-backward-end history-search-end
-        zle -N history-beginning-search-forward-end history-search-end
-        bindkey "^[OA" history-beginning-search-backward-end
-        bindkey "^[OB" history-beginning-search-forward-end
-
-        # General completion behavior
-        zstyle ':completion:*' completer _extensions _complete _approximate
-
-        # Use cache
-        zstyle ':completion:*' use-cache on
-        zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/.zcompcache"
-
-        # Complete the alias
-        zstyle ':completion:*' complete true
-
-        # Autocomplete options
-        zstyle ':completion:*' complete-options true
-
-        # Completion matching control
-        zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
-        zstyle ':completion:*' keep-prefix true
-
-        # Group matches and describe
-        zstyle ':completion:*' menu select
-        zstyle ':completion:*' list-grouped false
-        zstyle ':completion:*' list-separator '''
-        zstyle ':completion:*' group-name '''
-        zstyle ':completion:*' verbose yes
-        zstyle ':completion:*:matches' group 'yes'
-        zstyle ':completion:*:warnings' format '%F{red}%B-- No match for: %d --%b%f'
-        zstyle ':completion:*:messages' format '%d'
-        zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b'
-        zstyle ':completion:*:descriptions' format '[%d]'
-
-        # Colors
-        zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
-
-        # case insensitive tab completion
-        zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories
-        zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
-        zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand'
-        zstyle ':completion:*:*:-command-:*:*' group-order aliases builtins functions commands
-        zstyle ':completion:*' special-dirs true
-        zstyle ':completion:*' squeeze-slashes true
-
-        # Sort
-        zstyle ':completion:*' sort false
-        zstyle ":completion:*:git-checkout:*" sort false
-        zstyle ':completion:*' file-sort modification
-        zstyle ':completion:*:eza' sort false
-        zstyle ':completion:complete:*:options' sort false
-        zstyle ':completion:files' sort false
-
-        ${lib.optionalString config.services.gpg-agent.enable ''
-          gnupg_path=$(ls $XDG_RUNTIME_DIR/gnupg)
-          export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/$gnupg_path/S.gpg-agent.ssh"
-        ''}
-
-        # Allow foot to pipe command output
-        function precmd {
-          if ! builtin zle; then
-              print -n "\e]133;D\e\\"
-          fi
-        }
-        function preexec {
-          print -n "\e]133;C\e\\"
-        }
-
-      '';
   };
 }

home/programs/spicetify/default.nix

@@ -1,32 +1,31 @@
-# Spicetify is a spotify client customizer
+{ pkgs, config, lib, inputs, ... }:
-{
+let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
-  pkgs,
-  config,
-  lib,
-  inputs,
-  ...
-}: let
-  spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};
-  accent = "${config.lib.stylix.colors.base0D}";
-  background = "${config.lib.stylix.colors.base00}";
 in {
+
   imports = [ inputs.spicetify-nix.homeManagerModules.default ];
-
+  nixpkgs.config.allowUnfreePredicate = pkg:
-  stylix.targets.spicetify.enable = false;
+    builtins.elem (lib.getName pkg) [ "spotify" ];
-
   programs.spicetify = {
     enable = true;
-    theme = lib.mkForce spicePkgs.themes.dribbblish;
+    theme = spicePkgs.themes.text;
-
     colorScheme = "custom";
 
     customColorScheme = {
-      button = accent;
+      text = "${config.var.theme.colors.fg}";
-      button-active = accent;
+      subtext = "${config.var.theme.colors.fgalt}";
-      tab-active = accent;
+      sidebar-text = "${config.var.theme.colors.fgalt}";
-      player = background;
+      main = "${config.var.theme.colors.bg}";
-      main = background;
+      sidebar = "${config.var.theme.colors.bg}";
-      sidebar = background;
+      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; [
@@ -36,7 +35,7 @@ in {
       hidePodcasts
       adblock
       fullAppDisplay
-      keyboardShortcut
+      shuffle
     ];
   };
 }

home/programs/thunar/default.nix

@@ -1,161 +0,0 @@
-# Thunar is a file explorer
-{
-  pkgs,
-  config,
-  ...
-}: let
-  user = config.var.username;
-in {
-  # ctrl + m to toggle the menubar
-  home.packages = with pkgs; [
-    xfce.thunar
-    xfce.xfconf
-    xfce.tumbler
-    xfce.thunar-archive-plugin
-    xfce.thunar-volman
-    xfce.thunar-media-tags-plugin
-    p7zip
-    xarchiver
-  ];
-
-  gtk = {
-    iconTheme = {
-      name = "WhiteSur";
-      package = pkgs.whitesur-icon-theme.override {
-        boldPanelIcons = true;
-        alternativeIcons = true;
-      };
-    };
-  };
-
-  home.sessionVariables = {
-    XDG_ICON_DIR = "${pkgs.whitesur-icon-theme}/share/icons/WhiteSur";
-  };
-
-  # bookmarks for the side pane
-  gtk.gtk3.bookmarks = [
-    "file:///home/${user}/Downloads Downloads"
-    "file:///home/${user}/Pictures Pictures"
-    "file:///home/${user}/.config/nixos NixOS"
-    "file:///home/${user}/dev Development"
-  ];
-
-  home.file.".config/xarchiver/xarchiverrc".text = ''
-    [xarchiver]
-    preferred_format=0
-    prefer_unzip=true
-    confirm_deletion=true
-    sort_filename_content=false
-    advanced_isearch=true
-    auto_expand=true
-    store_output=false
-    icon_size=2
-    show_archive_comment=false
-    show_sidebar=true
-    show_location_bar=true
-    show_toolbar=true
-    preferred_custom_cmd=
-    preferred_temp_dir=/tmp
-    preferred_extract_dir=/home/${user}/Downloads
-    allow_sub_dir=0
-    ensure_directory=true
-    overwrite=false
-    full_path=2
-    touch=false
-    fresh=false
-    update=false
-    store_path=false
-    updadd=true
-    freshen=false
-    recurse=true
-    solid_archive=false
-    remove_files=false
-  '';
-
-  home.file.".config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml".text = ''
-    <?xml version="1.1" 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="230"/>
-      <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="false"/>
-      <property name="misc-thumbnail-draw-frames" type="bool" value="true"/>
-      <property name="misc-text-beside-icons" type="bool" value="false"/>
-      <property name="misc-change-window-icon" type="bool" value="false"/>
-      <property name="hidden-bookmarks" type="array">
-        <value type="string" value="computer:///"/>
-        <value type="string" value="recent:///"/>
-        <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,118,111,50,50,50,50,993,50,50,84,50,151"/>
-      <property name="last-toolbar-items" type="string" value="menu:1,undo:1,back:1,forward:1,open-parent:0,open-home:0,redo:0,zoom-in:0,zoom-out:0,zoom-reset:0,location-bar:1,view-switcher:1,search:1,view-as-icons:0,view-as-detailed-list:0,view-as-compact-list:0,toggle-split-view:0,reload:0,new-tab:0,new-window:0,uca-action-1700000000000001:0"/>
-      <property name="last-side-pane" type="string" value="THUNAR_SIDEPANE_TYPE_SHORTCUTS"/>
-      <property name="last-image-preview-visible" type="bool" value="false"/>
-      <property name="misc-use-csd" type="bool" value="true"/>
-      <property name="default-view" type="string" value="ThunarIconView"/>
-      <property name="misc-thumbnail-max-file-size" type="uint64" value="1073741824"/>
-      <property name="misc-symbolic-icons-in-toolbar" type="bool" value="true"/>
-      <property name="misc-date-style" type="string" value="THUNAR_DATE_STYLE_SIMPLE"/>
-      <property name="shortcuts-icon-size" type="string" value="THUNAR_ICON_SIZE_16"/>
-      <property name="tree-icon-size" type="string" value="THUNAR_ICON_SIZE_16"/>
-      <property name="misc-symbolic-icons-in-sidepane" type="bool" value="true"/>
-      <property name="misc-open-new-window-as-tab" type="bool" value="false"/>
-      <property name="misc-full-path-in-tab-title" type="bool" value="true"/>
-      <property name="misc-show-delete-action" type="bool" value="false"/>
-    </channel>
-  '';
-
-  xdg.configFile."Thunar/uca.xml".text = ''
-    <?xml version="1.0" encoding="UTF-8"?>
-    <actions>
-      <action>
-          <icon>utilities-terminal</icon>
-          <name>Open Terminal Here</name>
-          <unique-id>1700000000000001</unique-id>
-          <command>kitty -d %f</command>
-          <description>Opens Kitty terminal in the selected folder</description>
-          <patterns>*</patterns>
-          <startup-notify/>
-          <directories/>
-      </action>
-      <action>
-          <icon></icon>
-          <name>Extract here</name>
-          <submenu></submenu>
-          <unique-id>1689618425925956-3</unique-id>
-          <command>xarchiver -x . %f</command>
-          <description>Extracts the archive into the directory it is located in.</description>
-          <range>*</range>
-          <patterns>*.tar.bz2;*.tar.gz;*.tar.xz;*.tar.Z;*.tar;*.taz;*.tb2;*.tbz;*.tbz2;*.tgz;*.txz;*.zip;*.bz2;*.docx;*.apk;*.gz;*.odt;</patterns>
-          <other-files/>
-      </action>
-      <action>
-        <icon>package-x-generic</icon>
-        <name>Compress here (tar.gz)</name>
-        <submenu></submenu>
-        <unique-id>1700000000000003</unique-id>
-        <command>tar -czvf %n.tar.gz %N</command>
-        <description>Creates a compressed archive (.tar.gz) of selected files/folders.</description>
-        <range>*</range>
-        <patterns>*</patterns>
-        <directories/>
-        <other-files/>
-      </action>
-    </actions>
-  '';
-}

home/programs/vivaldi/default.nix

@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  programs.vivaldi = {
-    enable = true;
-    commandLineArgs = [
-      "--no-default-browser-check"
-    ];
-  };
-
-  home.sessionVariables = {
-    DEFAULT_BROWSER = "${pkgs.vivaldi}/bin/vivaldi";
-  };
-}

home/programs/yazi/default.nix

@@ -0,0 +1,39 @@
+{
+  programs.yazi = {
+    enable = true;
+    enableZshIntegration = true;
+
+    settings = {
+      log = { enabled = false; };
+      manager = {
+        show_hidden = false;
+        sort_by = "modified";
+        sort_dir_first = true;
+        sort_reverse = true;
+      };
+    };
+
+    theme = {
+      filetype = {
+        rules = [
+          {
+            fg = "#7AD9E5";
+            mime = "image/*";
+          }
+          {
+            fg = "#F3D398";
+            mime = "video/*";
+          }
+          {
+            fg = "#F3D398";
+            mime = "audio/*";
+          }
+          {
+            fg = "#CD9EFC";
+            mime = "application/x-bzip";
+          }
+        ];
+      };
+    };
+  };
+}

home/scripts/brightness/default.nix

@@ -0,0 +1,31 @@
+{ 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}}%-
+  '';
+
+  brightness-set = pkgs.writeShellScriptBin "brightness-set" ''
+    ${pkgs.brightnessctl}/bin/brightnessctl set ''${1-100}%
+  '';
+
+  brightness-up = pkgs.writeShellScriptBin "brightness-up" ''
+    brightness-change up ${increments}
+  '';
+
+  brightness-down = pkgs.writeShellScriptBin "brightness-down" ''
+    brightness-change down ${increments}
+  '';
+
+in {
+  home.packages = [
+    pkgs.brightnessctl
+    brightness-change
+    brightness-up
+    brightness-down
+    brightness-set
+  ];
+}

home/scripts/caffeine/default.nix

@@ -0,0 +1,25 @@
+{ pkgs, ... }:
+let
+  caffeine-status = pkgs.writeShellScriptBin "caffeine-status" ''
+    [[ $(pidof "hypridle") ]] && echo "0" || echo "1"
+  '';
+
+  caffeine-status-icon = pkgs.writeShellScriptBin "caffeine-status-icon" ''
+    [[ $(pidof "hypridle") ]] && echo "󰾪" || echo "󰅶"
+  '';
+
+  caffeine = pkgs.writeShellScriptBin "caffeine" ''
+    if [[ $(pidof "hypridle") ]]; then
+      pkill hypridle
+      title="󰅶  Caffeine Activated"
+      description="Caffeine is now active! Your screen will not turn off automatically."
+    else
+      ${pkgs.hyprland}/bin/hyprctl dispatch exec ${pkgs.hypridle}/bin/hypridle
+      title="󰾪  Caffeine Deactivated"
+      description="Caffeine is now deactivated! Your screen will turn off automatically."
+    fi
+
+    notif "caffeine" "$title" "$description"
+  '';
+
+in { home.packages = [ caffeine-status caffeine caffeine-status-icon ]; }

home/scripts/default.nix

@@ -0,0 +1,13 @@
+{
+  imports = [
+    ./nixy
+    ./sounds
+    ./brightness
+    ./caffeine
+    ./night-shift
+    ./screenshot
+    ./nerdfont_fzf
+    ./notification
+    ./system
+  ];
+}

home/scripts/nerdfont_fzf/default.nix

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

home/scripts/night-shift/default.nix

@@ -0,0 +1,55 @@
+{ pkgs, ... }:
+
+let
+  default = "4000";
+
+  night-shift-on = pkgs.writeShellScriptBin "night-shift-on" ''
+    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.gammastep}/bin/gammastep -O ${default}"
+    title="󰖔  Night-Shift Activated"
+    description="Night-Shift is now activated! Your screen will be warmer and easier on the eyes."
+
+    notif "night-shift" "$title" "$description"
+  '';
+
+  night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
+    pkill gammastep
+    title="󰖕  Night-Shift Deactivated"
+    description="Night-Shift is now deactivated! Your screen will return to normal."
+
+    notif "night-shift" "$title" "$description"
+  '';
+
+  night-shift = pkgs.writeShellScriptBin "night-shift" ''
+    if pgrep gammastep; then
+      night-shift-off
+    else
+      night-shift-on
+    fi
+  '';
+
+  night-shift-status = pkgs.writeShellScriptBin "night-shift-status" ''
+    if [[ $(pgrep gammastep) ]]; then
+      echo "1"
+    else
+      echo "0"
+    fi
+  '';
+
+  night-shift-status-icon =
+    pkgs.writeShellScriptBin "night-shift-status-icon" ''
+      if [[ $(pgrep gammastep) ]]; then
+        echo "󰖔"
+      else
+        echo "󰖕"
+      fi
+    '';
+in {
+  home.packages = [
+    pkgs.gammastep
+    night-shift-on
+    night-shift-off
+    night-shift
+    night-shift-status
+    night-shift-status-icon
+  ];
+}

home/scripts/nixy/default.nix

@@ -0,0 +1,55 @@
+{ pkgs, config, ... }:
+let
+  nixy = pkgs.writeShellScriptBin "nixy" ''
+    function exec() {
+      $@
+    }
+
+    function ui(){
+      DEFAULT_ICON="󰘳"
+
+      # "icon;name;command"[]
+      apps=(
+        ";Rebuild;nixy rebuild"
+        ";Upgrade;nixy upgrade"
+        ";Update;nixy update"
+        ";Collect Garbage;nixy gc"
+        ";Clean Boot Menu;nixy cb"
+      )
+
+      # 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 ${config.var.configDirectory}#${config.var.hostname}
+    elif [[ $1 == "upgrade" ]];then
+      sudo nixos-rebuild switch --upgrade --flake ${config.var.configDirectory}#${config.var.hostname}
+    elif [[ $1 == "update" ]];then
+      cd ${config.var.configDirectory} && sudo nix flake update
+    elif [[ $1 == "gc" ]];then
+      cd ${config.var.configDirectory} && sudo nix-collect-garbage -d
+    elif [[ $1 == "cb" ]];then
+      sudo /run/current-system/bin/switch-to-configuration boot
+    elif [[ $1 == "remote" ]];then
+      cd ~/.config/nixos && git add . && git commit -m "update" && git push
+      ssh jack -S -C "cd /home/hadi/.config/nixos && git pull && sudo -S nixos-rebuild switch --flake ~/.config/nixos#jack"
+    else
+      echo "Unknown argument"
+    fi
+  '';
+
+in { home.packages = [ nixy ]; }

home/scripts/notification/default.nix

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

home/scripts/screenshot/default.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }:
+
+let
+  screenshot = pkgs.writeShellScriptBin "screenshot" ''
+    if [[ $2 == "swappy" ]];then
+      folder="/tmp"
+    else
+      folder="$HOME/Pictures/screenshots"
+    fi
+    filename="$(date +%Y-%m-%d_%H:%M:%S).png"
+    mode="region" # Default to region
+
+    if [[ $1 == "window" ]];then
+      mode="window"
+    elif [[ $1 == "monitor" ]];then
+      mode="output"
+    fi
+
+    ${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/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 ]; }

home/scripts/sounds/default.nix

@@ -0,0 +1,30 @@
+{ pkgs, ... }:
+
+let
+  increments = "5";
+
+  sound-change = pkgs.writeShellScriptBin "sound-change" ''
+    [[ $1 == "mute" ]] && wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+    [[ $1 == "up" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-${increments}}%+
+    [[ $1 == "down" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-${increments}}%-
+    [[ $1 == "set" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-100}%
+  '';
+
+  sound-up = pkgs.writeShellScriptBin "sound-up" ''
+    sound-change up ${increments}
+  '';
+
+  sound-set = pkgs.writeShellScriptBin "sound-set" ''
+    sound-change set ''${1-100}
+  '';
+
+  sound-down = pkgs.writeShellScriptBin "sound-down" ''
+    sound-change down ${increments}
+  '';
+
+  sound-toggle = pkgs.writeShellScriptBin "sound-toggle" ''
+    sound-change mute
+  '';
+in {
+  home.packages = [ sound-change sound-up sound-down sound-toggle sound-set ];
+}

home/scripts/system/default.nix

@@ -0,0 +1,24 @@
+{ pkgs, ... }:
+
+let
+  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
+  '';
+
+  lock = pkgs.writeShellScriptBin "lock" ''
+    ${pkgs.hyprlock}/bin/hyprlock
+  '';
+
+in { home.packages = [ menu powermenu lock ]; }

home/system/batsignal/default.nix

@@ -0,0 +1,6 @@
+{
+  services.batsignal = {
+    enable = true;
+    extraArgs = [ "-c 10" "-w 30" "-f 97" ];
+  };
+}

home/system/caelestia-shell/appearance.nix

@@ -1,49 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: let
-  rounding = config.theme.rounding + config.theme.gaps-out;
-  inherit (config.stylix) fonts;
-in {
-  home.packages = with pkgs; [
-    papirus-icon-theme
-  ];
-
-  programs.caelestia.settings = {
-    paths.sessionGif = ./session-gif-hacker-cat.gif;
-    background.enabled = false;
-    appearance = {
-      transparency = {
-        enable = true;
-        base = 0.85;
-        layers = 0.4;
-      };
-      font.family = {
-        material = "Material Symbols Rounded";
-        mono = fonts.monospace.name;
-        sans = fonts.sansSerif.name;
-      };
-    };
-    utilities = {
-      enabled = true;
-      maxToasts = 4;
-      toasts = {
-        audioInputChanged = true;
-        audioOutputChanged = true;
-        capsLockChanged = false;
-        chargingChanged = true;
-        configLoaded = false;
-        dndChanged = true;
-        gameModeChanged = true;
-        numLockChanged = false;
-        nowPlaying = false;
-        kbLayoutChanged = false;
-      };
-    };
-    border = {
-      inherit rounding;
-      thickness = 8;
-    };
-  };
-}

home/system/caelestia-shell/bar.nix

@@ -1,69 +0,0 @@
-{
-  programs.caelestia.settings.bar = {
-    clock.showIcon = false;
-    popouts.activeWindow = false;
-    persistent = true;
-    status = {
-      showBattery = true;
-      showMicrophone = false;
-      showLockStatus = false;
-      showBluetooth = true;
-      showAudio = true;
-      showKbLayout = false;
-      showNetwork = true;
-    };
-    workspaces = {
-      activeIndicator = true;
-      activeLabel = "󰪥 ";
-      activeTrail = false;
-      label = " ";
-      occupiedBg = true;
-      occupiedLabel = "󰪥 ";
-      rounded = true;
-      showWindows = false;
-      shown = 5;
-    };
-    entries = [
-      {
-        id = "logo";
-        enabled = true;
-      }
-      {
-        id = "workspaces";
-        enabled = true;
-      }
-      {
-        id = "spacer";
-        enabled = true;
-      }
-      {
-        id = "activeWindow";
-        enabled = true;
-      }
-      {
-        id = "spacer";
-        enabled = true;
-      }
-      {
-        id = "tray";
-        enabled = true;
-      }
-      {
-        id = "clock";
-        enabled = true;
-      }
-      {
-        id = "statusIcons";
-        enabled = true;
-      }
-      {
-        id = "power";
-        enabled = true;
-      }
-    ];
-    tray = {
-      background = false;
-      recolour = false;
-    };
-  };
-}

home/system/caelestia-shell/bindings.nix

@@ -1,58 +0,0 @@
-{
-  wayland.windowManager.hyprland.settings = {
-    bindin = [
-      # Launcher
-      "$mod, mouse:272, global, caelestia:launcherInterrupt"
-      "$mod, mouse:273, global, caelestia:launcherInterrupt"
-      "$mod, mouse:274, global, caelestia:launcherInterrupt"
-      "$mod, mouse:275, global, caelestia:launcherInterrupt"
-      "$mod, mouse:276, global, caelestia:launcherInterrupt"
-      "$mod, mouse:277, global, caelestia:launcherInterrupt"
-      "$mod, mouse_up, global, caelestia:launcherInterrupt"
-      "$mod, mouse_down, global, caelestia:launcherInterrupt"
-    ];
-    bind = [
-      # Launcher
-      "$mod, SPACE, global, caelestia:launcher"
-      "$mod, X, global, caelestia:session" # Powermenu
-
-      # Misc
-      "$mod, L, global, caelestia:lock"
-      "$mod, N, exec, caelestia shell drawers toggle sidebar"
-
-      # Utilities
-      "$mod+Shift, SPACE, exec, caelestia shell gameMode toggle" # Toggle Focus/Game mode
-      "$mod+Shift, S, global, caelestia:screenshotFreeze" # Capture region (freeze)
-      "$mod+Shift+Alt, S, global, caelestia:screenshot" # Capture region
-      "$mod+Alt, R, exec, caelestia record -s" # Record screen with sound
-      "Ctrl+Alt, R, exec, caelestia record" # Record screen
-      "$mod+Shift+Alt, R, exec, caelestia record -r" # Record region
-
-      "$mod+Shift, E, exec, pkill fuzzel || caelestia emoji -p"
-    ];
-    bindl = [
-      # Brightness
-      ", XF86MonBrightnessUp, global, caelestia:brightnessUp"
-      ", XF86MonBrightnessDown, global, caelestia:brightnessDown"
-      "$mod, F2, exec, nightshift-toggle"
-      "$mod, F3, exec, nightshift-toggle"
-
-      # Media
-      ", XF86AudioPlay, global, caelestia:mediaToggle"
-      ", XF86AudioPause, global, caelestia:mediaToggle"
-      ", XF86AudioNext, global, caelestia:mediaNext"
-      ", XF86AudioPrev, global, caelestia:mediaPrev"
-      ", XF86AudioStop, global, caelestia:mediaStop"
-
-      # Sound
-      ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-
-      # Utilities
-      ", Print, exec, caelestia screenshot" # Full screen capture > clipboard
-    ];
-    bindle = [
-      ", XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
-      ", XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ 0; wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
-    ];
-  };
-}

home/system/caelestia-shell/default.nix

@@ -1,62 +0,0 @@
-# Caelestia Shell Home Manager Configuration
-# See https://github.com/caelestia-dots/shell
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  imports = [
-    inputs.caelestia-shell.homeManagerModules.default
-    ./bindings.nix
-    ./bar.nix
-    ./launcher.nix
-    ./appearance.nix
-    ./scheme.nix
-  ];
-
-  programs.caelestia = {
-    enable = true;
-    systemd.enable = false;
-    settings = {
-      services.weatherLocation = "Paris";
-      general = {
-        apps = {
-          terminal = ["ghostty"];
-          audio = ["pavucontrol"];
-          explorer = ["thunar"];
-        };
-        idle = {
-          timeouts = [];
-        };
-      };
-    };
-    cli = {
-      enable = true;
-      settings.theme = {
-        enableTerm = false;
-        enableDiscord = false;
-        enableSpicetify = false;
-        enableBtop = false;
-        enableCava = false;
-        enableHypr = false;
-        enableGtk = false;
-        enableQt = false;
-      };
-    };
-  };
-
-  home.packages = with pkgs; [
-    gpu-screen-recorder
-  ];
-
-  wayland.windowManager.hyprland.settings.exec-once = [
-    "uwsm app -- caelestia resizer -d"
-    "uwsm app -- caelestia shell -d"
-    "caelestia scheme set -n custom"
-  ];
-
-  services.cliphist = {
-    enable = true;
-    allowImages = true;
-  };
-}

home/system/caelestia-shell/launcher.nix

@@ -1,124 +0,0 @@
-{
-  programs.caelestia.settings = {
-    session.commands = {
-      logout = ["loginctl" "terminate-user" ""];
-      shutdown = ["systemctl" "poweroff"];
-      hibernate = ["systemctl" "hibernate"];
-      reboot = ["systemctl" "reboot"];
-    };
-    launcher = {
-      actionPrefix = "/";
-      actions = [
-        {
-          name = "Calculator";
-          icon = "calculate";
-          description = "Do simple math equations (powered by Qalc)";
-          command = ["autocomplete" "calc"];
-          enabled = true;
-          dangerous = false;
-        }
-        {
-          name = "Shutdown";
-          icon = "power_settings_new";
-          description = "Shutdown the system";
-          command = ["systemctl" "poweroff"];
-          enabled = true;
-          dangerous = true;
-        }
-        {
-          name = "Reboot";
-          icon = "cached";
-          description = "Reboot the system";
-          command = ["systemctl" "reboot"];
-          enabled = true;
-          dangerous = true;
-        }
-        {
-          name = "Logout";
-          icon = "exit_to_app";
-          description = "Log out of the current session";
-          command = ["loginctl" "terminate-user" ""];
-          enabled = true;
-          dangerous = true;
-        }
-        {
-          name = "Lock";
-          icon = "lock";
-          description = "Lock the current session";
-          command = ["loginctl" "lock-session"];
-          enabled = true;
-          dangerous = false;
-        }
-        {
-          name = "Sleep";
-          icon = "bedtime";
-          description = "Suspend then hibernate";
-          command = ["systemctl" "suspend-then-hibernate"];
-          enabled = true;
-          dangerous = false;
-        }
-        {
-          name = "Restart caelestia";
-          icon = "cached";
-          description = "Restart caelestia";
-          command = ["hyprctl" "dispatch" "exec" "caelestia-shell kill | sleep 1 | caelestia-shell"];
-          enabled = true;
-          dangerous = false;
-        }
-        {
-          name = "Emoji Picker";
-          icon = "mood";
-          description = "Toggle the emoji picker";
-          command = ["caelestia" "emoji" "-p"];
-          enabled = true;
-          dangerous = false;
-        }
-        {
-          name = "Clipboard History";
-          icon = "content_paste";
-          description = "Toggle the clipboard history";
-          command = ["caelestia" "clipboard"];
-          enabled = true;
-          dangerous = false;
-        }
-        {
-          name = "Delete from Clipboard History";
-          icon = "content_paste_off";
-          description = "Delete a line from the clipboard history";
-          command = ["caelestia" "clipboard"];
-          enabled = true;
-          dangerous = false;
-        }
-        {
-          name = "Night Shift";
-          icon = "moon_stars";
-          description = "Toggle Night Shift, the blue light filter";
-          command = ["nightshift-toggle"];
-          enabled = true;
-          dangerous = false;
-        }
-        {
-          name = "Hyprpicker";
-          icon = "colorize";
-          description = "Pick an hex color";
-          command = ["hyprpicker" "-a"];
-          enabled = true;
-          dangerous = false;
-        }
-      ];
-      dragThreshold = 50;
-      enableDangerousActions = false;
-      maxShown = 7;
-      specialPrefix = "@";
-      useFuzzy = {
-        apps = false;
-        actions = false;
-        schemes = false;
-        variants = false;
-        wallpapers = false;
-      };
-      showOnHover = false;
-      hiddenApps = [];
-    };
-  };
-}