update

Former-commit-id: bbaf52b496

.sops.yaml

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

README.md

@@ -1,47 +1,49 @@
 [//]: # (Title: Nixy)  
-[//]: # (Description: Nixy is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
+[//]: # (Description: Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
 [//]: # (Author: Hadi)  
-[//]: # (Date: 09/04/24)
+[//]: # (Date: 06/17/24)
-[//]: # (Version: v2.3.0)
 
 <div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
+    <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
 </div>
 
-<br>
+<br><br>
+
+<div align="center">
+    <a href="https://github.com/anotherhadi/nixy">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=2.0.0&colorA=040409&colorB=a158ff&logo=githubactions&logoColor=a158ff&"/>
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/stargazers">
+        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=starship&logoColor=a158ff">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/">
+        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color=a158ff&labelColor=040409&style=for-the-badge&logo=github&logoColor=a158ff">
+    </a>
+    <a href="https://nixos.org">
+        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor=040409&logo=NixOS&logoColor=a158ff&color=a158ff">
+    </a>
+    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
+        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA=040409&colorB=a158ff&logo=unlicense&logoColor=a158ff&"/>
+    </a>
+</div>
+
+<br><br>
+
+<div align="center">
+    <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" />
+</div>
 
 # Nixy
 
-<br>
+**Nixy** is a NixOS configuration with home-manager, secrets and custom theming all in one place.
-<div align="center">
-    <a href="https://github.com/anotherhadi/nixy">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message=v2.3.0&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=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)
-    - [🏠 `home`](#-home)
-    - [💻 `hosts`](#-hosts)
   - [Installation](#installation)
   - [Documentation](#documentation)
 
@@ -53,28 +55,13 @@ It's a simple way to manage your system configuration and dotfiles.
 
 ## Architecture
 
-### 🏠 `home`
+- 🏠 `home` are the dotfiles and configuration files for the user
-
+- 💻 `hosts` are the system configuration files
-Those are the dotfiles and configuration files for user-level configuration
+  - `laptop` is mine
-
+  - `guest` is a template that you can copy and modify for your own system
-**Subfolders:**
+  - `themes` contains all the themes available (see [THEMES.md](docs/THEMES.md))
-
+  - `shared` are some nix files that you can import (nvidia, prime, fonts, ...)
-- `programs` is a collection of apps configured with home-manager
+- 🤫 `secrets` are the secrets files encrypted with sops
-- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
-- `system` is some "desktop environment" configuration
-- `wallpapers` are... wallpapers
-
-### 💻 `hosts`
-
-Those are the host-specific configurations
-Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
-
-**Subfolders:**
-
-- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
-- 📦 `modules` are the nix modules that you can import
-- `laptop` is my configuration for my laptop with Nvidia that you can copy
-- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)
 
 ## Installation
 
@@ -82,15 +69,12 @@ Each host contains a `configuration.nix` for system-level configuration, a `home
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```
 
-- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+- Change the username in the flake.nix file
-- Add your `hardware-configuration.nix` to your new host's folder
+- import the guest configuration instead of the `hosts/laptop` one
-- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
+- import your hardware-configuration.nix into the `hosts/guest` folder
-
-> [!NOTE]
-> When you add new files, don't forget to run `git add .` to add them to the git repository
 
 ```sh
-sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
 ```
 
 ## Documentation
@@ -98,9 +82,6 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 - [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,41 +1,33 @@
-# Apps and services
+# APPS
 
-*non-exhaustive lists*
+*non-exhaustive list*
 
-## Laptop
+| Category       | Software      |
-
+|----------------|---------------|
-The laptop configuration is used by an Omen 16 laptop w/ nvidia and an amd gpu running NixOS.
+| WM             | Hyprland      |
-The configurations files can be found in the `hosts/laptop` directory.
+|                | hyprlock      |
-
+|                | hyprpaper     |
-| Category                                | Name           |
+|                | hypridle      |
-| --------------------------------------- | -------------- |
+|                | wlogout       |
-| WM                                      | Hyprland       |
+| Bar            | waybar        |
-|                                         | hyprlock       |
+| Terminal       | kitty         |
-|                                         | hyprpaper      |
+| Shell          | zsh           |
-|                                         | hypridle       |
+|                | tmux          |
-|                                         | hyprcursor     |
+|                | starship      |
-|                                         | wlogout        |
+|                | bat           |
-| Bar                                     | hyprpanel      |
+|                | eza           |
-| Terminal                                | kitty          |
+|                | zoxide        |
-| Shell                                   | zsh            |
+|                | fzf           |
-|                                         | tmux           |
+| Editor         | neovim(nixvim)|
-|                                         | starship       |
+| File manager   | lf            |
-|                                         | bat            |
+|                | thunar        |
-|                                         | eza            |
+| Browser        | qutebrowser   |
-|                                         | zoxide         |
+| Music          | spicetify     |
-|                                         | fzf            |
+| Notifications  | dunst         |
-| Editor                                  | neovim(nixvim) |
+| Launcher       | wofi          |
-| File manager                            | thunar         |
+| DM             | tuigreet      |
-| Browser                                 | qutebrowser    |
+| Secrets        | sops-nix      |
-| Music                                   | spicetify      |
+| Misc           | lazygit       |
-| Launcher                                | wofi           |
+|                | neofetch      |
-| DM                                      | tuigreet       |
+|                | cava          |
-| Secrets                                 | sops-nix       |
+|                | ...           |
-| See [hosts/laptop](../hosts/laptop/)... |                |
-
-## Server
-
-The server configuration is used by a home server running NixOS.
-The configurations files can be found in the `hosts/server` directory.
-I mainly use it for self-hosting websites and services such as Nextcloud, Vaultwarden, jellyfin, ...
-I exposed some services to the internet using a reverse proxy (Nginx) and cloudflare-dyndns, others are accessed through a tailscale network

docs/CONTRIBUTING.md

@@ -1,19 +1,10 @@
 # Contributing to Nixy
 
-Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the [TODO.md](./TODO.md) file!
+Everybody is invited and welcome to contribute to Nixy. There is a lot to do... Check the `docs/TODO.md` file!
 
 The process is straight-forward.
 
 - Read [How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/guide/pull-requests.md#best-practices-for-faster-reviews) by Kubernetes (but skip step 0 and 1)
 - Fork Nixy [git repository](https://github.com/anotherhadi/nixy).
-- Write your changes (new theme, bug fixes, task in to-do, ...).
+- Write your changes (new theme, bug fixes, ...).
 - Create a Pull Request against the main branch of Nixy.
-
-> [!TIP]
-> 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

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

docs/SCRIPTS.md

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

docs/THEMES.md

@@ -1,14 +1,13 @@
 # Themes
 
-Themes are defined in `hosts/themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
+Themes are defined in `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 of your host's variables.nix file.
+You can change the selected theme by changing the import statement at the top of your host's variables file.
 
-> [!TIP]
+*To apply the theme to duckduckgo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`.*
-> To apply the theme to DuckDuckGo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`
 
-## Create your theme
+## Create your own theme
 
-Create a copy of one of the existing themes and change the variables.
+Create a copy of one of the existing theme and change the variables.
 Wallpapers are loaded from the `home/wallpapers` folder.
 
 ## Gallery
@@ -18,3 +17,15 @@ Wallpapers are loaded from the `home/wallpapers` folder.
 ![nixy1](src/nixy/1.png)
 ![nixy2](src/nixy/2.png)
 ![nixy3](src/nixy/3.png)
+
+### Catppuccin
+
+![catppuccin1](src/catppuccin/1.png)
+![catppuccin2](src/catppuccin/2.png)
+![catppuccin3](src/catppuccin/3.png)
+
+### Windows
+
+![windows1](src/windows/1.png)
+![windows2](src/windows/2.png)
+![windows3](src/windows/3.png)

docs/TODO.md

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

docs/WALLPAPERS.md

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

@@ -1,20 +0,0 @@
-#!/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

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

docs/scripts/create_guest_config.sh

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

docs/scripts/create_preview_wallpapers.sh

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

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

docs/scripts/keybindings_to_markdown.sh

@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-# A script to parse the Hyprland configuration to store keybindings in a table
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-KEYBINDINGS_FILE="./docs/KEYBINDINGS.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

@@ -1,26 +0,0 @@
-#!/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,5 +1,7 @@
 
-**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
+# Nixy
+
+**Nixy** is a NixOS configuration with home-manager, secrets and custom theming all in one place.
 It's a simple way to manage your system configuration and dotfiles.
 
 ## Table of Content
@@ -14,28 +16,13 @@ It's a simple way to manage your system configuration and dotfiles.
 
 ## Architecture
 
-### 🏠 `home`
+- 🏠 `home` are the dotfiles and configuration files for the user
-
+- 💻 `hosts` are the system configuration files
-Those are the dotfiles and configuration files for user-level configuration
+  - `laptop` is mine
-
+  - `guest` is a template that you can copy and modify for your own system
-**Subfolders:**
+  - `themes` contains all the themes available (see [THEMES.md](docs/THEMES.md))
-
+  - `shared` are some nix files that you can import (nvidia, prime, fonts, ...)
-- `programs` is a collection of apps configured with home-manager
+- 🤫 `secrets` are the secrets files encrypted with sops
-- `scripts` is a folder full of bash scripts (see [SCRIPTS.md](docs/SCRIPTS.md))
-- `system` is some "desktop environment" configuration
-- `wallpapers` are... wallpapers
-
-### 💻 `hosts`
-
-Those are the host-specific configurations
-Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
-
-**Subfolders:**
-
-- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
-- 📦 `modules` are the nix modules that you can import
-- `laptop` is my configuration for my laptop with Nvidia that you can copy
-- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)
 
 ## Installation
 
@@ -43,15 +30,12 @@ Each host contains a `configuration.nix` for system-level configuration, a `home
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```
 
-- Copy the `hosts/laptop` folder, rename it to your system name, and change the variables inside the `variables.nix` file
+- Change the username in the flake.nix file
-- Add your `hardware-configuration.nix` to your new host's folder
+- import the guest configuration instead of the `hosts/laptop` one
-- Add your 'nixosConfigurations' inside `flake.nix` (You can edit your hostname one and change the lines containing '# CHANGEME')
+- import your hardware-configuration.nix into the `hosts/guest` folder
-
-> [!NOTE]
-> When you add new files, don't forget to run `git add .` to add them to the git repository
 
 ```sh
-sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
 ```
 
 ## Documentation
@@ -59,9 +43,6 @@ sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
 - [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,33 +1,34 @@
 [//]: # (Title: Nixy)  
-[//]: # (Description: {description})  
+[//]: # (Description: Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
 [//]: # (Author: Hadi)  
 [//]: # (Date: {date})
-[//]: # (Version: {version})
 
 <div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
+    <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.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={version}&colorA={backgroundcolor}&colorB={primarycolor}&logo=githubactions&logoColor={primarycolor}"/>
+        <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={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=starship&logoColor={primarycolor}">
+        <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={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=github&logoColor={primarycolor}">
+        <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={backgroundcolor}&logo=NixOS&logoColor={primarycolor}&color={primarycolor}">
+        <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={backgroundcolor}&colorB={primarycolor}&logo=unlicense&logoColor={primarycolor}"/>
+        <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><br>
+
+<div align="center">
+    <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" />
+</div>

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

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

flake.lock

@@ -1,24 +1,5 @@
 {
   "nodes": {
-    "ags": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3",
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1721306136,
-        "narHash": "sha256-VKPsIGf3/a+RONBipx4lEE4LXG2sdMNkWQu22LNQItg=",
-        "owner": "Aylur",
-        "repo": "ags",
-        "rev": "344ea72cd3b8d4911f362fec34bce7d8fb37028c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Aylur",
-        "repo": "ags",
-        "type": "github"
-      }
-    },
     "apple-fonts": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -30,11 +11,11 @@
         "sf-pro": "sf-pro"
       },
       "locked": {
-        "lastModified": 1719591391,
+        "lastModified": 1718062482,
-        "narHash": "sha256-sVTFewitXIYe5vBihbCFQGdBPdnT26kES1T05umBBnE=",
+        "narHash": "sha256-bGWs6XRVgzm1Uagx/EAnz9wnMQVImR1ZlVpAy+SDXCw=",
         "owner": "Lyndeno",
         "repo": "apple-fonts.nix",
-        "rev": "0e21619dad5b0d9ca2e050155e32448380547b06",
+        "rev": "eeb3521706bfe21206b1301ff8e0876defa1b6dd",
         "type": "github"
       },
       "original": {
@@ -43,52 +24,20 @@
         "type": "github"
       }
     },
-    "aquamarine": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1725016199,
-        "narHash": "sha256-2TMk7F2a27ZtOUW/bftkDyZKp3OQ71E5XnfKSUT8HZQ=",
-        "owner": "hyprwm",
-        "repo": "aquamarine",
-        "rev": "cff00196f0fcf734a2bf164eb0dfdb6e58c5c906",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "aquamarine",
-        "type": "github"
-      }
-    },
     "devshell": {
       "inputs": {
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1722113426,
+        "lastModified": 1717408969,
-        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
+        "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
+        "rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
         "type": "github"
       },
       "original": {
@@ -135,11 +84,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722555600,
+        "lastModified": 1717285511,
-        "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=",
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "8471fe90ad337a8074e957b69ca4d0089218391d",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
         "type": "github"
       },
       "original": {
@@ -167,15 +116,33 @@
       }
     },
     "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
+        "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": 1710146030,
+        "lastModified": 1685518550,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -186,10 +153,7 @@
     },
     "git-hooks": {
       "inputs": {
-        "flake-compat": [
+        "flake-compat": "flake-compat_2",
-          "nixvim",
-          "flake-compat"
-        ],
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixvim",
@@ -201,11 +165,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724857454,
+        "lastModified": 1717664902,
-        "narHash": "sha256-Qyl9Q4QMTLZnnBb/8OuQ9LSkzWjBU1T5l5zIzTxkkhk=",
+        "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "4509ca64f1084e73bc7a721b20c669a8d4c5ebe6",
+        "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
         "type": "github"
       },
       "original": {
@@ -243,11 +207,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724435763,
+        "lastModified": 1718243258,
-        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
+        "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
+        "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
         "type": "github"
       },
       "original": {
@@ -264,11 +228,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724435763,
+        "lastModified": 1718141734,
-        "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
+        "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
+        "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad",
         "type": "github"
       },
       "original": {
@@ -293,11 +257,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1722623071,
+        "lastModified": 1717181720,
-        "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=",
+        "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "912d56025f03d41b1ad29510c423757b4379eb1c",
+        "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c",
         "type": "github"
       },
       "original": {
@@ -308,7 +272,6 @@
     },
     "hyprland": {
       "inputs": {
-        "aquamarine": "aquamarine",
         "hyprcursor": "hyprcursor",
         "hyprlang": "hyprlang",
         "hyprutils": "hyprutils",
@@ -318,11 +281,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1725019943,
+        "lastModified": 1718359900,
-        "narHash": "sha256-tAGs6TpIYkRUWjU0WYAavzHCPy4XLLMn63caFF7OCNc=",
+        "narHash": "sha256-eVf70Ps7O8R3DEEfSMW54V07kxkRv5IaWMxSa77hMu4=",
         "ref": "refs/heads/main",
-        "rev": "25e72949a1cc2368425ed81712a394cb277f514f",
+        "rev": "b2590b58c51094424a9651d8df37dfab838b5bbb",
-        "revCount": 5160,
+        "revCount": 4824,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -333,36 +296,6 @@
         "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": [
@@ -377,11 +310,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721326555,
+        "lastModified": 1691753796,
-        "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
+        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
+        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
         "type": "github"
       },
       "original": {
@@ -406,11 +339,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724174162,
+        "lastModified": 1717881852,
-        "narHash": "sha256-fOOBLwil6M9QWMCiSULwjMQzrXhHXUnEqmjHX5ZHeVI=",
+        "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "16e5c9465f04477d8a3dd48a0a26bf437986336c",
+        "rev": "ec6938c66253429192274d612912649a0cfe4d28",
         "type": "github"
       },
       "original": {
@@ -419,25 +352,6 @@
         "type": "github"
       }
     },
-    "hyprpanel": {
-      "inputs": {
-        "ags": "ags",
-        "nixpkgs": "nixpkgs_4"
-      },
-      "locked": {
-        "lastModified": 1725006826,
-        "narHash": "sha256-DO9Sxg+HP7Iy/TguZtjwXRjlH35liWXEuG17ilcJejI=",
-        "owner": "Jas-SinghFSU",
-        "repo": "HyprPanel",
-        "rev": "4bd5c3ed30ae643ac1dee152f8b9332d0c5c3eb9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Jas-SinghFSU",
-        "repo": "HyprPanel",
-        "type": "github"
-      }
-    },
     "hyprutils": {
       "inputs": {
         "nixpkgs": [
@@ -450,11 +364,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724966483,
+        "lastModified": 1717881334,
-        "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=",
+        "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2",
+        "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e",
         "type": "github"
       },
       "original": {
@@ -475,11 +389,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721324119,
+        "lastModified": 1717784906,
-        "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
+        "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
+        "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d",
         "type": "github"
       },
       "original": {
@@ -496,11 +410,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724561770,
+        "lastModified": 1717976995,
-        "narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
+        "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
+        "rev": "315aa649ba307704db0b16c92f097a08a65ec955",
         "type": "github"
       },
       "original": {
@@ -511,11 +425,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1724878143,
+        "lastModified": 1718349360,
-        "narHash": "sha256-UjpKo92iZ25M05kgSOw/Ti6VZwpgdlOa73zHj8OcaDk=",
+        "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "95c3dfe6ef2e96ddc1ccdd7194e3cda02ca9a8ef",
+        "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6",
         "type": "github"
       },
       "original": {
@@ -543,27 +457,27 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1721524707,
+        "lastModified": 1717880976,
-        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
+        "narHash": "sha256-BRvSCsKtDUr83NEtbGfHLUOdDK0Cgbezj2PtcHnz+sQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
+        "rev": "4913a7c3d8b8d00cb9476a6bd730ff57777f740c",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "release-24.05",
+        "ref": "release-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1724819573,
+        "lastModified": 1717974879,
-        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
+        "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
+        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
         "type": "github"
       },
       "original": {
@@ -575,15 +489,15 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1718714799,
+        "lastModified": 1718160348,
-        "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
+        "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
+        "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -591,31 +505,15 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1722185531,
+        "lastModified": 1686020360,
-        "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
+        "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
+        "rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_5": {
-      "locked": {
-        "lastModified": 1724819573,
-        "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -632,15 +530,14 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "nuschtosSearch": "nuschtosSearch",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1724968633,
+        "lastModified": 1718358971,
-        "narHash": "sha256-eb2NCdLwfXL1MuTAkoDncSl2lCJwyylV5/NM1Ws2P/U=",
+        "narHash": "sha256-8REGUp3RB2/3Q3Ibu00onhj1HyLh/Z8oRU6D3/EQ08w=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "2704133fe3ca616b22ed6685cc67180456eb4160",
+        "rev": "e51b8b9b5c91aa49981d78c4aa1ac08a50150103",
         "type": "github"
       },
       "original": {
@@ -649,25 +546,32 @@
         "type": "github"
       }
     },
-    "nuschtosSearch": {
+    "nur": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
       "locked": {
-        "lastModified": 1724584782,
+        "lastModified": 1718354773,
-        "narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
+        "narHash": "sha256-p0pjm5l6LOYoEzSMLZv0QSE4vgGwfhkCz7VN58IUjzc=",
-        "owner": "NuschtOS",
+        "owner": "nix-community",
-        "repo": "search",
+        "repo": "NUR",
-        "rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
+        "rev": "2fe75ecfd4dd1d2063fcc31ccb5db6d9f2b6b33c",
         "type": "github"
       },
       "original": {
-        "owner": "NuschtOS",
+        "id": "nur",
-        "repo": "search",
+        "type": "indirect"
+      }
+    },
+    "nurpkgs": {
+      "locked": {
+        "lastModified": 1718354773,
+        "narHash": "sha256-p0pjm5l6LOYoEzSMLZv0QSE4vgGwfhkCz7VN58IUjzc=",
+        "owner": "nix-community",
+        "repo": "NUR",
+        "rev": "2fe75ecfd4dd1d2063fcc31ccb5db6d9f2b6b33c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "NUR",
         "type": "github"
       }
     },
@@ -688,11 +592,11 @@
         "apple-fonts": "apple-fonts",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "hyprland-plugins": "hyprland-plugins",
-        "hyprpanel": "hyprpanel",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
+        "nur": "nur",
+        "nurpkgs": "nurpkgs",
         "sops-nix": "sops-nix",
         "spicetify-nix": "spicetify-nix"
       }
@@ -753,11 +657,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1723501126,
+        "lastModified": 1718137936,
-        "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=",
+        "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "be0eec2d27563590194a9206f551a6f73d52fa34",
+        "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6",
         "type": "github"
       },
       "original": {
@@ -768,21 +672,19 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
+        "nixpkgs": "nixpkgs_4"
-          "nixpkgs"
-        ]
       },
       "locked": {
-        "lastModified": 1724991403,
+        "lastModified": 1704167711,
-        "narHash": "sha256-n0os3uymBUoGlikG87Yp7oisYGrkEwsm3nptS9FhdAk=",
+        "narHash": "sha256-kFDq+kf/Di/P8bq5sUP8pVwRkrSVrABksBjMPmLic3s=",
-        "owner": "Gerg-L",
+        "owner": "the-argus",
         "repo": "spicetify-nix",
-        "rev": "0965e58aa38245b2105fec2949a9463fe34e3f05",
+        "rev": "1325416f951d6a82cfddb1289864ad782e2b87c4",
         "type": "github"
       },
       "original": {
-        "owner": "Gerg-L",
+        "owner": "the-argus",
         "repo": "spicetify-nix",
         "type": "github"
       }
@@ -819,16 +721,16 @@
     },
     "systems_3": {
       "locked": {
-        "lastModified": 1689347949,
+        "lastModified": 1681028828,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
@@ -855,11 +757,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724833132,
+        "lastModified": 1718139168,
-        "narHash": "sha256-F4djBvyNRAXGusJiNYInqR6zIMI3rvlp6WiKwsRISos=",
+        "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "3ffd842a5f50f435d3e603312eefa4790db46af5",
+        "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1",
         "type": "github"
       },
       "original": {
@@ -885,11 +787,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724073926,
+        "lastModified": 1717918856,
-        "narHash": "sha256-nWlUL43jOFHf+KW6Hqrx+W/r1XdXuDyb0wC/SrHsOu4=",
+        "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "a08ecbbf33598924e93542f737fc6169a26b481e",
+        "rev": "72907822c19afc0983c69d59d299204381623725",
         "type": "github"
       },
       "original": {

flake.nix

@@ -16,45 +16,35 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
-    spicetify-nix = {
+    spicetify-nix.url = "github:the-argus/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";
-    hyprland-plugins = {
+    nurpkgs.url = "github:nix-community/NUR";
-      url = "github:hyprwm/hyprland-plugins";
-      inputs.hyprland.follows = "hyprland";
-    };
     nixos-hardware.url = "github:NixOS/nixos-hardware/master";
-    hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
   };
 
-  outputs = inputs@{ nixpkgs, ... }: {
+  outputs = inputs@{ nixpkgs, nur, ... }: {
     nixosConfigurations = {
-      nixy = nixpkgs.lib.nixosSystem { # CHANGEME
-        system = "x86_64-linux";
-        modules = [
-          {
-            nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
-            _module.args = { inherit inputs; };
-          }
-          inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME
-          inputs.home-manager.nixosModules.home-manager
-          ./hosts/laptop/configuration.nix # CHANGEME
-        ];
-      };
 
-      jack = nixpkgs.lib.nixosSystem {
+      nixy = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          { _module.args = { inherit inputs; }; }
+          ./hosts/laptop/configuration.nix
-          inputs.sops-nix.nixosModules.sops
+          inputs.nixos-hardware.nixosModules.omen-16-n0005ne
           inputs.home-manager.nixosModules.home-manager
-          ./hosts/server/configuration.nix
+          {
+            nixpkgs.overlays = [ nur.overlay ];
+            _module.args = { inherit inputs; };
+            home-manager = {
+              useGlobalPkgs = true;
+              useUserPackages = true;
+              users."hadi" = import ./home/laptop.nix; # CHANGE ME
+              extraSpecialArgs = { inherit inputs; };
+            };
+          }
         ];
       };
 

home/laptop.nix

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

home/programs/nextcloud/default.nix

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

home/programs/nvim/colorscheme.nix

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

home/programs/nvim/default.nix

@@ -1,17 +1,30 @@
 { 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/dashboard.nix
+    ./plugins/none-ls.nix
+    ./plugins/wilder.nix
     ./plugins/lsp.nix
-    ./plugins/markdown.nix
+    ./plugins/treesitter.nix
-    ./plugins/tree.nix
+    ./plugins/toggleterm.nix
-    ./plugins/ui.nix
+    ./plugins/copilot.nix
-    ./plugins/utils.nix
+    ./plugins/whichkey.nix
-    ./plugins/zen-mode.nix
+    ./plugins/alpha.nix
-
+    ./plugins/keymaps.nix
+    ./plugins/comment.nix
+    ./plugins/oil.nix
+    ./plugins/trouble.nix
+    ./plugins/tmux-navigator.nix
+    ./plugins/noice.nix
+    ./plugins/obsidian.nix
     ./options.nix
     ./colorscheme.nix
-    ./keymaps.nix
   ];
 }

home/programs/nvim/keymaps.nix

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

home/programs/nvim/plugins/alpha.nix

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

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

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

home/programs/nvim/plugins/bufferline.nix

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

home/programs/nvim/plugins/comment.nix

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

home/programs/nvim/plugins/copilot.nix

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

home/programs/nvim/plugins/git.nix

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

home/programs/nvim/plugins/keymaps.nix

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

home/programs/nvim/plugins/lazygit.nix

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

home/programs/nvim/plugins/lightline.nix

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

home/programs/nvim/plugins/lsp.nix

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

home/programs/nvim/plugins/markdown.nix

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

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

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

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

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

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

home/programs/nvim/plugins/obsidian.nix

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

home/programs/nvim/plugins/oil.nix

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

home/programs/nvim/plugins/telescope.nix

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

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

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

home/programs/nvim/plugins/toggleterm.nix

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

home/programs/nvim/plugins/tree.nix

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

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

home/programs/nvim/plugins/trouble.nix

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

home/programs/nvim/plugins/ui.nix

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

home/programs/nvim/plugins/utils.nix

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

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

home/programs/nvim/plugins/wilder.nix

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

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

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

home/programs/qutebrowser/homepage/default.nix

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

home/programs/shell/eza.nix

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

home/programs/spicetify/default.nix

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

home/programs/yazi/default.nix

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

home/scripts/brightness/default.nix

@@ -4,12 +4,18 @@ let
   increments = "5";
 
   brightness-change = pkgs.writeShellScriptBin "brightness-change" ''
-    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%+
+    sleep 0.05
-    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ''${2-${increments}}%-
-  '';
 
-  brightness-set = pkgs.writeShellScriptBin "brightness-set" ''
+    [[ $1 == "up" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%+
-    ${pkgs.brightnessctl}/bin/brightnessctl set ''${1-100}%
+    [[ $1 == "down" ]] && ${pkgs.brightnessctl}/bin/brightnessctl set ${increments}%-
+
+    brightness_level=$(${pkgs.brightnessctl}/bin/brightnessctl get)
+
+    message="󰃠  Brightness: $brightness_level%"
+
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+                -h int:value:"$brightness_level" \
+                --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
   '';
 
   brightness-up = pkgs.writeShellScriptBin "brightness-up" ''
@@ -21,11 +27,9 @@ let
   '';
 
 in {
-  home.packages = [
+  home.packages = with pkgs; [
-    pkgs.brightnessctl
     brightness-change
     brightness-up
     brightness-down
-    brightness-set
   ];
 }

home/scripts/caffeine/default.nix

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

home/scripts/compress/default.nix

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

home/scripts/default.nix

@@ -6,8 +6,10 @@
     ./caffeine
     ./night-shift
     ./screenshot
+    ./startup
     ./nerdfont_fzf
-    ./notification
     ./system
+    ./compress
+    ./misc
   ];
 }

home/scripts/misc/default.nix

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

home/scripts/nerdfont_fzf/default.nix

@@ -12,17 +12,24 @@ let
     fi
 
     echo "Copied to clipboard: $fzf_result"
-    ${pkgs.wl-clipboard}/bin/wl-copy "$fzf_result" # wait for paste before exiting.. not cool
+    echo "Paste it to close the window"
+    ${pkgs.wl-clipboard}/bin/wl-copy -o "$fzf_result" # wait for paste before exiting.. not cool
   '';
 
   nerdfont-fzf-fetch = pkgs.writeShellScriptBin "nerdfont-fzf-fetch" ''
     wget "https://raw.githubusercontent.com/ryanoasis/nerd-fonts/master/glyphnames.json" -O "glyphnames.json" || exit 1
     jq 'del(.METADATA)' "glyphnames.json"
   '';
+
+  nerdfont-popup = pkgs.writeShellScriptBin "nerdfont-popup" ''
+    ${pkgs.kitty}/bin/kitty --class floating -o font_size=18 zsh -c nerdfont-fzf 2>/dev/null
+  '';
+
 in {
-  home.packages = [ nerdfont-fzf nerdfont-fzf-fetch ];
+  home.packages = with pkgs; [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
 
   xdg.configFile."nerdfont_glyphnames.json" = {
     source = ./nerdfont_glyphnames.json;
   };
+
 }

home/scripts/night-shift/default.nix

@@ -1,55 +1,20 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 
 let
+  homedir = config.home.homeDirectory;
   default = "4000";
 
   night-shift-on = pkgs.writeShellScriptBin "night-shift-on" ''
-    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.gammastep}/bin/gammastep -O ${default}"
+    ${pkgs.hyprland}/bin/hyprctl dispatch exec "${pkgs.wlsunset}/bin/wlsunset -t ${default}"
-    title="󰖔  Night-Shift Activated"
+    message="󰖔  Night-Shift Activated"
-    description="Night-Shift is now activated! Your screen will be warmer and easier on the eyes."
+    ${pkgs.libnotify}/bin/notify-send "$message" \
-
+      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
-    notif "night-shift" "$title" "$description"
   '';
-
   night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
-    pkill gammastep
+    pkill wlsunset
-    title="󰖕  Night-Shift Deactivated"
+    message="󰖔  Night-Shift Deactivated"
-    description="Night-Shift is now deactivated! Your screen will return to normal."
+    ${pkgs.libnotify}/bin/notify-send "$message" \
-
+      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
-    notif "night-shift" "$title" "$description"
   '';
 
-  night-shift = pkgs.writeShellScriptBin "night-shift" ''
+in { home.packages = with pkgs; [ night-shift-on night-shift-off ]; }
-    if pgrep gammastep; then
-      night-shift-off
-    else
-      night-shift-on
-    fi
-  '';
-
-  night-shift-status = pkgs.writeShellScriptBin "night-shift-status" ''
-    if [[ $(pgrep gammastep) ]]; then
-      echo "1"
-    else
-      echo "0"
-    fi
-  '';
-
-  night-shift-status-icon =
-    pkgs.writeShellScriptBin "night-shift-status-icon" ''
-      if [[ $(pgrep gammastep) ]]; then
-        echo "󰖔"
-      else
-        echo "󰖕"
-      fi
-    '';
-in {
-  home.packages = [
-    pkgs.gammastep
-    night-shift-on
-    night-shift-off
-    night-shift
-    night-shift-status
-    night-shift-status-icon
-  ];
-}

home/scripts/nixy/default.nix

@@ -1,55 +1,32 @@
 { pkgs, config, ... }:
+
 let
-  nixy = pkgs.writeShellScriptBin "nixy" ''
+  nixy-rebuild = pkgs.writeShellScriptBin "nixy-rebuild" ''
-    function exec() {
+    sudo nixos-rebuild switch --flake ${config.var.configDirectory}#nixy
-      $@
-    }
-
-    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 ]; }
+  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
+  ];
+}

home/scripts/notification/default.nix

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

home/scripts/screenshot/default.nix

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

home/scripts/sounds/default.nix

@@ -1,23 +1,40 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 
 let
+  homedir = config.home.homeDirectory;
   increments = "5";
 
   sound-change = pkgs.writeShellScriptBin "sound-change" ''
+    sleep 0.05
+
     [[ $1 == "mute" ]] && wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-    [[ $1 == "up" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-${increments}}%+
+    [[ $1 == "up" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2%+"
-    [[ $1 == "down" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-${increments}}%-
+    [[ $1 == "down" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ "$2%-"
-    [[ $1 == "set" ]] && wpctl set-volume @DEFAULT_AUDIO_SINK@ ''${2-100}%
+
+    sink_info=$(wpctl get-volume @DEFAULT_AUDIO_SINK@)
+
+    volume=$(echo "$(echo "$sink_info" | awk '{print $2}' | sed 's/%//')*100" | bc -l | xargs printf "%.0f")
+    muted=false
+    if [[ $sink_info == *"MUTED"* ]]; then
+      muted=true
+    fi
+
+    message=""
+    if [ $muted = true ]; then
+      message="󰖁 Muted"
+    else
+      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"
   '';
 
   sound-up = pkgs.writeShellScriptBin "sound-up" ''
     sound-change up ${increments}
   '';
 
-  sound-set = pkgs.writeShellScriptBin "sound-set" ''
-    sound-change set ''${1-100}
-  '';
-
   sound-down = pkgs.writeShellScriptBin "sound-down" ''
     sound-change down ${increments}
   '';
@@ -25,6 +42,52 @@ let
   sound-toggle = pkgs.writeShellScriptBin "sound-toggle" ''
     sound-change mute
   '';
+
+  sound-output = pkgs.writeShellScriptBin "sound-output" ''
+      function parse_sinks(){
+        output=$(wpctl status)
+        sinks=($(echo "$output" | sed 's/ │  //' | awk '/Sinks:/ {flag=1; next} /^$/ {flag=0} flag' | sed 's/ /-/g'))
+
+        for sink in "''${sinks[@]}"; do
+
+          id=""
+          default=false
+          sink=$(echo "$sink" | sed 's/-/ /g')
+          sink_name=$(echo "$sink" | sed 's/\[vol:.*$//')
+
+          if [[ $sink_name == "*"* ]]; then
+            sink_name=$(echo "$sink_name" | sed 's/*//')
+            default=true
+          fi
+
+          id=$(echo "$sink_name" | cut -d'.' -f1)
+          sink_name=$(echo "$sink_name" | sed 's/^[ ]*//;s/[ ]*$//' )
+          sink_name=$(echo "$sink_name" | cut -d'.' -f2 )
+
+          if [[ $default == true ]];then
+            printf "*%s (%d)" "$sink_name" "$id"
+          else
+            printf " %s (%d)" "$sink_name" "$id"
+          fi
+          printf "\n"
+        done
+    }
+
+
+    choosed_sink=$(echo "$(parse_sinks)" | ${pkgs.fzf}/bin/fzf \
+      --border-label "Choose sound output" ) || exit 1
+
+    choosed_sink_id=$(echo "$choosed_sink" | sed 's/.*(\(.*\))/\1/')
+
+    wpctl set-default $choosed_sink_id
+  '';
+
 in {
-  home.packages = [ sound-change sound-up sound-down sound-toggle sound-set ];
+  home.packages = with pkgs; [
+    sound-output
+    sound-change
+    sound-up
+    sound-down
+    sound-toggle
+  ];
 }

home/scripts/startup/default.nix

@@ -0,0 +1,43 @@
+# 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" ''
+    # Because HM enabling services suck.
+
+    [[ ${toString config.var.sops} == "1" ]] && systemctl --user start sops-nix
+
+    [[ ${toString config.var.nextcloud} == "1" ]] && nextcloud-watch &
+
+    notify-system &
+    ${pkgs.waybar}/bin/waybar &
+
+
+    wlr-randr --output "Unknown-1" --off # REMOVE WEIRD GHOST MONITOR
+  '';
+
+in { home.packages = with pkgs; [ startup nextcloud-watch nextcloud-client ]; }

home/scripts/system/default.nix

@@ -1,24 +1,43 @@
 { pkgs, ... }:
 
 let
-  menu = pkgs.writeShellScriptBin "menu" ''
+  notify-system = pkgs.writeShellScriptBin "notify-system" ''
-    if pgrep wofi; then
+    function minute() {
-    	pkill wofi
+      while true;do
-    else
+        battery-plugged &
-    	wofi --show drun
+        battery-level &
+        sleep 60
+      done
+    }
+
+    minute
+  '';
+
+  battery-plugged = pkgs.writeShellScriptBin "battery-plugged" ''
+    BATTERY_STATUS=$(cat /sys/class/power_supply/BAT*/status | head -n1)
+    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"
+      else
+        ${pkgs.libnotify}/bin/notify-send "󰚥  " "Battery is plugged in"
+      fi
+    fi
+    echo $BATTERY_STATUS > /tmp/old_battery_status
+  '';
+
+  battery-level = pkgs.writeShellScriptBin "battery-level" ''
+    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%"
+    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"
     fi
   '';
 
-  powermenu = pkgs.writeShellScriptBin "powermenu" ''
+in {
-    if pgrep wlogout; then
+  home.packages = with pkgs; [ notify-system battery-plugged battery-level ];
-    	pkill wlogout
+}
-    else
-      ${pkgs.wlogout}/bin/wlogout
-    fi
-  '';
-
-  lock = pkgs.writeShellScriptBin "lock" ''
-    ${pkgs.hyprlock}/bin/hyprlock
-  '';
-
-in { home.packages = [ menu powermenu lock ]; }

home/system/batsignal/default.nix

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

home/system/clipman/default.nix

@@ -1,18 +0,0 @@
-{ pkgs, ... }:
-let
-
-  clipboard-clear = pkgs.writeShellScriptBin "clipboard-clear" ''
-    clipman clear --all
-  '';
-
-  clipboard = pkgs.writeShellScriptBin "clipboard" ''
-    clipman pick --tool=wofi
-  '';
-
-in {
-  wayland.windowManager.hyprland.settings.exec-once =
-    [ "${clipboard-clear}" "wl-paste -t text --watch clipman store" ];
-  home.packages = with pkgs; [ clipman clipboard clipboard-clear ];
-  services.clipman.enable = true;
-
-}

home/system/dunst/default.nix

@@ -0,0 +1,83 @@
+{ config, pkgs, ... }: {
+
+  home.packages = with pkgs; [ libnotify ];
+
+  services.dunst = {
+    enable = true;
+    iconTheme = {
+      name = "Adwaita-Dark";
+      package = pkgs.gnome.adwaita-icon-theme;
+    };
+    settings = {
+      global = {
+        rounded = "yes";
+        origin = "top-center";
+        monitor = "0";
+        alignment = "center";
+        vertical_alignment = "center";
+        width = "400";
+        height = "400";
+        scale = 0;
+        gap_size = 0;
+        progress_bar = true;
+        transparency = 0;
+        text_icon_padding = 0;
+        separator_color = "frame";
+        sort = "yes";
+        idle_threshold = 120;
+        line_height = 0;
+        markup = "full";
+        show_age_threshold = 60;
+        ellipsize = "middle";
+        ignore_newline = "no";
+        stack_duplicates = true;
+        sticky_history = "yes";
+        history_length = 20;
+        always_run_script = true;
+        corner_radius = config.var.theme.rounding;
+        follow = "mouse";
+        font = config.var.theme.font;
+        format = "<b>%s</b>\\n%b";
+        progress_bar_corner_radius = config.var.theme.rounding - 10;
+        #format = ''
+        #  <span foreground='#${config.var.theme.colors.accent}'><b>%s %p</b></span>
+        #  %b'';
+        frame_color = "#" + config.var.theme.colors.bg;
+        highlight = "#" + config.var.theme.colors.accent;
+        foreground = "#" + config.var.theme.colors.fg;
+        frame_width = 1;
+        offset = "0x10";
+        horizontal_padding = 10;
+        icon_position = "left";
+        indicate_hidden = "yes";
+        min_icon_size = 0;
+        max_icon_size = 64;
+        mouse_left_click = "do_action, close_current";
+        mouse_middle_click = "close_current";
+        mouse_right_click = "close_all";
+        padding = 10;
+        plain_text = "no";
+        separator_height = 2;
+        show_indicators = "yes";
+        shrink = "no";
+        word_wrap = "yes";
+        browser = "${pkgs.qutebrowser}/bin/qutebrowser";
+      };
+
+      fullscreen_delay_everything = { fullscreen = "delay"; };
+
+      urgency_critical = {
+        background = "#" + config.var.theme.colors.c1;
+        foreground = "#" + config.var.theme.colors.c0;
+      };
+      urgency_low = {
+        background = "#" + config.var.theme.colors.bgalt;
+        foreground = "#" + config.var.theme.colors.fgalt;
+      };
+      urgency_normal = {
+        background = "#" + config.var.theme.colors.bgalt;
+        foreground = "#" + config.var.theme.colors.fgalt;
+      };
+    };
+  };
+}

home/system/gtk/default.nix

@@ -32,34 +32,7 @@
   home.file = {
     ".local/share/themes/FlatColor" = {
       recursive = true;
-      source = pkgs.stdenv.mkDerivation {
+      source = ./gtk;
-        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

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

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