Release v2.3.0

Former-commit-id: 90e8d5577e

.sops.yaml

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

README.md

@@ -1,46 +1,42 @@
 [//]: # (Title: Nixy)  
-[//]: # (Description: Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
+[//]: # (Description: Nixy is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
 [//]: # (Author: Hadi)  
-[//]: # (Date: 06/17/24)
+[//]: # (Date: 08/28/24)
+[//]: # (Version: v2.2.0)
 
 <div align="center">
-    <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
+    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
 </div>
 
-<br><br>
-
-<div align="center">
-    <a href="https://github.com/anotherhadi/nixy">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=2.0.0&colorA=040409&colorB=a158ff&logo=githubactions&logoColor=a158ff&"/>
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=starship&logoColor=a158ff">
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=github&logoColor=a158ff">
-    </a>
-    <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=040409&logo=NixOS&logoColor=a158ff&color=a158ff">
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=040409&colorB=a158ff&logo=unlicense&logoColor=a158ff&"/>
-    </a>
-</div>
-
-<br><br>
-
-<div align="center">
-    <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" />
-</div>
+<br>
 
 # Nixy
 
-**Nixy** is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+<br>
+<div align="center">
+    <a href="https://github.com/anotherhadi/nixy">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=v2.2.0&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/stargazers">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=starship&logoColor=89b4fa">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=github&logoColor=89b4fa">
+    </a>
+    <a href="https://nixos.org">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=181825&logo=NixOS&logoColor=89b4fa&color=89b4fa">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=181825&colorB=89b4fa&logo=unlicense&logoColor=89b4fa"/>
+    </a>
+</div>
+<br>
+
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
 It's a simple way to manage your system configuration and dotfiles.
 
 ## Table of Content
 
-- [Nixy](#nixy)
   - [Table of Content](#table-of-content)
   - [Gallery](#gallery)
   - [Architecture](#architecture)
@@ -49,19 +45,22 @@ It's a simple way to manage your system configuration and dotfiles.
 
 ## Gallery
 
-![nixy1](docs/src/nixy/1.png)
-![nixy2](docs/src/nixy/2.png)
-![nixy3](docs/src/nixy/3.png)
+![catppuccin1](docs/src/catppuccin/1.png)
+![catppuccin2](docs/src/catppuccin/2.png)
+![catppuccin3](docs/src/catppuccin/3.png)
 
 ## Architecture
 
-- 🏠 `home` are the dotfiles and configuration files for the user
+- 🏠 `home` are the dotfiles and configuration files for the users
+  - 'programs' is a collection of apps configured with home-manager
+  - 'scripts' is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
+  - 'system' is some "desktop environment" configuration
+  - 'wallpapers' are... wallpapers
 - 💻 `hosts` are the system configuration files
-  - `laptop` is mine
-  - `guest` is a template that you can copy and modify for your own system
-  - `themes` contains all the themes available (see [THEMES.md](docs/THEMES.md))
-  - `shared` are some nix files that you can import (nvidia, prime, fonts, ...)
-- 🤫 `secrets` are the secrets files encrypted with sops
+  - 'laptop' is my configuration for my laptop with Nvidia that you can copy
+  - 'server' is for my homeserver (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
+  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
+  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
 
 ## Installation
 
@@ -69,12 +68,15 @@ It's a simple way to manage your system configuration and dotfiles.
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```
 
-- Change the username in the flake.nix file
-- import the guest configuration instead of the `hosts/laptop` one
-- import your hardware-configuration.nix into the `hosts/guest` folder
+- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+- Add your `hardware-configuration.nix` to your new host's folder
+- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
+
+> [!NOTE]
+> When you add new files, don't forget to run `git add .` to add them to the git repository
 
 ```sh
-sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
+sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 ```
 
 ## Documentation
@@ -82,6 +84,9 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
 - [THEMES.md](docs/THEMES.md): How themes work and how to create your own
 - [APPS.md](docs/APPS.md): Which apps are installed
 - [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
+- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
+
 - [TODO.md](docs/TODO.md): What's next (feel free to contribute)
 - [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License

docs/APPS.md

@@ -1,13 +1,19 @@
-# APPS
+# Apps and services
 
-*non-exhaustive list*
+*non-exhaustive lists*
 
-| Category       | Software      |
-|----------------|---------------|
+## Laptop
+
+The laptop configuration is used by an Omen 16 laptop w/ nvidia and an amd gpu running NixOS.
+The configurations files can be found in the `hosts/laptop` directory.
+
+| Category                                | Name           |
+| --------------------------------------- | -------------- |
 | WM                                      | Hyprland       |
 |                                         | hyprlock       |
 |                                         | hyprpaper      |
 |                                         | hypridle       |
+|                                         | hyprcursor     |
 |                                         | wlogout        |
 | Bar                                     | waybar         |
 | Terminal                                | kitty          |
@@ -30,4 +36,21 @@
 | Misc                                    | lazygit        |
 |                                         | neofetch       |
 |                                         | cava           |
-|                | ...           |
+| See [hosts/laptop](../hosts/laptop/)... |                |
+
+## Server
+
+The server configuration is used by a home server running NixOS.
+The configurations files can be found in the `hosts/server` directory.
+I mainly use it for self-hosting websites and services such as Nextcloud, Vaultwarden, ...
+I exposed some services to the internet using a reverse proxy (Nginx) and cloudflare-dyndns, others are accessed through a tailscale network
+
+### Apps
+
+- Nextcloud
+- Vaultwarden
+- Adguard Home
+- Uptime Kuma
+- "Jackflix"
+  - Jellyfin, Transmission, *arr
+- See [hosts/server](../hosts/server/)...

docs/CONTRIBUTING.md

@@ -1,10 +1,19 @@
 # Contributing to Nixy
 
-Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the `docs/TODO.md` file!
+Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the [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, ...).
+- Write your changes (new theme, bug fixes, task in to-do, ...).
 - Create a Pull Request against the main branch of Nixy.
+
+> [!TIP]
+> When wallpapers are added, run `./docs/scripts/compress_png.sh` and `./docs/scripts/create_preview_wallpapers.sh`
+
+> [!TIP]
+> To update the README, change the `./docs/src/README_template.md` and run `./docs/scripts/create_readme.sh`
+
+> [!IMPORTANT]
+> Don't push your host's folder

docs/KEYBINDINGS.md

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

docs/SCRIPTS.md

@@ -1,12 +1,18 @@
 # Scripts
 
+Scripts are located in the `home/scripts` folder. Home-manager add those in the path.
+
 ## Nix/NixOs shortcuts
 
-- `nixy-edit`
-- `nixy-rebuild`
-- `nixy-update`
-- `nixy-gc` # garbage collection
-- `nixy-cb` # clean boot menu
+> [!TIP]
+> The `hostname` variable in `hosts/yourhost/variables.nix` should be also the name of the `nixosConfiguration` in `flake.nix` file.
+
+- `nixy` # UI
+- `nixy rebuild`
+- `nixy update`
+- `nixy upgrade`
+- `nixy gc` # garbage collection
+- `nixy cb` # clean boot menu
 
 ## Brightness control
 
@@ -20,7 +26,7 @@
 - `sound-down`
 - `sound-toggle`
 - `sound-output`
-- `sound-change <up/down/mute> <increment>`
+- `sound-change [up/down/mute] <increment>`
 
 ## Caffeine
 
@@ -33,6 +39,8 @@ Caffeine is a simple script that toggles hypridle (disable suspend & screenlock)
 
 Blue light filter, using wlsunset
 
+- `night-shift` # Toggle night shift
+- `night-shift-status` # Return active/inactive
 - `night-shift-on`
 - `night-shift-off`
 
@@ -45,7 +53,7 @@ It will copy the selected icon to the clipboard.
 
 ## Compress/Extract
 
-Some shortcut to compress and extract files.
+Some shortcuts to compress and extract files.
 
 - `compress` ...
 - `extract` ...

docs/THEMES.md

@@ -1,13 +1,14 @@
 # Themes
 
-Themes are defined in `hosts/themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps installed.
-You can change the selected theme by changing the import statement at the top of your host's variables file.
+Themes are defined in `hosts/themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
+You can change the selected theme by changing the import statement of your host's variables.nix file.
 
-*To apply the theme to duckduckgo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`.*
+> [!TIP]
+> To apply the theme to DuckDuckGo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`
 
-## Create your own theme
+## Create your theme
 
-Create a copy of one of the existing theme and change the variables.
+Create a copy of one of the existing themes and change the variables.
 Wallpapers are loaded from the `home/wallpapers` folder.
 
 ## Gallery

docs/TODO.md

@@ -1,10 +1,34 @@
-# Todolist
+# Todolist {
 
-- [ ] Installation script
+feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
+
+- [ ] Nixy
   - [ ] Themes
-  - [ ] MacOS theme
-- [ ] Make hyprcursor work
+
+- [ ] Clipse: clipboard manager
+- [ ] Walker launcher implementation
+- [ ] Swaync implementation
+
+- [ ] Qutebrowser
+  - [ ] !!! Bitwarden integration (I need this.)
+
+- [ ] Hyprland
+  - [ ] Implement Hyprcursor
+    - [ ] wofi: popin
+    - [ ] wlogout: fade in
+  - [ ] Fix screenshots (screenshot region's border shows up in the screenshot, hyprshot jq error?)
+  - [ ] Hyprlock themes (repo hyprlock-styles on github)
+
 - [ ] Nixvim
-  - [ ] Telescope shortcut for file content
-  - [ ] Markdown snippets
-  - [ ] Make whichkey better
+  - [ ] Keymaps:
+    - Trouble
+    - Tagbar (actually not working)
+  - [ ] Disable background color for headlines.nvim for titles
+
+## Server
+
+- [ ] Jackflix V2
+  - Backup Radarr, Prowlarr, Sonarr config
+  - Take a look into buildarr or build a custom solution with *arr apis
+- [ ] Bitcoin-git: broken
+- [ ] Secrets mode 0444: not secure

docs/WALLPAPERS.md

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

docs/scripts/compress_png.sh

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

docs/scripts/compress_src_png.sh

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

docs/scripts/create_guest_config.sh

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

docs/scripts/create_preview_wallpapers.sh

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

docs/scripts/create_readme.sh

@@ -7,8 +7,21 @@
 README_FILE="./README.md"
 
 header=$(cat "./docs/src/header.md")
-table_of_content=$(~/go/bin/md-table-of-contents ./docs/src/README_template.md)
+table_of_content=$(md-table-of-contents ./docs/src/README_template.md) # https://github.com/anotherhadi/md-table-of-contents
+version=$(git describe --tags --abbrev=0)
 readme_content=$(cat "./docs/src/README_template.md")
+description=$(curl -s https://api.github.com/repos/anotherhadi/nixy | jq .description)
+description="${description%\"}"
+description="${description#\"}"
 
-echo "${header//\{date\}/$(date '+%D')}" >"$README_FILE"
-echo "${readme_content//\{md_table_of_content\}/$table_of_content}" >>"$README_FILE"
+header=${header//\{date\}/$(date '+%D')}
+header=${header//\{primarycolor\}/89b4fa}
+header=${header//\{backgroundcolor\}/181825}
+header=${header//\{version\}/$version}
+header=${header//\{description\}/$description}
+readme_content=${readme_content//\{md_table_of_content\}/$table_of_content}
+
+echo "$header" >"$README_FILE"
+echo "$readme_content" >>"$README_FILE"
+sed 's/\r//' "$README_FILE" >"/tmp/readme.md"
+mv "/tmp/readme.md" "$README_FILE"

docs/scripts/install.sh

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

docs/scripts/keybindings_to_markdown.sh

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

docs/scripts/new_tag.sh

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

docs/src/README_template.md

@@ -1,7 +1,5 @@
 
-# Nixy
-
-**Nixy** is a NixOS configuration with home-manager, secrets and custom theming all in one place.
+**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
 It's a simple way to manage your system configuration and dotfiles.
 
 ## Table of Content
@@ -10,19 +8,22 @@ It's a simple way to manage your system configuration and dotfiles.
 
 ## Gallery
 
-![nixy1](docs/src/nixy/1.png)
-![nixy2](docs/src/nixy/2.png)
-![nixy3](docs/src/nixy/3.png)
+![catppuccin1](docs/src/catppuccin/1.png)
+![catppuccin2](docs/src/catppuccin/2.png)
+![catppuccin3](docs/src/catppuccin/3.png)
 
 ## Architecture
 
-- 🏠 `home` are the dotfiles and configuration files for the user
+- 🏠 `home` are the dotfiles and configuration files for the users
+  - 'programs' is a collection of apps configured with home-manager
+  - 'scripts' is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
+  - 'system' is some "desktop environment" configuration
+  - 'wallpapers' are... wallpapers
 - 💻 `hosts` are the system configuration files
-  - `laptop` is mine
-  - `guest` is a template that you can copy and modify for your own system
-  - `themes` contains all the themes available (see [THEMES.md](docs/THEMES.md))
-  - `shared` are some nix files that you can import (nvidia, prime, fonts, ...)
-- 🤫 `secrets` are the secrets files encrypted with sops
+  - 'laptop' is my configuration for my laptop with Nvidia that you can copy
+  - 'server' is for my homeserver (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
+  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
+  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
 
 ## Installation
 
@@ -30,12 +31,15 @@ It's a simple way to manage your system configuration and dotfiles.
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```
 
-- Change the username in the flake.nix file
-- import the guest configuration instead of the `hosts/laptop` one
-- import your hardware-configuration.nix into the `hosts/guest` folder
+- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+- Add your `hardware-configuration.nix` to your new host's folder
+- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
+
+> [!NOTE]
+> When you add new files, don't forget to run `git add .` to add them to the git repository
 
 ```sh
-sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
+sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 ```
 
 ## Documentation
@@ -43,6 +47,9 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
 - [THEMES.md](docs/THEMES.md): How themes work and how to create your own
 - [APPS.md](docs/APPS.md): Which apps are installed
 - [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
+- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
+- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
+
 - [TODO.md](docs/TODO.md): What's next (feel free to contribute)
 - [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
 - [LICENSE](LICENSE): MIT License

docs/src/header.md

@@ -1,34 +1,33 @@
 [//]: # (Title: Nixy)  
-[//]: # (Description: Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
+[//]: # (Description: {description})  
 [//]: # (Author: Hadi)  
 [//]: # (Date: {date})
+[//]: # (Version: {version})
 
 <div align="center">
-    <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
+    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
 </div>
 
-<br><br>
+<br>
 
+# Nixy
+
+<br>
 <div align="center">
     <a href="https://github.com/anotherhadi/nixy">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=2.0.0&colorA=040409&colorB=a158ff&logo=githubactions&logoColor=a158ff&"/>
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message={version}&colorA={backgroundcolor}&colorB={primarycolor}&logo=githubactions&logoColor={primarycolor}"/>
     </a>
     <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=starship&logoColor=a158ff">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=starship&logoColor={primarycolor}">
     </a>
     <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=github&logoColor=a158ff">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=github&logoColor={primarycolor}">
     </a>
     <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=040409&logo=NixOS&logoColor=a158ff&color=a158ff">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor={backgroundcolor}&logo=NixOS&logoColor={primarycolor}&color={primarycolor}">
     </a>
     <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=040409&colorB=a158ff&logo=unlicense&logoColor=a158ff&"/>
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA={backgroundcolor}&colorB={primarycolor}&logo=unlicense&logoColor={primarycolor}"/>
     </a>
 </div>
-
-<br><br>
-
-<div align="center">
-    <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" />
-</div>
+<br>

flake.lock

@@ -11,11 +11,11 @@
         "sf-pro": "sf-pro"
       },
       "locked": {
-        "lastModified": 1718062482,
-        "narHash": "sha256-bGWs6XRVgzm1Uagx/EAnz9wnMQVImR1ZlVpAy+SDXCw=",
+        "lastModified": 1719591391,
+        "narHash": "sha256-sVTFewitXIYe5vBihbCFQGdBPdnT26kES1T05umBBnE=",
         "owner": "Lyndeno",
         "repo": "apple-fonts.nix",
-        "rev": "eeb3521706bfe21206b1301ff8e0876defa1b6dd",
+        "rev": "0e21619dad5b0d9ca2e050155e32448380547b06",
         "type": "github"
       },
       "original": {
@@ -24,20 +24,52 @@
         "type": "github"
       }
     },
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1724273991,
+        "narHash": "sha256-+aUSOXKGpS5CRm1oTitgNAr05ThQNbKIXalZHl3nC6Y=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "9a3161ad4c78dc420d1cbb3aae638222608c7de4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1717408969,
-        "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
+        "lastModified": 1722113426,
+        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
+        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
         "type": "github"
       },
       "original": {
@@ -84,11 +116,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717285511,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "lastModified": 1722555600,
+        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
         "type": "github"
       },
       "original": {
@@ -120,29 +152,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1701680307,
-        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_4"
-      },
-      "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
         "type": "github"
       },
       "original": {
@@ -153,7 +167,10 @@
     },
     "git-hooks": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-compat": [
+          "nixvim",
+          "flake-compat"
+        ],
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixvim",
@@ -165,11 +182,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717664902,
-        "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
+        "lastModified": 1724440431,
+        "narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
+        "rev": "c8a54057aae480c56e28ef3e14e4960628ac495b",
         "type": "github"
       },
       "original": {
@@ -207,11 +224,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718243258,
-        "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
         "type": "github"
       },
       "original": {
@@ -228,11 +245,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718141734,
-        "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=",
+        "lastModified": 1724435763,
+        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad",
+        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
         "type": "github"
       },
       "original": {
@@ -257,11 +274,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717181720,
-        "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=",
+        "lastModified": 1722623071,
+        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c",
+        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
         "type": "github"
       },
       "original": {
@@ -272,6 +289,7 @@
     },
     "hyprland": {
       "inputs": {
+        "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
@@ -281,11 +299,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1718359900,
-        "narHash": "sha256-eVf70Ps7O8R3DEEfSMW54V07kxkRv5IaWMxSa77hMu4=",
+        "lastModified": 1724784150,
+        "narHash": "sha256-XlmFLoLppuKxSh2eGPXy27+tNIQ+w+cXoh8Ln3vBJew=",
         "ref": "refs/heads/main",
-        "rev": "b2590b58c51094424a9651d8df37dfab838b5bbb",
-        "revCount": 4824,
+        "rev": "17ed4fc04cedbaad365bdebf6bfe0160c527f3fe",
+        "revCount": 5147,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -296,6 +314,36 @@
         "url": "https://github.com/hyprwm/Hyprland"
       }
     },
+    "hyprland-plugins": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ],
+        "nixpkgs": [
+          "hyprland-plugins",
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland-plugins",
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1723143591,
+        "narHash": "sha256-dPcWAeRJoG5CyWC32X3XX+Og0v/k1/S1N0T5dQWT32k=",
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "rev": "b73d7b901d8cb1172dd25c7b7159f0242c625a77",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-plugins",
+        "type": "github"
+      }
+    },
     "hyprland-protocols": {
       "inputs": {
         "nixpkgs": [
@@ -310,11 +358,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691753796,
-        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
+        "lastModified": 1721326555,
+        "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
+        "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
         "type": "github"
       },
       "original": {
@@ -339,11 +387,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717881852,
-        "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
+        "lastModified": 1724174162,
+        "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "ec6938c66253429192274d612912649a0cfe4d28",
+        "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c",
         "type": "github"
       },
       "original": {
@@ -364,11 +412,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717881334,
-        "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=",
+        "lastModified": 1722869141,
+        "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e",
+        "rev": "0252fd13e78e60fb0da512a212e56007515a49f7",
         "type": "github"
       },
       "original": {
@@ -389,11 +437,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717784906,
-        "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=",
+        "lastModified": 1721324119,
+        "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d",
+        "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
         "type": "github"
       },
       "original": {
@@ -410,11 +458,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717976995,
-        "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=",
+        "lastModified": 1724561770,
+        "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "315aa649ba307704db0b16c92f097a08a65ec955",
+        "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
         "type": "github"
       },
       "original": {
@@ -425,11 +473,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1718349360,
-        "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=",
+        "lastModified": 1724575805,
+        "narHash": "sha256-OB/kEL3GAhUZmUfkbPfsPhKs0pRqJKs0EEBiLfyKZw8=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6",
+        "rev": "9fc19be21f0807d6be092d70bf0b1de0c00ac895",
         "type": "github"
       },
       "original": {
@@ -457,27 +505,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1717880976,
-        "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
+        "lastModified": 1721524707,
+        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
+        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-23.11",
+        "ref": "release-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1717974879,
-        "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
+        "lastModified": 1724224976,
+        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
+        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
         "type": "github"
       },
       "original": {
@@ -489,11 +537,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1718160348,
-        "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
+        "lastModified": 1724479785,
+        "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
+        "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
         "type": "github"
       },
       "original": {
@@ -503,22 +551,6 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1686020360,
-        "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -530,14 +562,15 @@
         "nixpkgs": [
           "nixpkgs"
         ],
+        "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1718358971,
-        "narHash": "sha256-8REGUp3RB2/3Q3Ibu00onhj1HyLh/Z8oRU6D3/EQ08w=",
+        "lastModified": 1724820329,
+        "narHash": "sha256-jXaDebjRjcUgZcMNXkvA99s/tTUvZfLLJxLwf1e/qwE=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "e51b8b9b5c91aa49981d78c4aa1ac08a50150103",
+        "rev": "70e9532ec290769e4d671747b0f65b1c29a3c14e",
         "type": "github"
       },
       "original": {
@@ -546,32 +579,25 @@
         "type": "github"
       }
     },
-    "nur": {
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1718354773,
-        "narHash": "sha256-p0pjm5l6LOYoEzSMLZv0QSE4vgGwfhkCz7VN58IUjzc=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "2fe75ecfd4dd1d2063fcc31ccb5db6d9f2b6b33c",
+        "lastModified": 1724584782,
+        "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
         "type": "github"
       },
       "original": {
-        "id": "nur",
-        "type": "indirect"
-      }
-    },
-    "nurpkgs": {
-      "locked": {
-        "lastModified": 1718354773,
-        "narHash": "sha256-p0pjm5l6LOYoEzSMLZv0QSE4vgGwfhkCz7VN58IUjzc=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "2fe75ecfd4dd1d2063fcc31ccb5db6d9f2b6b33c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
+        "owner": "NuschtOS",
+        "repo": "search",
         "type": "github"
       }
     },
@@ -592,11 +618,10 @@
         "apple-fonts": "apple-fonts",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
+        "hyprland-plugins": "hyprland-plugins",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
-        "nur": "nur",
-        "nurpkgs": "nurpkgs",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix"
       }
@@ -657,11 +682,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1718137936,
-        "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=",
+        "lastModified": 1723501126,
+        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6",
+        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
         "type": "github"
       },
       "original": {
@@ -672,19 +697,21 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
+        "flake-compat": "flake-compat_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1704167711,
-        "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=",
-        "owner": "the-argus",
+        "lastModified": 1724818600,
+        "narHash": "sha256-7i8zqLTds2bXs6n/2ucSJdmKTzhajCktQ2WWFOVW3x0=",
+        "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4",
+        "rev": "c8050c21e2e61efe0ac2d423eac9062c62bb6633",
         "type": "github"
       },
       "original": {
-        "owner": "the-argus",
+        "owner": "Gerg-L",
         "repo": "spicetify-nix",
         "type": "github"
       }
@@ -734,21 +761,6 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -757,11 +769,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1718139168,
-        "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=",
+        "lastModified": 1724338379,
+        "narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1",
+        "rev": "070f834771efa715f3e74cd8ab93ecc96fabc951",
         "type": "github"
       },
       "original": {
@@ -787,11 +799,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717918856,
-        "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=",
+        "lastModified": 1724073926,
+        "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "72907822c19afc0983c69d59d299204381623725",
+        "rev": "a08ecbbf33598924e93542f737fc6169a26b481e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -16,35 +16,42 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
-    spicetify-nix.url = "github:the-argus/spicetify-nix";
+    spicetify-nix = {
+      url = "github:Gerg-L/spicetify-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
     sops-nix = {
       url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
     hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    nurpkgs.url = "github:nix-community/NUR";
+    hyprland-plugins = {
+      url = "github:hyprwm/hyprland-plugins";
+      inputs.hyprland.follows = "hyprland";
+    };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
   };
 
-  outputs = inputs@{ nixpkgs, nur, ... }: {
+  outputs = inputs@{ nixpkgs, ... }: {
     nixosConfigurations = {
 
-      nixy = nixpkgs.lib.nixosSystem {
+      nixy = nixpkgs.lib.nixosSystem { # CHANGEME
         system = "x86_64-linux";
         modules = [
-          ./hosts/laptop/configuration.nix
-          inputs.nixos-hardware.nixosModules.omen-16-n0005ne
+          { _module.args = { inherit inputs; }; }
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
           inputs.home-manager.nixosModules.home-manager
-          {
-            nixpkgs.overlays = [ nur.overlay ];
-            _module.args = { inherit inputs; };
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."hadi" = import ./home/laptop.nix; # CHANGE ME
-              extraSpecialArgs = { inherit inputs; };
+          ./hosts/laptop/configuration.nix # CHANGEME
+        ];
       };
-          }
+
+      jack = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [
+          { _module.args = { inherit inputs; }; }
+          inputs.sops-nix.nixosModules.sops
+          inputs.home-manager.nixosModules.home-manager
+          ./hosts/server/configuration.nix
         ];
       };
 

home/laptop.nix

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

home/programs/nextcloud/default.nix

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

home/programs/nvim/colorscheme.nix

@@ -3,7 +3,10 @@
     enable = true;
     colorschemes.catppuccin = {
       enable = true;
-      settings = { transparent_background = true; };
+      settings = {
+        transparent_background = true;
+        flavour = "mocha";
+      };
     };
   };
 }

home/programs/nvim/default.nix

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

home/programs/nvim/keymaps.nix

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

home/programs/nvim/options.nix

@@ -24,7 +24,7 @@
     wildmode = "list:longest";
     completeopt = [ "menuone" "noselect" ];
     signcolumn = "yes";
-    cursorline = true;
+    cursorline = false;
     scrolloff = 8;
     mouse = "a";
 
@@ -32,6 +32,6 @@
 
     swapfile = false;
     undofile = true;
-    conceallevel = 2;
+    conceallevel = 3;
   };
 }

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

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

home/programs/nvim/plugins/bufferline.nix

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

home/programs/nvim/plugins/comment.nix

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

home/programs/nvim/plugins/copilot.nix

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

home/programs/nvim/plugins/dashboard.nix

@@ -71,7 +71,22 @@
             type = "button";
             val = "  NixOs Config";
             on_press.__raw =
-              "function() vim.cmd[[e ${config.var.configDirectory}]] end";
+              "function() vim.cmd[[Neotree ${config.var.configDirectory}]] end";
+            opts = {
+              shortcut = "nc";
+              position = "center";
+              cursor = 3;
+              width = 50;
+              align_shortcut = "right";
+              hl_shortcut = "AlphaShortcutColor";
+              hl = "AlphaTextColor";
+            };
+          }
+          {
+            type = "button";
+            val = "  Keybindings";
+            on_press.__raw =
+              "function() vim.cmd[[e ${config.var.configDirectory}/docs/KEYBINDINGS.md]] end";
             opts = {
               shortcut = "nc";
               position = "center";

home/programs/nvim/plugins/git.nix

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

home/programs/nvim/plugins/keymaps.nix

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

home/programs/nvim/plugins/lazygit.nix

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

home/programs/nvim/plugins/lightline.nix

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

home/programs/nvim/plugins/lsp.nix

@@ -9,8 +9,16 @@
         gopls.enable = true;
         nixd.enable = true;
         tailwindcss.enable = true;
-        html.enable = true;
+        # html.enable = true; # FIXME: broken for some reason
         svelte.enable = true;
+        marksman.enable = true;
+        ltex = {
+          enable = false;
+          settings = {
+            enabled = false;
+            language = "en";
+          };
+        };
       };
       keymaps.lspBuf = {
         "gd" = "definition";
@@ -20,5 +28,23 @@
         "K" = "hover";
       };
     };
+    none-ls = {
+      enable = true;
+      sources = {
+        diagnostics = {
+          golangci_lint.enable = true;
+          statix.enable = true;
+        };
+        formatting = {
+          gofmt.enable = true;
+          goimports.enable = true;
+          nixfmt.enable = true;
+          markdownlint.enable = true;
+          tidy.enable = true;
+          shellharden.enable = true;
+          shfmt.enable = true;
+        };
+      };
+    };
   };
 }

home/programs/nvim/plugins/markdown.nix

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

home/programs/nvim/plugins/noice.nix

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

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

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

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

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

home/programs/nvim/plugins/obsidian.nix

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

home/programs/nvim/plugins/oil.nix

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

home/programs/nvim/plugins/telescope.nix

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

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

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

home/programs/nvim/plugins/toggleterm.nix

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

home/programs/nvim/plugins/tree.nix

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

home/programs/nvim/plugins/treesitter.nix

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

home/programs/nvim/plugins/trouble.nix

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

home/programs/nvim/plugins/ui.nix

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

home/programs/nvim/plugins/utils.nix

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

home/programs/nvim/plugins/whichkey.nix

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

home/programs/nvim/plugins/wilder.nix

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

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

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

home/programs/qutebrowser/default.nix

@@ -1,6 +1,79 @@
-{ config, ... }: {
+{ pkgs, config, ... }:
+let
+  settings = ''
+    {
+      "config": {
+        "title" : "Welcome Home",
+        "openLinksInNewTab": false,
+        "locale": "fr-FR",
+        "colors": {
+          "primary": "#${config.var.theme.colors.accent}",
+          "background": "#${config.var.theme.colors.bg}",
+          "foreground": "#${config.var.theme.colors.fg}",
+          "muted": "#${config.var.theme.colors.c8}"
+        },
+        "folders": [
+          {
+            "name": "Bookmarks",
+            "links": [
+              {"title": "MyNixOs", "url": "https://mynixos.com", "icon": "󱄅"},
+              {"title": "Github", "url": "https://github.com", "icon": ""},
+              {"title": "Proton", "url": "https://mail.proton.me/u/0/inbox", "icon": ""},
+              {"title": "Cloudflare One", "url": "https://one.dash.cloudflare.com/", "icon": ""},
+              {"title": "Chat GPT", "url": "https://chat.openai.com/", "icon": "󰭹"},
+              {"title": "Nixvim", "url": "https://nix-community.github.io/nixvim/", "icon": ""},
+              {"title": "Hyprland Wiki", "url": "https://wiki.hyprland.org/", "icon": "󰖬"},
+              {"title": "Youtube", "url": "https://youtube.com", "icon": "󰗃"},
+              {"title": "Figma", "url": "https://figma.com", "icon": ""},
+              {"title": "Server", "url": "https://home.anotherhadi.com", "icon": ""}
+            ]
+          },
+          {
+            "name": "Work",
+            "links": [
+              {"title": "Outlook", "url": "https://outlook.office.com/mail/", "icon": "󰴢"},
+              {"title": "Office", "url": "https://www.office.com/?auth=2", "icon": "󰏆"},
+              {"title": "Teams", "url": "https://teams.microsoft.com/_", "icon": "󰊻"}
+            ]
+          }
+        ]
+      }
+    }
+  '';
 
-  imports = [ ./duckduckgo-colorscheme.nix ./homepage ];
+  homepage = pkgs.buildNpmPackage {
+    pname = "homepage";
+    version = "0.0.0";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "anotherhadi";
+      repo = "homepage";
+      rev = "b77d35ed3596eb451bd2ec78063d7cc6e73c773d";
+      hash = "sha256-j/40922kfAh6zqJ4IRYpr66YXNNYsxuXwZ0aiJFJea0=";
+    };
+
+    # npmDepsHash = lib.fakeHash;
+    npmDepsHash = "sha256-bG+CHTq2Rst3JMxsjAC81KhK+G7WwsTVD1eyP87g0z4=";
+
+    buildPhase = ''
+      npm install
+      cp ${
+        pkgs.writeText "src/routes/config.json" settings
+      } src/routes/config.json
+      npm run build
+      mkdir $out
+      mv build $out
+    '';
+
+    meta = {
+      description = "homepage";
+      homepage = "https://github.com/anotherhadi/homepage";
+    };
+  };
+
+in {
+
+  imports = [ ./duckduckgo-colorscheme.nix ];
 
   programs.qutebrowser = {
     enable = true;
@@ -18,8 +91,9 @@
     };
 
     quickmarks = {
-      home = "${config.var.homeDirectory}/.config/startpage/index.html";
-      server = "${config.var.homeDirectory}/.config/serverpage/index.html";
+      home = "${homepage}/build/index.html";
+      server = "https://home.anotherhadi.com";
+      jack = "https://home.anotherhadi.com";
       mynixos = "https://mynixos.com";
       github = "https://github.com";
       outlook = "https://outlook.office.com/mail/";
@@ -38,10 +112,8 @@
 
     settings = {
       url = {
-        default_page =
-          "${config.var.homeDirectory}/.config/startpage/index.html";
-        start_pages =
-          [ "${config.var.homeDirectory}/.config/startpage/index.html" ];
+        default_page = "${homepage}/build/index.html";
+        start_pages = [ "${homepage}/build/index.html" ];
       };
 
       colors = {
@@ -133,6 +205,8 @@
           "dark"; # Enable dark mode for websites that support it
       };
 
+      statusbar.show = "in-mode";
+
       fonts = { default_family = "${config.var.theme.font}"; };
 
       completion = {
@@ -152,6 +226,7 @@
         autoplay = false;
         javascript.clipboard = "access";
         javascript.enabled = true;
+        webgl = true;
         pdfjs = true;
       };
 
@@ -184,8 +259,8 @@
 
     keyBindings = {
       normal = {
-        "gh" = "open ${config.var.homeDirectory}/.config/startpage/index.html";
-        "gs" = "open ${config.var.homeDirectory}/.config/serverpage/index.html";
+        "gh" = "open ${homepage}/build/index.html";
+        "gs" = "open https://home.anotherhadi.com";
 
         " p" = "tab-move -";
         " n" = "tab-move +";
@@ -256,6 +331,7 @@
       config.unbind("gt")
 
       c.tabs.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
+      c.statusbar.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
 
       config.load_autoconfig(True)
     '';

home/programs/qutebrowser/homepage/default.nix

@@ -1,297 +0,0 @@
-{ config, ... }:
-let
-  bookmarks = ''
-    Bookmarks: [
-      {text: "MyNixOs", url: "https://mynixos.com", icon: "󱄅"},
-      {text: "Github", url: "https://github.com", icon: ""},
-      {text: "Proton", url: "https://mail.proton.me/u/0/inbox", icon: ""},
-      {text: "Cloudflare One", url: "https://one.dash.cloudflare.com/", icon: ""},
-      {text: "Chat GPT", url: "https://chat.openai.com/", icon: "󰭹"},
-      {text: "Nixvim", url: "https://nix-community.github.io/nixvim/", icon: ""},
-      {text: "Hyprland Wiki", url: "https://wiki.hyprland.org/", icon: "󰖬"},
-      {text: "Nerdfont", url: "https://www.nerdfonts.com/cheat-sheet", icon: ""},
-      {text: "Youtube", url: "https://youtube.com", icon: "󰗃"},
-    ],
-    Home: [
-      {text: "Casa", url: "http://192.168.2.16:8081/#/", icon: "󰋜"},
-      {text: "Plex", url: "http://192.168.2.16:32400", icon: "󰚺"},
-      {text: "Nextcloud", url: "http://192.168.2.16:10081", icon: ""},
-    ],
-    Work: [
-      {text: "Outlook", url: "https://outlook.office.com/mail/", icon: "󰴢"},
-      {text: "Office", url: "https://www.office.com/?auth=2", icon: "󰏆"},
-      {text: "Teams", url: "https://teams.microsoft.com/_", icon: "󰊻"},
-    ],
-  '';
-in {
-
-  xdg.configFile."startpage/index.html".text = ''
-    <!DOCTYPE html>
-    <html lang="en">
-
-    <head>
-      <meta charset="UTF-8">
-      <meta name="viewport" content="width=device-width, initial-scale=1.0">
-      <title>Homepage</title>
-      <style>
-        h1,
-        h2,
-        h3,
-        p {
-          margin: 0;
-          padding: 0;
-          font-family: '${config.var.theme.font}', sans-serif;
-        }
-
-        .w-screen {
-          width: 100vw;
-        }
-
-        .overflow-hidden {
-          overflow: hidden;
-        }
-
-        .max-w-7xl {
-          max-width: 80rem;
-        }
-
-        .mx-auto {
-          margin-left: auto;
-          margin-right: auto;
-        }
-
-        .justify-between {
-          justify-content: space-between;
-        }
-
-        .items-center {
-          align-items: center;
-        }
-
-        .py-12 {
-          padding-top: 3rem;
-          padding-bottom: 3rem;
-        }
-
-        .px-2 {
-          padding-left: 0.5rem;
-          padding-right: 0.5rem;
-        }
-
-        .text-5xl {
-          font-size: 3rem;
-          line-height: 1;
-        }
-
-        .font-bold {
-          font-weight: 700;
-        }
-
-        .mb-4 {
-          margin-bottom: 1rem;
-        }
-
-        .flex {
-          display: flex;
-        }
-
-        .flex-wrap {
-          flex-wrap: wrap;
-        }
-
-        .flex-col {
-          flex-direction: column;
-        }
-
-        .flex-grow {
-          flex-grow: 1;
-        }
-
-        .gap-5 {
-          gap: 1.25rem;
-        }
-
-        .gap-05 {
-          gap: 0.125rem;
-        }
-
-        .justify-start {
-          justify-content: flex-start;
-        }
-
-        .items-start {
-          align-items: flex-start;
-        }
-
-        .hover\:opacity-60:hover {
-          opacity: 0.6;
-        }
-
-        .pb-10 {
-          padding-bottom: 2.5rem;
-        }
-
-        .p-10 {
-          padding: 2.5rem;
-        }
-
-        .text-xl {
-          font-size: 1.25rem;
-          line-height: 1.75rem;
-        }
-
-        .text-lg {
-          font-size: 1.125rem;
-          line-height: 1.75rem;
-        }
-
-        .text-sm {
-          font-size: 0.875rem;
-          line-height: 1.25rem;
-        }
-
-        .text-4xl {
-          font-size: 2.25rem;
-          line-height: 2.5rem;
-        }
-
-        .px-5 {
-          padding-left: 1.25rem;
-          padding-right: 1.25rem;
-        }
-
-        .py-2 {
-          padding-top: 0.5rem;
-          padding-bottom: 0.5rem;
-        }
-
-        a {
-          text-decoration: none;
-        }
-
-        a, a:visited, a:hover, a:active {
-          color: inherit;
-        }
-        </style>
-    </head>
-
-    <body class="w-screen" style="background-color: #${config.var.theme.colors.bg}; color: #${config.var.theme.colors.fg};">
-      <div class="max-w-7xl mx-auto p-10">
-        <div class="w-full flex justify-between" id="date-time">
-          <p class="text-xl"></p>
-          <p class="text-xl"></p>
-        </div>
-        <div class="w-full py-12 px-2" id="greeting">
-          <h1 class="text-5xl font-bold mb-4" style="color: #${config.var.theme.colors.accent};"></h1>
-        </div>
-        <div id="link-list" class="flex gap-5 flex-col justify-start items-start"></div>
-      </div>
-      <script defer>
-        const linkLists = {
-          ${bookmarks}
-        };
-
-        function getDomainFromUrl(url) {
-          let domain = url.replace(/(^\w+:|^)\/\//, "");
-          domain = domain.split('/')[0];
-          return domain;
-        }
-
-        const linkListContainer = document.getElementById('link-list');
-
-        for (const key in linkLists) {
-          if (Object.hasOwnProperty.call(linkLists, key)) {
-            const linkList = linkLists[key];
-            const title = document.createElement('h2');
-            title.textContent = key.charAt(0).toUpperCase() + key.slice(1);
-            title.className = "text-3xl font-bold"
-            linkListContainer.appendChild(title);
-
-            const list = document.createElement('div');
-            list.className = 'flex flex-wrap gap-5 justify-start';
-            linkList.forEach(link => {
-              const anchor = document.createElement('a');
-              anchor.href = link.url;
-              anchor.className = "px-5 py-2 hover:opacity-60 flex-grow"
-
-              const div = document.createElement('div');
-              div.className = 'flex flex-row gap-5 items-center';
-
-              let icon = document.createElement('p');
-              icon.textContent = link.icon || "";
-              icon.className = "text-4xl";
-              div.appendChild(icon);
-
-              const divNameUrl = document.createElement('div');
-              divNameUrl.className = 'flex flex-col gap-05';
-
-              const name = document.createElement('p');
-              name.textContent = link.text;
-              name.className = 'text-lg font-medium';
-
-              const url = document.createElement('p');
-              url.textContent = link.url;
-              url.className = 'text-sm';
-              url.style = "color: #${config.var.theme.colors.fgalt};"
-
-              divNameUrl.appendChild(name);
-              divNameUrl.appendChild(url);
-              div.appendChild(divNameUrl);
-              anchor.appendChild(div);
-              list.appendChild(anchor);
-            });
-
-            linkListContainer.appendChild(list);
-            const spacer = document.createElement('div');
-            spacer.className = "pb-10"
-            linkListContainer.appendChild(spacer);
-          }
-        }
-
-        function updateDateTime() {
-          const dateTimeContainer = document.getElementById('date-time');
-          const currentDate = new Date();
-          const dateOptions = {weekday: 'long', year: 'numeric', month: 'long', day: 'numeric'};
-          const timeOptions = {hour: '2-digit', minute: '2-digit'};
-          const formattedDate = currentDate.toLocaleDateString('en-US', dateOptions);
-          const formattedTime = currentDate.toLocaleTimeString('en-US', timeOptions);
-          const dateParagraph = dateTimeContainer.querySelector('p:nth-child(1)');
-          const timeParagraph = dateTimeContainer.querySelector('p:nth-child(2)');
-          dateParagraph.textContent = formattedDate;
-          timeParagraph.textContent = formattedTime;
-        }
-
-        updateDateTime();
-        setInterval(updateDateTime, 60000);
-
-        function updateGreeting() {
-          const greetingContainer = document.getElementById('greeting');
-          const currentDate = new Date();
-          const currentHour = currentDate.getHours();
-          let greetingText;
-
-          if (currentHour < 2) {
-            greetingText = "Good night! ";
-          } else if (currentHour < 5) {
-            greetingText = "Hello, night owl! 󰏒";
-          } else if (currentHour < 12) {
-            greetingText = "Good morning! ";
-          } else if (currentHour < 17) {
-            greetingText = "Good afternoon! ️";
-          } else if (currentHour < 20) {
-            greetingText = "Good evening! ";
-          } else {
-            greetingText = "Good night! ";
-          }
-
-          const greetingHeader = greetingContainer.querySelector('h1');
-          greetingHeader.textContent = greetingText;
-        }
-
-        updateGreeting();
-      </script>
-    </body>
-
-    </html>
-  '';
-}

home/programs/shell/default.nix

@@ -6,7 +6,6 @@
     ./zoxide.nix
     ./tmux.nix
     ./lazygit.nix
-    ./fetch
-    ./lf
+    ./eza.nix
   ];
 }

home/programs/shell/eza.nix

@@ -0,0 +1,13 @@
+{
+  programs.eza = {
+    enable = true;
+    icons = true;
+
+    extraOptions = [
+      "--group-directories-first"
+      "--no-quotes"
+      "--git-ignore"
+      "--icons=always"
+    ];
+  };
+}

home/programs/shell/tmux.nix

@@ -12,6 +12,7 @@
       bind-key j select-pane -D
       bind-key k select-pane -U
       bind-key l select-pane -R
+      set -gq allow-passthrough on
     '';
 
     plugins = with pkgs; [
@@ -39,6 +40,7 @@
 
           set -g @catppuccin_directory_text "#{pane_current_path}"
           set -g @catppuccin_status_background "default"
+          set-option -g default-terminal "screen-256color"
         '';
       }
     ];

home/programs/shell/zsh.nix

@@ -1,6 +1,8 @@
 { pkgs, lib, config, ... }: {
 
-  home.packages = with pkgs; [ eza bat ripgrep tldr ];
+  home.packages = with pkgs; [ bat ripgrep tldr ];
+
+  home.sessionPath = [ "$HOME/go/bin" ];
 
   programs.zsh = {
     enable = true;
@@ -15,6 +17,8 @@
         pkgs.neofetch + "/bin/neofetch"
       else if config.var.theme.fetch == "nerdfetch" then
         "nerdfetch"
+      else if config.var.theme.fetch == "pfetch" then
+        "echo; ${pkgs.pfetch}/bin/pfetch"
       else
         ""}
     '';
@@ -33,25 +37,30 @@
 
     shellAliases = {
       vim = "nvim";
+      vi = "nvim";
       v = "nvim";
       c = "clear";
       clera = "clear";
       celar = "clear";
       e = "exit";
       cd = "z";
-      ls = "${pkgs.eza}/bin/eza --icons=always";
-      tree = "${pkgs.eza}/bin/eza --icons=always --tree";
+      ls = "eza --icons=always --no-quotes";
+      tree = "eza --icons=always --tree --no-quotes";
       sl = "ls";
       open = "${pkgs.xdg_utils}/bin/xdg-open";
       icat = "${pkgs.kitty}/bin/kitty +kitten icat";
-      note = "vim ~/Nextcloud/obsidian";
-      obs = "vim ~/Nextcloud/obsidian";
+      wireguard-import = "nmcli connection import type wireguard file";
+      neorg =
+        "cd ~/nextcloud/neorg && vim -c ':ZenMode' -c ':Telescope find_files' index.norg";
+      notes =
+        "cd ~/nextcloud/Notes && vim -c ':ZenMode' -c ':Telescope find_files' index.md";
+      note = "notes";
 
       # git
       ga = "git add";
       gc = "git commit";
       gcm = "git commit -m";
-      gcu = "git commit -am 'Update'";
+      gcu = "git add . && git commit -m 'Update'";
       gp = "git push";
       gpl = "git pull";
       gs = "git status";

home/programs/spicetify/default.nix

@@ -1,5 +1,5 @@
 { pkgs, config, lib, inputs, ... }:
-let spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
+let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
 in {
 
   imports = [ inputs.spicetify-nix.homeManagerModules.default ];
@@ -33,6 +33,7 @@ in {
       lastfm
       historyShortcut
       hidePodcasts
+      adblock
       fullAppDisplay
       shuffle
     ];

home/programs/yazi/default.nix

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

home/scripts/battery/default.nix

@@ -1,16 +1,11 @@
 { pkgs, ... }:
-
 let
-  notify-system = pkgs.writeShellScriptBin "notify-system" ''
-    function minute() {
+  battery-watch = pkgs.writeShellScriptBin "battery-watch" ''
     while true;do
       battery-plugged &
       battery-level &
       sleep 60
     done
-    }
-
-    minute
   '';
 
   battery-plugged = pkgs.writeShellScriptBin "battery-plugged" ''
@@ -18,9 +13,9 @@ let
     OLD_BATTERY_STATUS=$(cat /tmp/old_battery_status 2>/dev/null || echo "Unknown")
     if [[ $BATTERY_STATUS != $OLD_BATTERY_STATUS && $OLD_BATTERY_STATUS != "Unknown" ]]; then
       if [[ $BATTERY_STATUS == "Discharging" ]]; then
-        ${pkgs.libnotify}/bin/notify-send "󰚦  " "Battery is unplugged"
+        notif "battery" "󰚦 Battery is unplugged"
       else
-        ${pkgs.libnotify}/bin/notify-send "󰚥  " "Battery is plugged in"
+        notif "battery" "󰚥 Battery is plugged in"
       fi
     fi
     echo $BATTERY_STATUS > /tmp/old_battery_status
@@ -30,14 +25,12 @@ let
     BATTERY_LEVEL=$(cat /sys/class/power_supply/BAT*/capacity | head -n1)
     BATTERY_STATUS=$(cat /sys/class/power_supply/BAT*/status | head -n1)
     if [[ $BATTERY_LEVEL -le 20 ]] && [[ $BATTERY_STATUS == "Discharging" ]]; then
-      ${pkgs.libnotify}/bin/notify-send "󰁻  Low battery" "Battery level is $BATTERY_LEVEL%"
+      notif "battery" "󰁻  Low battery" "Battery level is $BATTERY_LEVEL%"
     elif [[ $BATTERY_LEVEL -le 10 ]] && [[ $BATTERY_STATUS == "Discharging" ]]; then
-      ${pkgs.libnotify}/bin/notify-send --urgency=critical "󰁺  Very low battery" "Battery level is $BATTERY_LEVEL%"
-    elif [[ $BATTERY_LEVEL -eq 100 ]] && [[ $BATTERY_STATUS -ne "Discharging" ]]; then
-      ${pkgs.libnotify}/bin/notify-send "󰁹  Fully charged"
+      notif "battery" "󰁺  Very low battery" "Battery level is $BATTERY_LEVEL%"
+    # elif [[ $BATTERY_LEVEL -eq 100 ]] && [[ $BATTERY_STATUS -ne "Discharging" ]]; then
+    #   notif "battery" "󰁹 Fully charged"
     fi
   '';
 
-in {
-  home.packages = with pkgs; [ notify-system battery-plugged battery-level ];
-}
+in { home.packages = [ battery-watch battery-plugged battery-level ]; }

home/scripts/brightness/default.nix

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

home/scripts/caffeine/default.nix

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

home/scripts/compress/default.nix

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

home/scripts/default.nix

@@ -8,7 +8,8 @@
     ./screenshot
     ./startup
     ./nerdfont_fzf
-    ./system
+    ./notification
+    ./battery
     ./compress
     ./misc
   ];

home/scripts/misc/default.nix

@@ -1,8 +1,6 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 let
-  homedir = config.home.homeDirectory;
-
   menu = pkgs.writeShellScriptBin "menu" ''
     if pgrep wofi; then
     	pkill wofi
@@ -19,12 +17,8 @@ let
     fi
   '';
 
-  wireguard-import = pkgs.writeShellScriptBin "wireguard-import" ''
-    nmcli connection import type wireguard file "$1"
+  lock = pkgs.writeShellScriptBin "lock" ''
+    ${pkgs.hyprlock}/bin/hyprlock
   '';
 
-  vault = pkgs.writeShellScriptBin "vault" ''
-    nvim $HOME/Nextcloud/obsidian
-  '';
-
-in { home.packages = with pkgs; [ menu wireguard-import powermenu vault ]; }
+in { home.packages = [ menu powermenu lock ]; }

home/scripts/nerdfont_fzf/default.nix

@@ -26,10 +26,9 @@ let
   '';
 
 in {
-  home.packages = with pkgs; [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
+  home.packages = [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
 
   xdg.configFile."nerdfont_glyphnames.json" = {
     source = ./nerdfont_glyphnames.json;
   };
-
 }

home/scripts/night-shift/default.nix

@@ -1,20 +1,50 @@
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 
 let
-  homedir = config.home.homeDirectory;
   default = "4000";
 
   night-shift-on = pkgs.writeShellScriptBin "night-shift-on" ''
     ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.wlsunset}/bin/wlsunset -t ${default}"
     message="󰖔  Night-Shift Activated"
-    ${pkgs.libnotify}/bin/notify-send "$message" \
-      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+    notif "night-shift" "$message"
   '';
+
   night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
     pkill wlsunset
     message="󰖔  Night-Shift Deactivated"
-    ${pkgs.libnotify}/bin/notify-send "$message" \
-      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+    notif "night-shift" "$message"
   '';
 
-in { home.packages = with pkgs; [ night-shift-on night-shift-off ]; }
+  night-shift = pkgs.writeShellScriptBin "night-shift" ''
+    if pgrep wlsunset; then
+      night-shift-off
+    else
+      night-shift-on
+    fi
+  '';
+
+  night-shift-status = pkgs.writeShellScriptBin "night-shift-status" ''
+    if [[ $(pgrep wlsunset) ]]; then
+      echo "1"
+    else
+      echo "0"
+    fi
+  '';
+
+  night-shift-status-icon =
+    pkgs.writeShellScriptBin "night-shift-status-icon" ''
+      if [[ $(pgrep wlsunset) ]]; then
+        echo "󰖔"
+      else
+        echo "󰖕"
+      fi
+    '';
+in {
+  home.packages = [
+    night-shift-on
+    night-shift-off
+    night-shift
+    night-shift-status
+    night-shift-status-icon
+  ];
+}

home/scripts/nixy/default.nix

@@ -1,32 +1,57 @@
 { pkgs, config, ... }:
 
 let
-  nixy-rebuild = pkgs.writeShellScriptBin "nixy-rebuild" ''
-    sudo nixos-rebuild switch --flake ${config.var.configDirectory}#nixy
-  '';
 
-  nixy-upgrade = pkgs.writeShellScriptBin "nixy-upgrade" ''
-    sudo nixos-rebuild switch --upgrade --flake ${config.var.configDirectory}#nixy
-  '';
-
-  nixy-update = pkgs.writeShellScriptBin "nixy-update" ''
-    cd ${config.var.configDirectory} && sudo nix flake update
-  '';
-
-  nixy-gc = pkgs.writeShellScriptBin "nixy-gc" ''
-    cd ${config.var.configDirectory} && sudo nix-collect-garbage -d
-  '';
-
-  nixy-cb = pkgs.writeShellScriptBin "nixy-cb" ''
-    sudo /run/current-system/bin/switch-to-configuration boot
-  '';
-
-in {
-  home.packages = with pkgs; [
-    nixy-rebuild
-    nixy-upgrade
-    nixy-update
-    nixy-gc
-    nixy-cb
-  ];
+  nixy = pkgs.writeShellScriptBin "nixy" ''
+    function exec() {
+      $@
     }
+
+    function ui(){
+      DEFAULT_ICON="󰘳"
+
+      # "icon;name;command"[]
+      apps=(
+        ";Rebuild;nixy rebuild"
+        ";Upgrade;nixy upgrade"
+        ";Update;nixy update"
+        ";Collect Garbage;nixy gc"
+        ";Clean Boot Menu;nixy cb"
+      )
+
+      # Apply default icons if empty:
+      for i in "''${!apps[@]}"; do
+        apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/')
+      done
+
+      fzf_result=$(printf "%s\n" "''${apps[@]}" | awk -F ';' '{print $1" "$2}' | fzf)
+      [[ -z $fzf_result ]] && exit 0
+      fzf_result=''${fzf_result/ /;}
+      line=$(printf "%s\n" "''${apps[@]}" | grep "$fzf_result")
+      command=$(echo "$line" | sed 's/^[^;]*;//;s/^[^;]*;//')
+
+      exec "$command"
+      exit 0
+    }
+
+    [[ $1 == "" ]] && ui
+
+    if [[ $1 == "rebuild" ]];then
+      sudo nixos-rebuild switch --flake ${config.var.configDirectory}#${config.var.hostname}
+    elif [[ $1 == "upgrade" ]];then
+      sudo nixos-rebuild switch --upgrade --flake ${config.var.configDirectory}#${config.var.hostname}
+    elif [[ $1 == "update" ]];then
+      cd ${config.var.configDirectory} && sudo nix flake update
+    elif [[ $1 == "gc" ]];then
+      cd ${config.var.configDirectory} && sudo nix-collect-garbage -d
+    elif [[ $1 == "cb" ]];then
+      sudo /run/current-system/bin/switch-to-configuration boot
+    elif [[ $1 == "remote" ]];then
+      cd ~/.config/nixos && git add . && git commit -m "update" && git push
+      ssh jack -S -C "cd /home/hadi/.config/nixos && git pull && sudo -S nixos-rebuild switch --flake ~/.config/nixos#jack"
+    else
+      echo "Unknown argument"
+    fi
+  '';
+
+in { home.packages = [ nixy ]; }

home/scripts/notification/default.nix

@@ -0,0 +1,27 @@
+{ pkgs, ... }:
+let
+  notif = pkgs.writeShellScriptBin "notif" ''
+    # Shell script to send custom notifications
+    NOTIF_FOLDER="/tmp/notif"
+    sender_id=$1 # To overwrite existing notifications
+    message=$2
+    extraargs=""
+    description=""
+    if [[ $3 == "extraargs="* ]]; then
+      extraargs=$(echo "$3" | sed 's/extraargs=//g')
+    else
+      description="$3"
+      extraargs="$4"
+    fi
+
+    [[ -d "$NOTIF_FOLDER" ]] || mkdir $NOTIF_FOLDER
+    [[ -f "$NOTIF_FOLDER/$sender_id" ]] || echo "0" > "$NOTIF_FOLDER/$sender_id"
+
+    old_notification_id=$(cat "$NOTIF_FOLDER/$sender_id")
+
+     ${pkgs.libnotify}/bin/notify-send "$message" \
+     $extraargs \
+    --replace-id="$old_notification_id" --print-id > "$NOTIF_FOLDER/$sender_id"
+  '';
+
+in { home.packages = [ notif ]; }

home/scripts/screenshot/default.nix

@@ -1,7 +1,6 @@
 { pkgs, ... }:
 
 let
-  # TODO: Broken - hypshot not working (jq error)
   screenshot = pkgs.writeShellScriptBin "screenshot" ''
     if [[ $2 == "swappy" ]];then
       folder="/tmp"
@@ -30,4 +29,4 @@ let
                 --icon="$folder/$filename" \
                 --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
   '';
-in { home.packages = with pkgs; [ hyprshot screenshot ]; }
+in { home.packages = [ pkgs.hyprshot screenshot ]; }

home/scripts/sounds/default.nix

@@ -26,9 +26,7 @@ let
       message="󰕾 Volume: $volume%"
     fi
 
-    ${pkgs.libnotify}/bin/notify-send "$message" \
-      -h int:value:"$volume" \
-      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
+    notif "sound" "$message" "extraargs=-h int:value:$volume"
   '';
 
   sound-up = pkgs.writeShellScriptBin "sound-up" ''
@@ -83,11 +81,6 @@ let
   '';
 
 in {
-  home.packages = with pkgs; [
-    sound-output
-    sound-change
-    sound-up
-    sound-down
-    sound-toggle
-  ];
+  home.packages =
+    [ sound-output sound-change sound-up sound-down sound-toggle ];
 }

home/scripts/startup/default.nix

@@ -1,43 +1,17 @@
 # File runned at startup by Hyprland
 { pkgs, config, ... }:
 let
-  nextcloud-watch = pkgs.writeShellScriptBin "nextcloud-watch" ''
-    # Start nextcloud if I'm on my local network
-    while true;do
-      sleep 120
-      ssid=$(nmcli -t -f name connection show --active | head -n1)
-      nextcloud_status=$(ps -aux | grep -E "/bin/nextcloud --background$")
-      if [[ $nextcloud_status == "" ]]; then
-        service_status="inactive"
-      else
-        service_status="active"
-      fi
-
-      if [[ $ssid == "inthecloud" || $ssid == "Wired connection 2" ]]; then
-        if [[ $service_status == "inactive" ]]; then
-            ${pkgs.nextcloud-client}/bin/nextcloud --background
-        fi
-      else
-        if [[ $service_status == "active" ]]; then
-            nextcloud_pid=$(pgrep -n nextcloud)
-            kill $nextcloud_pid
-        fi
-      fi
-    done
-  '';
-
   startup = pkgs.writeShellScriptBin "startup" ''
+    # Startup is a script called by Hyprland on startup
     # Because HM enabling services suck.
 
     [[ ${toString config.var.sops} == "1" ]] && systemctl --user start sops-nix
 
-    [[ ${toString config.var.nextcloud} == "1" ]] && nextcloud-watch &
-
-    notify-system &
+    battery-watch &
     ${pkgs.waybar}/bin/waybar &
 
 
-    wlr-randr --output "Unknown-1" --off # REMOVE WEIRD GHOST MONITOR
+    wlr-randr --output "Unknown-1" --off # FIX: REMOVE WEIRD GHOST MONITOR
   '';
 
-in { home.packages = with pkgs; [ startup nextcloud-watch nextcloud-client ]; }
+in { home.packages = [ startup ]; }

home/system/dunst/default.nix

@@ -5,8 +5,8 @@
   services.dunst = {
     enable = true;
     iconTheme = {
-      name = "Adwaita-Dark";
-      package = pkgs.gnome.adwaita-icon-theme;
+      name = "Moka";
+      package = pkgs.moka-icon-theme;
     };
     settings = {
       global = {

home/system/gtk/default.nix

@@ -32,7 +32,34 @@
   home.file = {
     ".local/share/themes/FlatColor" = {
       recursive = true;
-      source = ./gtk;
+      source = pkgs.stdenv.mkDerivation {
+        name = "FlatColor";
+
+        src = pkgs.fetchFromGitHub {
+          owner = "jasperro";
+          repo = "FlatColor";
+          rev = "0a56c50e8c5e2ad35f6174c19a00e01b30874074";
+          hash = "sha256-P8RnYTk9Z1rCBEEMLTVRrNr5tUM/Pc9dsdMtpHd1Y18=";
+        };
+
+        buildPhase = ''
+          mkdir -p $out
+          # delete the default gtk-color-scheme:
+          file="./gtk-2.0/gtkrc"
+          sed -i '3,29d' $file
+          sed -i '3i include "../colors2"' $file
+
+          file="./gtk-3.0/gtk.css"
+          sed -i '2,10d' $file
+          sed -i '2i @import url("../colors3");' $file
+
+          file="./gtk-3.20/gtk.css"
+          sed -i '2,26d' $file
+          sed -i '2i @import url("../colors3");' $file
+
+          cp -r . $out 
+        '';
+      };
     };
 
     ".local/share/themes/FlatColor/colors2".text = ''

home/system/gtk/gtk/gtk-2.0/gtkrc

@@ -1,771 +0,0 @@
-#modded Numix gtkrc
-
-gtk-color-scheme = "include ../colors2"
-gtk-auto-mnemonics	= 1
-
-# Default Style
-# DO --NOT-- CHANGE ACTIVE
-# IT's THE COLOR THAT WPGTK REPLACES
-# FEEL FREE TO MODIFY EVERYTHING ELSE IN gtkrc.base
-
-style "murrine-default" {
-	GtkArrow::arrow-scaling= 0.6
-
-	GtkButton::child-displacement-x = 0
-	GtkButton::child-displacement-y = 0
-
-	GtkButton::default-border = { 0, 0, 0, 0 }
-
-	GtkButtonBox::child-min-height = 26
-
-	GtkCheckButton::indicator-size = 16
-
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry::honors-transparent-bg-hint = 1
-	GtkEntry::state-hint = 0
-
-	GtkExpander::expander-size = 16
-
-	GtkImage::x-ayatana-indicator-dynamic = 1
-
-	GtkMenu::horizontal-padding = 0
-	GtkMenu::vertical-padding = 0
-
-	GtkMenuBar::internal-padding = 0
-	GtkMenuBar::window-dragging = 1
-
-	GtkMenuItem::arrow-scaling= 0.5
-
-	GtkPaned::handle-size = 1
-
-	GtkProgressBar::min-horizontal-bar-height = 12
-	GtkProgressBar::min-vertical-bar-width = 12
-
-	GtkRange::trough-border = 0
-	GtkRange::slider-width = 8
-	GtkRange::stepper-size = 12
-	GtkRange::stepper_spacing = 0
-	GtkRange::trough-under-steppers = 1
-
-	GtkScale::slider-length = 16
-	GtkScale::slider-width = 16
-	GtkScale::trough-side-details = 1
-
-	GtkScrollbar::activate-slider = 1
-	GtkScrollbar::has-backward-stepper = 0
-	GtkScrollbar::has-forward-stepper = 0
-	GtkScrollbar::has-secondary-backward-stepper = 0
-	GtkScrollbar::has-secondary-forward-stepper = 0
-	GtkScrollbar::min-slider-length = 80
-	GtkScrollbar::slider-width = 8
-	GtkScrollbar::trough-border = 0
-
-	GtkScrolledWindow::scrollbar-spacing = 0
-	GtkScrolledWindow::scrollbars-within-bevel = 1
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-
-	GtkToolbar::internal-padding = 0
-
-	GtkTreeView::expander-size = 11
-	GtkTreeView::vertical-separator = 0
-
-	GtkWidget::focus-line-width = 1
-	# The following line prevents the Firefox tabs
-	# from jumping a few pixels when you create a new tab
-	GtkWidget::focus-padding = 0
-
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 1
-
-	GtkWindow::resize-grip-height = 0
-	GtkWindow::resize-grip-width = 0
-
-	WnckTasklist::fade-overlay-rect = 0
-
-	GnomeHRef::link_color = @link_color
-	GtkHTML::link-color = @link_color
- 	GtkIMHtmlr::hyperlink-color = @link_color
-	GtkIMHtml::hyperlink-color = @link_color
-	GtkWidget::link-color = @link_color
-	GtkWidget::visited-link-color = @text_color
-
-	GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified
-	GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified
-
-	xthickness = 1
-	ythickness = 1
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @bg_color
-	bg[INSENSITIVE] = @bg_color
-
-	base[NORMAL] = shade(0.85, @color0)
-	base[PRELIGHT] = shade (0.85, @color0)
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		animation = FALSE
-		arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
-		border_shades = { 1.0, 1.0 } # gradient to draw on border
-		colorize_scrollbar = TRUE
-		comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
-		contrast = 0.0 # overal contrast with borders
-		focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
-		glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
-		glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides
-		glow_shade = 1.0 # amount of glow
-		gradient_shades = { 1.0, 1.0, 1.0, 1.0 } # gradient to draw on widgets
-		highlight_shade = 1.0 # amount of highlight
-		lightborder_shade = 1.0 # amount of inset light border
-		lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line
-		menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
-		menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped
-		menustyle = 0 # 0 = none, 1 = vertical striped
-		progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
-		reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		roundness = 0 # roundness of widgets
-		scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		sliderstyle = 0 # 0 = none, 1 = handles
-		stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles
-		toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
-   }
-}
-
-style "murrine-wide" {
-	xthickness = 2
-	ythickness = 2
-}
-
-style "murrine-wider" {
-	xthickness = 3
-	ythickness = 3
-}
-
-style "murrine-thin" {
-	xthickness = 0
-	ythickness = 0
-}
-
-# Notebook
-
-style "murrine-notebook-bg" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade (0.70, @bg_color)
-}
-
-style "murrine-notebook" = "murrine-notebook-bg" {
-	xthickness = 2
-	ythickness = 2
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-# Various Standard Widgets
-
-style "murrine-button"  = "murrine-wider" {
-	bg[NORMAL] = shade (1.3, @bg_color)
-	bg[PRELIGHT] = shade (0.80, @selected_bg_color)
-	bg[ACTIVE] = shade (1.00, @selected_bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-  	engine "murrine" {
-	}
-}
-
-style "murrine-scrollbar" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = mix (0.31, @text_color, @bg_color)
-	bg[ACTIVE] = @selected_bg_color
-
-	engine "murrine" {
-		roundness = 0
-		contrast = 0.0
-		border_shades = { 0.9, 0.9 }
-		trough_shades = { 0.97, 0.97 }
-		trough_border_shades = { 1.0, 1.0 }
-	}
-}
-
-style "murrine-overlay-scrollbar" {
-	bg[ACTIVE] = shade (0.8, @bg_color)
-	bg[INSENSITIVE] = shade (0.97, @bg_color)
-
-	base[SELECTED] = shade (0.6, @bg_color)
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-}
-
-style "murrine-scale" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = @bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[INSENSITIVE] = shade (0.95, @bg_color)
-
-	engine "murrine" {
-		roundness = 8
-		gradient_shades = { 1.08, 1.08, 1.08, 1.08 }
-		border_shades = { 1.0, 1.0 }
-		trough_shades = { 1.08, 1.08 }
-		trough_border_shades = { 0.8, 0.8 }
-	}
-}
-
-style "murrine-progressbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade(0.60, @bg_color)
-
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {
-		roundness = 0
-		border_shades = { 1.2, 1.2 }
-		trough_border_shades = { 0.8, 0.8 }
-	}
-}
-
-style "murrine-treeview-header" = "murrine-button" {
-  	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-treeview" {
-  	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-frame-title" {
-	fg[NORMAL] = lighter (@text_color)
-}
-
-style "murrine-tooltips" {
-	xthickness = 5
-	ythickness = 5
-
-	bg[NORMAL] = @tooltip_bg_color
-	bg[SELECTED] = @tooltip_bg_color
-
-	fg[NORMAL] = @text_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-		rgba = FALSE
-	}
-}
-
-style "murrine-spinbutton" = "murrine-button" {
-	engine "murrine" {
-	}
-}
-
-style "murrine-radiocheck" = "murrine-default" {
-	bg[SELECTED] = @bg_color
-
-	text[NORMAL] = @selected_bg_color
-	text[PRELIGHT] = @selected_bg_color
-}
-
-style "murrine-entry" = "murrine-wider" {
-        bg[SELECTED] = @selected_bg_color
-
-	engine "murrine" {
-		border_shades = { 1.15, 1.15 }
-	}
-}
-
-style "metacity-frame" = "murrine-default" {
-	bg[SELECTED] = @selected_bg_color
-}
-
-style "murrine-statusbar" { 
-  bg[NORMAL] = @bg_color
-}
-style "murrine-comboboxentry" = "murrine-entry" { }
-style "murrine-hscale" = "murrine-scale" { }
-style "murrine-vscale" = "murrine-scale" { }
-style "murrine-hscrollbar" = "murrine-scrollbar" { }
-style "murrine-vscrollbar" = "murrine-scrollbar" { }
-
-# Menus
-
-style "murrine-menu" = "murrine-thin" {
-	bg[NORMAL] = shade(0.8, @menu_bg_color)
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	text[NORMAL] = @menu_fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-menu-item" = "murrine-wider" {
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {
-		textstyle = 0
-		border_shades = { 1.2, 1.2 }
-	}
-}
-
-style "murrine-separator-menu-item" = "murrine-thin" { }
-
-style "murrine-menubar" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  mix (0.21, @text_color, @bg_color)
-	bg[SELECTED] =  mix (0.21, @text_color, @bg_color)
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-menubaritem" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  @selected_bg_color
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-# Toolbars
-
-style "murrine-toolbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-	}
-}
-
-style "murrine-toolbutton" = "murrine-button" {
-	bg[NORMAL] = shade (1.08, @bg_color)
-	bg[PRELIGHT] = shade (1.10, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.95, @bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-	}
-}
-
-class "GtkToolbar" style "murrine-toolbar"
-class "GtkHandleBox" style "murrine-toolbar"
-widget_class "*Toolbar*.*Separator*" style "murrine-toolbar"
-
-# Panels
-
-style "murrine-panel" = "murrine-thin" {
-	xthickness = 2
-
-	bg[NORMAL] = @menu_bg_color
-	bg[PRELIGHT] =  shade(0.8, @selected_bg_color)
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @text_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = shade(0.8, @text_color)
-
-	base[NORMAL] = @menu_bg_color
-	base[PRELIGHT] =  mix (0.21, @text_color, @menu_bg_color)
-	base[SELECTED] =  @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = @menu_bg_color
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = shade (1.08, @text_color)
-	text[SELECTED] = shade (1.08, @text_color)
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-		contrast = 0.0
-	}
-}
-
-widget "*PanelWidget*" style "murrine-panel"
-widget "*PanelApplet*" style "murrine-panel"
-widget "*fast-user-switch*" style "murrine-panel"
-widget "*CPUFreq*Applet*" style "murrine-panel"
-widget "*indicator-applet*" style "murrine-panel"
-class "PanelApp*" style "murrine-panel"
-class "PanelToplevel*" style "murrine-panel"
-widget_class "*PanelToplevel*" style "murrine-panel"
-widget_class "*notif*" style "murrine-panel"
-widget_class "*Notif*" style "murrine-panel"
-widget_class "*Tray*" style "murrine-panel" 
-widget_class "*tray*" style "murrine-panel"
-widget_class "*computertemp*" style "murrine-panel"
-widget_class "*Applet*Tomboy*" style "murrine-panel"
-widget_class "*Applet*Netstatus*" style "murrine-panel"
-widget "*gdm-user-switch-menubar*" style "murrine-panel"
-
-style "bold-panel-item" {
-	font_name = "Bold"
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-widget "*Panel*MenuBar*" style "bold-panel-item"
-widget "*gimmie*" style "bold-panel-item"
-
-# widget_class "*Mail*" style "murrine-panel" # Disabled to fix Evolution bug
-# class "*Panel*" style "murrine-panel" # Disabled to fix bug
-
-# XFCE Styles
-
-style "workspace-switcher" = "murrine-panel" {
-	bg[SELECTED] = @selected_bg_color
-}
-
-style "xfce-header" {
-	bg[NORMAL] = shade (0.9, @bg_color)
-	base[NORMAL] = shade (1.18, @bg_color)
-}
-
-style "xfdesktop-windowlist" {
-	bg[NORMAL] = @bg_color
-	fg[INSENSITIVE] = shade (0.95, @bg_color)
-	text[INSENSITIVE] = shade (0.95, @bg_color)
-}
-
-style "xfdesktop-icon-view" {
-	XfdesktopIconView::label-alpha = 0
-	XfdesktopIconView::selected-label-alpha = 60
-	XfdesktopIconVIew::ellipsize-icon-labels = 1
-
-	base[NORMAL] = @selected_bg_color
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-
-	engine "murrine" {
-		textstyle = 5
-		text_shade = 0.05
-	}
-}
-
-style "xfwm-tabwin" {
-	Xfwm4TabwinWidget::border-width = 0
-	Xfwm4TabwinWidget::icon-size = 64
-
-	bg[NORMAL] = @menu_bg_color
-	fg[NORMAL] = @menu_fg_color
-
-	engine "murrine" {
-		focusstyle = 0
-	}
-}
-
-style "xfsm-logout" {
-	bg[NORMAL] = @menu_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[PRELIGHT] = shade (1.1, @menu_bg_color)
-	bg[SELECTED] = shade (0.5, @menu_bg_color)
-	bg[INSENSITIVE] = shade (1.3, @menu_bg_color)
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @menu_fg_color
-
-	text[NORMAL] = @menu_fg_color
-
-	engine "murrine" {
-	}
-}
-
-style "xfsm-logout-button" {
-	bg[NORMAL] = shade (1.2, @menu_bg_color)
-	bg[PRELIGHT] = shade (1.4, @menu_bg_color)
-
-	engine "murrine" {
-	}
-}
-
-widget "*WnckPager*" style "workspace-switcher"
-
-widget "*Xfce*Panel*" style "murrine-panel"
-class "*Xfce*Panel*" style "murrine-panel"
-
-# Thunar Styles
-
-style "sidepane" {
-	base[NORMAL] = @bg_color
-	base[INSENSITIVE] = shade(0.90, @bg_color)
-	bg[NORMAL] = @bg_color
-	text[NORMAL] = @text_color
-}
-
-widget_class "*ThunarShortcutsView*" style "sidepane"
-widget_class "*ThunarTreeView*" style "sidepane"
-widget_class "*ThunarLocationEntry*" style "murrine-entry"
-
-# Gtk2 Open-File Dialog
-
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane"
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-
-# Google Chrome/Chromium Styles (requires 9.0.597 or newer)
-
-style "chromium-toolbar-button" {
-	engine "murrine" {
-		roundness = 2
-		textstyle = 0
-	}
-}
-
-style "chrome-gtk-frame" {
-	ChromeGtkFrame::frame-color = @titlebar_bg_color
-	ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 0
-	ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 0
-	ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = @bg_color
-	ChromeGtkFrame::scrollbar-slider-normal-color =  mix (0.21, @text_color, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color =  mix (0.31, @text_color, @bg_color)
-}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-
-widget_class "*Chrom*Button*" style "chromium-toolbar-button"
-
-# General Styles
-
-class "GtkWidget" style "murrine-default"
-
-class "GtkFrame" style "murrine-wide"
-class "MetaFrames" style "metacity-frame"
-class "GtkWindow" style "metacity-frame"
-
-class "GtkSeparator" style "murrine-wide"
-class "GtkCalendar" style "murrine-wide"
-
-class "GtkSpinButton" style "murrine-spinbutton"
-
-class "GtkScale" style "murrine-scale"
-class "GtkVScale" style "murrine-vscale"
-class "GtkHScale" style "murrine-hscale"
-class "GtkScrollbar" style "murrine-scrollbar"
-class "GtkVScrollbar" style "murrine-vscrollbar"
-class "GtkHScrollbar" style "murrine-hscrollbar"
-
-class "GtkRadio*" style "murrine-radiocheck"
-class "GtkCheck*" style "murrine-radiocheck"
-
-class "GtkEntry" style "murrine-entry"
-
-widget_class "*<GtkNotebook>" style "murrine-notebook"
-widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook-bg"
-widget_class "*.GtkNotebook.*.GtkViewport" style "murrine-notebook"
-
-widget_class "*<GtkButton>" style "murrine-button"
-widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
-widget_class "*<GtkProgress>" style "murrine-progressbar"
-widget_class "*<GtkProgressBar>" style "murrine-progressbar"
-
-widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
-
-widget_class "*<GtkMenu>*" style "murrine-menu"
-widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
-widget_class "*Menu*.*Sepa*"  style "murrine-separator-menu-item"
-widget_class "*<GtkMenuBar>*" style "murrine-menubar"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "murrine-menubaritem"
-
-widget_class "*GtkToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToggleToolButton*" style "murrine-toolbutton"
-widget_class "*GtkMenuToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToolbar*Button" style "murrine-toolbutton"
-
-widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
-
-widget_class "*.<GtkTreeView>*" style "murrine-treeview"
-widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
-
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-widget_class "*<GtkScrolledWindow>*<OsScrollbar>" style "murrine-overlay-scrollbar"
-
-# Workarounds and Non-Standard Styling
-
-style "text-is-fg-color-workaround" {
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-}
-
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround"
-
-style "fg-is-text-color-workaround" {
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[INSENSITIVE] = darker (@text_color)
-}
-
-widget_class "*<GtkListItem>*" style "fg-is-text-color-workaround"
-widget_class "*<GtkCList>" style "fg-is-text-color-workaround"
-widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
-
-style "murrine-evo-new-button-workaround" {
-	engine "murrine" {
-		toolbarstyle = 0
-	}
-}
-
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
-
-style "inkscape-toolbar-fix" {
-	engine "murrine" {
-		gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-		highlight_shade = 1.0
-	}
-}
-
-#widget "*GtkHandleBox*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*CommandsToolbar*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*SnapToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SelectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*NodeToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*TweakToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ZoomToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*StarToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*RectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*3DBoxToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ArcToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SpiralToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PencilToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PenToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*CalligraphyToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*EraserToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*LPEToolToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix"
-
-# Performance Fixes
-
-style "performance-fix" {
-	engine "murrine" {
-		textstyle = 0
-	}
-}
-
-widget_class "*gtkmm__GtkWindow*" style "performance-fix" # Inkscape
-widget_class "*GimpDisplayShell*" style "performance-fix" # Gimp
-widget_class "*GimpToolbox*" style "performance-fix"
-widget_class "*GimpMenuDock*" style "performance-fix"
-widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice
-widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.)
-
-widget_class "*XfceHeading*" style "xfce-header"
-widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-widget "xfwm4-tabwin*" style "xfwm-tabwin"
-widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
-widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button"

home/system/gtk/gtk/gtk-2.0/gtkrc.base

@@ -1,797 +0,0 @@
-#modded Numix gtkrc
-
-gtk-color-scheme = "bg_color:{color0}
-color0:{color0}
-color1:{color1}
-color2:{color2}
-color3:{color3}
-color4:{color4}
-color5:{color5}
-color6:{color6}
-color7:{color7}
-color8:{color8}
-color9:{color9}
-color10:{color10}
-color11:{color11}
-color12:{color12}
-color13:{color13}
-color14:{color14}
-color15:{color15}
-text_color:{color15}
-selected_bg_color:{active}
-selected_fg_color:{color15}
-tooltip_bg_color:{color0}
-tooltip_fg_color:{color15}
-titlebar_bg_color:{color0}
-titlebar_fg_color:{color15}
-menu_bg_color:{color0}
-menu_fg_color:{color15}
-link_color:{active}"
-gtk-auto-mnemonics	= 1
-
-# Default Style
-# DO --NOT-- CHANGE ACTIVE
-# IT's THE COLOR THAT WPGTK REPLACES
-# FEEL FREE TO MODIFY EVERYTHING ELSE IN gtkrc.base
-
-style "murrine-default" {{
-	GtkArrow::arrow-scaling= 0.6
-
-	GtkButton::child-displacement-x = 0
-	GtkButton::child-displacement-y = 0
-
-	GtkButton::default-border = {{ 0, 0, 0, 0 }}
-
-	GtkButtonBox::child-min-height = 26
-
-	GtkCheckButton::indicator-size = 16
-
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry::honors-transparent-bg-hint = 1
-	GtkEntry::state-hint = 0
-
-	GtkExpander::expander-size = 16
-
-	GtkImage::x-ayatana-indicator-dynamic = 1
-
-	GtkMenu::horizontal-padding = 0
-	GtkMenu::vertical-padding = 0
-
-	GtkMenuBar::internal-padding = 0
-	GtkMenuBar::window-dragging = 1
-
-	GtkMenuItem::arrow-scaling= 0.5
-
-	GtkPaned::handle-size = 1
-
-	GtkProgressBar::min-horizontal-bar-height = 12
-	GtkProgressBar::min-vertical-bar-width = 12
-
-	GtkRange::trough-border = 0
-	GtkRange::slider-width = 8
-	GtkRange::stepper-size = 12
-	GtkRange::stepper_spacing = 0
-	GtkRange::trough-under-steppers = 1
-
-	GtkScale::slider-length = 16
-	GtkScale::slider-width = 16
-	GtkScale::trough-side-details = 1
-
-	GtkScrollbar::activate-slider = 1
-	GtkScrollbar::has-backward-stepper = 0
-	GtkScrollbar::has-forward-stepper = 0
-	GtkScrollbar::has-secondary-backward-stepper = 0
-	GtkScrollbar::has-secondary-forward-stepper = 0
-	GtkScrollbar::min-slider-length = 80
-	GtkScrollbar::slider-width = 8
-	GtkScrollbar::trough-border = 0
-
-	GtkScrolledWindow::scrollbar-spacing = 0
-	GtkScrolledWindow::scrollbars-within-bevel = 1
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-
-	GtkToolbar::internal-padding = 0
-
-	GtkTreeView::expander-size = 11
-	GtkTreeView::vertical-separator = 0
-
-	GtkWidget::focus-line-width = 1
-	# The following line prevents the Firefox tabs
-	# from jumping a few pixels when you create a new tab
-	GtkWidget::focus-padding = 0
-
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 1
-
-	GtkWindow::resize-grip-height = 0
-	GtkWindow::resize-grip-width = 0
-
-	WnckTasklist::fade-overlay-rect = 0
-
-	GnomeHRef::link_color = @link_color
-	GtkHTML::link-color = @link_color
- 	GtkIMHtmlr::hyperlink-color = @link_color
-	GtkIMHtml::hyperlink-color = @link_color
-	GtkWidget::link-color = @link_color
-	GtkWidget::visited-link-color = @text_color
-
-	GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified
-	GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified
-
-	xthickness = 1
-	ythickness = 1
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @bg_color
-	bg[INSENSITIVE] = @bg_color
-
-	base[NORMAL] = shade(0.85, @color0)
-	base[PRELIGHT] = shade (0.85, @color0)
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		animation = FALSE
-		arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
-		border_shades = {{ 1.0, 1.0 }} # gradient to draw on border
-		colorize_scrollbar = TRUE
-		comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
-		contrast = 0.0 # overal contrast with borders
-		focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
-		glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
-		glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides
-		glow_shade = 1.0 # amount of glow
-		gradient_shades = {{ 1.0, 1.0, 1.0, 1.0 }} # gradient to draw on widgets
-		highlight_shade = 1.0 # amount of highlight
-		lightborder_shade = 1.0 # amount of inset light border
-		lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line
-		menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
-		menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped
-		menustyle = 0 # 0 = none, 1 = vertical striped
-		progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
-		reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		roundness = 0 # roundness of widgets
-		scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		sliderstyle = 0 # 0 = none, 1 = handles
-		stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles
-		toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
-   }}
-}}
-
-style "murrine-wide" {{
-	xthickness = 2
-	ythickness = 2
-}}
-
-style "murrine-wider" {{
-	xthickness = 3
-	ythickness = 3
-}}
-
-style "murrine-thin" {{
-	xthickness = 0
-	ythickness = 0
-}}
-
-# Notebook
-
-style "murrine-notebook-bg" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade (0.70, @bg_color)
-}}
-
-style "murrine-notebook" = "murrine-notebook-bg" {{
-	xthickness = 2
-	ythickness = 2
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-# Various Standard Widgets
-
-style "murrine-button"  = "murrine-wider" {{
-	bg[NORMAL] = shade (1.3, @bg_color)
-	bg[PRELIGHT] = shade (0.80, @selected_bg_color)
-	bg[ACTIVE] = shade (1.00, @selected_bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-  	engine "murrine" {{
-	}}
-}}
-
-style "murrine-scrollbar" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = mix (0.31, @text_color, @bg_color)
-	bg[ACTIVE] = @selected_bg_color
-
-	engine "murrine" {{
-		roundness = 0
-		contrast = 0.0
-		border_shades = {{ 0.9, 0.9 }}
-		trough_shades = {{ 0.97, 0.97 }}
-		trough_border_shades = {{ 1.0, 1.0 }}
-	}}
-}}
-
-style "murrine-overlay-scrollbar" {{
-	bg[ACTIVE] = shade (0.8, @bg_color)
-	bg[INSENSITIVE] = shade (0.97, @bg_color)
-
-	base[SELECTED] = shade (0.6, @bg_color)
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-}}
-
-style "murrine-scale" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = @bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[INSENSITIVE] = shade (0.95, @bg_color)
-
-	engine "murrine" {{
-		roundness = 8
-		gradient_shades = {{ 1.08, 1.08, 1.08, 1.08 }}
-		border_shades = {{ 1.0, 1.0 }}
-		trough_shades = {{ 1.08, 1.08 }}
-		trough_border_shades = {{ 0.8, 0.8 }}
-	}}
-}}
-
-style "murrine-progressbar" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade(0.60, @bg_color)
-
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {{
-		roundness = 0
-		border_shades = {{ 1.2, 1.2 }}
-		trough_border_shades = {{ 0.8, 0.8 }}
-	}}
-}}
-
-style "murrine-treeview-header" = "murrine-button" {{
-  	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-treeview" {{
-  	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-frame-title" {{
-	fg[NORMAL] = lighter (@text_color)
-}}
-
-style "murrine-tooltips" {{
-	xthickness = 5
-	ythickness = 5
-
-	bg[NORMAL] = @tooltip_bg_color
-	bg[SELECTED] = @tooltip_bg_color
-
-	fg[NORMAL] = @text_color
-
-	engine "murrine" {{
-		textstyle = 0
-		roundness = 0
-		rgba = FALSE
-	}}
-}}
-
-style "murrine-spinbutton" = "murrine-button" {{
-	engine "murrine" {{
-	}}
-}}
-
-style "murrine-radiocheck" = "murrine-default" {{
-	bg[SELECTED] = @bg_color
-
-	text[NORMAL] = @selected_bg_color
-	text[PRELIGHT] = @selected_bg_color
-}}
-
-style "murrine-entry" = "murrine-wider" {{
-        bg[SELECTED] = @selected_bg_color
-
-	engine "murrine" {{
-		border_shades = {{ 1.15, 1.15 }}
-	}}
-}}
-
-style "metacity-frame" = "murrine-default" {{
-	bg[SELECTED] = @selected_bg_color
-}}
-
-style "murrine-statusbar" {{ 
-  bg[NORMAL] = @bg_color
-}}
-style "murrine-comboboxentry" = "murrine-entry" {{ }}
-style "murrine-hscale" = "murrine-scale" {{ }}
-style "murrine-vscale" = "murrine-scale" {{ }}
-style "murrine-hscrollbar" = "murrine-scrollbar" {{ }}
-style "murrine-vscrollbar" = "murrine-scrollbar" {{ }}
-
-# Menus
-
-style "murrine-menu" = "murrine-thin" {{
-	bg[NORMAL] = shade(0.8, @menu_bg_color)
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	text[NORMAL] = @menu_fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-menu-item" = "murrine-wider" {{
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {{
-		textstyle = 0
-		border_shades = {{ 1.2, 1.2 }}
-	}}
-}}
-
-style "murrine-separator-menu-item" = "murrine-thin" {{ }}
-
-style "murrine-menubar" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  mix (0.21, @text_color, @bg_color)
-	bg[SELECTED] =  mix (0.21, @text_color, @bg_color)
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-menubaritem" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  @selected_bg_color
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-# Toolbars
-
-style "murrine-toolbar" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-style "murrine-toolbutton" = "murrine-button" {{
-	bg[NORMAL] = shade (1.08, @bg_color)
-	bg[PRELIGHT] = shade (1.10, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.95, @bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-class "GtkToolbar" style "murrine-toolbar"
-class "GtkHandleBox" style "murrine-toolbar"
-widget_class "*Toolbar*.*Separator*" style "murrine-toolbar"
-
-# Panels
-
-style "murrine-panel" = "murrine-thin" {{
-	xthickness = 2
-
-	bg[NORMAL] = @menu_bg_color
-	bg[PRELIGHT] =  shade(0.8, @selected_bg_color)
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @text_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = shade(0.8, @text_color)
-
-	base[NORMAL] = @menu_bg_color
-	base[PRELIGHT] =  mix (0.21, @text_color, @menu_bg_color)
-	base[SELECTED] =  @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = @menu_bg_color
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = shade (1.08, @text_color)
-	text[SELECTED] = shade (1.08, @text_color)
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-		contrast = 0.0
-	}}
-}}
-
-widget "*PanelWidget*" style "murrine-panel"
-widget "*PanelApplet*" style "murrine-panel"
-widget "*fast-user-switch*" style "murrine-panel"
-widget "*CPUFreq*Applet*" style "murrine-panel"
-widget "*indicator-applet*" style "murrine-panel"
-class "PanelApp*" style "murrine-panel"
-class "PanelToplevel*" style "murrine-panel"
-widget_class "*PanelToplevel*" style "murrine-panel"
-widget_class "*notif*" style "murrine-panel"
-widget_class "*Notif*" style "murrine-panel"
-widget_class "*Tray*" style "murrine-panel" 
-widget_class "*tray*" style "murrine-panel"
-widget_class "*computertemp*" style "murrine-panel"
-widget_class "*Applet*Tomboy*" style "murrine-panel"
-widget_class "*Applet*Netstatus*" style "murrine-panel"
-widget "*gdm-user-switch-menubar*" style "murrine-panel"
-
-style "bold-panel-item" {{
-	font_name = "Bold"
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-widget "*Panel*MenuBar*" style "bold-panel-item"
-widget "*gimmie*" style "bold-panel-item"
-
-# widget_class "*Mail*" style "murrine-panel" # Disabled to fix Evolution bug
-# class "*Panel*" style "murrine-panel" # Disabled to fix bug
-
-# XFCE Styles
-
-style "workspace-switcher" = "murrine-panel" {{
-	bg[SELECTED] = @selected_bg_color
-}}
-
-style "xfce-header" {{
-	bg[NORMAL] = shade (0.9, @bg_color)
-	base[NORMAL] = shade (1.18, @bg_color)
-}}
-
-style "xfdesktop-windowlist" {{
-	bg[NORMAL] = @bg_color
-	fg[INSENSITIVE] = shade (0.95, @bg_color)
-	text[INSENSITIVE] = shade (0.95, @bg_color)
-}}
-
-style "xfdesktop-icon-view" {{
-	XfdesktopIconView::label-alpha = 0
-	XfdesktopIconView::selected-label-alpha = 60
-	XfdesktopIconVIew::ellipsize-icon-labels = 1
-
-	base[NORMAL] = @selected_bg_color
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-
-	engine "murrine" {{
-		textstyle = 5
-		text_shade = 0.05
-	}}
-}}
-
-style "xfwm-tabwin" {{
-	Xfwm4TabwinWidget::border-width = 0
-	Xfwm4TabwinWidget::icon-size = 64
-
-	bg[NORMAL] = @menu_bg_color
-	fg[NORMAL] = @menu_fg_color
-
-	engine "murrine" {{
-		focusstyle = 0
-	}}
-}}
-
-style "xfsm-logout" {{
-	bg[NORMAL] = @menu_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[PRELIGHT] = shade (1.1, @menu_bg_color)
-	bg[SELECTED] = shade (0.5, @menu_bg_color)
-	bg[INSENSITIVE] = shade (1.3, @menu_bg_color)
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @menu_fg_color
-
-	text[NORMAL] = @menu_fg_color
-
-	engine "murrine" {{
-	}}
-}}
-
-style "xfsm-logout-button" {{
-	bg[NORMAL] = shade (1.2, @menu_bg_color)
-	bg[PRELIGHT] = shade (1.4, @menu_bg_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-widget "*WnckPager*" style "workspace-switcher"
-
-widget "*Xfce*Panel*" style "murrine-panel"
-class "*Xfce*Panel*" style "murrine-panel"
-
-# Thunar Styles
-
-style "sidepane" {{
-	base[NORMAL] = @bg_color
-	base[INSENSITIVE] = shade(0.90, @bg_color)
-	bg[NORMAL] = @bg_color
-	text[NORMAL] = @text_color
-}}
-
-widget_class "*ThunarShortcutsView*" style "sidepane"
-widget_class "*ThunarTreeView*" style "sidepane"
-widget_class "*ThunarLocationEntry*" style "murrine-entry"
-
-# Gtk2 Open-File Dialog
-
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane"
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-
-# Google Chrome/Chromium Styles (requires 9.0.597 or newer)
-
-style "chromium-toolbar-button" {{
-	engine "murrine" {{
-		roundness = 2
-		textstyle = 0
-	}}
-}}
-
-style "chrome-gtk-frame" {{
-	ChromeGtkFrame::frame-color = @titlebar_bg_color
-	ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 0
-	ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 0
-	ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = @bg_color
-	ChromeGtkFrame::scrollbar-slider-normal-color =  mix (0.21, @text_color, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color =  mix (0.31, @text_color, @bg_color)
-}}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-
-widget_class "*Chrom*Button*" style "chromium-toolbar-button"
-
-# General Styles
-
-class "GtkWidget" style "murrine-default"
-
-class "GtkFrame" style "murrine-wide"
-class "MetaFrames" style "metacity-frame"
-class "GtkWindow" style "metacity-frame"
-
-class "GtkSeparator" style "murrine-wide"
-class "GtkCalendar" style "murrine-wide"
-
-class "GtkSpinButton" style "murrine-spinbutton"
-
-class "GtkScale" style "murrine-scale"
-class "GtkVScale" style "murrine-vscale"
-class "GtkHScale" style "murrine-hscale"
-class "GtkScrollbar" style "murrine-scrollbar"
-class "GtkVScrollbar" style "murrine-vscrollbar"
-class "GtkHScrollbar" style "murrine-hscrollbar"
-
-class "GtkRadio*" style "murrine-radiocheck"
-class "GtkCheck*" style "murrine-radiocheck"
-
-class "GtkEntry" style "murrine-entry"
-
-widget_class "*<GtkNotebook>" style "murrine-notebook"
-widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook-bg"
-widget_class "*.GtkNotebook.*.GtkViewport" style "murrine-notebook"
-
-widget_class "*<GtkButton>" style "murrine-button"
-widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
-widget_class "*<GtkProgress>" style "murrine-progressbar"
-widget_class "*<GtkProgressBar>" style "murrine-progressbar"
-
-widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
-
-widget_class "*<GtkMenu>*" style "murrine-menu"
-widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
-widget_class "*Menu*.*Sepa*"  style "murrine-separator-menu-item"
-widget_class "*<GtkMenuBar>*" style "murrine-menubar"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "murrine-menubaritem"
-
-widget_class "*GtkToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToggleToolButton*" style "murrine-toolbutton"
-widget_class "*GtkMenuToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToolbar*Button" style "murrine-toolbutton"
-
-widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
-
-widget_class "*.<GtkTreeView>*" style "murrine-treeview"
-widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
-
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-widget_class "*<GtkScrolledWindow>*<OsScrollbar>" style "murrine-overlay-scrollbar"
-
-# Workarounds and Non-Standard Styling
-
-style "text-is-fg-color-workaround" {{
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-}}
-
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround"
-
-style "fg-is-text-color-workaround" {{
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[INSENSITIVE] = darker (@text_color)
-}}
-
-widget_class "*<GtkListItem>*" style "fg-is-text-color-workaround"
-widget_class "*<GtkCList>" style "fg-is-text-color-workaround"
-widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
-
-style "murrine-evo-new-button-workaround" {{
-	engine "murrine" {{
-		toolbarstyle = 0
-	}}
-}}
-
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
-
-style "inkscape-toolbar-fix" {{
-	engine "murrine" {{
-		gradient_shades = {{ 1.0, 1.0, 1.0, 1.0 }}
-		highlight_shade = 1.0
-	}}
-}}
-
-#widget "*GtkHandleBox*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*CommandsToolbar*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*SnapToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SelectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*NodeToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*TweakToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ZoomToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*StarToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*RectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*3DBoxToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ArcToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SpiralToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PencilToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PenToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*CalligraphyToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*EraserToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*LPEToolToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix"
-
-# Performance Fixes
-
-style "performance-fix" {{
-	engine "murrine" {{
-		textstyle = 0
-	}}
-}}
-
-widget_class "*gtkmm__GtkWindow*" style "performance-fix" # Inkscape
-widget_class "*GimpDisplayShell*" style "performance-fix" # Gimp
-widget_class "*GimpToolbox*" style "performance-fix"
-widget_class "*GimpMenuDock*" style "performance-fix"
-widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice
-widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.)
-
-widget_class "*XfceHeading*" style "xfce-header"
-widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-widget "xfwm4-tabwin*" style "xfwm-tabwin"
-widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
-widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button"