change apps

Former-commit-id: 7aa07cde8e

.github/FUNDING.yml

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

.github/assets/README_template.md

@@ -23,14 +23,18 @@
 </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.
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
-It includes *home-manager*, *secrets*, and *custom theming* all in one place.
+It's a simple way to manage your system configuration and dotfiles.
 
-**Features:**
+I'm Hadi, a french developer, student in infosec, enthusiastic about nix, golang & blockchains.
+This is my own, **keyboard-centric**, and **minimalistic** NixOS configuration.
+I enable vim-like keybindings everywhere I can, and I use a lot of custom scripts to make my life easier.
 
-- 💻 Hyprland-centric: Preconfigured Hyprland ecosystem (Hyprlock, Hyprpanel, etc.)
+**Nixy key points:**
-- 🎨 Consistent Theming: Base16 & Stylix-powered themes
+
-- ⌨️  Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
+- Hypr-ecosystem first (hyprland, hyprlock, hyprpanel, hypridle, ...)
+- Stylix/base16 themes
+- Vim-like keybindings everywhere (hyprland, qutebrowser, nvim, ...)
 
 ## Table of Content
 
@@ -45,9 +49,9 @@ It includes *home-manager*, *secrets*, and *custom theming* all in one place.
 
 ## Architecture
 
-### 🏠 /home (User-level configuration)
+### 🏠 home
 
-Contains **dotfiles and settings** that apply to your user environment.
+Those are the dotfiles and configuration files for user-level configuration
 
 **Subfolders:**
 
@@ -55,44 +59,35 @@ Contains **dotfiles and settings** that apply to your user environment.
 - `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
 - `system` is some "desktop environment" configuration
 
-### 🐧 /nixos
+### 🐧 nixos
 
 Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
 
-### 🎨 /themes
+### 🎨 themes
 
-This folder contains all system themes. Mainly [stylix](https://stylix.danth.me/) configurations.
+Those are the themes used in the system configuration. The `stylix` folder contains the [stylix](https://github.com/danth/stylix) defined themes, the `var` folder contains the variables not handled by stylix.
-Check out the available themes and learn how to create your own in [THEMES.md](docs/THEMES.md)
+See avaiable themes in [THEMES.md](docs/THEMES.md)
 
-### 💻 /hosts
+### 💻 hosts
 
-This directory contains host-specific configurations.
+Those are the host-specific configurations.
-Each host includes:
+Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
-
-- `configuration.nix` for system-wide settings
-- `home.nix` for user-level configuration
-- `variables.nix` for global variables
-- `secrets/` for sensitive data
 
 ## Installation
 
-1. [Fork](https://github.com/anotherhadi/nixy/fork) this repo and clone it to your system:
+1. Clone the repo
 
 ```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.
+2. Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
-3. Copy your `hardware-configuration.nix` into your new host's folder to ensure proper hardware support.
+3. Add your `hardware-configuration.nix` to your new host's folder
-4. Register your new host in `flake.nix` by adding it under nixosConfigurations.
+4. Add your 'nixosConfigurations' inside `flake.nix`
 
 > [!Important]
-> `# CHANGEME` comments are placed throughout the config to indicate necessary modifications.
+> I added few `# CHANGEME` comments in the files to help you find what to change. Be sure to check them up.
-> Use the following command to quickly locate them:
+> You can use `rg "CHANGEME"` to find them all with ripgrep.
->
-> ```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
@@ -105,11 +100,11 @@ 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
-- [SCRIPTS](docs/SCRIPTS.md): A list of available scripts and their usage
+- [SCRIPTS](docs/SCRIPTS.md): Scripts that are available
 - [KEYBINDINGS-HYPRLAND](docs/KEYBINDINGS-HYPRLAND.md): Keybindings available in Hyprland
-- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome collection of wallpapers
+- [WALLPAPERS](https://github.com/anotherhadi/nixy-wallpapers): A collection of wallpapers for Nixy.
 
+- [TODO](docs/TODO.md): What's next (feel free to contribute)
 - [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License

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

@@ -20,5 +20,5 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
           git add .
-          git commit -m "Update KEYBINDINGS-HYPRLAND.md (auto)" && git push
+          git commit -m "Update KEYBINDINGS-HYPRLAND.md (auto)"
-          exit 0
+          git push

.github/workflows/update-readme.yml

@@ -27,5 +27,5 @@ jobs:
           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
+          git commit -m "Update README.md (auto)"
-          exit 0
+          git push

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

@@ -20,5 +20,5 @@ jobs:
           git config user.name github-actions
           git config user.email github-actions@github.com
           git add .
-          git commit -m "Update SCRIPTS.md (auto)" && git push
+          git commit -m "Update SCRIPTS.md (auto)"
-          exit 0
+          git push

.gitignore

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

README.md

@@ -24,24 +24,28 @@
 </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.
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
-It includes *home-manager*, *secrets*, and *custom theming* all in one place.
+It's a simple way to manage your system configuration and dotfiles.
 
-**Features:**
+I'm Hadi, a french developer, student in infosec, enthusiastic about nix, golang & blockchains.
+This is my own, **keyboard-centric**, and **minimalistic** NixOS configuration.
+I enable vim-like keybindings everywhere I can, and I use a lot of custom scripts to make my life easier.
 
-- 💻 Hyprland-centric: Preconfigured Hyprland ecosystem (Hyprlock, Hyprpanel, etc.)
+**Nixy key points:**
-- 🎨 Consistent Theming: Base16 & Stylix-powered themes
+
-- ⌨️  Vim-like Everywhere: Unified keybindings (Hyprland, nvim, vimium, etc.)
+- Hypr-ecosystem first (hyprland, hyprlock, hyprpanel, hypridle, ...)
+- Stylix/base16 themes
+- Vim-like keybindings everywhere (hyprland, qutebrowser, nvim, ...)
 
 ## Table of Content
 
 - [Table of Content](#table-of-content)
 - [Gallery](#gallery)
 - [Architecture](#architecture)
-  - [🏠 /home (User-level configuration)](#-home-user-level-configuration)
+  - [🏠 home](#-home)
-  - [🐧 /nixos](#-nixos)
+  - [🐧 nixos](#-nixos)
-  - [🎨 /themes](#-themes)
+  - [🎨 themes](#-themes)
-  - [💻 /hosts](#-hosts)
+  - [💻 hosts](#-hosts)
 - [Installation](#installation)
 - [Documentation](#documentation)
 
@@ -54,9 +58,9 @@ It includes *home-manager*, *secrets*, and *custom theming* all in one place.
 
 ## Architecture
 
-### 🏠 /home (User-level configuration)
+### 🏠 home
 
-Contains **dotfiles and settings** that apply to your user environment.
+Those are the dotfiles and configuration files for user-level configuration
 
 **Subfolders:**
 
@@ -64,44 +68,35 @@ Contains **dotfiles and settings** that apply to your user environment.
 - `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
 - `system` is some "desktop environment" configuration
 
-### 🐧 /nixos
+### 🐧 nixos
 
 Those are the system-level configurations. (audio, bluetooth, gpu, bootloader, ...)
 
-### 🎨 /themes
+### 🎨 themes
 
-This folder contains all system themes. Mainly [stylix](https://stylix.danth.me/) configurations.
+Those are the themes used in the system configuration. The `stylix` folder contains the [stylix](https://github.com/danth/stylix) defined themes, the `var` folder contains the variables not handled by stylix.
-Check out the available themes and learn how to create your own in [THEMES.md](docs/THEMES.md)
+See avaiable themes in [THEMES.md](docs/THEMES.md)
 
-### 💻 /hosts
+### 💻 hosts
 
-This directory contains host-specific configurations.
+Those are the host-specific configurations.
-Each host includes:
+Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
-
-- `configuration.nix` for system-wide settings
-- `home.nix` for user-level configuration
-- `variables.nix` for global variables
-- `secrets/` for sensitive data
 
 ## Installation
 
-1. [Fork](https://github.com/anotherhadi/nixy/fork) this repo and clone it to your system:
+1. Clone the repo
 
 ```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.
+2. Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
-3. Copy your `hardware-configuration.nix` into your new host's folder to ensure proper hardware support.
+3. Add your `hardware-configuration.nix` to your new host's folder
-4. Register your new host in `flake.nix` by adding it under nixosConfigurations.
+4. Add your 'nixosConfigurations' inside `flake.nix`
 
 > [!Important]
-> `# CHANGEME` comments are placed throughout the config to indicate necessary modifications.
+> I added few `# CHANGEME` comments in the files to help you find what to change. Be sure to check them up.
-> Use the following command to quickly locate them:
+> You can use `rg "CHANGEME"` to find them all with ripgrep.
->
-> ```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
@@ -114,11 +109,11 @@ 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
-- [SCRIPTS](docs/SCRIPTS.md): A list of available scripts and their usage
+- [SCRIPTS](docs/SCRIPTS.md): Scripts that are available
 - [KEYBINDINGS-HYPRLAND](docs/KEYBINDINGS-HYPRLAND.md): Keybindings available in Hyprland
-- [WALLPAPERS](https://github.com/anotherhadi/awesome-wallpapers): An awesome collection of wallpapers
+- [WALLPAPERS](https://github.com/anotherhadi/nixy-wallpapers): A collection of wallpapers for Nixy.
 
+- [TODO](docs/TODO.md): What's next (feel free to contribute)
 - [CONTRIBUTING](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License

docs/CONTRIBUTING.md

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

docs/KEYBINDINGS-HYPRLAND.md

@@ -10,14 +10,14 @@
 | Move app to Workspace | SHIFT + SUPER + {Number} |
 | Kitty | SUPER + RETURN |
 | Thunar | SUPER + E |
-| Zen Browser | SUPER + B |
+| Qutebrowser | SUPER + B |
 | Bitwarden | SUPER + K |
 | Lock | SUPER + L |
 | Powermenu | SUPER + X |
 | Launcher | SUPER + SPACE |
 | Quickmenu | SUPER + C |
 | Toggle HyprFocus | SHIFT + SUPER + SPACE |
-| Planify | SUPER + P |
+| "$mod,TAB, overview:toggle"  |  |
 | Close window | SUPER + Q |
 | Toggle Floating | SUPER + T |
 | Toggle Fullscreen | SUPER + F |
@@ -34,6 +34,7 @@
 | Screenshot window | SHIFT + SUPER + PRINT |
 | Screenshot region then edit | ALTPRINT |
 | Toggle hyprpanel | SHIFT + SUPER + T |
+| Search on internet with wofi | SHIFT + SUPER + S |
 | Clipboard picker with wofi | SHIFT + SUPER + C |
 | Emoji picker with wofi | SHIFT + SUPER + E |
 | Toggle night shift | SUPER + F2 |

docs/SCRIPTS.md

@@ -94,6 +94,5 @@ Usefull quick scripts
 
 - `menu` - Open wofi with drun mode. (wofi)
 - `powermenu` - Open power dropdown menu. (wofi)
-- `quickmenu` - Open a dropdown menu with shortcuts and scripts. (wofi)
 - `lock` - Lock the screen. (hyprlock)
 

docs/SERVER.md

@@ -1,62 +0,0 @@
-# SERVER
-
-## 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`.  
-- **Bitwarden**: A self-hosted password manager for secure credential storage.  
-- **Nextcloud**: A private cloud solution for file synchronization and collaboration.  
-
-### **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)
-- **Hoarder**: A self-hostable bookmark-everything app (links, notes and images)
-
-### **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.
-
-## What's Next?
-
-I want to self-host:
-
-- **A great todolist app**: One that is compatible with markdown & IOS
-- **Cyberchef**
-- **Maybe**: An app to manage finances

docs/THEMES.md

@@ -1,7 +1,7 @@
 # Themes
 
 Themes are defined in `themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
-You can change the selected theme by changing the import statement of your host's variables.nix file.
+You can change the selected theme by changing the import statement of your host's configuration.nix file.
 
 > [!TIP]
 > To apply the theme to DuckDuckGo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`

docs/TODO.md

@@ -0,0 +1,10 @@
+# Todolist
+
+feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
+
+- [ ] ${config.users.users.${user}.home} instead of "/home/${username}"
+- [ ] Hyprpanel screenshot
+- [ ] PIA Vpn (issue in progress)
+- [ ] Webcord (system24 theme? Tui)
+- [ ] check gvolpe/nix-config
+- [ ] <https://github.com/isabelroses/dotfiles/blob/main/home/comfy/system/xdg.nix>

flake.nix

@@ -1,51 +1,49 @@
 {
   # https://github.com/anotherhadi/nixy
   description = ''
-    Nixy simplifies and unifies the Hyprland ecosystem with a modular, easily customizable setup.
+    Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place.
-    It provides a structured way to manage your system configuration and dotfiles with minimal effort. 
+    It's a simple way to manage your system configuration and dotfiles.
   '';
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
-    stylix.url = "github:danth/stylix";
-    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
-    zen-browser.url = "github:0xc000022070/zen-browser-flake";
-    nixcord.url = "github:kaylorben/nixcord";
-    sops-nix.url = "github:Mic92/sops-nix";
-    nixarr.url = "github:rasmus-kirk/nixarr";
-    anyrun.url = "github:fufexan/anyrun/launch-prefix";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixvim = {
-      url =
+      url = "github:nix-community/nixvim";
-        "github:nix-community/nixvim/d81f37256d0a8691b837b74979d27bf89be8ecdd";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     spicetify-nix = {
       url = "github:Gerg-L/spicetify-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    hyprspace = {
+    sops-nix = {
-      url = "github:KZDKM/Hyprspace";
+      url = "github:Mic92/sops-nix";
-      inputs.hyprland.follows = "hyprland";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
-    search-nixos-api.url = "github:anotherhadi/search-nixos-api";
+    hyprspace = { url = "github:KZDKM/Hyprspace"; };
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
+    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
+    stylix.url = "github:danth/stylix";
+    apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
+    nur.url = "github:nix-community/NUR";
+    zen-browser.url =
+      "git+https://git.sr.ht/~canasta/zen-browser-flake/"; # updated flake
   };
 
   outputs = inputs@{ nixpkgs, ... }: {
     nixosConfigurations = {
-      nixy =
+      nixy = # CHANGEME: This should match the 'hostname' in your variables.nix file
-        # CHANGEME: This should match the 'hostname' in your variables.nix file
         nixpkgs.lib.nixosSystem {
           system = "x86_64-linux";
           modules = [
             {
-              nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
+              nixpkgs.overlays =
+                [ inputs.hyprpanel.overlay inputs.nur.overlays.default ];
               _module.args = { inherit inputs; };
             }
             inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware
@@ -54,19 +52,7 @@
             ./hosts/laptop/configuration.nix # CHANGEME: change the path to match your host folder
           ];
         };
-      # Jack is my server
+
-      jack = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          { _module.args = { inherit inputs; }; }
-          inputs.home-manager.nixosModules.home-manager
-          inputs.stylix.nixosModules.stylix
-          inputs.sops-nix.nixosModules.sops
-          inputs.nixarr.nixosModules.default
-          inputs.search-nixos-api.nixosModules.search-nixos-api
-          ./hosts/server/configuration.nix
-        ];
-      };
     };
   };
 }

home/programs/anyrun/default.nix

@@ -1,87 +0,0 @@
-{ pkgs, inputs, ... }: {
-  programs.anyrun = {
-    enable = true;
-    config = {
-      plugins = with inputs.anyrun.packages.${pkgs.system}; [
-        applications
-        shell
-        randr
-        rink
-        symbols
-        translate
-      ];
-
-      width.fraction = 0.25;
-      y.fraction = 0.3;
-      hidePluginInfo = true;
-      closeOnClick = true;
-    };
-
-    extraCss = ''
-      * {
-        all: unset;
-        font-size: 1.2rem;
-      }
-
-      #window,
-      #match,
-      #entry,
-      #plugin,
-      #main {
-        background: transparent;
-      }
-
-      #match.activatable {
-        border-radius: 8px;
-        margin: 4px 0;
-        padding: 4px;
-        /* transition: 100ms ease-out; */
-      }
-      #match.activatable:first-child {
-        margin-top: 12px;
-      }
-      #match.activatable:last-child {
-        margin-bottom: 0;
-      }
-
-      #match:hover {
-        background: rgba(255, 255, 255, 0.05);
-      }
-      #match:selected {
-        background: rgba(255, 255, 255, 0.1);
-      }
-
-      #entry {
-        background: rgba(255, 255, 255, 0.05);
-        border: 1px solid rgba(255, 255, 255, 0.1);
-        border-radius: 8px;
-        padding: 4px 8px;
-      }
-
-      box#main {
-        background: rgba(0, 0, 0, 0.5);
-        box-shadow:
-          inset 0 0 0 1px rgba(255, 255, 255, 0.1),
-          0 30px 30px 15px rgba(0, 0, 0, 0.5);
-        border-radius: 20px;
-        padding: 12px;
-      }
-    '';
-
-    extraConfigFiles = {
-      "applications.ron".text = ''
-        Config(
-          desktop_actions: false,
-          max_entries: 5,
-          terminal: Some("foot"),
-        )
-      '';
-
-      "shell.ron".text = ''
-        Config(
-          prefix: ">"
-        )
-      '';
-    };
-  };
-}

