Update README.md (auto)

Signed-off-by: Hadi <112569860+anotherhadi@users.noreply.github.com>

.github/FUNDING.yml

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

.github/assets/README_template.md

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

@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+# Create the README.md file from the .github/assets/README_template.md file
+
+[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
+
+README_FILE="./README.md"
+
+table_of_content=$(markdown-table-of-contents --start-by 2 ./.github/assets/README_template.md) # https://github.com/anotherhadi/markdown-table-of-contents
+readme_content=$(cat "./.github/assets/README_template.md")
+
+# Replace variables
+readme_content=${readme_content//\{primarycolor\}/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

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

.gitignore

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

.sops.yaml

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

README.md

@@ -1,11 +1,6 @@
-[//]: # (Title: Nixy)  
+[//]: # (This file is autogenerated)
-[//]: # (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: 06/25/24)
-[//]: # (Version: v2.0.0)
-
 <div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
+    <img alt="nixy logo" src="https://raw.githubusercontent.com/anotherhadi/nixy/main/.github/assets/logo.png" width="120px" />
 </div>
 
 <br>
@@ -14,64 +9,115 @@
 
 <br>
 <div align="center">
-    <a href="https://github.com/anotherhadi/nixy">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=v2.0.0&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
-    </a>
     <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=starship&logoColor=89b4fa">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=A89AD1&labelColor=0b0b0b&style=for-the-badge&logo=starship&logoColor=A89AD1">
     </a>
     <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=github&logoColor=89b4fa">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=A89AD1&labelColor=0b0b0b&style=for-the-badge&logo=github&logoColor=A89AD1">
     </a>
     <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=181825&logo=NixOS&logoColor=89b4fa&color=89b4fa">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=0b0b0b&logo=NixOS&logoColor=A89AD1&color=A89AD1">
     </a>
     <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=181825&colorB=89b4fa&logo=unlicense&logoColor=89b4fa"/>
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=0b0b0b&colorB=A89AD1&logo=unlicense&logoColor=A89AD1"/>
     </a>
 </div>
 <br>
 
-**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
+**Nixy simplifies and unifies** the Hyprland ecosystem with a modular, easily
-It's a simple way to manage your system configuration and dotfiles.
+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
 
-  - [Table of Content](#table-of-content)
+- [Table of Content](#table-of-content)
-  - [Gallery](#gallery)
+- [Screenshots](#screenshots)
-  - [Architecture](#architecture)
+- [Architecture](#architecture)
-  - [Installation](#installation)
+  - [🏠 /home (User-level configuration)](#-home-user-level-configuration)
-  - [Documentation](#documentation)
+  - [🐧 /nixos](#-nixos)
+  - [🎨 /themes](#-themes)
+  - [💻 /hosts](#-hosts)
+  - [🖥️ /server-modules](#-server-modules)
+- [Installation](#installation)
+- [Documentation](#documentation)
 
-## Gallery
+## Screenshots
 
-![catppuccin1](docs/src/catppuccin/1.png)
+![Home](.github/assets/rose-pine/home.png)
-![catppuccin2](docs/src/catppuccin/2.png)
+![Flake & Spotify](.github/assets/rose-pine/flake-spotify.png)
-![catppuccin3](docs/src/catppuccin/3.png)
+![Browser and notification center](.github/assets/rose-pine/browser-and-notifications.png)
 
 ## Architecture
 
-- 🏠 `home` are the dotfiles and configuration files for the user
+### 🏠 /home (User-level configuration)
-- 💻 `hosts` are the system configuration files
+
-  - 'laptop' is my configuration for my laptop with Nvidia
+Contains **dotfiles and settings** that apply to your user environment.
-  - 'server' is for my Nixos server (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
+
-  - 'guest' is a *template* that you can copy and modify for *your own system*
+**Subfolders:**
-  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
+
-  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
+- `programs` is a collection of apps configured with home-manager
-- 🤫 `secrets` are the secrets files encrypted with sops-nix
+- `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
 ```
 
-- Copy the `hosts/guest` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+2. Copy the `hosts/laptop` folder, rename it to match your system’s hostname,
-- Add your `hardware-configuration.nix` to your new host's folder
+   and update `variables.nix` with your machine’s settings.
-- Add your 'nixosConfigurations' inside `flake.nix` (You can edit the "yourhostname" one and change the lines containing '# CHANGEME')
+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.
 
-> [!NOTE]
+> [!IMPORTANT]
-> When you add new files, don't forget to run `git add .` to add them to the git repository
+> `# 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
@@ -79,9 +125,10 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 
 ## Documentation
 
-- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
+- [SERVER](docs/SERVER.md): Check out the server documentation
-- [APPS.md](docs/APPS.md): Which apps are installed
+- [THEMES](docs/THEMES.md): How themes work and how to create your own
-- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome
-- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
+  collection of wallpapers
-- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
+
-- [LICENSE](LICENSE): MIT Licensey
+- [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
+- [LICENSE](LICENSE): MIT License

docs/APPS.md

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

docs/CONTRIBUTING.md

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

docs/SCRIPTS.md

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

docs/SERVER.md

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

docs/TODO.md

@@ -1,42 +0,0 @@
-# Todolist
-
-feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
-
-- [ ] Nixy
-  - [ ] Installation script ([install.sh](./scripts/install.sh) to test on a fresh install)
-  - [ ] Variables-template with defaults
-  - [ ] Themes
-    - [ ] Upload new wallpapers
-    - [ ] MacOS theme
-    - [ ] GithubFetch: Neofetch like, github calendar in the terminal
-  - [ ] Write a hyprland shortcuts markdown file (Parse the hyprland settings conf)
-  - [ ] Tofi (Wofi but terminal based)
-
-- [ ] Waybar
-  - [ ] Caffeine status
-  - [ ] Night-shift status
-
-- [ ] Hyprland
-  - [ ] Make hyprcursor work
-  - [ ] Animations based on app name
-    - [ ] Wofi: popin
-    - [ ] Wlogout: fade in
-  - [ ] Fix screenshots
-
-- [ ] Nixvim
-  - [ ] Telescope: find with file content
-  - [ ] Markdown snippets
-  - [ ] Whichkey: Description for keybindings
-  - [ ] Spelling
-
-- [ ] Backup system for some folders ($home/dev, $home/pictures, ...)
-  - [ ] Exclude file pattern (nodes modules, ...)
-  - [ ] Auto backup when a specific usb key is plugged
-
-- [ ] Usb security for laptop & server, variable in variables.nix, disable for guest
-
-- [ ] Server
-  - [ ] Bitcoin-git
-  - [ ] ServerFetch: Neofetch like, but for server: CPU, RAM, Disk, Network, Uptime, status (check with uptime kuma API)
-  - [ ] Ntfy auth file
-  - [ ] Launch transmission-openvpn on boot (see hosts/server/modules/jackflix/transmission.nix)

docs/scripts/compress_png.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# Compress png files in ./docs/src
-
-[[ -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
-
-for file in ./home/wallpapers/*.png; do
-  optipng "$file"
-done

docs/scripts/create_guest_config.sh

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

docs/scripts/create_readme.sh

@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-# Create the README.md file from the docs/src/README_template.md file
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-README_FILE="./README.md"
-
-header=$(cat "./docs/src/header.md")
-table_of_content=$(~/go/bin/md-table-of-contents ./docs/src/README_template.md)
-version=$(git describe --tags --abbrev=0)
-readme_content=$(cat "./docs/src/README_template.md")
-
-header=${header//\{date\}/$(date '+%D')}
-header=${header//\{primarycolor\}/89b4fa}
-header=${header//\{backgroundcolor\}/181825}
-header=${header//\{version\}/$version}
-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/get_keybindings.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-[[ -f "./home/system/hyprland/default.nix" ]] || (echo "File ./home/system/hyprland/default.nix not found" && exit 1)
-
-config=$( cat "./home/system/hyprland/default.nix")
-
-# get text between
-#  bind = [
-# and next ]
-
-# Example:
-# "$mod, E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Description
-# Steps:
-# We should remove the ""
-# $mod replace by Super key
-# $shiftMod replace by "Super Shift"
-# Concat with key
-# Remove , exec, 
-# Remove variables and /bin/ if present
-
-# Create a markdown table with everything 

docs/scripts/install.sh

@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-# https://github.com/anotherhadi/nixy
-# Installation script: Should be run on fresh nixos install.
-
-printf "\n\e[0;92m- \e[0m\e[1;77mNixy's Installation Script\e[0;96m [anotherhadi/nixy]\e[0m"
-
-# Check if we're on the good directory
-[[ -f "./docs/scripts/install.sh" ]] || (
-  printf "\n\e[0;91mx \e[0m\e[1;77mNot in the project root directory\e[0m"
-  exit 1
-)
-DIR=$PWD
-
-# Create a new configuration
-read -rp $'\n\e[0;92m+\e[0m\e[1;77m Username: \e[0;96m' username
-read -rp $'\n\e[0;92m+\e[0m\e[1;77m Hostname: \e[0;96m' hostname
-
-HOST_DIR="./hosts/$hostname"
-mkdir "$HOST_DIR"
-
-nixos-generate-config --show-hardware-config >"$HOST_DIR/hardware-configuration.nix"
-
-printf "\n\e[0;92m? \e[0m\e[1;77mInstall Nvidia drivers?\e[0;96m [y/N]\e[0m"
-read -r yn
-yn=$(echo "$yn" | tr '[:upper:]' '[:lower:]')
-if [[ $yn == "y" || $yn == "yes" ]]; then
-  nvidia=true
-else
-  nvidia=false
-fi
-
-printf "\n\e[0;92m? \e[0m\e[1;77mInstall prime?\e[0;96m [y/N]\e[0m"
-read -r yn
-yn=$(echo "$yn" | tr '[:upper:]' '[:lower:]')
-if [[ $yn == "y" || $yn == "yes" ]]; then
-  prime=true
-else
-  prime=false
-fi
-
-cp "$LAPTOP_CONFIG/configuration.nix" "$HOST_DIR/configuration.nix"
-cp "$LAPTOP_CONFIG/variables.nix" "$HOST_DIR/variables.nix"
-
-config=$(cat "$LAPTOP_CONFIG/configuration.nix")
-if [[ $nvidia == false ]]; then
-  config=$(echo "$config" | sed 's/..\/shared\/nvidia/# ..\/shared\/nvidia/')
-fi
-if [[ $prime == false ]]; then
-  config=$(echo "$config" | sed 's/..\/shared\/prime/# ..\/shared\/prime/')
-fi
-echo "$config" >"$HOST_DIR/configuration.nix"
-
-variables=$(cat "$LAPTOP_CONFIG/variables.nix")
-variables=$(echo "$variables" | sed 's/112569860+anotherhadi@users.noreply.github.com/your_email/')
-variables=$(echo "$variables" | sed "s/hadi/$username/")
-variables=$(echo "$variables" | sed "s/nixy/$hostname/") # FIXME: Host name can be mixed with themes
-variables=$(echo "$variables" | sed "s/Hadi/$username/")
-variables=$(echo "$variables" | sed 's/sops = true/sops = false/')
-variables=$(echo "$variables" | sed 's/obsidian = true/obsidian = false/')
-variables=$(echo "$variables" | sed 's/tailscale = true/tailscale = false/')
-echo "$variables" >"$HOST_DIR/variables.nix"
-
-# Add it to the git index
-git add .
-
-printf "\n\e[0;92m+ \e[0m\e[1;77mHost added!\e[0m"
-
-# REBUILD
-
-printf "\n\e[0;92m? \e[0m\e[1;77mDo you want to rebuild?\e[0;96m [y/N]\e[0m"
-read -r yn
-yn=$(echo "$yn" | tr '[:upper:]' '[:lower:]')
-if [[ $yn == "y" || $yn == "yes" ]]; then
-  sudo nixos-rebuild switch --flake "$DIR"#"$hostname"
-fi
-
-printf "\n\e[0;92m✓ \e[0m\e[1;77mDone!\e[0m"

docs/scripts/take_rice_screenshot.sh

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

docs/src/README_template.md

@@ -1,50 +0,0 @@
-
-**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
-It's a simple way to manage your system configuration and dotfiles.
-
-## Table of Content
-
-{md_table_of_content}
-
-## Gallery
-
-![catppuccin1](docs/src/catppuccin/1.png)
-![catppuccin2](docs/src/catppuccin/2.png)
-![catppuccin3](docs/src/catppuccin/3.png)
-
-## Architecture
-
-- 🏠 `home` are the dotfiles and configuration files for the user
-- 💻 `hosts` are the system configuration files
-  - 'laptop' is my configuration for my laptop with Nvidia
-  - 'server' is for my homeserver (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
-  - 'guest' is a *template* that you can copy and modify for *your own system*
-  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
-  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
-- 🤫 `secrets` are the secrets files encrypted with sops-nix
-
-## Installation
-
-```sh
-git clone https://github.com/anotherhadi/nixy ~/.config/nixos
-```
-
-- Copy the `hosts/guest` 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 the "yourhostname" 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
-- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
-- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
-- [LICENSE](LICENSE): MIT Licensey

docs/src/header.md

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

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

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

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

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

flake.nix

@@ -1,91 +1,70 @@
 {
   # https://github.com/anotherhadi/nixy
   description = ''
-    Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+    Nixy simplifies and unifies the Hyprland ecosystem with a modular, easily customizable setup.
-    It's a simple way to manage your system configuration and dotfiles.
+    It provides a structured way to manage your system configuration and dotfiles with minimal effort.
   '';
 
   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";
     };
-    nixvim = {
+    caelestia-shell = {
-      url = "github:nix-community/nixvim";
+      url = "github:caelestia-dots/shell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
+    caelestia-cli = {
-    spicetify-nix.url = "github:the-argus/spicetify-nix";
+      url = "github:caelestia-dots/cli";
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    spicetify-nix = {
-    nurpkgs.url = "github:nix-community/NUR";
+      url = "github:Gerg-L/spicetify-nix";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    # Server
+    eleakxir.url = "github:anotherhadi/eleakxir";
+    nixarr.url = "github:rasmus-kirk/nixarr";
   };
 
-  outputs = inputs@{ nixpkgs, nur, ... }: {
+  outputs = inputs @ {nixpkgs, ...}: {
     nixosConfigurations = {
-
+      nixy =
-      nixy = nixpkgs.lib.nixosSystem {
+        # CHANGEME: This should match the 'hostname' in your variables.nix file
-        system = "x86_64-linux";
+        nixpkgs.lib.nixosSystem {
-        modules = [
+          modules = [
-          ./hosts/laptop/configuration.nix
+            {
-          inputs.nixos-hardware.nixosModules.omen-16-n0005ne
+              nixpkgs.overlays = [];
-          inputs.home-manager.nixosModules.home-manager
+              _module.args = {
-          {
+                inherit inputs;
-            nixpkgs.overlays = [ nur.overlay ];
+              };
-            _module.args = { inherit inputs; };
+            }
-            home-manager = {
+            inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware
-              useGlobalPkgs = true;
+            inputs.home-manager.nixosModules.home-manager
-              useUserPackages = true;
+            inputs.stylix.nixosModules.stylix
-              users."hadi" = import ./home/laptop.nix;
+            ./hosts/laptop/configuration.nix # CHANGEME: change the path to match your host folder
-              extraSpecialArgs = { inherit inputs; };
+          ];
-            };
+        };
-          }
+      # 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.eleakxir.nixosModules.eleakxir
           ./hosts/server/configuration.nix
-          inputs.home-manager.nixosModules.home-manager
-          {
-            nixpkgs.overlays = [ nur.overlay ];
-            _module.args = { inherit inputs; };
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."hadi" = import ./home/server.nix;
-              extraSpecialArgs = { inherit inputs; };
-            };
-          }
         ];
       };
-
-      yourhostname = nixpkgs.lib.nixosSystem { # CHANGEME
-        system = "x86_64-linux";
-        modules = [
-          ./hosts/yourhostname/configuration.nix # CHANGEME
-          inputs.home-manager.nixosModules.home-manager
-          {
-            nixpkgs.overlays = [ nur.overlay ];
-            _module.args = { inherit inputs; };
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."yourusername" = import # CHANGEME
-                ./home/laptop.nix; # you can also create a new ./home/yourhostname.nix
-              extraSpecialArgs = { inherit inputs; };
-            };
-          }
-        ];
-      };
-
     };
   };
 }

home/laptop.nix

@@ -1,103 +0,0 @@
-{ pkgs, config, ... }: {
-
-  imports = [
-    ../hosts/laptop/variables.nix # CHANGEME, replace with your host
-
-    # Programs
-    ./programs/btop
-    ./programs/cava
-    ./programs/kitty
-    ./programs/nextcloud
-    ./programs/nvim
-    ./programs/qutebrowser
-    ./programs/spicetify
-    ./programs/zathura
-    ./programs/shell
-    ./programs/git
-
-    # Scripts
-    ./scripts # All scripts
-
-    # System (Desktop environment like stuff)
-    ./system/dunst
-    ./system/gtk
-    ./system/hyprland
-    ./system/waybar
-    ./system/wlogout
-    ./system/wofi
-    ./system/mime
-    ./system/udiskie
-
-    ./system/sops/laptop.nix # You should probably remove this line
-  ];
-
-  home = {
-    inherit (config.var) username;
-    inherit (config.var) homeDirectory;
-
-    packages = with pkgs; [
-      swappy
-      imv
-      discord
-      obsidian
-      xfce.thunar
-      bitwarden
-      vlc
-      nextcloud-client
-      tailscale
-
-      # Dev
-      go
-      cargo
-      nodejs
-      python3
-      jq
-      git-ignore
-      nurl
-      prefetch-npm-deps
-      figlet
-
-      # Utils
-      fd
-      bc
-      gcc
-      blueman
-      zip
-      unzip
-      xdg_utils
-      wget
-      curl
-      wf-recorder
-      glow
-      nwg-displays
-      wireguard-tools
-      bitwarden-cli
-      optipng
-      pfetch
-      usbutils
-
-      # Just cool
-      peaclock
-      cbonsai
-      pipes
-      cmatrix
-
-      # Backup
-      vscode
-      tor-browser
-      firefox
-      neovide
-    ];
-
-    # Import wallpapers into $HOME/wallpapers
-    file."wallpapers" = {
-      recursive = true;
-      source = ./wallpapers;
-    };
-
-    stateVersion = "24.05";
-  };
-
-  programs.home-manager.enable = true;
-
-}

home/programs/btop/default.nix

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

home/programs/cava/default.nix

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

home/programs/discord/default.nix

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

home/programs/fetch/default.nix

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

home/programs/fetch/neofetch/default.nix

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

home/programs/fetch/nerdfetch/default.nix

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

home/programs/ghostty/default.nix

@@ -0,0 +1,22 @@
+{
+  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,8 +1,10 @@
-{ config, ... }: {
+# Git configuration
+{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"
@@ -15,36 +17,39 @@
       "result"
       "result-*"
     ];
-    extraConfig = {
+    settings = {
+      user.name = username;
+      user.email = email;
       init.defaultBranch = "main";
+      pull.rebase = "false";
       push.autoSetupRemote = true;
-    };
+      color.ui = "1";
-    aliases = {
+      alias = {
-      essa = "push --force";
+        essa = "push --force";
-      co = "checkout";
+        co = "checkout";
-      fuck = "commit --amend -m";
+        fuck = "commit --amend -m";
-      c = "commit -m";
+        c = "commit -m";
-      ca = "commit -am";
+        ca = "commit -am";
-      forgor = "commit --amend --no-edit";
+        forgor = "commit --amend --no-edit";
-      graph = "log --all --decorate --graph --oneline";
+        graph = "log --all --decorate --graph --oneline";
-      oops = "checkout --";
+        oops = "checkout --";
-      l = "log";
+        l = "log";
-      r = "rebase";
+        r = "rebase";
-      s = "status --short";
+        s = "status --short";
-      ss = "status";
+        ss = "status";
-      d = "diff";
+        d = "diff";
-      ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
+        ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
-      pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
+        pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
-      af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
+        af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
-      st = "status";
+        st = "status";
-      br = "branch";
+        br = "branch";
-      df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
+        df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
-      hist = ''
+        hist = ''
-        log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
+          log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
-      llog = ''
+        llog = ''
-        log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
+          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 =
+        edit-unmerged = "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
-        "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
+      };
     };
   };
 }

home/programs/git/lazygit.nix

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

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

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

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

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

home/programs/nightshift/default.nix

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

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

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

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

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

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

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

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

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

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

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

home/programs/nvim/default.nix

@@ -1,31 +0,0 @@
-{ inputs, ... }: {
-  imports = [
-    inputs.nixvim.homeManagerModules.nixvim
-    ./plugins/auto-pairs.nix
-    ./plugins/bufferline.nix
-    ./plugins/lazygit.nix
-    ./plugins/telescope.nix
-    ./plugins/nvim-tree.nix
-    ./plugins/lightline.nix
-    ./plugins/git.nix
-    ./plugins/cmp.nix
-    ./plugins/none-ls.nix
-    ./plugins/wilder.nix
-    ./plugins/lsp.nix
-    ./plugins/treesitter.nix
-    ./plugins/toggleterm.nix
-    ./plugins/copilot.nix
-    ./plugins/whichkey.nix
-    ./plugins/alpha.nix
-    ./plugins/keymaps.nix
-    ./plugins/comment.nix
-    ./plugins/oil.nix
-    ./plugins/trouble.nix
-    ./plugins/tmux-navigator.nix
-    ./plugins/noice.nix
-    ./plugins/obsidian.nix
-    ./plugins/image.nix
-    ./options.nix
-    ./colorscheme.nix
-  ];
-}

home/programs/nvim/options.nix

@@ -1,37 +0,0 @@
-{
-
-  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 = true;
-    scrolloff = 8;
-    mouse = "a";
-
-    wrap = false;
-
-    swapfile = false;
-    undofile = true;
-    conceallevel = 2;
-  };
-}

home/programs/nvim/plugins/alpha.nix

@@ -1,133 +0,0 @@
-{ 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[[e ${config.var.configDirectory}]] 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/auto-pairs.nix

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

home/programs/nvim/plugins/bufferline.nix

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

home/programs/nvim/plugins/cmp.nix

@@ -1,113 +0,0 @@
-{
-  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/comment.nix

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

home/programs/nvim/plugins/copilot.nix

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

home/programs/nvim/plugins/git.nix

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

home/programs/nvim/plugins/image.nix

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

home/programs/nvim/plugins/keymaps.nix

@@ -1,71 +0,0 @@
-{
-  programs.nixvim.keymaps = [
-    {
-      key = "<leader>e";
-      action = "<CMD>Neotree toggle<CR>";
-    }
-    {
-      key = "<space>fm";
-      action = "<CMD>lua vim.lsp.buf.format()<CR>";
-    }
-
-    {
-      key = "<leader>ot";
-      action = "<cmd>lua require('obsidian').util.toggle_checkbox()<cr>";
-    }
-
-    {
-      key = "<leader>oo";
-      action = "<cmd>ObsidianQuickSwitch<cr>";
-    }
-
-    {
-      key = "<leader>on";
-      action = "<cmd>ObsidianNew<cr>";
-    }
-
-    {
-      key = "<leader>of";
-      action = "<cmd>ObsidianSearch<cr>";
-    }
-
-    {
-      key = "<leader>oi";
-      action = "<cmd>ObsidianPasteImg<cr>";
-    }
-
-    {
-      key = "<leader>E";
-      action = "<cmd>Oil<cr>";
-    }
-
-    {
-      key = "<leader>t";
-      action = "<cmd>TroubleToggle<cr>";
-    }
-
-    {
-      key = "<C-h>";
-      action = "<cmd>TmuxNavigateLeft<cr>";
-    }
-    {
-      key = "<C-j>";
-      action = "<cmd>TmuxNavigateDown<cr>";
-    }
-    {
-      key = "<C-k>";
-      action = "<cmd>TmuxNavigateUp<cr>";
-    }
-    {
-      key = "<C-l>";
-      action = "<cmd>TmuxNavigateRight<cr>";
-    }
-
-    # Terminal Mappings
-    {
-      mode = "t";
-      key = "<esc>";
-      action = "<C-\\><C-n>";
-    }
-  ];
-}

home/programs/nvim/plugins/lazygit.nix

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

home/programs/nvim/plugins/lightline.nix

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

home/programs/nvim/plugins/lsp.nix

@@ -1,24 +0,0 @@
-{
-  programs.nixvim.plugins = {
-    lsp-format.enable = true;
-    lsp = {
-      enable = true;
-      servers = {
-        bashls.enable = true;
-        clangd.enable = true;
-        gopls.enable = true;
-        nixd.enable = true;
-        tailwindcss.enable = true;
-        html.enable = true;
-        svelte.enable = true;
-      };
-      keymaps.lspBuf = {
-        "gd" = "definition";
-        "gD" = "references";
-        "gt" = "type_definition";
-        "gi" = "implementation";
-        "K" = "hover";
-      };
-    };
-  };
-}

home/programs/nvim/plugins/noice.nix

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

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

@@ -1,20 +0,0 @@
-{
-  programs.nixvim.plugins.none-ls = {
-    enable = true;
-    sources = {
-      diagnostics = {
-        golangci_lint.enable = true;
-        statix.enable = true;
-      };
-      formatting = {
-        gofmt.enable = true;
-        goimports.enable = true;
-        nixfmt.enable = true;
-        markdownlint.enable = true;
-        tidy.enable = true;
-        shellharden.enable = true;
-        shfmt.enable = true;
-      };
-    };
-  };
-}

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

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

home/programs/nvim/plugins/obsidian.nix

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

home/programs/nvim/plugins/oil.nix

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

home/programs/nvim/plugins/telescope.nix

@@ -1,13 +0,0 @@
-{
-  programs.nixvim.plugins.telescope = {
-    enable = true;
-    keymaps = {
-      "<leader>fg" = "live_grep";
-      #"<C-p>" = {
-      #  action = "git_files";
-      #  desc = "Telescope Git Files";
-      #};
-    };
-    extensions.fzf-native = { enable = true; };
-  };
-}

home/programs/nvim/plugins/tmux-navigator.nix

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

home/programs/nvim/plugins/toggleterm.nix

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

home/programs/nvim/plugins/treesitter.nix

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

home/programs/nvim/plugins/trouble.nix

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

home/programs/nvim/plugins/whichkey.nix

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

home/programs/nvim/plugins/wilder.nix

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

home/programs/proton/default.nix

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

@@ -1,335 +0,0 @@
-{ 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": "Nerdfont", "url": "https://www.nerdfonts.com/cheat-sheet", "icon": ""},
-              {"title": "Youtube", "url": "https://youtube.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 = "40286c5e03bcfb9993cce354b4f12c00a1b4966d";
-      hash = "sha256-zlJ/bzFWE64HpUCxiRT5E9wrjVVwSTSgIOrifWKxphU=";
-    };
-
-    # 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
-      };
-
-      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;
-        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}
-
-      config.load_autoconfig(True)
-    '';
-  };
-}

home/programs/qutebrowser/duckduckgo-colorscheme.nix

@@ -1,36 +0,0 @@
-{ 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,13 +1,4 @@
+# Import all shell configurations
 {
-  imports = [
+  imports = [./fzf.nix ./zsh.nix ./starship.nix ./zoxide.nix ./eza.nix];
-    ./fzf.nix
-    ./zsh.nix
-    ./starship.nix
-    ./zoxide.nix
-    ./tmux.nix
-    ./lazygit.nix
-    ./eza.nix
-    ./fetch
-    ./lf
-  ];
 }

home/programs/shell/eza.nix

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

home/programs/shell/fetch/default.nix

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

home/programs/shell/fzf.nix

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

home/programs/shell/lazygit.nix

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

home/programs/shell/lf/config/colors

@@ -1,174 +0,0 @@
-# vim:ft=dircolors
-# (This is not a dircolors file but it helps to highlight colors and comments)
-
-# default values from dircolors
-# (entries with a leading # are not implemented in lf)
-# #no     00              # NORMAL
-# fi      00              # FILE
-# #rs     0               # RESET
-# di      01;34           # DIR
-# ln      01;36           # LINK
-# #mh     00              # MULTIHARDLINK
-# pi      40;33           # FIFO
-# so      01;35           # SOCK
-# #do     01;35           # DOOR
-# bd      40;33;01        # BLK
-# cd      40;33;01        # CHR
-# or      40;31;01        # ORPHAN
-# #mi     00              # MISSING
-# su      37;41           # SETUID
-# sg      30;43           # SETGID
-# #ca     30;41           # CAPABILITY
-# tw      30;42           # STICKY_OTHER_WRITABLE
-# ow      34;42           # OTHER_WRITABLE
-# st      37;44           # STICKY
-# ex      01;32           # EXEC
-
-# default values from lf (with matching order)
-# ln      01;36   # LINK
-# or      31;01   # ORPHAN
-# tw      01;34   # STICKY_OTHER_WRITABLE
-# ow      01;34   # OTHER_WRITABLE
-# st      01;34   # STICKY
-# di      01;34   # DIR
-# pi      33      # FIFO
-# so      01;35   # SOCK
-# bd      33;01   # BLK
-# cd      33;01   # CHR
-# su      01;32   # SETUID
-# sg      01;32   # SETGID
-# ex      01;32   # EXEC
-# fi      00      # FILE
-
-# file types (with matching order)
-ln      01;36   # LINK
-or      31;01   # ORPHAN
-tw      34      # STICKY_OTHER_WRITABLE
-ow      34      # OTHER_WRITABLE
-st      01;34   # STICKY
-di      01;34   # DIR
-pi      33      # FIFO
-so      01;35   # SOCK
-bd      33;01   # BLK
-cd      33;01   # CHR
-su      01;32   # SETUID
-sg      01;32   # SETGID
-ex      01;32   # EXEC
-fi      00      # FILE
-
-# archives or compressed (dircolors defaults)
-*.tar   01;31
-*.tgz   01;31
-*.arc   01;31
-*.arj   01;31
-*.taz   01;31
-*.lha   01;31
-*.lz4   01;31
-*.lzh   01;31
-*.lzma  01;31
-*.tlz   01;31
-*.txz   01;31
-*.tzo   01;31
-*.t7z   01;31
-*.zip   01;31
-*.z     01;31
-*.dz    01;31
-*.gz    01;31
-*.lrz   01;31
-*.lz    01;31
-*.lzo   01;31
-*.xz    01;31
-*.zst   01;31
-*.tzst  01;31
-*.bz2   01;31
-*.bz    01;31
-*.tbz   01;31
-*.tbz2  01;31
-*.tz    01;31
-*.deb   01;31
-*.rpm   01;31
-*.jar   01;31
-*.war   01;31
-*.ear   01;31
-*.sar   01;31
-*.rar   01;31
-*.alz   01;31
-*.ace   01;31
-*.zoo   01;31
-*.cpio  01;31
-*.7z    01;31
-*.rz    01;31
-*.cab   01;31
-*.wim   01;31
-*.swm   01;31
-*.dwm   01;31
-*.esd   01;31
-
-# image formats (dircolors defaults)
-*.jpg   01;35
-*.jpeg  01;35
-*.mjpg  01;35
-*.mjpeg 01;35
-*.gif   01;35
-*.bmp   01;35
-*.pbm   01;35
-*.pgm   01;35
-*.ppm   01;35
-*.tga   01;35
-*.xbm   01;35
-*.xpm   01;35
-*.tif   01;35
-*.tiff  01;35
-*.png   01;35
-*.svg   01;35
-*.svgz  01;35
-*.mng   01;35
-*.pcx   01;35
-*.mov   01;35
-*.mpg   01;35
-*.mpeg  01;35
-*.m2v   01;35
-*.mkv   01;35
-*.webm  01;35
-*.ogm   01;35
-*.mp4   01;35
-*.m4v   01;35
-*.mp4v  01;35
-*.vob   01;35
-*.qt    01;35
-*.nuv   01;35
-*.wmv   01;35
-*.asf   01;35
-*.rm    01;35
-*.rmvb  01;35
-*.flc   01;35
-*.avi   01;35
-*.fli   01;35
-*.flv   01;35
-*.gl    01;35
-*.dl    01;35
-*.xcf   01;35
-*.xwd   01;35
-*.yuv   01;35
-*.cgm   01;35
-*.emf   01;35
-*.ogv   01;35
-*.ogx   01;35
-
-# audio formats (dircolors defaults)
-*.aac   00;36
-*.au    00;36
-*.flac  00;36
-*.m4a   00;36
-*.mid   00;36
-*.midi  00;36
-*.mka   00;36
-*.mp3   00;36
-*.mpc   00;36
-*.ogg   00;36
-*.ra    00;36
-*.wav   00;36
-*.oga   00;36
-*.opus  00;36
-*.spx   00;36
-*.xspf  00;36