home/programs/discord/default.nix

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

home/programs/fetch/neofetch/default.nix

@@ -1,4 +1,3 @@
-# Legacy
 { pkgs, ... }: {
   home.packages = with pkgs; [ neofetch ];
 

home/programs/fetch/nerdfetch/default.nix

@@ -1,5 +1,3 @@
-# Nerdfetch, a simple system info script written in bash
-# Source: https://github.com/ThatOneCalculator/NerdFetch
 { pkgs, ... }:
 let
   nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''

home/programs/git/default.nix

@@ -1,4 +1,3 @@
-# Git configuration
 { config, ... }:
 let
   username = config.var.git.username;
@@ -22,7 +21,6 @@ in {
     ];
     extraConfig = {
       init.defaultBranch = "main";
-      pull.rebase = "false";
       push.autoSetupRemote = true;
       color.ui = "1";
     };

home/programs/kitty/default.nix

@@ -1,4 +1,3 @@
-# Kitty is a fast, featureful, GPU based terminal emulator
 {
   programs.kitty = {
     enable = true;
@@ -21,13 +20,9 @@
       remember_window_size = "no";
       disable_ligatures = "never";
       url_style = "curly";
-      copy_on_select = "clipboard";
       cursor_shape = "Underline";
       cursor_underline_thickness = 3;
-      cursor_trail = 3;
-      cursor_trail_decay = "0.1 0.4";
       window_padding_width = 10;
-      open_url_with = "default";
     };
   };
 }

home/programs/lazygit/default.nix

@@ -1,4 +1,3 @@
-# Lazygit is a simple terminal UI for git commands.
 { config, lib, ... }:
 let
   accent = "#${config.lib.stylix.colors.base0D}";

home/programs/nvim/autocmds.nix

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

home/programs/nvim/default.nix

@@ -2,16 +2,15 @@
 { inputs, ... }: {
   imports = [
     inputs.nixvim.homeManagerModules.nixvim
-    ./plugins/cmp.nix
-    ./plugins/floaterm.nix
-    ./plugins/git.nix
     ./plugins/lsp.nix
-    ./plugins/markdown.nix
+    ./plugins/tree.nix
-    ./plugins/mini.nix
+    ./plugins/telescope.nix
-    ./plugins/picker.nix
+    ./plugins/cmp.nix
-    ./plugins/snacks.nix
+    ./plugins/ui.nix
-    ./plugins/trouble.nix
+    ./plugins/lualine.nix
     ./plugins/utils.nix
+    ./plugins/dashboard.nix
+    ./plugins/markdown.nix
 
     ./options.nix
     ./keymaps.nix

home/programs/nvim/keymaps.nix

@@ -12,6 +12,31 @@
         };
         spec = [
           # General Mappings
+          {
+            __unkeyed-1 = "<leader>c";
+            mode = [ "n" "v" ];
+            group = "+code";
+          }
+          {
+            __unkeyed-1 = "<leader>d";
+            mode = [ "n" "v" ];
+            group = "+debug";
+          }
+          {
+            __unkeyed-1 = "<leader>s";
+            mode = "n";
+            group = "+search";
+          }
+          {
+            __unkeyed-1 = "<leader>m";
+            mode = "n";
+            group = "+markdown";
+          }
+          {
+            __unkeyed-1 = "<leader>t";
+            mode = "n";
+            group = "+trouble";
+          }
           {
             __unkeyed-1 = "<leader>u";
             mode = "n";
@@ -23,9 +48,9 @@
             group = "+windows";
           }
           {
-            __unkeyed-1 = "<leader>c";
+            __unkeyed-1 = "<leader>h";
             mode = "n";
-            group = "+code";
+            group = "+harpoon";
           }
         ];
         win = {
@@ -37,6 +62,22 @@
 
     keymaps = [
       # General Mappings
+      {
+        key = "<leader>e";
+        action = "<cmd>Oil --float<cr>";
+        options.desc = "Oil";
+      }
+      {
+        key = "-";
+        action = "<cmd>Oil<cr>";
+        options.desc = "Oil";
+      }
+      {
+        key = "<leader>E";
+        action = "<cmd>Neotree toggle<cr>";
+        options.desc = "Neotree";
+      }
+
       {
         key = "s";
         action = "<cmd>lua require('flash').jump()<cr>";
@@ -47,13 +88,7 @@
         action = "<cmd>lua vim.lsp.buf.hover()<cr>";
         options.desc = "LSP Hover";
       }
-      {
-        key = "<C-tab>";
-        action = "<cmd>bnext<cr>";
-        options.desc = "Next Buffer";
-      }
 
-      # Tmux
       {
         key = "<C-h>";
         action = "<cmd>TmuxNavigateLeft<cr>";
@@ -71,29 +106,12 @@
         action = "<cmd>TmuxNavigateRight<cr>";
       }
 
-      # Disable Arrow Keys in Normal Mode
-      {
-        key = "<Up>";
-        action = "<Nop>";
-        options.desc = "Disable Up Arrow";
-      }
-      {
-        key = "<Down>";
-        action = "<Nop>";
-        options.desc = "Disable Down Arrow";
-      }
-      {
-        key = "<Left>";
-        action = "<Nop>";
-        options.desc = "Disable Left Arrow";
-      }
-      {
-        key = "<Right>";
-        action = "<Nop>";
-        options.desc = "Disable Right Arrow";
-      }
-
       # UI
+      {
+        key = "<leader>uz";
+        action = "<cmd>ZenMode<cr>";
+        options.desc = "Toggle ZenMode";
+      }
       {
         key = "<leader>uw";
         action = "<cmd>set wrap!<cr>";
@@ -107,7 +125,7 @@
       {
         key = "<leader>us";
         action = "<cmd>set spell!<cr>";
-        options.desc = "Toggle spellLazyGitcheck";
+        options.desc = "Toggle spellcheck";
       }
       {
         key = "<leader>uc";
@@ -135,6 +153,95 @@
         options.desc = "Hide tabline";
       }
 
+      # Search
+      {
+        key = "<leader> ";
+        action = "<cmd>lua require('telescope.builtin').find_files()<cr>";
+        options.desc = "Telescope";
+      }
+      {
+        key = "<leader>sg";
+        action = "<cmd>lua require('telescope.builtin').live_grep()<cr>";
+        options.desc = "Livegrep";
+      }
+      {
+        key = "<leader>sf";
+        action = "<cmd>lua require('telescope.builtin').find_files()<cr>";
+        options.desc = "Find Files";
+      }
+      {
+        key = "<leader>sb";
+        action = "<cmd>lua require('telescope.builtin').buffers()<cr>";
+        options.desc = "Buffers";
+      }
+      {
+        key = "<leader>sh";
+        action = "<cmd>lua require('telescope.builtin').help_tags()<cr>";
+        options.desc = "Help Tags";
+      }
+      {
+        key = "<leader>sc";
+        action = "<cmd>lua require('telescope.builtin').commands()<cr>";
+        options.desc = "Commands";
+      }
+      {
+        key = "<leader>sm";
+        action = "<cmd>lua require('telescope.builtin').marks()<cr>";
+        options.desc = "Marks";
+      }
+      {
+        key = "<leader>so";
+        action = "<cmd>lua require('telescope.builtin').oldfiles()<cr>";
+        options.desc = "Oldfiles";
+      }
+      {
+        key = "<leader>ss";
+        action = "<cmd>lua require('telescope.builtin').spell_suggest()<cr>";
+        options.desc = "Spell Suggest";
+      }
+      {
+        key = "<leader>sr";
+        action = "<cmd>:noh<return><esc>";
+        options.desc = "Reset search";
+      }
+      {
+        key = "<leader>st";
+        action = "<cmd>TodoTelescope<cr>";
+        options.desc = "Todos";
+      }
+
+      # Trouble
+      {
+        key = "<leader>tx";
+        action = "<cmd>Trouble diagnostics toggle<cr>";
+        options.desc = "Diagnostics (Trouble)";
+      }
+      {
+        key = "<leader>tX";
+        action = "<cmd>Trouble diagnostics toggle filter.buf=0<cr>";
+        options.desc = "Buffer Diagnostics (Trouble)";
+      }
+      {
+        key = "<leader>ts";
+        action = "<cmd>Trouble symbols toggle focus=false<cr>";
+        options.desc = "Symbols (Trouble)";
+      }
+      {
+        key = "<leader>tl";
+        action = "<cmd>Trouble lsp toggle focus=false win.position=right<cr>";
+        options.desc = "LSP Definitions / references / ... (Trouble)";
+      }
+      {
+        key = "<leader>tL";
+        action = "<cmd>Trouble loclist toggle<cr>";
+        options.desc = "Location List (Trouble)";
+      }
+      {
+        key = "<leader>tQ";
+        action = "<cmd>Trouble qflist toggle<cr>";
+        options.desc = "Quickfix List (Trouble)";
+      }
+
       # Windows
       {
         key = "<leader>ws";
@@ -151,6 +258,53 @@
         action = "<cmd>close<cr>";
         options.desc = "Close";
       }
+
+      # Code
+      {
+        key = "<leader>cd";
+        action = "<cmd>lua vim.lsp.buf.definition()<cr>";
+        options.desc = "LSP Definition";
+      }
+      {
+        key = "<leader>cr";
+        action = "<cmd>lua vim.lsp.buf.references()<cr>";
+        options.desc = "LSP References";
+      }
+      {
+        key = "<leader>ct";
+        action = "<cmd>lua vim.lsp.buf.type_definition()<cr>";
+        options.desc = "LSP Type Definition";
+      }
+      {
+        key = "<leader>ca";
+        action = "<cmd>lua vim.lsp.buf.code_action()<cr>";
+        options.desc = "LSP Code Action";
+      }
+      {
+        key = "<leader>cf";
+        action = "<cmd>lua vim.lsp.buf.formatting()<cr>";
+        options.desc = "LSP Formatting";
+      }
+      {
+        key = "<leader>cn";
+        action = "<cmd>lua vim.lsp.diagnostic.goto_next()<cr>";
+        options.desc = "LSP Next Diagnostic";
+      }
+      {
+        key = "<leader>cp";
+        action = "<cmd>lua vim.lsp.diagnostic.goto_prev()<cr>";
+        options.desc = "LSP Previous Diagnostic";
+      }
+      {
+        key = "<leader>cu";
+        action = "<cmd>lua require('dapui').toggle()<CR>";
+        options.desc = "Toggle Dapui";
+      }
+      {
+        key = "<leader>cb";
+        action = "<cmd>lua require('dap').toggle_breakpoint()<CR>";
+        options.desc = "Toggle breakpoint";
+      }
     ];
   };
 }

home/programs/nvim/options.nix

@@ -1,10 +1,6 @@
 {
   programs.nixvim = {
     globals.mapleader = " ";
-    diagnostics = {
-      virtual_text = true;
-      virtual_improved = { current_line = "only"; };
-    };
     opts = {
       autoindent = true;
 
@@ -42,6 +38,11 @@
       # Highlight current line
       cursorline = true;
 
+      # Enable linematch diff algorithm
+      diffopt.__raw = ''
+        vim.list_extend(vim.opt.diffopt:get(), { "algorithm:histogram", "linematch:60" })
+      '';
+
       # Expand <Tab> to spaces
       expandtab = true;
 
@@ -91,6 +92,11 @@
       # Number of spaces to use for indentation
       shiftwidth = 2;
 
+      # Disable search count wrap and startup messages
+      shortmess.__raw = ''
+        vim.tbl_deep_extend("force", vim.opt.shortmess:get(), { s = true, I = true })
+      '';
+
       # Disable showing modes in command line
       showmode = false;
 
@@ -127,6 +133,10 @@
       # Save undo history to undo file (in $XDG_STATE_HOME/nvim/undo)
       undofile = true;
 
+      viewoptions.__raw = ''
+        vim.tbl_filter(function(val) return val ~= "curdir" end, vim.opt.viewoptions:get())
+      '';
+
       # Enable virtual edit in visual block mode
       # This has the effect of selecting empty cells beyond lines boundaries
       virtualedit = "block";

home/programs/nvim/plugins/cmp.nix

@@ -21,7 +21,6 @@
           }
           { name = "nvim_lua"; }
           { name = "mkdnflow"; }
-          { name = "render-markdown"; }
           { name = "path"; }
         ];
 

home/programs/nvim/plugins/dashboard.nix

@@ -0,0 +1,153 @@
+{ config, ... }:
+let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  muted = "#${config.lib.stylix.colors.base03}";
+  foreground = "#${config.lib.stylix.colors.base05}";
+  configDir = config.var.configDirectory;
+in {
+
+  programs.nixvim.highlight = {
+    AlphaHeaderColor.fg = accent;
+    AlphaTextColor.fg = foreground;
+    AlphaShortcutColor.fg = muted;
+  };
+
+  programs.nixvim.plugins.alpha = {
+    enable = true;
+    layout = [
+      {
+        type = "padding";
+        val = 4;
+      }
+      {
+        type = "text";
+        opts = {
+          position = "center";
+          hl = "AlphaHeaderColor";
+        };
+        val = [
+          "                                                                     "
+          "       ████ ██████           █████      ██                     "
+          "      ███████████             █████                             "
+          "      █████████ ███████████████████ ███   ███████████   "
+          "     █████████  ███    █████████████ █████ ██████████████   "
+          "    █████████ ██████████ █████████ █████ █████ ████ █████   "
+          "  ███████████ ███    ███ █████████ █████ █████ ████ █████  "
+          " ██████  █████████████████████ ████ █████ █████ ████ ██████ "
+          "                                                                       "
+        ];
+      }
+      {
+        type = "padding";
+        val = 4;
+      }
+      {
+        type = "group";
+
+        val = [
+          {
+            type = "button";
+            val = "󰭎  Find file";
+            on_press.__raw = "function() vim.cmd[[Telescope find_files]] end";
+            opts = {
+              shortcut = "nf";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "  New file";
+            on_press.__raw = "function() vim.cmd[[ene]] end";
+            opts = {
+              shortcut = "nn";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "  NixOs Config";
+            on_press.__raw = "function() vim.cmd[[Neotree ${configDir}]] end";
+            opts = {
+              shortcut = "nc";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "  Keybindings";
+            on_press.__raw =
+              "function() vim.cmd[[e ${configDir}/docs/KEYBINDINGS.md]] end";
+            opts = {
+              shortcut = "nc";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "  Recently used";
+            on_press.__raw = "function() vim.cmd[[Telescope oldfiles]] end";
+            opts = {
+              shortcut = "no";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "󰱽  Find text";
+            on_press.__raw = "function() vim.cmd[[Telescope live_grep]] end";
+            opts = {
+              shortcut = "nt";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "󰩈  Quit Neovim";
+            on_press.__raw = "function() vim.cmd[[qa]] end";
+            opts = {
+              shortcut = "nq";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+        ];
+
+      }
+    ];
+  };
+
+}

home/programs/nvim/plugins/floaterm.nix

@@ -1,13 +0,0 @@
-{ config, ... }: {
-  programs.nixvim = {
-    plugins.floaterm.enable = true;
-    highlightOverride = {
-      FloatermBorder.fg = "#${config.lib.stylix.colors.base01}";
-    };
-    keymaps = [{
-      key = "<leader>cn";
-      action = "<cmd>FloatermNew --title=nixy nixy || sleep 10<cr>";
-      options.desc = "Nixy";
-    }];
-  };
-}

home/programs/nvim/plugins/git.nix

@@ -1,13 +0,0 @@
-{
-  programs.nixvim = {
-    plugins = {
-      gitsigns.enable = true;
-      snacks.settings = { lazygit.enable = true; };
-    };
-    keymaps = [{
-      key = "<leader>gl";
-      action = "<cmd>lua Snacks.lazygit()<cr>";
-      options.desc = "LazyGit";
-    }];
-  };
-}

home/programs/nvim/plugins/lsp.nix

@@ -3,21 +3,36 @@
     lsp-format.enable = true;
     lsp = {
       enable = true;
-      inlayHints = true;
       servers = {
         bashls.enable = true;
+        clangd.enable = true;
         gopls.enable = true;
+        eslint.enable = true;
         ts_ls.enable = true;
-        nixd.enable = true;
+        nixd = {
+          enable = true;
+          extraOptions = {
+            expr = "import <nixpkgs> {}";
+            # fix- encoding: https://github.com/nix-community/nixvim/issues/2390
+            offset_encoding = "utf-8";
+          };
+        };
         tailwindcss.enable = true;
         html.enable = true;
         svelte.enable = true;
+        marksman.enable = true;
+      };
+      keymaps.lspBuf = {
+        "gd" = "definition";
+        "gD" = "references";
+        "gt" = "type_definition";
+        "gi" = "implementation";
+        "K" = "hover";
       };
     };
     none-ls = {
       enable = true;
       sources = {
-        completion = { luasnip.enable = true; };
         diagnostics = {
           golangci_lint.enable = true;
           statix.enable = true;

home/programs/nvim/plugins/lualine.nix

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

home/programs/nvim/plugins/markdown.nix

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

home/programs/nvim/plugins/mini.nix

@@ -1,22 +0,0 @@
-{ config, ... }: {
-  programs.nixvim = {
-    plugins.mini = {
-      enable = true;
-      mockDevIcons = true;
-      modules = {
-        icons = { };
-        # TODO: Learn how to use this
-        bracketed = { };
-        git = { };
-        diff = { };
-        starter = { };
-        pairs = { };
-        notify = { lsp_progress.enable = false; };
-        indentscope = { };
-        cursorword = { };
-        comment = { };
-        starter = { };
-      };
-    };
-  };
-}

home/programs/nvim/plugins/picker.nix

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

home/programs/nvim/plugins/snacks.nix

@@ -1,40 +0,0 @@
-{
-  programs.nixvim = {
-    plugins.snacks = {
-      enable = true;
-      settings = {
-        image = {
-          enable = true;
-          doc = { inline = false; };
-        };
-        quickfile.enable = true;
-        statuscolumn.enable = true;
-        zen.enable = true;
-        bufdelete.enable = true;
-      };
-    };
-
-    keymaps = [
-      {
-        key = "<leader>uz";
-        action = "<cmd>lua Snacks.zen()<cr>";
-        options.desc = "Zen";
-      }
-      {
-        key = "<leader>ud";
-        action = "<cmd>lua Snacks.dim.enable()<cr>";
-        options.desc = "Dim";
-      }
-      {
-        key = "<leader>uD";
-        action = "<cmd>lua Snacks.dim.disable()<cr>";
-        options.desc = "Undim";
-      }
-      {
-        key = "<leader>wc";
-        action = "<cmd>lua Snacks.bufdelete.all()<cr>";
-        options.desc = "Close all buffers";
-      }
-    ];
-  };
-}

home/programs/nvim/plugins/telescope.nix

@@ -0,0 +1,31 @@
+{ config, ... }:
+let
+  accent = "#${config.lib.stylix.colors.base0D}";
+  background = "#${config.lib.stylix.colors.base00}";
+  background-alt = "#${config.lib.stylix.colors.base01}";
+in {
+  programs.nixvim = {
+    highlight = {
+      TelescopePromptPrefix.fg = accent;
+      TelescopeSelectionCaret = {
+        fg = accent;
+        bg = background-alt;
+      };
+      TelescopeSelection.bg = background-alt;
+      TelescopePromptTitle = {
+        bg = background;
+        fg = accent;
+      };
+      TelescopePromptNormal.bg = background;
+      TelescopePromptBorder = {
+        bg = background;
+        fg = accent;
+      };
+    };
+    plugins.telescope = {
+      enable = true;
+      extensions.fzf-native = { enable = true; };
+      settings.defaults = { selection_caret = "❚ "; };
+    };
+  };
+}

home/programs/nvim/plugins/tree.nix

@@ -0,0 +1,49 @@
+{
+  programs.nixvim = {
+    plugins = {
+      neo-tree.enable = true;
+      oil = {
+        enable = true;
+        settings = {
+          default_file_explorer = false;
+          skip_confirm_for_simple_edits = true;
+          view_options.is_hidden_file = ''
+            function(name, bufnr)
+              return vim.startswith(name, ".") or name == "img"
+            end
+          '';
+          win_options = {
+            concealcursor = "ncv";
+            conceallevel = 3;
+            cursorcolumn = false;
+            foldcolumn = "0";
+            list = false;
+            signcolumn = "no";
+            spell = false;
+            wrap = false;
+          };
+          float = { padding = 5; };
+          keymaps = {
+            "-" = "actions.parent";
+            "b" = "actions.parent";
+            "<C-c>" = "actions.close";
+            "<C-h>" = "actions.select_split";
+            "<C-l>" = "actions.refresh";
+            "<C-p>" = "actions.preview";
+            "<C-s>" = "actions.select_vsplit";
+            "<C-t>" = "actions.select_tab";
+            "<CR>" = "actions.select";
+            _ = "actions.open_cwd";
+            "`" = "actions.cd";
+            "g." = "actions.toggle_hidden";
+            "g?" = "actions.show_help";
+            "g\\" = "actions.toggle_trash";
+            gs = "actions.change_sort";
+            gx = "actions.open_external";
+            "~" = "actions.tcd";
+          };
+        };
+      };
+    };
+  };
+}

home/programs/nvim/plugins/trouble.nix

@@ -1,46 +0,0 @@
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ ctags ];
-
-  programs.nixvim = {
-    plugins = {
-      trouble.enable = true;
-      which-key.settings.spec = [{
-        __unkeyed-1 = "<leader>t";
-        mode = "n";
-        group = "+trouble";
-      }];
-    };
-    keymaps = [
-      {
-        key = "<leader>tx";
-        action = "<cmd>Trouble diagnostics toggle<cr>";
-        options.desc = "Diagnostics (Trouble)";
-      }
-      {
-        key = "<leader>tX";
-        action = "<cmd>Trouble diagnostics toggle filter.buf=0<cr>";
-        options.desc = "Buffer Diagnostics (Trouble)";
-      }
-      {
-        key = "<leader>ts";
-        action = "<cmd>Trouble symbols toggle focus=false<cr>";
-        options.desc = "Symbols (Trouble)";
-      }
-      {
-        key = "<leader>tl";
-        action = "<cmd>Trouble lsp toggle focus=false win.position=right<cr>";
-        options.desc = "LSP Definitions / references / ... (Trouble)";
-      }
-      {
-        key = "<leader>tL";
-        action = "<cmd>Trouble loclist toggle<cr>";
-        options.desc = "Location List (Trouble)";
-      }
-      {
-        key = "<leader>tQ";
-        action = "<cmd>Trouble qflist toggle<cr>";
-        options.desc = "Quickfix List (Trouble)";
-      }
-    ];
-  };
-}

home/programs/nvim/plugins/ui.nix

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

home/programs/nvim/plugins/utils.nix

@@ -1,21 +1,16 @@
-{ config, lib, pkgs, ... }: {
+{ config, ... }: {
   programs.nixvim = {
-    nixpkgs.config.allowUnfree = true; # For copilot
     highlightOverride = {
-      WhichKeySeparator.bg = "#${config.lib.stylix.colors.base00}";
+      FloatBorder.fg = "#${config.lib.stylix.colors.base0D}";
     };
+    nixpkgs.config = { allowUnfree = true; };
     plugins = {
-      bufferline.enable = true;
+      copilot-vim.enable = true;
-      copilot-vim = {
-        enable = true;
-        # FIXME: Temp issue solving
-        settings.node_command = lib.getExe pkgs.nodejs_20;
-      };
       flash.enable = true;
       tmux-navigator.enable = true;
+      comment.enable = true;
+      nvim-autopairs.enable = true;
       todo-comments.enable = true;
-      lualine = { enable = true; };
-      aerial.enable = true;
       treesitter = {
         enable = true;
         nixGrammars = true;
@@ -26,12 +21,5 @@
         };
       };
     };
-    keymaps = [
-      {
-        key = "<leader>ct";
-        action = "<cmd>AerialToggle<cr>";
-        options.desc = "Aerial (tags)";
-      }
-    ];
   };
 }

home/programs/qutebrowser/default.nix

@@ -80,7 +80,7 @@ let
 
 in {
 
-  imports = [ ../duckduckgo-colorscheme ];
+  imports = [ ./duckduckgo-colorscheme.nix ];
 
   programs.qutebrowser = {
     enable = true;

home/programs/qutebrowser/duckduckgo-colorscheme.nix

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

home/programs/shell/fzf.nix

@@ -19,7 +19,7 @@ in {
     defaultOptions = [
       "--margin=1"
       "--layout=reverse"
-      "--border=none"
+      "--border=rounded"
       "--info='hidden'"
       "--header=''"
       "--prompt='/ '"

home/programs/shell/starship.nix

@@ -9,8 +9,6 @@ in {
     settings = {
       add_newline = true;
       format = lib.concatStrings [
-        "$nix_shell"
-        "$hostname"
         "$directory"
         "$git_branch"
         "$git_state"

home/programs/shell/zsh.nix

@@ -1,6 +1,6 @@
 # My shell configuration
 { pkgs, lib, config, ... }:
-let fetch = config.theme.fetch; # neofetch, nerdfetch, pfetch
+let fetch = config.var.theme.fetch; # neofetch, nerdfetch, pfetch
 in {
 
   home.packages = with pkgs; [ bat ripgrep tldr sesh ];
@@ -11,51 +11,31 @@ in {
     enable = true;
     enableCompletion = true;
     autosuggestion.enable = true;
-    syntaxHighlighting = {
+    syntaxHighlighting.enable = true;
-      enable = true;
-      highlighters = [ "main" "brackets" "pattern" "regexp" "root" "line" ];
-    };
     historySubstringSearch.enable = true;
 
-    initExtraFirst =
+    initExtraFirst = ''
-      #bash 
+      bindkey -e
-      ''
+      ${if fetch == "neofetch" then
-        bindkey -e
+        pkgs.neofetch + "/bin/neofetch"
-        ${if fetch == "neofetch" then
+      else if fetch == "nerdfetch" then
-          pkgs.neofetch + "/bin/neofetch"
+        "nerdfetch"
-        else if fetch == "nerdfetch" then
+      else if fetch == "pfetch" then
-          "nerdfetch"
+        "echo; ${pkgs.pfetch}/bin/pfetch"
-        else if fetch == "pfetch" then
+      else
-          "echo; ${pkgs.pfetch}/bin/pfetch"
+        ""}
-        else
-          ""}
 
-        function sesh-sessions() {
+      function sesh-sessions() {
-          session=$(sesh list -t -c | fzf --height 70% --reverse)
+        session=$(sesh list -t -c | fzf --height 70% --reverse)
-          [[ -z "$session" ]] && return
+        [[ -z "$session" ]] && return
-          sesh connect $session
+        sesh connect $session
-        }
+      }
 
-        function chatgptlist(){
+      zle     -N             sesh-sessions
-          for arg in "$@"; do 
+      bindkey -M emacs '\es' sesh-sessions
-              echo "$arg:"
+      bindkey -M vicmd '\es' sesh-sessions
-              echo "\`\`\`"
+      bindkey -M viins '\es' sesh-sessions
-              cat "$arg"
+    '';
-              echo "\`\`\`" 
-              echo 
-          done
-        }
-
-
-        function n4c() {
-          nix develop --no-write-lock-file --refresh "github:anotherhadi/nix4cyber#''${1:-all}"
-        }
-
-        zle     -N             sesh-sessions
-        bindkey -M emacs '\es' sesh-sessions
-        bindkey -M vicmd '\es' sesh-sessions
-        bindkey -M viins '\es' sesh-sessions
-      '';
 
     history = {
       ignoreDups = true;
@@ -96,19 +76,13 @@ in {
       open = "${pkgs.xdg-utils}/bin/xdg-open";
       icat = "${pkgs.kitty}/bin/kitty +kitten icat";
       ssh = "kitty +kitten ssh";
-      cat =
-        "bat --theme=base16 --color=always --paging=never --tabs=2 --wrap=never --plain";
 
-      obsidian-no-gpu =
-        "env ELECTRON_OZONE_PLATFORM_HINT=auto obsidian --ozone-platform=x11";
       wireguard-import = "nmcli connection import type wireguard file";
 
       notes =
         "nvim ~/nextcloud/notes/index.md --cmd 'cd ~/nextcloud/notes' -c ':Telescope find_files'";
       note = "notes";
 
-      nix-shell = "nix-shell --command zsh";
-
       # git
       g = "lazygit";
       ga = "git add";
@@ -127,78 +101,5 @@ in {
       gaa = "git add .";
       gcm = "git commit -m";
     };
-
-    initExtra = ''
-      # search history based on what's typed in the prompt
-      autoload -U history-search-end
-      zle -N history-beginning-search-backward-end history-search-end
-      zle -N history-beginning-search-forward-end history-search-end
-      bindkey "^[OA" history-beginning-search-backward-end
-      bindkey "^[OB" history-beginning-search-forward-end
-
-      # General completion behavior
-      zstyle ':completion:*' completer _extensions _complete _approximate
-
-      # Use cache
-      zstyle ':completion:*' use-cache on
-      zstyle ':completion:*' cache-path "$XDG_CACHE_HOME/zsh/.zcompcache"
-
-      # Complete the alias
-      zstyle ':completion:*' complete true
-
-      # Autocomplete options
-      zstyle ':completion:*' complete-options true
-
-      # Completion matching control
-      zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
-      zstyle ':completion:*' keep-prefix true
-
-      # Group matches and describe
-      zstyle ':completion:*' menu select
-      zstyle ':completion:*' list-grouped false
-      zstyle ':completion:*' list-separator '''
-      zstyle ':completion:*' group-name '''
-      zstyle ':completion:*' verbose yes
-      zstyle ':completion:*:matches' group 'yes'
-      zstyle ':completion:*:warnings' format '%F{red}%B-- No match for: %d --%b%f'
-      zstyle ':completion:*:messages' format '%d'
-      zstyle ':completion:*:corrections' format '%B%d (errors: %e)%b'
-      zstyle ':completion:*:descriptions' format '[%d]'
-
-      # Colors
-      zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
-
-      # case insensitive tab completion
-      zstyle ':completion:*:*:cd:*' tag-order local-directories directory-stack path-directories
-      zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
-      zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand'
-      zstyle ':completion:*:*:-command-:*:*' group-order aliases builtins functions commands
-      zstyle ':completion:*' special-dirs true
-      zstyle ':completion:*' squeeze-slashes true
-
-      # Sort
-      zstyle ':completion:*' sort false
-      zstyle ":completion:*:git-checkout:*" sort false
-      zstyle ':completion:*' file-sort modification
-      zstyle ':completion:*:eza' sort false
-      zstyle ':completion:complete:*:options' sort false
-      zstyle ':completion:files' sort false
-
-      ${lib.optionalString config.services.gpg-agent.enable ''
-        gnupg_path=$(ls $XDG_RUNTIME_DIR/gnupg)
-        export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gnupg/$gnupg_path/S.gpg-agent.ssh"
-      ''}
-
-      # Allow foot to pipe command output
-      function precmd {
-        if ! builtin zle; then
-            print -n "\e]133;D\e\\"
-        fi
-      }
-      function preexec {
-        print -n "\e]133;C\e\\"
-      }
-
-    '';
   };
 }

home/programs/spicetify/default.nix

@@ -3,7 +3,6 @@
 let
   spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
   accent = "${config.lib.stylix.colors.base0D}";
-  background = "${config.lib.stylix.colors.base00}";
 in {
   imports = [ inputs.spicetify-nix.homeManagerModules.default ];
 
@@ -11,7 +10,7 @@ in {
 
   programs.spicetify = {
     enable = true;
-    theme = lib.mkForce spicePkgs.themes.dribbblish;
+    theme = lib.mkForce spicePkgs.themes.text;
 
     colorScheme = "custom";
 
@@ -19,9 +18,6 @@ in {
       button = accent;
       button-active = accent;
       tab-active = accent;
-      player = background;
-      main = background;
-      sidebar = background;
     };
 
     enabledExtensions = with spicePkgs.extensions; [
@@ -31,7 +27,7 @@ in {
       hidePodcasts
       adblock
       fullAppDisplay
-      keyboardShortcut
+      shuffle
     ];
   };
 }

home/programs/tailscale/default.nix

@@ -1,8 +0,0 @@
-# Tailscale is a VPN service that works on top of WireGuard.
-# It allows me to access my servers and devices from anywhere.
-{ pkgs, ... }: {
-  home.packages = with pkgs; [ tailscale tailscale-systray ];
-
-  wayland.windowManager.hyprland.settings.exec-once =
-    [ "${pkgs.tailscale-systray}/bin/tailscale-systray" ];
-}

home/programs/thunar/default.nix

@@ -1,40 +1,12 @@
 # Thunar is a file explorer
-{ pkgs, config, ... }:
+{ pkgs, ... }: {
-let user = config.var.username;
-in {
   # ctrl + m to toggle the menubar
-  home.packages = with pkgs; [
+  home.packages = with pkgs.xfce; [
-    xfce.thunar
+    thunar
-    xfce.xfconf
+    xfconf
-    xfce.tumbler
+    tumbler
-    xfce.thunar-archive-plugin
+    thunar-archive-plugin
-    xfce.thunar-volman
+    thunar-volman
-    xfce.thunar-media-tags-plugin
-    p7zip
-    unar
-  ];
-
-  gtk = {
-    iconTheme = {
-      name = "WhiteSur";
-      package = pkgs.whitesur-icon-theme.override {
-        boldPanelIcons = true;
-        alternativeIcons = true;
-      };
-    };
-  };
-
-  home.sessionVariables = {
-    XDG_ICON_DIR = "${pkgs.whitesur-icon-theme}/share/icons/WhiteSur";
-  };
-
-  # bookmarks for the side pane
-  gtk.gtk3.bookmarks = [
-    "file:///home/${user}/Downloads Downloads"
-    "file:///home/${user}/Pictures Pictures"
-    "file:///home/${user}/nextcloud Nextcloud"
-    "file:///home/${user}/.config/nixos NixOS"
-    "file:///home/${user}/dev Development"
   ];
 
   home.file.".config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml".text = ''

home/programs/zen/default.nix

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

home/scripts/hyprfocus/default.nix

@@ -12,18 +12,13 @@ let
     # bash
     ''
       hyprpanel-hide
-
+      hyprctl keyword "general:gaps_in" 0
-      hyprctl --batch "\
+      hyprctl keyword "general:gaps_out" 0
-          keyword animations:enabled 0;\
+      hyprctl keyword "general:border_size" 1
-          keyword decoration:shadow:enabled 0;\
+      hyprctl keyword "decoration:rounding" 0
-          keyword decoration:blur:enabled 0;\
+      hyprctl keyword "decoration:drop_shadow" false
-          keyword general:gaps_in 0;\
+      hyprctl keyword "decoration:inactive_opacity" 0.98
-          keyword general:gaps_out 0;\
+      hyprctl keyword "decoration:active_opacity" 1
-          keyword general:border_size 1;\
-          keyword decoration:rounding 0;\
-          keyword decoration:inactive_opacity 1;\
-          keyword decoration:active_opacity 1"
-
       echo "1" > /tmp/hyprfocus
     '';
 

home/scripts/hyprpanel/default.nix

@@ -38,7 +38,7 @@ let
   '';
 
   hyprpanel-reload = pkgs.writeShellScriptBin "hyprpanel-reload" ''
-    [ $(pgrep "hyprpanel") ] && pkill hyprpanel
+    [ $(pgrep "ags") ] && pkill ags
     hyprctl dispatch exec hyprpanel
   '';
 in {

home/scripts/nixy/default.nix

@@ -28,7 +28,6 @@ let
           "󰚰;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"
         )
@@ -45,13 +44,12 @@ let
         command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')
 
         exec "$command"
-        exit $?
+        exit 0
       }
 
       [[ $1 == "" ]] && ui
 
       if [[ $1 == "rebuild" ]];then
-        cd ${configDirectory} && git add .
         sudo nixos-rebuild switch --flake ${configDirectory}#${hostname}
       elif [[ $1 == "upgrade" ]];then
         sudo nixos-rebuild switch --upgrade --flake '${configDirectory}#${hostname}'
@@ -61,8 +59,17 @@ let
         cd ${configDirectory} && sudo nix-collect-garbage -d
       elif [[ $1 == "cb" ]];then
         sudo /run/current-system/bin/switch-to-configuration boot
-      elif [[ $1 == "listgen" ]];then
+      elif [[ $1 == "remote" ]];then
-        sudo nix-env -p /nix/var/nix/profiles/system --list-generations
+        cd ~/.config/nixos && git add . && git commit -m "update" && git push
+        ssh jack -S -C "cd /home/hadi/.config/nixos && git pull && sudo -S nixos-rebuild switch --flake ~/.config/nixos#jack"
+      elif [[ $1 == "loop" ]];then
+        while true; do
+          nixy
+          echo "Press enter to continue, e to exit" 
+          read -n 1 REPLY
+          clear
+          [[ $REPLY == "e" ]] && exit 0
+        done
       else
         echo "Unknown argument"
       fi

home/scripts/screenshot/default.nix

@@ -21,7 +21,7 @@ let
       mode="output"
     fi
 
-    ${pkgs.grimblast}/bin/grimblast --notify --freeze copysave $mode "$folder/$filename" || exit 1
+    ${pkgs.grimblast}/bin/grimblast --notify --freeze copy $mode "$folder/$filename" || exit 1
 
     if [[ $2 == "swappy" ]];then
       ${pkgs.swappy}/bin/swappy -f "$folder/$filename" -o "$HOME/Pictures/$filename"

home/scripts/system/default.nix

@@ -4,7 +4,6 @@
 #-
 #- - `menu` - Open wofi with drun mode. (wofi)
 #- - `powermenu` - Open power dropdown menu. (wofi)
-#- - `quickmenu` - Open a dropdown menu with shortcuts and scripts. (wofi)
 #- - `lock` - Lock the screen. (hyprlock)
 { pkgs, ... }:
 
@@ -15,18 +14,13 @@ let
       if pgrep wofi; then
       	pkill wofi
       else
-      	wofi -p " Apps" --show drun &
+      	wofi -p " Apps" --show drun
-      	# Quit when not focused anymore
-      	sleep 0.2
-      	while true; do
-      		window=$(hyprctl activewindow | grep "wofi")
-      		if [[ ! $window ]]; then
-      			pkill wofi
-      			break
-      		fi
-      		sleep 0.2
-      	done
       fi
+      # if pgrep tofi; then
+      # 	pkill tofi
+      # else
+      # 	tofi-drun --drun-launch=true
+      # fi
     '';
 
   powermenu = pkgs.writeShellScriptBin "powermenu"

home/system/batsignal/default.nix

@@ -0,0 +1,7 @@
+# Batsignal is a simple utility to send battery notifications.
+{
+  services.batsignal = {
+    enable = true;
+    extraArgs = [ "-c 10" "-w 30" "-f disabled" ];
+  };
+}

home/system/hypridle/default.nix

@@ -1,5 +1,5 @@
 # Hypridle is a daemon that listens for user activity and runs commands when the user is idle.
-{ pkgs, lib, ... }: {
+{ pkgs, ... }: {
   services.hypridle = {
     enable = true;
     settings = {
@@ -24,6 +24,4 @@
       ];
     };
   };
-  systemd.user.services.hypridle.Unit.After =
-    lib.mkForce "graphical-session.target";
 }

home/system/hyprland/animations.nix

@@ -1,6 +1,6 @@
 { config, ... }:
 let
-  animationSpeed = config.theme.animation-speed;
+  animationSpeed = config.var.theme.animation-speed;
 
   animationDuration = if animationSpeed == "slow" then
     "4"

home/system/hyprland/bindings.nix

@@ -1,16 +1,16 @@
 { pkgs, ... }: {
   wayland.windowManager.hyprland.settings = {
     bind = [
-      "$mod,RETURN, exec, uwsm app -- ${pkgs.kitty}/bin/kitty" # Kitty
+      "$mod,RETURN, exec, ${pkgs.kitty}/bin/kitty" # Kitty
-      "$mod,E, exec,  uwsm app -- ${pkgs.xfce.thunar}/bin/thunar" # Thunar
+      "$mod,E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Thunar
-      "$mod,B, exec,  uwsm app -- zen-beta" # Zen Browser
+      "$mod,B, exec, zen" # Qutebrowser
-      "$mod,K, exec,  uwsm app -- ${pkgs.bitwarden}/bin/bitwarden" # Bitwarden
+      "$mod,K, exec, ${pkgs.bitwarden}/bin/bitwarden" # Bitwarden
-      "$mod,L, exec,  uwsm app -- ${pkgs.hyprlock}/bin/hyprlock" # Lock
+      "$mod,L, exec, ${pkgs.hyprlock}/bin/hyprlock" # Lock
       "$mod,X, exec, powermenu" # Powermenu
       "$mod,SPACE, exec, menu" # Launcher
       "$mod,C, exec, quickmenu" # Quickmenu
       "$shiftMod,SPACE, exec, hyprfocus-toggle" # Toggle HyprFocus
-      "$mod,P, exec,  uwsm app -- ${pkgs.planify}/bin/io.github.alainm23.planify" # Planify
+      # "$mod,TAB, overview:toggle" # Overview
 
       "$mod,Q, killactive," # Close window
       "$mod,T, togglefloating," # Toggle Floating
@@ -30,6 +30,7 @@
       "ALT,PRINT, exec, screenshot region swappy" # Screenshot region then edit
 
       "$shiftMod,T, exec, hyprpanel-toggle" # Toggle hyprpanel
+      "$shiftMod,S, exec, ${pkgs.qutebrowser}/bin/qutebrowser :open $(wofi --show dmenu -L 1 -p ' Search on internet')" # Search on internet with wofi
       "$shiftMod,C, exec, clipboard" # Clipboard picker with wofi
       "$shiftMod,E, exec, ${pkgs.wofi-emoji}/bin/wofi-emoji" # Emoji picker with wofi
       "$mod,F2, exec, night-shift" # Toggle night shift

home/system/hyprland/default.nix

@@ -1,24 +1,21 @@
 # So best window tiling manager
-{ pkgs, config, inputs, lib, ... }:
+{ pkgs, config, inputs, ... }:
 let
-  border-size = config.theme.border-size;
+  border-size = config.var.theme.border-size;
-  gaps-in = config.theme.gaps-in;
+  gaps-in = config.var.theme.gaps-in;
-  gaps-out = config.theme.gaps-out;
+  gaps-out = config.var.theme.gaps-out;
-  active-opacity = config.theme.active-opacity;
+  active-opacity = config.var.theme.active-opacity;
-  inactive-opacity = config.theme.inactive-opacity;
+  inactive-opacity = config.var.theme.inactive-opacity;
-  rounding = config.theme.rounding;
+  rounding = config.var.theme.rounding;
-  blur = config.theme.blur;
+  blur = config.var.theme.blur;
   keyboardLayout = config.var.keyboardLayout;
-  background = "rgb(" + config.lib.stylix.colors.base00 + ")";
 in {
 
   imports = [
     ./animations.nix
     ./bindings.nix
     ./polkitagent.nix
-    ./keyboard-backlight.nix # CHANGEME: This is for my laptop only
+    # ./hyprspace.nix 
-    # FIXME: Broken on unstable
-    # ./hyprspace.nix
   ];
 
   home.packages = with pkgs; [
@@ -47,34 +44,29 @@ in {
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland.enable = true;
-    systemd = {
+    systemd.enable = true;
-      enable = false;
+    package = inputs.hyprland.packages."${pkgs.system}".hyprland;
-      variables = [
-        "--all"
-      ]; # https://wiki.hyprland.org/Nix/Hyprland-on-Home-Manager/#programs-dont-work-in-systemd-services-but-do-on-the-terminal
-    };
-    package = null;
-    portalPackage = null;
 
     settings = {
       "$mod" = "SUPER";
       "$shiftMod" = "SUPER_SHIFT";
 
       exec-once = [
-        "dbus-update-activation-environment --systemd --all &"
+        "${pkgs.bitwarden}/bin/bitwarden"
-        "systemctl --user enable --now hyprpaper.service &"
+        "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
-        "systemctl --user enable --now hypridle.service &"
-        "systemctl --user enable --now nextcloud-client.service  &"
       ];
 
       monitor = [
-        "eDP-2,highres,0x0,1" # My internal laptop screen
+        "eDP-2,highres,0x0,1"
-        "desc:AOC U34G2G1 0x00000E06,3440x1440@99.98,auto,1" # My external monitor
+        "DP-7, disable"
-        "desc:United Microelectr Corporation UMC SHARP,3840x2160,auto,2" # TV
+        "DP-8, disable"
-        ",prefered,auto,1" # default
+        "DP-9, disable"
+        "HDMI-A-1,3440x1440@99.98,auto,1"
+        ",prefered,auto,1"
       ];
 
       env = [
+        "XDG_SESSION_TYPE,wayland"
         "XDG_CURRENT_DESKTOP,Hyprland"
         "MOZ_ENABLE_WAYLAND,1"
         "ANKI_WAYLAND,1"
@@ -86,6 +78,8 @@ in {
         "QT_QPA_PLATFORM=wayland,xcb"
         "QT_WAYLAND_DISABLE_WINDOWDECORATION,1"
         "ELECTRON_OZONE_PLATFORM_HINT,auto"
+        # "GTK_THEME,FlatColor:dark"
+        # "GTK2_RC_FILES,/home/hadi/.local/share/themes/FlatColor/gtk-2.0/gtkrc"
         "__GL_GSYNC_ALLOWED,0"
         "__GL_VRR_ALLOWED,0"
         "DISABLE_QT5_COMPAT,0"
@@ -94,6 +88,7 @@ in {
         "WLR_BACKEND,vulkan"
         "WLR_RENDERER,vulkan"
         "WLR_NO_HARDWARE_CURSORS,1"
+        "XDG_SESSION_TYPE,wayland"
         "SDL_VIDEODRIVER,wayland"
         "CLUTTER_BACKEND,wayland"
         "AQ_DRM_DEVICES,/dev/dri/card2:/dev/dri/card1" # CHANGEME: Related to the GPU
@@ -109,8 +104,8 @@ in {
         gaps_in = gaps-in;
         gaps_out = gaps-out;
         border_size = border-size;
+        border_part_of_window = true;
         layout = "master";
-        "col.inactive_border" = lib.mkForce background;
       };
 
       decoration = {
@@ -122,10 +117,7 @@ in {
           range = 20;
           render_power = 3;
         };
-        blur = {
+        blur = { enabled = if blur then "true" else "false"; };
-          enabled = if blur then "true" else "false";
-          size = 18;
-        };
       };
 
       master = {
@@ -145,39 +137,8 @@ in {
         new_window_takes_over_fullscreen = 2;
       };
 
-      windowrulev2 = [
+      windowrulev2 =
-        "float, tag:modal"
+        [ "float, tag:modal" "pin, tag:modal" "center, tag:modal" ];
-        "pin, tag:modal"
-        "center, tag:modal"
-        # telegram media viewer
-        "float, title:^(Media viewer)$"
-
-        # Bitwarden extension
-        "float, title:^(.*Bitwarden Password Manager.*)$"
-
-        # gnome calculator
-        "float, class:^(org.gnome.Calculator)$"
-        "size 360 490, class:^(org.gnome.Calculator)$"
-
-        # make Firefox/Zen PiP window floating and sticky
-        "float, title:^(Picture-in-Picture)$"
-        "pin, title:^(Picture-in-Picture)$"
-
-        # idle inhibit while watching videos
-        "idleinhibit focus, class:^(mpv|.+exe|celluloid)$"
-        "idleinhibit focus, class:^(zen)$, title:^(.*YouTube.*)$"
-        "idleinhibit fullscreen, class:^(zen)$"
-
-        "dimaround, class:^(gcr-prompter)$"
-        "dimaround, class:^(xdg-desktop-portal-gtk)$"
-        "dimaround, class:^(polkit-gnome-authentication-agent-1)$"
-        "dimaround, class:^(zen)$, title:^(File Upload)$"
-
-        # fix xwayland apps
-        "rounding 0, xwayland:1"
-        "center, class:^(.*jetbrains.*)$, title:^(Confirm Exit|Open Project|win424|win201|splash)$"
-        "size 640 400, class:^(.*jetbrains.*)$, title:^(splash)$"
-      ];
 
       layerrule = [ "noanim, launcher" "noanim, ^ags-.*" ];
 
@@ -199,4 +160,6 @@ in {
 
     };
   };
+  systemd.user.targets.hyprland-session.Unit.Wants =
+    [ "xdg-desktop-autostart.target" ];
 }

home/system/hyprland/hyprspace.nix

@@ -1,20 +1,14 @@
-# Hyprspace is a hyprland plugin that provides a workspaces overview (three-finger swipe up) and a workspace switcher (three-finger down).
 { inputs, pkgs, ... }: {
+
   wayland.windowManager.hyprland = {
     plugins = [ inputs.hyprspace.packages.${pkgs.system}.Hyprspace ];
     settings = {
-      plugin = {
+      plugin = { overview = { autoDrag = false; }; };
-        overview = {
+
-          centerAligned = true;
+      bind = [
-          hideTopLayers = true;
+        "$mod,TAB, overview:toggle" # Overview
-          hideOverlayLayers = true;
+
-          showNewWorkspace = true;
+      ];
-          exitOnClick = true;
-          exitOnSwitch = true;
-          drawActiveWorkspace = true;
-          autoDrag = false;
-        };
-      };
     };
   };
 }

home/system/hyprland/keyboard-backlight.nix

@@ -1,32 +0,0 @@
-# Turn the keyboard red/off when the battery is low
-{ pkgs, config, ... }:
-let
-  keyboard-backlight = pkgs.writeShellScriptBin "keyboard-backlight" ''
-    function set_keyboard_backlight {
-      local color=$1
-        echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone00
-        echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone01
-        echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone02
-        echo $color > /sys/devices/platform/hp-wmi/rgb_zones/zone03
-    }
-    state="white"
-    while true; do
-      BATTERY_LEVEL=$(cat /sys/class/power_supply/BAT*/capacity)
-      if [[ $BATTERY_LEVEL -le 10 ]]; then
-        if [[ $state == "red" ]];then
-          state="white"
-          set_keyboard_backlight "000000"
-        else
-          state="red"
-          set_keyboard_backlight "FF0000"
-        fi
-      else
-        state="white"
-        set_keyboard_backlight ${config.lib.stylix.colors.base0D}
-      fi
-      sleep 2
-    done
-  '';
-in {
-  wayland.windowManager.hyprland.settings.exec-once = [ keyboard-backlight ];
-}

home/system/hyprland/polkitagent.nix

@@ -1,6 +1,6 @@
-# HyprPolkitAgent is a simple polkit agent for wayland compositors
+{ inputs, pkgs, ... }: {
-{ pkgs, ... }: {
+  home.packages =
-  home.packages = with pkgs; [ hyprpolkitagent ];
+    [ inputs.hyprpolkitagent.packages."${pkgs.system}".hyprpolkitagent ];
 
   wayland.windowManager.hyprland.settings.exec-once =
     [ "systemctl --user start hyprpolkitagent" ];

home/system/hyprlock/default.nix

@@ -1,7 +1,8 @@
 # Hyprlock is a lockscreen for Hyprland
 { config, lib, ... }:
 let
-  foreground = "rgba(${config.theme.textColorOnWallpaper}ee)";
+  foreground = "rgba(216, 222, 233, 0.70)";
+  imageStr = toString config.stylix.image;
   font = config.stylix.fonts.serif.name;
 in {
   programs.hyprlock = {
@@ -16,6 +17,7 @@ in {
       # BACKGROUND
       background = {
         monitor = "";
+        path = imageStr;
         blur_passes = 0;
         contrast = 0.8916;
         brightness = 0.7172;
@@ -71,8 +73,8 @@ in {
         dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8
         dots_spacing = 0.2; # Scale of dots' absolute size, 0.0 - 1.0
         dots_center = true;
-        outer_color = "rgba(25, 25, 25, 0)";
+        outer_color = "rgba(255, 255, 255, 0)";
-        inner_color = "rgba(25, 25, 25, 0.1)";
+        inner_color = "rgba(255, 255, 255, 0.1)";
         font_color = foreground;
         fade_on_empty = false;
         font_family = font + " Bold";

home/system/hyprpanel/default.nix

@@ -2,28 +2,25 @@
 # Display informations like workspaces, battery, wifi, ...
 { inputs, config, ... }:
 let
-  transparentButtons = config.theme.bar.transparentButtons;
+  transparentButtons = config.var.theme.bar.transparentButtons;
 
   accent = "#${config.lib.stylix.colors.base0D}";
   accent-alt = "#${config.lib.stylix.colors.base03}";
   background = "#${config.lib.stylix.colors.base00}";
   background-alt = "#${config.lib.stylix.colors.base01}";
   foreground = "#${config.lib.stylix.colors.base05}";
-  foregroundOnWallpaper = "#${config.theme.textColorOnWallpaper}";
   font = "${config.stylix.fonts.serif.name}";
   fontSize = "${toString config.stylix.fonts.sizes.desktop}";
 
-  rounding = config.theme.rounding;
+  rounding = config.var.theme.rounding;
-  border-size = config.theme.border-size;
+  border-size = config.var.theme.border-size;
 
-  gaps-out = config.theme.gaps-out;
+  gaps-out = config.var.theme.gaps-out;
-  gaps-in = config.theme.gaps-in;
+  gaps-in = config.var.theme.gaps-in;
 
-  floating = config.theme.bar.floating;
+  floating = config.var.theme.bar.floating;
-  transparent = config.theme.bar.transparent;
+  transparent = config.var.theme.bar.transparent;
-  position = config.theme.bar.position;
+  position = config.var.theme.bar.position;
-
-  notificationOpacity = 90;
 
   location = config.var.location;
 in {
@@ -35,22 +32,20 @@ in {
     hyprland.enable = true;
     overwrite.enable = true;
     overlay.enable = true;
-    settings = {
+    layout = {
-      layout = {
+      "bar.layouts" = {
-        "bar.layouts" = {
+        "0" = {
-          "*" = {
+          "left" = [ "dashboard" "workspaces" "windowtitle" ];
-            "left" = [ "dashboard" "workspaces" "windowtitle" ];
+          "middle" = [ "media" ];
-            "middle" = [ "media" "cava" ];
+          "right" = [
-            "right" = [
+            "systray"
-              "systray"
+            "volume"
-              "volume"
+            "bluetooth"
-              "bluetooth"
+            "battery"
-              "battery"
+            "network"
-              "network"
+            "clock"
-              "clock"
+            "notifications"
-              "notifications"
+          ];
-            ];
-          };
         };
       };
     };
@@ -100,7 +95,6 @@ in {
       "menus.clock.weather.location" = "${location}";
       "menus.clock.weather.unit" = "metric";
       "menus.dashboard.powermenu.confirmation" = false;
-      "menus.dashboard.powermenu.avatar.image" = "~/.face.icon";
 
       "menus.dashboard.shortcuts.left.shortcut1.icon" = "";
       "menus.dashboard.shortcuts.left.shortcut1.command" = "zen";
@@ -151,10 +145,7 @@ in {
         + (if transparentButtons && transparent then "00" else "")}";
       "theme.bar.buttons.style" = "default";
       "theme.bar.buttons.monochrome" = true;
-      "theme.bar.buttons.text" = if transparent && transparentButtons then
+      "theme.bar.buttons.text" = "${foreground}";
-        "${foregroundOnWallpaper}"
-      else
-        "${foreground}";
       "theme.bar.buttons.background" =
         "${(if transparent then background else background-alt)
         + (if transparentButtons then "00" else "")}";
@@ -164,6 +155,13 @@ in {
       "theme.bar.buttons.notifications.hover" = "${background}";
       "theme.bar.buttons.notifications.total" = "${accent}";
       "theme.bar.buttons.notifications.icon" = "${accent}";
+      "theme.notification.background" = "${background-alt}";
+      "theme.notification.actions.background" = "${accent}";
+      "theme.notification.actions.text" = "${foreground}";
+      "theme.notification.label" = "${accent}";
+      "theme.notification.border" = "${background-alt}";
+      "theme.notification.text" = "${foreground}";
+      "theme.notification.labelicon" = "${accent}";
       "theme.osd.bar_color" = "${accent}";
       "theme.osd.bar_overflow_color" = "${accent-alt}";
       "theme.osd.icon" = "${background}";
@@ -182,25 +180,6 @@ in {
       "bar.workspaces.showApplicationIcons" = true;
       "bar.workspaces.showWsIcons" = true;
       "theme.bar.dropdownGap" = "4.5em";
-      "theme.bar.menus.shadow" =
-        "${if transparent then "0 0 0 0" else "0px 0px 3px 1px #16161e"}";
-      "bar.customModules.cava.showIcon" = false;
-      "bar.customModules.cava.stereo" = true;
-      "bar.customModules.cava.showActiveOnly" = true;
-      "menus.power.lowBatteryNotification" = true;
-      "notifications.position" = "top right";
-      "notifications.showActionsOnHover" = true;
-      "theme.notification.enableShadow" = true;
-      "theme.notification.opacity" = notificationOpacity;
-      "theme.notification.background" = "${background-alt}";
-      "theme.notification.actions.background" = "${accent}";
-      "theme.notification.actions.text" = "${foreground}";
-      "theme.notification.label" = "${accent}";
-      "theme.notification.border" = "${background-alt}";
-      "theme.notification.text" = "${foreground}";
-      "theme.notification.labelicon" = "${accent}";
-      "theme.notification.close_button.background" = "${background-alt}";
-      "theme.notification.close_button.label" = "#f38ba8";
     };
   };
 }

home/system/hyprpaper/default.nix

@@ -1,5 +1,5 @@
 # Hyprpaper is used to set the wallpaper on the system
-{ lib, ... }: {
+{
   # The wallpaper is set by stylix
   services.hyprpaper = {
     enable = true;
@@ -9,6 +9,4 @@
       splash_offset = 2.0;
     };
   };
-  systemd.user.services.hyprpaper.Unit.After =
-    lib.mkForce "graphical-session.target";
 }

home/system/mime/default.nix

@@ -1,93 +1,40 @@
-{ pkgs, lib, ... }:
+# Mime allows us to configure the default applications for each file type
-with lib;
+{
-let
+  xdg.mimeApps = {
-  defaultApps = {
+    enable = true;
-    browser = [ "zen-beta.desktop" ];
+    defaultApplications = {
-    text = [ "org.gnome.TextEditor.desktop" ];
+      "text/markdown" = "nvim.desktop";
-    image = [ "imv-dir.desktop" ];
+      "text/plain" = "nvim.desktop";
-    audio = [ "mpv.desktop" ];
+      "text/x-shellscript" = "nvim.desktop";
-    video = [ "mpv.desktop" ];
+      "text/x-python" = "nvim.desktop";
-    directory = [ "thunar.desktop" ];
+      "text/x-go" = "nvim.desktop";
-    office = [ "libreoffice.desktop" ];
+      "text/css" = "nvim.desktop";
-    pdf = [ "zathura.desktop" ];
+      "text/javascript" = "nvim.desktop";
-    terminal = [ "kitty.desktop" ];
+      "text/x-c" = "nvim.desktop";
-    discord = [ "discord.desktop" ];
+      "text/x-c++" = "nvim.desktop";
-  };
+      "text/x-java" = "nvim.desktop";
-
+      "text/x-rust" = "nvim.desktop";
-  mimeMap = {
+      "text/x-yaml" = "nvim.desktop";
-    text = [ "text/plain" ];
+      "text/x-toml" = "nvim.desktop";
-    image = [
+      "text/x-dockerfile" = "nvim.desktop";
-      "image/bmp"
+      "text/x-xml" = "nvim.desktop";
-      "image/gif"
+      "text/x-php" = "nvim.desktop";
-      "image/jpeg"
+      "image/jpeg" = "imv.desktop";
-      "image/jpg"
+      "image/jpg" = "imv.desktop";
-      "image/png"
+      "image/webp" = "imv.desktop";
-      "image/svg+xml"
+      "image/gif" = "zen.desktop";
-      "image/tiff"
+      "x-scheme-handler/http" = "zen.desktop";
-      "image/vnd.microsoft.icon"
+      "x-scheme-handler/https" = "zen.desktop";
-      "image/webp"
+      "text/html" = "zen.desktop";
-    ];
+      "application/pdf" = "zathura.desktop";
-    audio = [
+      "image/png" = "imv-dir.desktop";
-      "audio/aac"
+      "x-scheme-handler/chrome" = "zen.desktop";
-      "audio/mpeg"
+      "application/x-extension-htm" = "zen.desktop";
-      "audio/ogg"
+      "application/x-extension-html" = "zen.desktop";
-      "audio/opus"
+      "application/x-extension-shtml" = "zen.desktop";
-      "audio/wav"
+      "application/xhtml+xml" = "zen.desktop";
-      "audio/webm"
+      "application/x-extension-xhtml" = "zen.desktop";
-      "audio/x-matroska"
+      "application/x-extension-xht" = "zen.desktop";
-    ];
-    video = [
-      "video/mp2t"
-      "video/mp4"
-      "video/mpeg"
-      "video/ogg"
-      "video/webm"
-      "video/x-flv"
-      "video/x-matroska"
-      "video/x-msvideo"
-    ];
-    directory = [ "inode/directory" ];
-    browser = [
-      "text/html"
-      "x-scheme-handler/about"
-      "x-scheme-handler/http"
-      "x-scheme-handler/https"
-      "x-scheme-handler/unknown"
-    ];
-    office = [
-      "application/vnd.oasis.opendocument.text"
-      "application/vnd.oasis.opendocument.spreadsheet"
-      "application/vnd.oasis.opendocument.presentation"
-      "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
-      "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-      "application/vnd.openxmlformats-officedocument.presentationml.presentation"
-      "application/msword"
-      "application/vnd.ms-excel"
-      "application/vnd.ms-powerpoint"
-      "application/rtf"
-    ];
-    pdf = [ "application/pdf" ];
-    terminal = [ "terminal" ];
-    # archive = [
-    #   "application/zip"
-    #   "application/rar"
-    #   "application/7z"
-    #   "application/*tar"
-    # ];
-    discord = [ "x-scheme-handler/discord" ];
-  };
-
-  associations = with lists;
-    listToAttrs (flatten (mapAttrsToList
-      (key: map (type: attrsets.nameValuePair type defaultApps."${key}"))
-      mimeMap));
-in {
-  xdg = {
-    configFile."mimeapps.list".force = true;
-    mimeApps = {
-      enable = true;
-      associations.added = associations;
-      defaultApplications = associations;
     };
   };
 }

home/system/tofi/default.nix

@@ -0,0 +1,23 @@
+# Tofi is a dmeny-like application launcher
+{ config, lib, ... }:
+let
+  background = "#${config.lib.stylix.colors.base00}70";
+  accent = "#${config.lib.stylix.colors.base0D}";
+in {
+  programs.tofi = lib.mkForce {
+    enable = true;
+    settings = {
+      border-width = 0;
+      background-color = background;
+      prompt-color = accent;
+      selection-color = accent;
+      height = "100%";
+      num-results = 5;
+      outline-width = 0;
+      padding-left = "35%";
+      padding-top = "35%";
+      result-spacing = 25;
+      width = "100%";
+    };
+  };
+}

home/system/wofi/default.nix

@@ -6,7 +6,7 @@ let
   background-alt = "#${config.lib.stylix.colors.base01}";
   foreground = "#${config.lib.stylix.colors.base05}";
   font = config.stylix.fonts.serif.name;
-  rounding = config.theme.rounding;
+  rounding = config.var.theme.rounding;
   font-size = config.stylix.fonts.sizes.popups;
 in {
 
@@ -17,12 +17,13 @@ in {
 
     settings = {
       allow_markup = true;
-      width = 650;
+      width = 450;
       show = "drun";
       prompt = "Apps";
       normal_window = true;
       layer = "top";
-      height = "325px";
+      term = "foot";
+      height = "305px";
       orientation = "vertical";
       halign = "fill";
       line_wrap = "off";
@@ -47,7 +48,7 @@ in {
       ''
         * {
           font-family: "${font}";
-          font-weight: 600;
+          font-weight: 500;
           font-size: ${toString font-size}px;
         }
 

hosts/laptop/configuration.nix

@@ -1,22 +1,27 @@
 { config, ... }: {
   imports = [
-    # Mostly system related configuration
     ../../nixos/nvidia.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU
+    ../../nixos/prime.nix # CHANGEME: Remove this line if you don't have an Nvidia GPU
+
     ../../nixos/audio.nix
+    ../../nixos/auto-upgrade.nix
     ../../nixos/bluetooth.nix
     ../../nixos/fonts.nix
     ../../nixos/home-manager.nix
+    ../../nixos/network-manager.nix
     ../../nixos/nix.nix
     ../../nixos/systemd-boot.nix
-    ../../nixos/sddm.nix
+    ../../nixos/timezone.nix
+    ../../nixos/tuigreet.nix
     ../../nixos/users.nix
     ../../nixos/utils.nix
-    ../../nixos/tailscale.nix
+    ../../nixos/xdg-portal.nix
-    ../../nixos/hyprland.nix
+    ../../nixos/variables-config.nix
+    ../../nixos/docker.nix
 
-    ../../nixos/omen.nix # For my laptop only
+    # Choose your theme here
+    ../../themes/stylix/2025.nix
 
-    # You should let those lines as is
     ./hardware-configuration.nix
     ./variables.nix
   ];

hosts/laptop/hardware-configuration.nix

@@ -1,28 +1,26 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{ config, lib, pkgs, modulesPath, ... }: {
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
-{
+  boot = {
-  imports =
+    initrd.availableKernelModules =
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+      [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
-    ];
+    initrd.kernelModules = [ ];
+    kernelModules = [ "kvm-amd" ];
+    extraModulePackages = [ ];
+  };
 
-  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "uas" "usbhid" "sd_mod" ];
+  fileSystems."/" = {
-  boot.initrd.kernelModules = [ ];
+    device = "/dev/disk/by-uuid/6c2487ec-20ff-4ce3-9396-281c2094aba1";
-  boot.kernelModules = [ "kvm-amd" ];
+    fsType = "ext4";
-  boot.extraModulePackages = [ ];
+  };
 
-  fileSystems."/" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/6320d3c6-0231-45ec-817a-c6f0e39aab73";
+    device = "/dev/disk/by-uuid/B4EA-C54F";
-      fsType = "ext4";
+    fsType = "vfat";
-    };
+  };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/5251-9B85";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
 
   swapDevices = [ ];
 
@@ -32,9 +30,9 @@
   # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
   # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp7s0f4u1u4.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode =
+    lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

hosts/laptop/home.nix

@@ -1,12 +1,12 @@
 { pkgs, config, ... }: {
 
   imports = [
-    # Mostly user-specific configuration
     ./variables.nix
 
     # Programs
     ../../home/programs/kitty
     ../../home/programs/nvim
+    # ../../home/programs/qutebrowser
     ../../home/programs/shell
     ../../home/programs/fetch
     ../../home/programs/git
@@ -16,9 +16,6 @@
     ../../home/programs/lazygit
     ../../home/programs/zen
     ../../home/programs/duckduckgo-colorscheme
-    ../../home/programs/discord
-    ../../home/programs/tailscale
-    ../../home/programs/anyrun
 
     # Scripts
     ../../home/scripts # All scripts
@@ -30,6 +27,7 @@
     ../../home/system/hyprpanel
     ../../home/system/hyprpaper
     ../../home/system/wofi
+    ../../home/system/batsignal
     ../../home/system/zathura
     ../../home/system/mime
     ../../home/system/udiskie
@@ -44,37 +42,31 @@
 
     packages = with pkgs; [
       # Apps
+      discord # Chat
       bitwarden # Password manager
       vlc # Video player
       blanket # White-noise app
       obsidian # Note taking app
       planify # Todolists
-      gnome-calendar # Calendar
+      gnome-calendar
-      textpieces # Manipulate texts
-      curtail # Compress images
-      resources
-      gnome-clocks
-      gnome-text-editor
-      mpv # Video player
-      figma-linux
 
       # Dev
       go
       nodejs
       python3
       jq
+      figlet
       just
-      pnpm
-      air
 
       # Utils
       zip
       unzip
       optipng
-      jpegoptim
       pfetch
+      pandoc
       btop
-      fastfetch
+      textpieces # Manipulate texts
+      curtail # Compress images
 
       # Just cool
       peaclock
@@ -83,7 +75,7 @@
       cmatrix
 
       # Backup
-      brave
+      firefox
       vscode
     ];
 

hosts/laptop/secrets/default.nix

@@ -23,6 +23,10 @@
         key_groups:
           - age:
             - *primary
+      - path_regex: hosts/desktop/secrets/secrets.yaml$
+        key_groups:
+          - age:
+            - *primary
       - path_regex: hosts/server/secrets/secrets.yaml$
         key_groups:
           - age:

hosts/laptop/secrets/secrets.yaml

@@ -1,5 +1,5 @@
 pia: ENC[AES256_GCM,data:0bnhHeVqKSLHVimd78a94ShHlO3+LUoZ4oiKD3cnBYkaZsw=,iv:S+/IChlFlqdI+PyFF+Ti4AJUkch2MS0qKiqHL1Q3RMk=,tag:+v2kV70ou84eIc01dKnAhA==,type:str]
-sshconfig: ENC[AES256_GCM,data:wktwwpHsd6u/A5ti0RmWZB5qGO5Ok0ly0SucjBIUxIfMEF2b8Cbmyg6nBqqELEDo7GQ8Hlvpxa1Pu7ajgXy35HNupb33KSXMLofvxCoyfC9UbzT85nHgGpE5kGv9iTpiuBsaDTAL9UCBcEaJED8xbUIUG3RME1m1Qqi07081mtqY7xR53QgaUc2w8ATCQ1ymiW7xZ0IbZw8G7RWzV7AXMpC1VOgr1NFgvUfLs4L/1PdG40fYwFaF1BcGtzUnkeZCdeAnMWj55GI5+6OX80HYuIgPApHfjlgRVaQ2c6Utsdc2wqekkPut996nm6bGCpld3JlKL/VXnsnhJoKgfdulL2o8uDYypcacYwTXonKsHqXX4tkhniDsyB6PA0Ty/eXrzwbsjD/yTcDHDJX2Xy594nRgLDM+VvyVosH7WhIDcMrk/RpSbBB2T7mNORI0VlLQFdMX2Rc6b6X/kBbd78ZoIthiaiZdgRpX++OGbwr9Fky8ml88,iv:x8aekarsRkyMmU1GjZt9El8dS1B51M6Htv+68yfVB/o=,tag:y3TkpEVf9TSIi3iK5JqilQ==,type:str]
+sshconfig: ENC[AES256_GCM,data:/sDTGVeYRjxF5Epp5kmVS0ScSYOqOs2grX0+Ap8HJc8CQftpNOYXNYdEyqLDMc5g5ualaO4iKg4sQ76J4j9ZPugt4iprIvOo2Uxmu7KRU47Z8SNwrrMNpv6x/XA2P6r261e/e/pOHyrmiFfV/I5Km9IwGqY5TWbEhvjx8qyRO2bQDIdffI1L1ZWJGC9ZOZ4o5RJCr2xB+qxLLI2pl8qHZhvfZlGHnyHw5ne0RfAFubIrW4nQJTamoaGHZqWro4tVSfXAEb+9IsYCc1aj3MehVdV8PUQ38/LxL2MAQTt9bs7sHLf9DmxZ6rGPWmpJ+IRoQbP1PA65tobFOd+Kf13XvWymNUcQpQFHDj0vpvDONxIikO+vj2T7SteRRPy+38UPdB8jrHfQ1JrGbxUQIrWOWeD3S44lINmquIMclJQ26zf6nvklXR7xCuzNAvmjublsnYK+CGDkt/ap/kDD7nCuQYYY,iv:VX55dyt2N80LJPDYoUES7ZWJjlqVyQrUQWvOQ/yItBc=,tag:6NlHwy0SqJ40+ltQHzmX7g==,type:str]
 github-key: ENC[AES256_GCM,data:xUgFMlBo8e+3eXqNscxbby1dWug3SgUagDiNUe/IGVbU6cczkaJ3uOaB0OuRBQ8AYhOLkzXj0pIKjUrElHwmYrhURtS1aF4SFEGJsjhhobNA//j3E2/5/nLVjfco+lRzyHdwmsNhEUCqEhsXrrodJMb39H4b5oip3z0rjc729YveiWUKQxXVZVPurp3nq9yNnix9R4CA6XYFRW6T6MNqgPD5qhbcDlhxLb/SN+uI5h+5eZIS24VDWlKaTaCLL5KLhZmfuA37SquOQ+edi9Yg8MnfrZkMrp/3qmAjP2rSQLMOc4QdQCLQBQSf0/snpydgLwY+FoJmMSztwtkqUdIZWOfDUJbJxegEOrAR68jLTNbp+GYiDn3thtOZDiK5p/M1amjCT+A9qeFMed5WS+aZHNTRbR9UcfiP6+48MGZFt1mr7q+/CoL04/DTp0w6tUf6/SZD31NvTJDqngkhpc0ZH9Dh5+2JcnBWpq25AM36kZTn1hIQCLNTr/oGWZXSLA2tksAhQCaUcFj4IIh6Bl96,iv:GEJsAs5NriwENYTV/VShgJF6iMmrtTwNiXOvfXyEP8E=,tag:nfZgsFqaet075GjQAoVZxQ==,type:str]
 gitlab-key: ENC[AES256_GCM,data:6271Tg7LIJsXAw7Co32vva+iUWv+eRAfVfXaGkoirHxiPTAgZfq8yDpGJwti2D/aFnLvbURcUgp3B5zy1aURu9puXi6QMu3orJOE2Zx0dX3lyeHyIhOZ1hAWsQxwBDkJYODuMZbIKHNrF26Mkk6smFF9SrGoADZGxY7XSou/iopw6yrLvQAXP6lN55PQvoP5/ek/QzKNwjJAbAjp7FjjtPqPUbUdj7bfIfr9avs6gpRYnRzb2H3auyhb5qvyuRWnKu4+FeZUofC7HnfRU1eSI8UzG49Rg4f2b1Xqr0JtsjvEmuRx7lbptINXEAjW7zaSZ2B9NgotWPIzkNZRNZkuTEaOulBf5iH3wJ9GM1FcbUu2gpCt6y+CMIk5QkVvETYtKuALLbcPx9/sc90doiH1411LeKQCs5l88BBILG9KPkKmXiGGUVNxzFtjbRYQIUEmmyl95kPPEdCkkzGzHXNfE3F9HRu4MCGKPK2yZPZtCXd3Jp1b21wKSIRNYqLqxru+J8eLSljd3czO0SuTG/Vx,iv:E+y3aVLaiStlPLTQBqyfJuEXtAQyOvDUYS+XfuOHuA0=,tag:6d1IAsGcmcpgL1pE9dDcbw==,type:str]
 jack-key: ENC[AES256_GCM,data:VfCl3wH0MMBc8QDyjLDFeSvzSEsf7uGpfJvRjFrmjW+bPRUXBpZhJV8a9VQIAz7z7zZXvzARMfCeI0ydyC57CW81GH5/H5pneJ4b+xreINjVfdLbL1nC1thelo/O64jda/L+xVKhgE+QQi8/zt4JmXGghkP+74nYcTTaMpmcbgWw354J1ybXqyCEY+88nsJ1d2s+M7M2bplx4fGb7sLUs6sqdsad3sENzhH/0HQCFXreHTtgsLbIs8ccmdRgFNKM8/wD0OoW76rOQsJoA9JY4yOTQNVoX5M8+Olj6+wVlt6QBrWrYRuEztGnHrHvzxiHXtmEkMwVNfoPpEflQyRYRa0rVp/66REOkMckGx6/LbxKFgrxnifRlsK3kWd28v2bRGVQOghUluYUtVkaJ+eh6o6ik0NQKx8/H6BznBSDE6MjDwbLv434LHBfDtAqhWN1eMbOlunFivsl5Hb/6rl9kydHlcCS6FY8cUHoKQ90gDaUuDrvUifwmdO5hU0GH5tgvGi1ReK9ndcpQsrHptG6,iv:oC1xU5Tu3The105VYRmxIw4kEwDoqe8T/EH6mmqpqwQ=,tag:Pu8c536u6W7ALrqjRsvXDw==,type:str]
@@ -18,8 +18,8 @@ sops:
             cmVxVC8rVDlWMUdZaGw3bmdOaWZGS1EKYahBlc8XpB5UdKZQkvxbLcKQ/xkFJjWo
             FSfQWnjhe/a7BJtJEcKZkjOQU0mYqlSu+uT2RA9diCQeRUJPRF+nAw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-03-19T08:38:27Z"
+    lastmodified: "2024-11-05T12:05:15Z"
-    mac: ENC[AES256_GCM,data:ZLljLyyibu9KMdJIwf9DsdKr4aVNWIKOneU05iPEOM9paLw/cSXVYqbfmj0i7xwvpZEin6QtUrUmIPepDIRMtIK8chmk7U5Lqxzp7XA0/IbXw0fkGg3+NmauHUGdeb1BJBLTT4AD+W0aqSayT9AvE40JOXMDzOW50WdUPzI5Ou0=,iv:6KdKZK0RoCkfTeO4oAUS1jRxcGZFrlTIXwXothQwsYE=,tag:VFL+TEjLZEue/hT1nl9f0g==,type:str]
+    mac: ENC[AES256_GCM,data:ggTUKhmfUp4CCE6w3uiuwV0ys6xUhaMBeXi4WiaxkED/lB9iUdP9UssE9iF5lToyNxt/6O2C60CXc4OvpqBxe5dsxPkVNeB6PNhQrD5Ga8+Cu0i6hKz6Fmm0Rq461OuX0Nu2Nl3MUBCWxjM0+1ywfLRKDcjoVC7RzP5eo1NtrV8=,iv:G+Ntog1claKwAY4PEpUK1hjNzspDZiO3bdWNxugUXDQ=,tag:Yg2ZJEV2VrnTmpw8TykmZg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
-    version: 3.9.4
+    version: 3.9.1

hosts/laptop/variables.nix

@@ -1,8 +1,5 @@
-{ config, lib, ... }: {
+{ config, ... }: {
-  imports = [
+  imports = [ ../../nixos/variables-config.nix ];
-    # Choose your theme here:
-    ../../themes/nixy.nix
-  ];
 
   config.var = {
     hostname = "nixy";
@@ -24,13 +21,8 @@
 
     autoUpgrade = false;
     autoGarbageCollector = true;
-  };
 
-  # Let this here
+    # Choose your theme variables here
-  options = {
+    theme = import ../../themes/var/2025.nix;
-    var = lib.mkOption {
-      type = lib.types.attrs;
-      default = { };
-    };
   };
 }

hosts/server/configuration.nix

@@ -1,35 +0,0 @@
-{ config, ... }: {
-  imports = [
-    ../../nixos/home-manager.nix
-    ../../nixos/nix.nix
-    ../../nixos/systemd-boot.nix
-    ../../nixos/users.nix
-    ../../nixos/utils.nix
-    ../../nixos/docker.nix
-    ../../nixos/tailscale.nix
-
-    ../../server-modules/ssh.nix
-    ../../server-modules/bitwarden.nix
-    ../../server-modules/firewall.nix
-    ../../server-modules/nginx.nix
-    ../../server-modules/nextcloud.nix
-    ../../server-modules/glance.nix
-    ../../server-modules/adguardhome.nix
-    ../../server-modules/hoarder.nix
-    ../../server-modules/arr.nix
-    ../../server-modules/mealie.nix
-    ../../server-modules/meilisearch.nix
-    ../../server-modules/search-nixos-api.nix
-
-    # You should let those lines as is
-    ./hardware-configuration.nix
-    ./variables.nix
-
-    ./secrets
-  ];
-
-  home-manager.users."${config.var.username}" = import ./home.nix;
-
-  # Don't touch this
-  system.stateVersion = "24.05";
-}

hosts/server/hardware-configuration.nix

@@ -1,30 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }: {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ "dm-snapshot" ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/350cf109-5380-4982-8a9e-279a9275ee18";
-    fsType = "ext4";
-  };
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/DD15-1125";
-    fsType = "vfat";
-    options = [ "fmask=0077" "dmask=0077" ];
-  };
-  swapDevices = [ ];
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp3s0.useDHCP = lib.mkDefault true;
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode =
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
-}

hosts/server/home.nix

@@ -1,47 +0,0 @@
-{ pkgs, config, ... }: {
-
-  imports = [
-    # Mostly user-specific configuration
-    ./variables.nix
-
-    # Programs
-    ../../home/programs/nvim
-    ../../home/programs/shell
-    ../../home/programs/fetch
-    ../../home/programs/git
-    ../../home/programs/lazygit
-
-    # Scripts
-    ../../home/scripts # All scripts
-  ];
-
-  home = {
-    inherit (config.var) username;
-    homeDirectory = "/home/" + config.var.username;
-
-    packages = with pkgs; [
-      # Dev
-      go
-      nodejs
-      python3
-      jq
-      just
-      pnpm
-      wireguard-tools
-
-      # Utils
-      zip
-      unzip
-      optipng
-      pfetch
-      btop
-      fastfetch
-      tailscale
-    ];
-
-    # Don't touch this
-    stateVersion = "24.05";
-  };
-
-  programs.home-manager.enable = true;
-}

hosts/server/secrets/default.nix

@@ -1,29 +0,0 @@
-{ pkgs, ... }: {
-  sops = {
-    age.keyFile = "/home/hadi/.config/sops/age/keys.txt";
-    defaultSopsFile = ./secrets.yaml;
-    secrets = {
-      sshconfig = {
-        owner = "hadi";
-        path = "/home/hadi/.ssh/config";
-        mode = "0600";
-      };
-      github-key = {
-        owner = "hadi";
-        path = "/home/hadi/.ssh/github";
-        mode = "0600";
-      };
-      cloudflare-dns-token = { path = "/etc/cloudflare/dnskey.txt"; };
-      nextcloud-pwd = { path = "/etc/nextcloud/pwd.txt"; };
-      adguard-pwd = { };
-      hoarder = { };
-      recyclarr = {
-        owner = "recyclarr";
-        mode = "0777";
-      };
-      wireguard-pia = { };
-    };
-  };
-
-  environment.systemPackages = with pkgs; [ sops age ];
-}

hosts/server/secrets/secrets.yaml

@@ -1,28 +0,0 @@
-sshconfig: ENC[AES256_GCM,data:R54HVxqAyj9yGO/AYL8p6cnXgYxkQKW9XveHlBMTnDXBJ7r/4HgnefdymprnXmdlbNWcWrRqmaLEuzJs/0BfixXfMvmGTUrmJ0ASVuDrz9k6rOLADAKFikQh0dib7NU4JmPgmUzMncXc2WuCd3BCG3kwBQ==,iv:Ro9FA+MzTAp+ERQMT88z8ioCox/dTj2vWcqCDOSLag4=,tag:5XiXIyz5/pjGFOB5ZjdOVg==,type:str]
-github-key: ENC[AES256_GCM,data:NRYhcBIwGJEV13+YECLR+2IErsn/7clbnkx0Mltr7dQajSb5WHZ3QDH0KQPylEHhplE5IVS0h4I0z+Pb1B0UteCxFmJ5wZq+2BKZkvE7G3dojqBpgHcVqJV2GLEJkRjlHfRgsbq/OBe8xcsPh20P1KUyP0WIwVbpt+9dFWGxEGYkp2uSyuBIJ98kElt0zuVgl7WcYoDO7v5WmGzZfla+yZwURvMk8zcM3gopo+4KL6YnYUs+UA3VlBBn6VK4Nvbqy6X0R0+ZA5HHAXg+OFgGmfWnENZmsyQJHXEchGGgEldzThkQ4r8yMkgN/ax+AGouLyzbITapGE4sE11FFgL6Hmp4pSXxl3UAGF+cvV5pIujbb28CXmSPRMyYpoNxI93PSYz/txAzE6Cr2dgwxR4zpMelv4i6IaGnY8NgpY8jp2Y6C0uuJxJCN0RtnjQw1rM2uRnm7vMGyU7XXz9DEVfGnYpTWnykXsEjHE5DVGy80ejYQlc6dtmf3vdTWpt+YYdCPw8/cd0PIx2D6geh1c28,iv:wl+RG24mXYMklD8CBGXVD36DMhlWT/7zh8ZMvr7vgOk=,tag:OJhqF8PoXotr7IsyFW6q1g==,type:str]
-cloudflare-dns-token: ENC[AES256_GCM,data:JIXUtVDpYS9B74W0ooj50kd4v2+PX+FdF218gvgaS04rYATu4N6w9KEFPfdQqLjUmVihzV6s/IR1fg==,iv:AlbQ86kvFQbetvmFwt/hEyUcqKTI+XzL/NvSMXW9wm4=,tag:1JQeK4KrTDa6Kz+JhWxkxQ==,type:str]
-nextcloud-pwd: ENC[AES256_GCM,data:2oqsNceKuwGscBN2VxAK,iv:FoSfHItgeB91fG38zqtuQzayvNjNPFQyZjZlpUq/eic=,tag:MoEpAmTj+zqVu6OLasD4kQ==,type:str]
-adguard-pwd: ENC[AES256_GCM,data:QavwLWENAURnRrFwiLntkiM=,iv:bxdQfBxNL5rwUr7CEKbwXtv5mUUXZHhvyqQL2KoPwEY=,tag:T+cSyzbGeo7E5smSsuFlHw==,type:str]
-hoarder: ENC[AES256_GCM,data:8A3eGqIlHJ2XpC2OdMNBXPm+5BdfMlOfTSgiibPtM+SFyiPtGhjWQNmVCD9REf0P2C4pikZ3R7vtwyKpjrraaoSAY7ztAk9eqqikorIzD8hn8wbHz/y+Eko=,iv:ngoVgF348IxokWGQVpbpTGhdIwjOOA6T8qLb1wX6GEU=,tag:+v9HLUksQJ1e2vRR/5fzEg==,type:str]
-recyclarr: ENC[AES256_GCM,data:XgQ5ZQHY/OKucvJGb6NQND9/zzi2E+W3y9gtQJEUL9uIUWbiZdEt9XHB7dMXl9MIjOjAlCNKIzUMXkgccKA3PbVgbaKUMh3oXmTVHVqmRHrFwCwZMAUTQeOvwgeYYHkw,iv:Fyb16m+E6ToRzC5JGKTxhPzFwhdqaZ9liWUtMGpQ9O8=,tag:fdlpq40dAU2UzOJTVNuHSg==,type:str]
-wireguard-pia: ENC[AES256_GCM,data:TBbhTqKvnjSQu8Tc2QieLrIeP36JEcKMeJ2xMzsTrGSgKnyrnm4CUjSsluYpD5TXpt5z2BSQVG0K5XqT0c5q7N16jk6KyDAjZEHm9gMCWlywh2oQWxpjw8G3jFiiHkH055Me8jVtTUF4d+gpMu/LMA4TZlaCMjVEkcYoHsdhWRpKZWDs98D35oSVX7BEUgc8WIWtyDc1QjJ0Chi6Mw1+C9h3njLoLe/esdS/KV9nJSBB9OsSt11V5Dl5NQDnr+cV0CytC9vHDoYX9+s6ZASom13MBjs8SHQBsteQcboSB/WglO93NIA1VQ/hwDZnCQ25u89Z7oMVMR+NNQ==,iv:1AGrXUDY55wc60t489Vf+YUreiFeo77aAtj29EBnPi4=,tag:djY1xJqSCoIth7++ZokwhA==,type:str]
-sops:
-    kms: []
-    gcp_kms: []
-    azure_kv: []
-    hc_vault: []
-    age:
-        - recipient: age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5Z3MzZmoyVDRtRmd3amFJ
-            MWVvWlA1c3RFeVMrbHJQQmNTcG9ZN2tXSWxjClJ0L1psd1RFM1EreG1yNHdOYzZF
-            aXphL0lvcGNFTFFMbkNocGNXY00xdW8KLS0tIFh2YjN0aTlRazBXSktnQWx0L3BY
-            TEc5d01RaVFGNXc3dlljM0FTTHpENjQKOqwI+pl8UxVIVl43glnOYvW660/PsDGY
-            yefODJGVtHrOm3yeXC2xlTi3sFW+c5wUl2yPqddbvcBt5Ud/yd4iXQ==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2025-03-24T12:14:53Z"
-    mac: ENC[AES256_GCM,data:iIQADIb6T/D7Zmq+3egSQKqsEuCP66E9EO98IMgxLBc7trR8VFjHX6vZWkcOVQYUXaOq/LyYMtgwdQ+zfxmiu1/sfflRFDeYpvSjC2pxXARSTfsYq18BwJo8rnQmMm7A8NyQjzmpAjo8bCTgFlNXhQd54vJCIeJGmsZKeXDGHg0=,iv:XBtl+1ssfkuR3P1pQ6Q7k+neuzam9UdTAS+UJcvQqB4=,tag:5YITncXhThWIOMK7NLsv0Q==,type:str]
-    pgp: []
-    unencrypted_suffix: _unencrypted
-    version: 3.9.4

hosts/server/variables.nix

@@ -1,36 +0,0 @@
-{ config, lib, ... }: {
-  imports = [
-    # Choose your theme here:
-    ../../themes/nixy.nix
-  ];
-
-  config.var = {
-    hostname = "jack";
-    username = "hadi";
-    configDirectory = "/home/" + config.var.username
-      + "/.config/nixos"; # The path of the nixos configuration directory
-
-    keyboardLayout = "fr";
-
-    location = "Paris";
-    timeZone = "Europe/Paris";
-    defaultLocale = "en_US.UTF-8";
-    extraLocale = "fr_FR.UTF-8";
-
-    git = {
-      username = "Hadi";
-      email = "112569860+anotherhadi@users.noreply.github.com";
-    };
-
-    autoUpgrade = false;
-    autoGarbageCollector = true;
-  };
-
-  # Let this here
-  options = {
-    var = lib.mkOption {
-      type = lib.types.attrs;
-      default = { };
-    };
-  };
-}

nixos/auto-upgrade.nix

@@ -0,0 +1,11 @@
+{ config, ... }:
+let configDir = config.var.configDirectory;
+in {
+  system.autoUpgrade = {
+    enable = config.var.autoUpgrade;
+    dates = "04:00";
+    flake = "${configDir}";
+    flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ];
+    allowReboot = false;
+  };
+}

nixos/bluetooth.nix

@@ -4,5 +4,6 @@
     enable = true;
     powerOnBoot = true;
   };
+
   services.blueman.enable = true;
 }

nixos/fonts.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, inputs, ... }: {
 
   fonts = {
     packages = with pkgs; [
@@ -19,8 +19,18 @@
       nerd-fonts.meslo-lg
       openmoji-color
       twemoji-color-font
+      inputs.apple-fonts.packages.${pkgs.system}.sf-pro-nerd
     ];
 
     enableDefaultPackages = false;
+
+    fontconfig = {
+      defaultFonts = {
+        monospace = [ "FiraCode Nerd Font Mono" "Noto Color Emoji" ];
+        sansSerif = [ "SFProDisplay Nerd Font" "Noto Color Emoji" ];
+        serif = [ "SFProDisplay Nerd Font" "Noto Color Emoji" ];
+        emoji = [ "Noto Color Emoji" ];
+      };
+    };
   };
 }

nixos/hyprland.nix

@@ -1,9 +0,0 @@
-{ inputs, pkgs, ... }: {
-  programs.hyprland = {
-    enable = true;
-    withUWSM = true;
-    package = inputs.hyprland.packages."${pkgs.system}".hyprland;
-    portalPackage =
-      inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
-  };
-}

nixos/network-manager.nix

@@ -0,0 +1,4 @@
+{
+  networking.networkmanager.enable = true;
+  systemd.services.NetworkManager-wait-online.enable = false;
+}

nixos/nix.nix

@@ -1,13 +1,6 @@
 { config, inputs, ... }:
 let autoGarbageCollector = config.var.autoGarbageCollector;
 in {
-  security.sudo.extraRules = [{
-    users = [ config.var.username ];
-    commands = [{
-      command = "/run/current-system/sw/bin/nixos-rebuild";
-      options = [ "NOPASSWD" ];
-    }];
-  }];
   nixpkgs.config = {
     allowUnfree = true;
     allowBroken = true;
@@ -21,20 +14,9 @@ in {
     settings = {
       auto-optimise-store = true;
       experimental-features = [ "nix-command" "flakes" ];
-      substituters = [
+      substituters = [ "https://hyprland.cachix.org" ];
-        # high priority since it's almost always used
-        "https://cache.nixos.org?priority=10"
-
-        "https://hyprland.cachix.org"
-        "https://nix-community.cachix.org"
-        "https://cache.garnix.io"
-        "https://numtide.cachix.org"
-      ];
       trusted-public-keys = [
         "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-        "cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
-        "numtide.cachix.org-1:2ps1kLBUWjxIneOy1Ik6cQjb41X0iXVXeHigGmycPPE="
       ];
     };
     gc = {

nixos/nvidia.nix

@@ -1,74 +1,42 @@
 { lib, pkgs, config, ... }:
-
 let
-  # Using beta driver for recent GPUs like RTX 4070
+  nvidiaDriverChannel =
-  nvidiaDriverChannel = config.boot.kernelPackages.nvidiaPackages.beta;
+    config.boot.kernelPackages.nvidiaPackages.beta; # stable, latest, beta, etc.
 in {
-  # Video drivers configuration for Xorg and Wayland
+  # Load nvidia driver for Xorg and Wayland
   services.xserver.videoDrivers =
-    [ "nvidia" ]; # Simplified - other modules are loaded automatically
+    [ "nvidia" "displayLink" ]; # or "nvidiaLegacy470 etc.
-
+  boot.kernelParams =
-  # Kernel parameters for better Wayland and Hyprland integration
+    lib.optionals (lib.elem "nvidia" config.services.xserver.videoDrivers) [
-  boot.kernelParams = [
+      "nvidia-drm.modeset=1"
-    "nvidia-drm.modeset=1" # Enable mode setting for Wayland
+      "nvidia_drm.fbdev=1"
-    "nvidia.NVreg_PreserveVideoMemoryAllocations=1" # Improves resume after sleep
+      "nvidia.NVreg_PreserveVideoMemoryAllocations=1"
-    "nvidia.NVreg_RegistryDwords=PowerMizerEnable=0x1;PerfLevelSrc=0x2222;PowerMizerLevel=0x3;PowerMizerDefault=0x3;PowerMizerDefaultAC=0x3" # Performance/power optimizations
+    ];
-  ];
-
-  # Blacklist nouveau to avoid conflicts
-  boot.blacklistedKernelModules = [ "nouveau" ];
-
-  # Environment variables for better compatibility
   environment.variables = {
-    LIBVA_DRIVER_NAME = "nvidia"; # Hardware video acceleration
+    # GBM_BACKEND = "nvidia-drm"; # If crash in firefox, remove this line
-    XDG_SESSION_TYPE = "wayland"; # Force Wayland
+    LIBVA_DRIVER_NAME = "nvidia"; # hardware acceleration
-    GBM_BACKEND = "nvidia-drm"; # Graphics backend for Wayland
+    __GLX_VENDOR_LIBRARY_NAME = "nvidia";
-    __GLX_VENDOR_LIBRARY_NAME = "nvidia"; # Use Nvidia driver for GLX
+    NVD_BACKEND = "direct";
-    WLR_NO_HARDWARE_CURSORS = "1"; # Fix for cursors on Wayland
-    NIXOS_OZONE_WL = "1"; # Wayland support for Electron apps
-    __GL_GSYNC_ALLOWED = "1"; # Enable G-Sync if available
-    __GL_VRR_ALLOWED = "1"; # Enable VRR (Variable Refresh Rate)
-    WLR_DRM_NO_ATOMIC = "1"; # Fix for some issues with Hyprland
-    NVD_BACKEND = "direct"; # Configuration for new driver
-    MOZ_ENABLE_WAYLAND = "1"; # Wayland support for Firefox
   };
-
-  # Configuration for proprietary packages
   nixpkgs.config = {
     nvidia.acceptLicense = true;
-    allowUnfree = true; # Simplified from specific allowUnfreePredicate
+    allowUnfreePredicate = pkg:
+      builtins.elem (lib.getName pkg) [
+        "cudatoolkit"
+        "nvidia-persistenced"
+        "nvidia-settings"
+        "nvidia-x11"
+      ];
   };
-
-  # Nvidia configuration
   hardware = {
     nvidia = {
-      open = false; # Proprietary driver for better performance
+      open = false;
-      nvidiaSettings = true; # Nvidia settings utility
+      nvidiaSettings = true;
-      powerManagement = {
+      powerManagement.enable =
-        enable = true; # Power management
+        true; # This can cause sleep/suspend to fail and saves entire VRAM to /tmp/
-        finegrained = true; # More precise power consumption control
+      modesetting.enable = true;
-      };
-      modesetting.enable = true; # Required for Wayland
       package = nvidiaDriverChannel;
-      forceFullCompositionPipeline = true; # Prevents screen tearing
-
-      # Configuration for hybrid AMD+Nvidia laptop
-      prime = {
-        # Optimized configuration for switchable graphics laptops
-        offload = {
-          enable = true; # Mode optimized for power saving
-          enableOffloadCmd =
-            true; # Allows running applications with dedicated GPU
-        };
-        # sync.enable disabled as offload is generally better for laptops
-        sync.enable = false;
-        # PCI IDs verified for your hardware
-        amdgpuBusId = "PCI:5:0:0"; # Integrated AMD GPU
-        nvidiaBusId = "PCI:1:0:0"; # Dedicated Nvidia GPU
-      };
     };
-
-    # Enhanced graphics support
     graphics = {
       enable = true;
       package = nvidiaDriverChannel;
@@ -79,25 +47,7 @@ in {
         libvdpau-va-gl
         mesa
         egl-wayland
-        vulkan-loader
-        vulkan-validation-layers
-        libva
       ];
     };
   };
-
-  # Nix cache for CUDA
-  nix.settings = {
-    substituters = [ "https://cuda-maintainers.cachix.org" ];
-    trusted-public-keys = [
-      "cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
-    ];
-  };
-
-  # Additional useful packages
-  environment.systemPackages = with pkgs; [
-    vulkan-tools
-    glxinfo
-    libva-utils # VA-API debugging tools
-  ];
 }

nixos/omen.nix

@@ -1,72 +0,0 @@
-{ config, pkgs, ... }:
-
-let
-  hp-omen-linux-module = pkgs.callPackage
-    ({ kernel ? config.boot.kernelPackages.kernel, stdenv, fetchFromGitHub }:
-      stdenv.mkDerivation (finalAttrs: {
-        pname = "hp-omen-linux-module";
-        version = "rebase-6.14";
-        src = fetchFromGitHub {
-          owner = "ranisalt";
-          repo = "hp-omen-linux-module";
-          rev = finalAttrs.version;
-          sha256 = "sha256-2zCm29bdboSjRm/caMjBPGNc0tZXPUnIIYlHxxfhAok=";
-        };
-        setSourceRoot = ''
-          export sourceRoot=$(pwd)/${finalAttrs.src.name}/src
-        '';
-        nativeBuildInputs = kernel.moduleBuildDependencies;
-        makeFlags = [
-          "KERNELDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-        ];
-        installPhase = ''
-          runHook preInstall
-          install hp-wmi.ko -Dm444 -t $out/lib/modules/${kernel.modDirVersion}/kernel/drivers/platform/x86/hp/
-          runHook postInstall
-        '';
-      })) { kernel = config.boot.kernelPackages.kernel; };
-in {
-  boot.extraModulePackages = [ hp-omen-linux-module ];
-  boot.kernelModules = [ "hp-wmi" ];
-
-  users.groups.omen-rgb = { };
-  users.users.${config.var.username}.extraGroups = [ "omen-rgb" ];
-
-  systemd.tmpfiles.rules = [
-    "w /sys/devices/platform/hp-wmi/rgb_zones/zone00 0660 root omen-rgb -"
-    "w /sys/devices/platform/hp-wmi/rgb_zones/zone01 0660 root omen-rgb -"
-    "w /sys/devices/platform/hp-wmi/rgb_zones/zone02 0660 root omen-rgb -"
-    "w /sys/devices/platform/hp-wmi/rgb_zones/zone03 0660 root omen-rgb -"
-
-  ];
-
-  services.udev.extraRules = ''
-    SUBSYSTEM=="platform", KERNEL=="hp-wmi", ACTION=="add", \
-    RUN+="${pkgs.coreutils}/bin/chgrp omen-rgb /sys/devices/platform/hp-wmi/rgb_zones/zone00", \
-    RUN+="${pkgs.coreutils}/bin/chmod 0660 /sys/devices/platform/hp-wmi/rgb_zones/zone00", \
-    RUN+="${pkgs.coreutils}/bin/chgrp omen-rgb /sys/devices/platform/hp-wmi/rgb_zones/zone01", \
-    RUN+="${pkgs.coreutils}/bin/chmod 0660 /sys/devices/platform/hp-wmi/rgb_zones/zone01", \
-    RUN+="${pkgs.coreutils}/bin/chgrp omen-rgb /sys/devices/platform/hp-wmi/rgb_zones/zone02", \
-    RUN+="${pkgs.coreutils}/bin/chmod 0660 /sys/devices/platform/hp-wmi/rgb_zones/zone02", \
-    RUN+="${pkgs.coreutils}/bin/chgrp omen-rgb /sys/devices/platform/hp-wmi/rgb_zones/zone03", \
-    RUN+="${pkgs.coreutils}/bin/chmod 0660 /sys/devices/platform/hp-wmi/rgb_zones/zone03"
-  '';
-  # systemd.services.fix-hp-omen-perms = {
-  #   description = "Fix HP Omen keyboard RGB zone permissions";
-  #   after = [ "systemd-modules-load.service" ];
-  #   wantedBy = [ "multi-user.target" ];
-  #   serviceConfig = {
-  #     Type = "oneshot";
-  #     ExecStart = ''
-  #       ${pkgs.coreutils}/bin/chgrp omen-rgb /sys/devices/platform/hp-wmi/rgb_zones/zone00
-  #       ${pkgs.coreutils}/bin/chmod 0660 /sys/devices/platform/hp-wmi/rgb_zones/zone00
-  #       ${pkgs.coreutils}/bin/chgrp omen-rgb /sys/devices/platform/hp-wmi/rgb_zones/zone01
-  #       ${pkgs.coreutils}/bin/chmod 0660 /sys/devices/platform/hp-wmi/rgb_zones/zone01
-  #       ${pkgs.coreutils}/bin/chgrp omen-rgb /sys/devices/platform/hp-wmi/rgb_zones/zone02
-  #       ${pkgs.coreutils}/bin/chmod 0660 /sys/devices/platform/hp-wmi/rgb_zones/zone02
-  #       ${pkgs.coreutils}/bin/chgrp omen-rgb /sys/devices/platform/hp-wmi/rgb_zones/zone03
-  #       ${pkgs.coreutils}/bin/chmod 0660 /sys/devices/platform/hp-wmi/rgb_zones/zone03
-  #     '';
-  #   };
-  # };
-}

nixos/pia.nix

@@ -0,0 +1,10 @@
+{ config, ... }: {
+  services.pia.enable = true;
+
+  # Alternatively, you can use the `authUserPassFile` attribute if you are using
+  # a Nix secrets manager. Here's an example using sops-nix.
+  #
+  # The secret you provide to `authUserPassFile` should be a multiline string with
+  # a single username on the first line a single password on the second line.
+  services.pia.authUserPassFile = "/home/hadi/.config/pia/pia.ovpn";
+}

nixos/prime.nix

@@ -0,0 +1,17 @@
+{
+  hardware.nvidia.prime = {
+    offload = {
+      enable = true;
+      enableOffloadCmd = true;
+    };
+
+    # sync.enable = true;
+
+    # CHANGEME: Change those values to match your hardware (if prime is imported)
+    amdgpuBusId =
+      "PCI:5:0:0"; # Set this to the bus ID of your AMD GPU if you have one
+    # intelBusId = "PCI:0:2:0"; # Set this to the bus ID of your Intel GPU if you have one
+    nvidiaBusId =
+      "PCI:1:0:0"; # Set this to the bus ID of your Nvidia GPU if you have one
+  };
+}

nixos/sddm.nix

@@ -1,68 +0,0 @@
-# SDDM is a display manager for X11 and Wayland
-{ pkgs, inputs, config, lib, ... }:
-let
-  foreground = config.theme.textColorOnWallpaper;
-  sddm-astronaut = pkgs.sddm-astronaut.override {
-    embeddedTheme = "pixel_sakura";
-    # TODO: Cleaner version for static vs .gif, just a string.replace
-    themeConfig = if lib.hasSuffix "sakura_static.png" config.stylix.image then
-      { }
-    else if lib.hasSuffix "studio.png" config.stylix.image then {
-      Background = pkgs.fetchurl {
-        url =
-          "https://raw.githubusercontent.com/anotherhadi/nixy-wallpapers/refs/heads/main/wallpapers/studio.gif";
-        sha256 = "sha256-qySDskjmFYt+ncslpbz0BfXiWm4hmFf5GPWF2NlTVB8=";
-      };
-      HeaderTextColor = "#${foreground}";
-      DateTextColor = "#${foreground}";
-      TimeTextColor = "#${foreground}";
-      LoginFieldTextColor = "#${foreground}";
-      PasswordFieldTextColor = "#${foreground}";
-      UserIconColor = "#${foreground}";
-      PasswordIconColor = "#${foreground}";
-      WarningColor = "#${foreground}";
-      LoginButtonBackgroundColor = "#${foreground}";
-      SystemButtonsIconsColor = "#${foreground}";
-      SessionButtonTextColor = "#${foreground}";
-      VirtualKeyboardButtonTextColor = "#${foreground}";
-      DropdownBackgroundColor = "#${foreground}";
-      HighlightBackgroundColor = "#${foreground}";
-    } else {
-      Background = "${toString config.stylix.image}";
-      HeaderTextColor = "#${foreground}";
-      DateTextColor = "#${foreground}";
-      TimeTextColor = "#${foreground}";
-      LoginFieldTextColor = "#${foreground}";
-      PasswordFieldTextColor = "#${foreground}";
-      UserIconColor = "#${foreground}";
-      PasswordIconColor = "#${foreground}";
-      WarningColor = "#${foreground}";
-      LoginButtonBackgroundColor = "#${foreground}";
-      SystemButtonsIconsColor = "#${foreground}";
-      SessionButtonTextColor = "#${foreground}";
-      VirtualKeyboardButtonTextColor = "#${foreground}";
-      DropdownBackgroundColor = "#${foreground}";
-      HighlightBackgroundColor = "#${foreground}";
-    };
-  };
-in {
-  services.displayManager = {
-    sddm = {
-      package = pkgs.kdePackages.sddm;
-      extraPackages = [ sddm-astronaut ];
-      enable = true;
-      wayland.enable = true;
-      theme = "sddm-astronaut-theme";
-      settings = {
-        Wayland.SessionDir = "${
-            inputs.hyprland.packages."${pkgs.system}".hyprland
-          }/share/wayland-sessions";
-      };
-    };
-  };
-
-  environment.systemPackages = [ sddm-astronaut ];
-
-  # To prevent getting stuck at shutdown
-  systemd.extraConfig = "DefaultTimeoutStopSec=10s";
-}

nixos/tailscale.nix

@@ -1,26 +0,0 @@
-# Tailscale is a VPN service that makes it easy to connect your devices between each other.
-{ config, ... }: {
-  security.sudo.extraRules = [{
-    users = [ config.var.username ];
-    commands = [
-      {
-        command = "/etc/profiles/per-user/${config.var.username}/bin/tailscale";
-        options = [ "NOPASSWD" ];
-      }
-      {
-        command = "/run/current-system/sw/bin/tailscale";
-        options = [ "NOPASSWD" ];
-      }
-    ];
-  }];
-  services.tailscale = {
-    enable = true;
-    openFirewall = true;
-  };
-
-  networking.firewall = {
-    trustedInterfaces = [ "tailscale0" ];
-    # required to connect to Tailscale exit nodes
-    checkReversePath = "loose";
-  };
-}

nixos/timezone.nix

@@ -0,0 +1,15 @@
+{ config, ... }: {
+  time.timeZone = config.var.timeZone;
+  i18n.defaultLocale = config.var.defaultLocale;
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = config.var.extraLocale;
+    LC_IDENTIFICATION = config.var.extraLocale;
+    LC_MEASUREMENT = config.var.extraLocale;
+    LC_MONETARY = config.var.extraLocale;
+    LC_NAME = config.var.extraLocale;
+    LC_NUMERIC = config.var.extraLocale;
+    LC_PAPER = config.var.extraLocale;
+    LC_TELEPHONE = config.var.extraLocale;
+    LC_TIME = config.var.extraLocale;
+  };
+}

nixos/tuigreet.nix

@@ -1,5 +1,3 @@
-# TUIGreet is a display manager.
-# Legacy, I'm now using SDDM
 { pkgs, ... }: {
   services.greetd = {
     enable = true;