Update

Former-commit-id: dff9dcc8d5
Update
2026-08-21 10:45:49 +02:00 · 2024-05-09 16:51:42 +02:00 · 2024-05-09 16:50:46 +02:00 · 2024-05-09 16:46:30 +02:00 · 2024-05-09 16:44:39 +02:00 · 2024-05-09 16:33:24 +02:00
415 changed files with 39494 additions and 17891 deletions
@@ -1 +1,2 @@
+.sops.yaml
 todolist.md
@@ -1,11 +0,0 @@
-keys:
-  - &primary age12yvtj49pfh3fqzqflscm0ek4yzrjhr6cqhn7x89gdxnlykq0xudq5c7334
-creation_rules:
-  - path_regex: secrets/laptop.yaml$
-    key_groups:
-      - age:
-        - *primary
-  - path_regex: secrets/server.yaml$
-    key_groups:
-      - age:
-        - *primary
@@ -1,64 +1,157 @@
-[//]: # (Title: Nixy)  
-[//]: # (Description: Nixy is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
-[//]: # (Author: Hadi)  
-[//]: # (Date: 06/25/24)
-[//]: # (Version: v2.0.0)
+<h1 align="center">
+   <img src="https://image.nostr.build/70ebe2b5183879d8c0ffa682cd0089e030ad01909678b242ed86449517eac3a5.png" width="100px" />
+   <br>
+      Nixy
+   <br>
+      <img src="https://image.nostr.build/aaf8cf0f3b9784c817f8cf328f19222db2e1886dfb89ae97de83ffa101d437b4.png" width="600px" /> <br>
+   <div align="center">

-<div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
-</div>
+   <div align="center">
+      <p></p>
+      <div align="center">
+         <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>
+   </div>
+</h1>

-<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=v2.0.0&colorA=181825&colorB=89b4fa&logo=githubactions&logoColor=89b4fa"/>
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color=89b4fa&labelColor=181825&style=for-the-badge&logo=starship&logoColor=89b4fa">
-    </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
-
-  - [Table of Content](#table-of-content)
-  - [Gallery](#gallery)
-  - [Architecture](#architecture)
-  - [Installation](#installation)
-  - [Documentation](#documentation)
+Hello there! This is my **NixOs (w/home-manager) dotfiles** repo. It's still a *work in progress*, and I'm still learning how to use nix.

 ## Gallery

-![catppuccin1](docs/src/catppuccin/1.png)
-![catppuccin2](docs/src/catppuccin/2.png)
-![catppuccin3](docs/src/catppuccin/3.png)
+![neofetch](https://image.nostr.build/c208c164ae04e4c58e01adb9fab584b163a565155865833851275f89c9270b7a.jpg)
+![qutebrowser](https://image.nostr.build/8cc32d981e6be256bdc37a2571c31bb76d7c3335ce7c76fa6eca89a03019bfc9.jpg)
+![spotify](https://image.nostr.build/76b18bcbcdf1d911a2dbdff7bfac6652044d45602a3dce9d9c53feb295d13245.jpg)
+![wofi](https://image.nostr.build/90d69ffe6251c17e25b0fb44abadaeb0dfe6db8210d935fca14bf8b00be49fa6.jpg)

-## Architecture
+## Apps

- 🏠 `home` are the dotfiles and configuration files for the user
- 💻 `hosts` are the system configuration files
-  - 'laptop' is my configuration for my laptop with Nvidia
-  - 'server' is for my Nixos server (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
-  - 'guest' is a *template* that you can copy and modify for *your own system*
-  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
-  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
- 🤫 `secrets` are the secrets files encrypted with sops-nix
+<details>
+<summary>Click to expand</summary>
+
+| Category       | Software      |
+|----------------|---------------|
+| WM             | Hyprland      |
+|                | hyprlock      |
+|                | hyprpaper     |
+|                | hypridle      |
+|                | wlogout       |
+| Bar            | waybar        |
+| Terminal       | kitty         |
+| Shell          | zsh           |
+|                | tmux          |
+|                | starship      |
+|                | bat           |
+|                | eza           |
+|                | zoxide        |
+|                | fzf           |
+| Editor         | nixvim        |
+| File manager   | lf            |
+|                | thunar        |
+| Browser        | qutebrowser   |
+| Music          | spicetify     |
+| Notifications  | dunst         |
+| Launcher       | wofi          |
+| DM             | tuigreet      |
+| Secrets        | sops-nix      |
+| Misc           | lazygit       |
+|                | neofetch      |
+|                | cava          |
+|                | ...           |
+
+</details>
+
+## Themes & Colors
+
+Themes and colors are managed by the `home/themes` folder. You can copy the default `nixy.nix` theme and make your own.
+
+To apply the theme to duckduckgo, follow the instructions in `$HOME/.config/duckduckgo-colorscheme.js`.
+
+## Scripts
+
+### Nix/NixOs shortcuts
+
+<details>
+<summary>Click to expand</summary>
+
+- `nixy-edit`
+- `nixy-rebuild`
+- `nixy-update`
+- `nixy-gc` # garbage collection
+- `nixy-cb` # clean boot menu
+
+</details>
+
+### Brightness control
+
+<details>
+<summary>Click to expand</summary>
+
+- `brightness-up`
+- `brightness-down`
+- `brightness-change <up/down> <increment>`
+
+</details>
+
+### Sound control
+
+<details>
+<summary>Click to expand</summary>
+
+- `sound-up`
+- `sound-down`
+- `sound-toggle`
+- `sound-output`
+- `sound-change <up/down/mute> <increment>`
+
+</details>
+
+### Caffeine
+
+<details>
+<summary>Click to expand</summary>
+
+Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
+
+- `caffeine` # Toggle caffeine
+- `caffeine-status` # Return active/inactive
+
+</details>
+
+### Night-Shift
+
+<details>
+<summary>Click to expand</summary>
+
+Blue light filter, using wlsunset
+
+- `night-shift-on`
+- `night-shift-off`
+
+</details>
+
+### Nerdfont FZF
+
+<details>
+<summary>Click to expand</summary>
+
+Nerdfont fzf is a quick way to search for nerdfont icons locally.
+It will copy the selected icon to the clipboard.
+
+- `nerdfont-fzf`
+
+</details>

 ## Installation

@@ -66,22 +159,11 @@ It's a simple way to manage your system configuration and dotfiles.
 git clone https://github.com/anotherhadi/nixy ~/.config/nixos
 ```

- Copy the `hosts/guest` folder, rename it to your system name, and change the variables inside the `variables.nix` file
- Add your `hardware-configuration.nix` to your new host's folder
- Add your 'nixosConfigurations' inside `flake.nix` (You can edit the "yourhostname" one and change the lines containing '# CHANGEME')
-
-> [!NOTE]
-> When you add new files, don't forget to run `git add .` to add them to the git repository
+- Change the `variables.nix` file to match your configuration
+- Remove the hardware module in flake.nix line 30
+- Change the `nixos/configuration.nix` file to match your system
+- Copy your `hardware-configuration.nix` file to the `nixos` folder

 ```sh
-sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
+sudo nixos-rebuild switch --flake ~/.config/nixos#nixy
 ```
-
-## Documentation
-
- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
- [APPS.md](docs/APPS.md): Which apps are installed
- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
- [LICENSE](LICENSE): MIT Licensey
@@ -1,57 +0,0 @@
-# Apps and services
-
-*non-exhaustive lists*
-
-## Laptop
-
-The laptop configuration is used by a Omen 16 laptop w/ nvidia and an amd gpu running NixOS.
-The configurations files can be found in the `hosts/laptop` directory.
-
-
-| Category       | Name          |
-|----------------|---------------|
-| WM             | Hyprland      |
-|                | hyprlock      |
-|                | hyprpaper     |
-|                | hypridle      |
-|                | wlogout       |
-| Bar            | waybar        |
-| Terminal       | kitty         |
-| Shell          | zsh           |
-|                | tmux          |
-|                | starship      |
-|                | bat           |
-|                | eza           |
-|                | zoxide        |
-|                | fzf           |
-| Editor         | neovim(nixvim)|
-| File manager   | lf            |
-|                | thunar        |
-| Browser        | qutebrowser   |
-| Music          | spicetify     |
-| Notifications  | dunst         |
-| Launcher       | wofi          |
-| DM             | tuigreet      |
-| Secrets        | sops-nix      |
-| Misc           | lazygit       |
-|                | neofetch      |
-|                | cava          |
-| See [hosts/laptop](../hosts/laptop/)... | |
-
-## Server
-
-The server configuration is used by a home server running NixOS.
-The configurations files can be found in the `hosts/server` directory.
-I mainly use it for self hosting websites and services such as Nextcloud, Vaultwarden, ... 
-I exposed some services to the internet using a reverse proxy (Nginx) and cloudflare-dyndns, others are accessed through a tailscale network
-
-### Apps
-
- Nextcloud
- Vaultwarden
- Adguard Home
- Unifi Controler
- Uptime Kuma
- "Jackflix"
-  - Jellyfin, Transmission, *arr
- See [hosts/server](../hosts/server/)...
@@ -1,13 +0,0 @@
-# Contributing to Nixy
-
-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 todo, ...).
- Create a Pull Request against the main branch of Nixy.
-
-> [!WARNING]
-> Don't push your host's files, secrets, or home configuration
@@ -1,57 +0,0 @@
-# Scripts
-
-Scripts are located in the `home/scripts` folder. Home-manager add those in the path.
-
-## Nix/NixOs shortcuts
-
-> [!TIP]
-> The `hostname` variable in `hosts/yourhost/variables.nix` should be also the name of the `nixosConfiguration` in `flake.nix` file.
-
- `nixy` # UI
- `nixy rebuild`
- `nixy update`
- `nixy upgrade`
- `nixy gc` # garbage collection
- `nixy cb` # clean boot menu
-
-## Brightness control
-
- `brightness-up`
- `brightness-down`
- `brightness-change <up/down> <increment>`
-
-## Sound control
-
- `sound-up`
- `sound-down`
- `sound-toggle`
- `sound-output`
- `sound-change [up/down/mute] <increment>`
-
-## Caffeine
-
-Caffeine is a simple script that toggles hypridle (disable suspend & screenlock).
-
- `caffeine` # Toggle caffeine
- `caffeine-status` # Return active/inactive
-
-## Night-Shift
-
-Blue light filter, using wlsunset
-
- `night-shift-on`
- `night-shift-off`
-
-## Nerdfont FZF
-
-Nerdfont fzf is a quick way to search for nerdfont icons locally.
-It will copy the selected icon to the clipboard.
-
- `nerdfont-fzf`
-
-## Compress/Extract
-
-Some shortcuts to compress and extract files.
-
- `compress` ...
- `extract` ...
@@ -1,32 +0,0 @@
-# Themes
-
-Themes are defined in `hosts/themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
-You can change the selected theme by changing the import statement of your host's variables.nix file.
-
-> [!TIP]
-> To apply the theme to Duckduckgo, follow the instructions in `$HOME/.duckduckgo-colorscheme.js`
-
-## Create your theme
-
-Create a copy of one of the existing themes and change the variables.
-Wallpapers are loaded from the `home/wallpapers` folder.
-
-## Gallery
-
-### Nixy
-
-![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)
@@ -1,42 +0,0 @@
-# Todolist
-
-feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
-
- [ ] Nixy
-  - [ ] Installation script ([install.sh](./scripts/install.sh) to test on a fresh install)
-  - [ ] Variables-template with defaults
-  - [ ] Themes
-    - [ ] Upload new wallpapers
-    - [ ] MacOS theme
-    - [ ] GithubFetch: Neofetch like, github calendar in the terminal
-  - [ ] Write a hyprland shortcuts markdown file (Parse the hyprland settings conf)
-  - [ ] Tofi (Wofi but terminal based)
-
- [ ] Waybar
-  - [ ] Caffeine status
-  - [ ] Night-shift status
-
- [ ] Hyprland
-  - [ ] Make hyprcursor work
-  - [ ] Animations based on app name
-    - [ ] Wofi: popin
-    - [ ] Wlogout: fade in
-  - [ ] Fix screenshots
-
- [ ] Nixvim
-  - [ ] Telescope: find with file content
-  - [ ] Markdown snippets
-  - [ ] Whichkey: Description for keybindings
-  - [ ] Spelling
-
- [ ] Backup system for some folders ($home/dev, $home/pictures, ...)
-  - [ ] Exclude file pattern (nodes modules, ...)
-  - [ ] Auto backup when a specific usb key is plugged
-
- [ ] Usb security for laptop & server, variable in variables.nix, disable for guest
-
- [ ] Server
-  - [ ] Bitcoin-git
-  - [ ] ServerFetch: Neofetch like, but for server: CPU, RAM, Disk, Network, Uptime, status (check with uptime kuma API)
-  - [ ] Ntfy auth file
-  - [ ] Launch transmission-openvpn on boot (see hosts/server/modules/jackflix/transmission.nix)
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# Compress png files in ./docs/src
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-# Main images
-for file in ./docs/src/*.png; do
-  optipng "$file"
-done
-
-# Theme's images
-for file in ./docs/src/*/*.png; do
-  optipng "$file"
-done
-
-for file in ./home/wallpapers/*.png; do
-  optipng "$file"
-done
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-# This script is used to copy my own configuration to the `./hosts/guest` one, and changing some settings
-
-[[ -d "./hosts" ]] || (
-  echo "Folder ./hosts not found"
-  exit 1
-)
-
-LAPTOP_CONFIG="./hosts/laptop"
-GUEST_CONFIG="./hosts/guest"
-
-cp "$LAPTOP_CONFIG/configuration.nix" "$GUEST_CONFIG/configuration.nix"
-cp "$LAPTOP_CONFIG/variables.nix" "$GUEST_CONFIG/variables.nix"
-
-# Remove the NVIDIA driver import
-config=$(cat "$LAPTOP_CONFIG/configuration.nix")
-config=$(echo "$config" | sed 's/..\/shared\/nvidia/# ..\/shared\/nvidia/')
-config=$(echo "$config" | sed 's/..\/shared\/prime/# ..\/shared\/prime/')
-echo "$config" >"$GUEST_CONFIG/configuration.nix"
-
-variables=$(cat "$LAPTOP_CONFIG/variables.nix")
-variables=$(echo "$variables" | sed 's/112569860+anotherhadi@users.noreply.github.com/your_email/')
-variables=$(echo "$variables" | sed 's/hadi/your_username/')
-variables=$(echo "$variables" | sed 's/Hadi/your_username/')
-variables=$(echo "$variables" | sed 's/sops = true/sops = false/')
-variables=$(echo "$variables" | sed 's/obsidian = true/obsidian = false/')
-variables=$(echo "$variables" | sed 's/tailscale = true/tailscale = false/')
-echo "$variables" >"$GUEST_CONFIG/variables.nix"
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-# Create the README.md file from the docs/src/README_template.md file
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-README_FILE="./README.md"
-
-header=$(cat "./docs/src/header.md")
-table_of_content=$(~/go/bin/md-table-of-contents ./docs/src/README_template.md)
-version=$(git describe --tags --abbrev=0)
-readme_content=$(cat "./docs/src/README_template.md")
-
-header=${header//\{date\}/$(date '+%D')}
-header=${header//\{primarycolor\}/89b4fa}
-header=${header//\{backgroundcolor\}/181825}
-header=${header//\{version\}/$version}
-readme_content=${readme_content//\{md_table_of_content\}/$table_of_content}
-
-echo "$header" >"$README_FILE"
-echo "$readme_content" >>"$README_FILE"
-sed 's/\r//' "$README_FILE" >"/tmp/readme.md"
-mv "/tmp/readme.md" "$README_FILE"
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-[[ -f "./home/system/hyprland/default.nix" ]] || (echo "File ./home/system/hyprland/default.nix not found" && exit 1)
-
-config=$( cat "./home/system/hyprland/default.nix")
-
-# get text between
-#  bind = [
-# and next ]
-
-# Example:
-# "$mod, E, exec, ${pkgs.xfce.thunar}/bin/thunar" # Description
-# Steps:
-# We should remove the ""
-# $mod replace by Super key
-# $shiftMod replace by "Super Shift"
-# Concat with key
-# Remove , exec, 
-# Remove variables and /bin/ if present
-
-# Create a markdown table with everything 
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-# https://github.com/anotherhadi/nixy
-# Installation script: Should be run on fresh nixos install.
-
-printf "\n\e[0;92m- \e[0m\e[1;77mNixy's Installation Script\e[0;96m [anotherhadi/nixy]\e[0m"
-
-# Check if we're on the good directory
-[[ -f "./docs/scripts/install.sh" ]] || (
-  printf "\n\e[0;91mx \e[0m\e[1;77mNot in the project root directory\e[0m"
-  exit 1
-)
-DIR=$PWD
-
-# Create a new configuration
-read -rp $'\n\e[0;92m+\e[0m\e[1;77m Username: \e[0;96m' username
-read -rp $'\n\e[0;92m+\e[0m\e[1;77m Hostname: \e[0;96m' hostname
-
-HOST_DIR="./hosts/$hostname"
-mkdir "$HOST_DIR"
-
-nixos-generate-config --show-hardware-config >"$HOST_DIR/hardware-configuration.nix"
-
-printf "\n\e[0;92m? \e[0m\e[1;77mInstall Nvidia drivers?\e[0;96m [y/N]\e[0m"
-read -r yn
-yn=$(echo "$yn" | tr '[:upper:]' '[:lower:]')
-if [[ $yn == "y" || $yn == "yes" ]]; then
-  nvidia=true
-else
-  nvidia=false
-fi
-
-printf "\n\e[0;92m? \e[0m\e[1;77mInstall prime?\e[0;96m [y/N]\e[0m"
-read -r yn
-yn=$(echo "$yn" | tr '[:upper:]' '[:lower:]')
-if [[ $yn == "y" || $yn == "yes" ]]; then
-  prime=true
-else
-  prime=false
-fi
-
-cp "$LAPTOP_CONFIG/configuration.nix" "$HOST_DIR/configuration.nix"
-cp "$LAPTOP_CONFIG/variables.nix" "$HOST_DIR/variables.nix"
-
-config=$(cat "$LAPTOP_CONFIG/configuration.nix")
-if [[ $nvidia == false ]]; then
-  config=$(echo "$config" | sed 's/..\/shared\/nvidia/# ..\/shared\/nvidia/')
-fi
-if [[ $prime == false ]]; then
-  config=$(echo "$config" | sed 's/..\/shared\/prime/# ..\/shared\/prime/')
-fi
-echo "$config" >"$HOST_DIR/configuration.nix"
-
-variables=$(cat "$LAPTOP_CONFIG/variables.nix")
-variables=$(echo "$variables" | sed 's/112569860+anotherhadi@users.noreply.github.com/your_email/')
-variables=$(echo "$variables" | sed "s/hadi/$username/")
-variables=$(echo "$variables" | sed "s/nixy/$hostname/") # FIXME: Host name can be mixed with themes
-variables=$(echo "$variables" | sed "s/Hadi/$username/")
-variables=$(echo "$variables" | sed 's/sops = true/sops = false/')
-variables=$(echo "$variables" | sed 's/obsidian = true/obsidian = false/')
-variables=$(echo "$variables" | sed 's/tailscale = true/tailscale = false/')
-echo "$variables" >"$HOST_DIR/variables.nix"
-
-# Add it to the git index
-git add .
-
-printf "\n\e[0;92m+ \e[0m\e[1;77mHost added!\e[0m"
-
-# REBUILD
-
-printf "\n\e[0;92m? \e[0m\e[1;77mDo you want to rebuild?\e[0;96m [y/N]\e[0m"
-read -r yn
-yn=$(echo "$yn" | tr '[:upper:]' '[:lower:]')
-if [[ $yn == "y" || $yn == "yes" ]]; then
-  sudo nixos-rebuild switch --flake "$DIR"#"$hostname"
-fi
-
-printf "\n\e[0;92m✓ \e[0m\e[1;77mDone!\e[0m"
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-[ "$1" = "" ] && echo "Usage: $0 <theme_name>" && exit 1
-theme_name=$1
-
-# Switch to workspace 1
-sleep 2
-
-# Step 1
-kitty --class peaclock peaclock &
-sleep 1
-menu &
-sleep 1
-hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "1.png" -d
-sleep 2
-pkill peaclock
-menu
-sleep 2
-
-# Step 2
-kitty cmatrix &
-sleep 1
-kitty &
-sleep 1
-qutebrowser &
-sleep 3
-hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "2.png" -d
-sleep 2
-pkill cmatrix
-pkill --newest qutebrowser ""
-pkill --newest kitty
-sleep 2
-
-# Step 3
-kitty cava &
-sleep 1
-spotify &
-sleep 10
-brightness-down
-sleep 1
-hyprshot -m "output" -m "active" -o "$HOME/.config/nixos/docs/src/$theme_name" -f "3.png" -d
-sleep 2
@@ -1,50 +0,0 @@
-
-**Nixy** is a **Hyprland** NixOS configuration with **home-manager**, **secrets**, and **custom theming** all in one place.
-It's a simple way to manage your system configuration and dotfiles.
-
-## Table of Content
-
-{md_table_of_content}
-
-## Gallery
-
-![catppuccin1](docs/src/catppuccin/1.png)
-![catppuccin2](docs/src/catppuccin/2.png)
-![catppuccin3](docs/src/catppuccin/3.png)
-
-## Architecture
-
- 🏠 `home` are the dotfiles and configuration files for the user
- 💻 `hosts` are the system configuration files
-  - 'laptop' is my configuration for my laptop with Nvidia
-  - 'server' is for my homeserver (w/nextcloud, nginx, vaultwarden, ... look `hosts/server`)
-  - 'guest' is a *template* that you can copy and modify for *your own system*
-  - 'themes' contains all the *themes* available *(see [THEMES.md](docs/THEMES.md))*
-  - 'modules' are some nix modules that you can import (Nvidia, prime, fonts, ...)
- 🤫 `secrets` are the secrets files encrypted with sops-nix
-
-## Installation
-
-```sh
-git clone https://github.com/anotherhadi/nixy ~/.config/nixos
-```
-
- Copy the `hosts/guest` folder, rename it to your system name, and change the variables inside the `variables.nix` file
- Add your `hardware-configuration.nix` to your new host's folder
- Add your 'nixosConfigurations' inside `flake.nix` (You can edit the "yourhostname" one and change the lines containing '# CHANGEME')
-
-> [!NOTE]
-> When you add new files, don't forget to run `git add .` to add them to the git repository
-
-```sh
-sudo nixos-rebuild switch --flake ~/.config/nixos#yourhostname
-```
-
-## Documentation
-
- [THEMES.md](docs/THEMES.md): How themes work and how to create your own
- [APPS.md](docs/APPS.md): Which apps are installed
- [SCRIPTS.md](docs/SCRIPTS.md): Scripts that are available
- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
- [LICENSE](LICENSE): MIT Licensey
@@ -1,33 +0,0 @@
-[//]: # (Title: Nixy)  
-[//]: # (Description: Nixy is a Hyprland NixOS configuration with home-manager, secrets and custom theming all in one place. It's a simple way to manage your system configuration and dotfiles.)  
-[//]: # (Author: Hadi)  
-[//]: # (Date: {date})
-[//]: # (Version: {version})
-
-<div align="center">
-    <img src="https://raw.githubusercontent.com/anotherhadi/nixy/main/docs/src/logo.png" width="100px" />
-</div>
-
-<br>
-
-# Nixy
-
-<br>
-<div align="center">
-    <a href="https://github.com/anotherhadi/nixy">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=Version&message={version}&colorA={backgroundcolor}&colorB={primarycolor}&logo=githubactions&logoColor={primarycolor}"/>
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/stargazers">
-        <img src="https://img.shields.io/github/stars/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=starship&logoColor={primarycolor}">
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/">
-        <img src="https://img.shields.io/github/repo-size/anotherhadi/nixy?color={primarycolor}&labelColor={backgroundcolor}&style=for-the-badge&logo=github&logoColor={primarycolor}">
-    </a>
-    <a href="https://nixos.org">
-        <img src="https://img.shields.io/badge/NixOS-unstable-blue.svg?style=for-the-badge&labelColor={backgroundcolor}&logo=NixOS&logoColor={primarycolor}&color={primarycolor}">
-    </a>
-    <a href="https://github.com/anotherhadi/nixy/blob/main/LICENSE">
-        <img src="https://img.shields.io/static/v1.svg?style=for-the-badge&label=License&message=MIT&colorA={backgroundcolor}&colorB={primarycolor}&logo=unlicense&logoColor={primarycolor}"/>
-    </a>
-</div>
-<br>
@@ -1 +0,0 @@
-8c00e379ddd7f89e4bbf9f381a5721d980c8026f
@@ -1 +0,0 @@
-62b52ad02a886c19a8cfe1ea17e8aaad50f23632
@@ -11,11 +11,11 @@
        "sf-pro": "sf-pro"
      },
      "locked": {
-        "lastModified": 1718062482,
-        "narHash": "sha256-bGWs6XRVgzm1Uagx/EAnz9wnMQVImR1ZlVpAy+SDXCw=",
+        "lastModified": 1705496891,
+        "narHash": "sha256-lLX87aJ9oUT3u0Iaf60xKIJ2RQNt3v4Ne2cvSWyaS7U=",
        "owner": "Lyndeno",
        "repo": "apple-fonts.nix",
-        "rev": "eeb3521706bfe21206b1301ff8e0876defa1b6dd",
+        "rev": "e6ffbc887752ba0fe035fbcc8b282555804dd3f6",
        "type": "github"
      },
      "original": {
@@ -33,11 +33,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717408969,
-        "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
+        "lastModified": 1713532798,
+        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
        "owner": "numtide",
        "repo": "devshell",
-        "rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
+        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
        "type": "github"
      },
      "original": {
@@ -84,11 +84,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717285511,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
+        "lastModified": 1714641030,
+        "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
+        "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e",
        "type": "github"
      },
      "original": {
@@ -97,16 +97,31 @@
        "type": "github"
      }
    },
+    "flake-root": {
+      "locked": {
+        "lastModified": 1713493429,
+        "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
+        "owner": "srid",
+        "repo": "flake-root",
+        "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "repo": "flake-root",
+        "type": "github"
+      }
+    },
    "flake-utils": {
      "inputs": {
        "systems": "systems"
      },
      "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1705309234,
+        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
        "type": "github"
      },
      "original": {
@@ -137,6 +152,24 @@
      "inputs": {
        "systems": "systems_4"
      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_7"
+      },
      "locked": {
        "lastModified": 1685518550,
        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
@@ -151,38 +184,11 @@
        "type": "github"
      }
    },
-    "git-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1718879355,
-        "narHash": "sha256-RTyqP4fBX2MdhNuMP+fnR3lIwbdtXhyj7w7fwtvgspc=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "8cd35b9496d21a6c55164d8547d9d5280162b07a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
    "gitignore": {
      "inputs": {
        "nixpkgs": [
          "nixvim",
-          "git-hooks",
+          "pre-commit-hooks",
          "nixpkgs"
        ]
      },
@@ -207,11 +213,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719180626,
-        "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
+        "lastModified": 1715077503,
+        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
+        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
        "type": "github"
      },
      "original": {
@@ -228,11 +234,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719037157,
-        "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=",
+        "lastModified": 1715077503,
+        "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511",
+        "rev": "6e277d9566de9976f47228dd8c580b97488734d4",
        "type": "github"
      },
      "original": {
@@ -257,11 +263,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718450675,
-        "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
+        "lastModified": 1713612213,
+        "narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
        "owner": "hyprwm",
        "repo": "hyprcursor",
-        "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
+        "rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
        "type": "github"
      },
      "original": {
@@ -274,18 +280,17 @@
      "inputs": {
        "hyprcursor": "hyprcursor",
        "hyprlang": "hyprlang",
-        "hyprutils": "hyprutils",
        "hyprwayland-scanner": "hyprwayland-scanner",
        "nixpkgs": "nixpkgs_2",
        "systems": "systems_2",
        "xdph": "xdph"
      },
      "locked": {
-        "lastModified": 1719338642,
-        "narHash": "sha256-oy2IpTiMTof5rUqdmUMYzn6Xugc8kTh629soVCyC3L4=",
+        "lastModified": 1715203037,
+        "narHash": "sha256-yWsrCPhBpin7AXVI66/EAE+YPJTweS8CDCZJQliB10k=",
        "ref": "refs/heads/main",
-        "rev": "95782de966ec9e182d49b2f032b74a1101f423e8",
-        "revCount": 4889,
+        "rev": "e4e84064f2d07810e0c150bce1369a0a00503e9a",
+        "revCount": 4638,
        "submodules": true,
        "type": "git",
        "url": "https://github.com/hyprwm/Hyprland"
@@ -325,10 +330,6 @@
    },
    "hyprlang": {
      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
        "nixpkgs": [
          "hyprland",
          "nixpkgs"
@@ -339,11 +340,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1717881852,
-        "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
+        "lastModified": 1713121246,
+        "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
        "owner": "hyprwm",
        "repo": "hyprlang",
-        "rev": "ec6938c66253429192274d612912649a0cfe4d28",
+        "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
        "type": "github"
      },
      "original": {
@@ -352,28 +353,25 @@
        "type": "github"
      }
    },
-    "hyprutils": {
+    "hyprlang_2": {
      "inputs": {
        "nixpkgs": [
-          "hyprland",
+          "rose-pine-hyprcursor",
          "nixpkgs"
        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
+        "systems": "systems_5"
      },
      "locked": {
-        "lastModified": 1719316102,
-        "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
+        "lastModified": 1709914708,
+        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
+        "repo": "hyprlang",
+        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
        "type": "github"
      },
      "original": {
        "owner": "hyprwm",
-        "repo": "hyprutils",
+        "repo": "hyprlang",
        "type": "github"
      }
    },
@@ -389,11 +387,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719067853,
-        "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
+        "lastModified": 1715090986,
+        "narHash": "sha256-FXpQvmS9R7alwZ47XK5UIcAbC9YKSxc0+GOVYqwa0jM=",
        "owner": "hyprwm",
        "repo": "hyprwayland-scanner",
-        "rev": "914f083741e694092ee60a39d31f693d0a6dc734",
+        "rev": "94e32ec37e7215b16d5c1b41b1773ff6742e704b",
        "type": "github"
      },
      "original": {
@@ -410,11 +408,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1719128254,
-        "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
+        "lastModified": 1713946171,
+        "narHash": "sha256-lc75rgRQLdp4Dzogv5cfqOg6qYc5Rp83oedF2t0kDp8=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "50581970f37f06a4719001735828519925ef8310",
+        "rev": "230a197063de9287128e2c68a7a4b0cd7d0b50a7",
        "type": "github"
      },
      "original": {
@@ -425,11 +423,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1719322773,
-        "narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=",
+        "lastModified": 1715148395,
+        "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "caabc425565bbd5c8640630b0bf6974961a49242",
+        "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a",
        "type": "github"
      },
      "original": {
@@ -441,11 +439,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1717786204,
-        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
+        "lastModified": 1696375444,
+        "narHash": "sha256-Sv0ICt/pXfpnFhTGYTsX6lUr1SljnuXWejYTI2ZqHa4=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
+        "rev": "81e8f48ebdecf07aab321182011b067aafc78896",
        "type": "github"
      },
      "original": {
@@ -457,11 +455,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1719099622,
-        "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=",
+        "lastModified": 1714858427,
+        "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924",
+        "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76",
        "type": "github"
      },
      "original": {
@@ -473,11 +471,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1719075281,
-        "narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
+        "lastModified": 1714253743,
+        "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
+        "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
        "type": "github"
      },
      "original": {
@@ -489,11 +487,11 @@
    },
    "nixpkgs_3": {
      "locked": {
-        "lastModified": 1719254875,
-        "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
+        "lastModified": 1715087517,
+        "narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
+        "rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
        "type": "github"
      },
      "original": {
@@ -504,6 +502,22 @@
      }
    },
    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1710272261,
+        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
      "locked": {
        "lastModified": 1686020360,
        "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
@@ -524,20 +538,21 @@
        "devshell": "devshell",
        "flake-compat": "flake-compat",
        "flake-parts": "flake-parts",
-        "git-hooks": "git-hooks",
+        "flake-root": "flake-root",
        "home-manager": "home-manager_2",
        "nix-darwin": "nix-darwin",
        "nixpkgs": [
          "nixpkgs"
        ],
+        "pre-commit-hooks": "pre-commit-hooks",
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1719334058,
-        "narHash": "sha256-5uhWaoHhUYEPNC42NVW+srBgldwQKQE6dvW45rg0K3Q=",
+        "lastModified": 1715115147,
+        "narHash": "sha256-oREqXPEtuYbOdBKbsDQzr2V01EzK4kD8MTdwO9ljTnU=",
        "owner": "nix-community",
        "repo": "nixvim",
-        "rev": "76a8790764ec983ca0659c952c4b6924c4e9bf1a",
+        "rev": "f7f255afe22fcca0c07177c3707fd61fa0c85835",
        "type": "github"
      },
      "original": {
@@ -546,39 +561,10 @@
        "type": "github"
      }
    },
-    "nur": {
-      "locked": {
-        "lastModified": 1719337524,
-        "narHash": "sha256-bYp4//+XM+J1Y23sW6VjXAiCHUdq3aqgXue/tVeCxLw=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "37ae43594731d4d801f53dffe465006421c7c292",
-        "type": "github"
-      },
-      "original": {
-        "id": "nur",
-        "type": "indirect"
-      }
-    },
-    "nurpkgs": {
-      "locked": {
-        "lastModified": 1719337524,
-        "narHash": "sha256-bYp4//+XM+J1Y23sW6VjXAiCHUdq3aqgXue/tVeCxLw=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "37ae43594731d4d801f53dffe465006421c7c292",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
    "ny": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-FkV8Z2fdUTwvcKeltFJVCisvAarcdnmlj/33exdyxnQ=",
+        "narHash": "sha256-phACDdjI8RX6yD77PSmFcsriagt+2UuySD7+WEzdzGo=",
        "type": "file",
        "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
      },
@@ -587,6 +573,34 @@
        "url": "https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
      }
    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_3",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1714478972,
+        "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "2849da033884f54822af194400f8dff435ada242",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
    "root": {
      "inputs": {
        "apple-fonts": "apple-fonts",
@@ -595,16 +609,35 @@
        "nixos-hardware": "nixos-hardware",
        "nixpkgs": "nixpkgs_3",
        "nixvim": "nixvim",
-        "nur": "nur",
-        "nurpkgs": "nurpkgs",
+        "rose-pine-hyprcursor": "rose-pine-hyprcursor",
        "sops-nix": "sops-nix",
        "spicetify-nix": "spicetify-nix"
      }
    },
+    "rose-pine-hyprcursor": {
+      "inputs": {
+        "hyprlang": "hyprlang_2",
+        "nixpkgs": "nixpkgs_4",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1711302328,
+        "narHash": "sha256-wLuFLI6S5DOretqJN05+kvrs8cbnZKfVLXrJ4hvI/Tg=",
+        "owner": "ndom91",
+        "repo": "rose-pine-hyprcursor",
+        "rev": "7e0473876f0e6d2308813a78fe84a6c6430b112b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ndom91",
+        "repo": "rose-pine-hyprcursor",
+        "type": "github"
+      }
+    },
    "sf-arabic": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-u+Q2Hd+JCiKhIQtbQqawg1lIEgGhjmdGye2cNdWlBG0=",
+        "narHash": "sha256-CPewXMGI78xHsjdRU8ZJIBSYjh5UY6UW21ihE4B+Bkk=",
        "type": "file",
        "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg"
      },
@@ -616,7 +649,7 @@
    "sf-compact": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-9kXXWmu2zg0LSE7SihItXmBltLvNwyG1Ba6QehvMh04=",
+        "narHash": "sha256-nJkPlddKF2dIwj+6jiVvS60hDcGAMasEOWemUwBS2mQ=",
        "type": "file",
        "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
      },
@@ -628,7 +661,7 @@
    "sf-mono": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-BVmYmgqq79ezgyqNClyHkj2L4N3/PRisPm8YFBQZQ98=",
+        "narHash": "sha256-KT1RXz3NcWPetyxVlgMfh/dsoznpI3lMnplz6V7PCUU=",
        "type": "file",
        "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"
      },
@@ -640,7 +673,7 @@
    "sf-pro": {
      "flake": false,
      "locked": {
-        "narHash": "sha256-yQhtaEPTuYOIOaC6eSPdka/Jv5Ydw3Mnd8Prlcgjs90=",
+        "narHash": "sha256-cn8ae2UddF8Pru6i3fSG2Wki5sf1DmWKD2FmKMsoeAA=",
        "type": "file",
        "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
      },
@@ -657,11 +690,11 @@
        "nixpkgs-stable": "nixpkgs-stable"
      },
      "locked": {
-        "lastModified": 1719268571,
-        "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=",
+        "lastModified": 1715244550,
+        "narHash": "sha256-ffOZL3eaZz5Y1nQ9muC36wBCWwS1hSRLhUzlA9hV2oI=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3",
+        "rev": "0dc50257c00ee3c65fef3a255f6564cfbfe6eb7f",
        "type": "github"
      },
      "original": {
@@ -672,8 +705,8 @@
    },
    "spicetify-nix": {
      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": "nixpkgs_4"
+        "flake-utils": "flake-utils_4",
+        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
        "lastModified": 1704167711,
@@ -749,6 +782,51 @@
        "type": "github"
      }
    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_6": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_7": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
    "treefmt-nix": {
      "inputs": {
        "nixpkgs": [
@@ -757,11 +835,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718522839,
-        "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=",
+        "lastModified": 1714058656,
+        "narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
        "owner": "numtide",
        "repo": "treefmt-nix",
-        "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81",
+        "rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
        "type": "github"
      },
      "original": {
@@ -770,6 +848,24 @@
        "type": "github"
      }
    },
+    "utils": {
+      "inputs": {
+        "systems": "systems_6"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
    "xdph": {
      "inputs": {
        "hyprland-protocols": "hyprland-protocols",
@@ -787,11 +883,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1718619174,
-        "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
+        "lastModified": 1714060055,
+        "narHash": "sha256-j43TS9wv9luaAlpxcxw0sjxkbcc2mGANVR2RYgo3RCw=",
        "owner": "hyprwm",
        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
+        "rev": "0fe840441e43da12cd7865ed9aa8cdc35a8da85a",
        "type": "github"
      },
      "original": {
@@ -1,9 +1,5 @@
 {
-  # https://github.com/anotherhadi/nixy
-  description = ''
-    Nixy is a NixOS configuration with home-manager, secrets and custom theming all in one place.
-    It's a simple way to manage your system configuration and dotfiles.
-  '';
+  description = "Nixy - Hadi's NixOS configuration";

  inputs = {
    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
@@ -21,71 +17,38 @@
      url = "github:Mic92/sops-nix";
      inputs.nixpkgs.follows = "nixpkgs";
    };
-    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
-    nurpkgs.url = "github:nix-community/NUR";
    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
+    rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
  };

-  outputs = inputs@{ nixpkgs, nur, ... }: {
-    nixosConfigurations = {
-
-      nixy = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          ./hosts/laptop/configuration.nix
-          inputs.nixos-hardware.nixosModules.omen-16-n0005ne
-          inputs.home-manager.nixosModules.home-manager
-          {
-            nixpkgs.overlays = [ nur.overlay ];
-            _module.args = { inherit inputs; };
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."hadi" = import ./home/laptop.nix;
-              extraSpecialArgs = { inherit inputs; };
-            };
-          }
-        ];
+  outputs = inputs@{ nixpkgs, home-manager, sops-nix, hyprland, spicetify-nix
+    , nixos-hardware, ... }: {
+      nixosConfigurations = {
+        nixy = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          modules = [
+            nixos-hardware.nixosModules.omen-16-n0005ne # REMOVE
+            ./nixos/configuration.nix
+            ./nixos/fonts.nix
+            ./nixos/tuigreet.nix
+            { _module.args = { inherit inputs; }; }
+            home-manager.nixosModules.home-manager
+            {
+              home-manager = {
+                useGlobalPkgs = true;
+                useUserPackages = true;
+                users."hadi" = import ./home/home.nix;
+                extraSpecialArgs = {
+                  inherit inputs;
+                  inherit spicetify-nix;
+                  inherit sops-nix;
+                  inherit hyprland;
+                };
+              };
+            }
+          ];
+        };
      };
-
-      jack = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          inputs.sops-nix.nixosModules.sops
-          ./hosts/server/configuration.nix
-          inputs.home-manager.nixosModules.home-manager
-          {
-            nixpkgs.overlays = [ nur.overlay ];
-            _module.args = { inherit inputs; };
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."hadi" = import ./home/server.nix;
-              extraSpecialArgs = { inherit inputs; };
-            };
-          }
-        ];
-      };
-
-      yourhostname = nixpkgs.lib.nixosSystem { # CHANGEME
-        system = "x86_64-linux";
-        modules = [
-          ./hosts/yourhostname/configuration.nix # CHANGEME
-          inputs.home-manager.nixosModules.home-manager
-          {
-            nixpkgs.overlays = [ nur.overlay ];
-            _module.args = { inherit inputs; };
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users."yourusername" = import # CHANGEME
-                ./home/laptop.nix; # you can also create a new ./home/yourhostname.nix
-              extraSpecialArgs = { inherit inputs; };
-            };
-          }
-        ];
-      };
-
    };
-  };
 }
@@ -5,8 +5,8 @@
      general.framerate = 60;
      smoothing.noise_reduction = 88;
      color = {
-        background = "'#${config.var.theme.colors.bg}'";
-        foreground = "'#${config.var.theme.colors.accent}'";
+        background = "'#${config.theme.colors.bg}'";
+        foreground = "'#${config.theme.colors.primary-bg}'";
      };
    };
  };
@@ -0,0 +1,14 @@
+{
+  imports = [
+    ./kitty
+    ./lf
+    ./neofetch
+    ./nvim
+    ./qutebrowser
+    ./spicetify
+    ./wofi
+    ./cava
+    ./tmux
+    ./lazygit
+  ];
+}
@@ -0,0 +1,50 @@
+{ config, pkgs, ... }: {
+
+  programs.kitty = {
+    enable = true;
+    settings = {
+
+      scrollback_lines = 10000;
+      enable_audio_bell = false;
+      update_check_interval = 0;
+      font_family = config.theme.font-mono;
+      font_size = 13;
+      cursor_shape = "Underline";
+      cursor_underline_thickness = 1;
+      window_padding_width = 10;
+      url_style = "curly";
+      confirm_os_window_close = "0";
+      remember_window_size = "no";
+      disable_ligatures = "never";
+      shell = "${pkgs.tmux}/bin/tmux";
+      initial_window_width = 1200;
+      initial_window_height = 600;
+
+      background = "#" + config.theme.colors.bg;
+      url_color = "#" + config.theme.colors.primary-fg;
+
+      color0 = "#" + config.theme.colors.color0;
+      color8 = "#" + config.theme.colors.color8;
+      color1 = "#" + config.theme.colors.color1;
+      color9 = "#" + config.theme.colors.color9;
+      color2 = "#" + config.theme.colors.color2;
+      color10 = "#" + config.theme.colors.color10;
+      color3 = "#" + config.theme.colors.color3;
+      color11 = "#" + config.theme.colors.color11;
+      color4 = "#" + config.theme.colors.color4;
+      color12 = "#" + config.theme.colors.color12;
+      color5 = "#" + config.theme.colors.color5;
+      color13 = "#" + config.theme.colors.color13;
+      color6 = "#" + config.theme.colors.color6;
+      color14 = "#" + config.theme.colors.color14;
+      color7 = "#" + config.theme.colors.color7;
+      color15 = "#" + config.theme.colors.color15;
+
+      cursor = "#" + config.theme.colors.fg;
+      cursor_text_color = "#" + config.theme.colors.bg;
+
+      selection_foreground = "#" + config.theme.colors.primary-fg;
+      selection_background = "#" + config.theme.colors.primary-bg;
+    };
+  };
+}
@@ -4,7 +4,7 @@
    settings = {
      gui.theme = {
        ligthTheme = false;
-        activeBorderColor = [ "${config.var.theme.colors.accentName}" "bold" ];
+        activeBorderColor = [ "${config.theme.colors.primary-ansi-16}" "bold" ];
        inactiveBorderColor = [ "black" ];
        selectedLineBgColor = [ "default" ];
      };
@@ -109,9 +109,9 @@
    song_format="%artist% - %album% - %title%"
    song_shorthand="off"
    mpc_args=()
-    colors=(${toString config.var.theme.colors.accentNumber} 1 ${
-      toString config.var.theme.colors.accentNumber
-    } ${toString config.var.theme.colors.accentNumber} 7)
+    colors=(${toString config.theme.colors.primary-ansi-16-number} 1 ${
+      toString config.theme.colors.primary-ansi-16-number
+    } ${toString config.theme.colors.primary-ansi-16-number} 7)
    bold="on"
    underline_enabled="on"
    underline_char="-"
@@ -1,9 +1,9 @@
 { config, ... }: {

  programs.nixvim.highlight = {
-    AlphaHeaderColor.fg = "#${config.var.theme.colors.accent}";
-    AlphaTextColor.fg = "#${config.var.theme.colors.fg}";
-    AlphaShortcutColor.fg = "#${config.var.theme.colors.fgalt}";
+    AlphaHeaderColor.fg = "#${config.theme.colors.primary-bg}";
+    AlphaTextColor.fg = "#${config.theme.colors.fg}";
+    AlphaShortcutColor.fg = "#${config.theme.colors.alt-fg}";
  };

  programs.nixvim.plugins.alpha = {
@@ -70,8 +70,7 @@
          {
            type = "button";
            val = "  NixOs Config";
-            on_press.__raw =
-              "function() vim.cmd[[e ${config.var.configDirectory}]] end";
+            on_press.__raw = "function() vim.cmd[[e ~/.config/nixos]] end";
            opts = {
              shortcut = "nc";
              position = "center";
@@ -0,0 +1,37 @@
+{ inputs, ... }: {
+  imports = [
+    inputs.nixvim.homeManagerModules.nixvim
+    ./auto-pairs.nix
+    ./options.nix
+    ./bufferline.nix
+    ./lazygit.nix
+    ./telescope.nix
+    ./nvim-tree.nix
+    ./lightline.nix
+    ./git.nix
+    ./cmp.nix
+    ./none-ls.nix
+    ./wilder.nix
+    ./lsp.nix
+    ./treesitter.nix
+    ./toggleterm.nix
+    ./copilot.nix
+    ./obsidian.nix
+    ./whichkey.nix
+    ./alpha.nix
+    ./keymaps.nix
+    ./comment.nix
+    ./oil.nix
+    ./trouble.nix
+    ./tmux-navigator.nix
+  ];
+
+  programs.nixvim = {
+    enable = true;
+    colorschemes.catppuccin = {
+      enable = true;
+      settings = { transparent_background = true; };
+    };
+  };
+
+}
@@ -12,8 +12,6 @@
        nixfmt.enable = true;
        markdownlint.enable = true;
        tidy.enable = true;
-        shellharden.enable = true;
-        shfmt.enable = true;
      };
    };
  };
@@ -1,8 +1,8 @@
-{ config, ... }: {
+{
  programs.nixvim.plugins.obsidian = {
-    enable = config.var.obsidian;
+    enable = true;
    settings = {
-      dir = "~/nextcloud/Notes";
+      dir = "~/Nextcloud/obsidian";
      disable_frontmatter = true;
    };
  };
@@ -0,0 +1,261 @@
+{ config, ... }: {
+
+  imports = [ ./duckduckgo-colorscheme.nix ./homepage/default.nix ];
+
+  programs.qutebrowser = {
+    enable = true;
+
+    searchEngines = {
+      "DEFAULT" = "https://duckduckgo.com/?q={}&ia=web";
+      "d" = "https://duckduckgo.com/?q={}&ia=web";
+      "g" = "https://google.com/search?q={}";
+      "y" = "https://youtube.com/results?search_query={}";
+      "ya" = "https://yandex.com/search/?text={}";
+      "n" = "https://mynixos.com/search?q={}";
+      "nixo" = "https://search.nixos.org/options?channel=unstable&query={}";
+      "nixp" = "https://search.nixos.org/packages?channel=unstable&query={}";
+      "gt" = "https://github.com/search?q={}&type=repositories";
+    };
+
+    quickmarks = {
+      home = "${config.home.homeDirectory}/.config/startpage/index.html";
+      mynixos = "https://mynixos.com";
+      github = "https://github.com";
+      outlook = "https://outlook.office.com/mail/";
+      office = "https://www.office.com/?auth=2";
+      teams = "https://teams.microsoft.com/_";
+      casa = "http://192.168.2.16:8081/#/";
+      proton = "https://mail.proton.me/u/0/inbox";
+      cloudflare-one = "https://one.dash.cloudflare.com/";
+      chatgpt = "https://chat.openai.com/";
+      nixvim = "https://nix-community.github.io/nixvim/";
+      hyprland = "https://wiki.hyprland.org/";
+      nerdfont = "https://www.nerdfonts.com/cheat-sheet";
+      youtube = "https://youtube.com/";
+      cloudflare = "https://dash.cloudflare.com/";
+    };
+
+    settings = {
+      url = {
+        default_page =
+          "${config.home.homeDirectory}/.config/startpage/index.html";
+        start_pages =
+          [ "${config.home.homeDirectory}/.config/startpage/index.html" ];
+      };
+
+      colors = {
+        tabs = {
+          odd.bg = "#${config.theme.colors.bg}";
+          odd.fg = "#${config.theme.colors.fg}";
+          even.bg = "#${config.theme.colors.bg}";
+          even.fg = "#${config.theme.colors.fg}";
+          selected = {
+            odd = {
+              bg = "#${config.theme.colors.primary-bg}";
+              fg = "#${config.theme.colors.primary-fg}";
+            };
+            even = {
+              bg = "#${config.theme.colors.primary-bg}";
+              fg = "#${config.theme.colors.primary-fg}";
+            };
+          };
+          indicator = {
+            error = "#${config.theme.colors.color1}";
+            start = "#${config.theme.colors.alt-bg}";
+            stop = "#${config.theme.colors.alt-bg}";
+          };
+        };
+
+        hints = {
+          bg = "#${config.theme.colors.alt-bg}";
+          fg = "#${config.theme.colors.alt-fg}";
+          match.fg = "#${config.theme.colors.bg}";
+        };
+
+        completion = {
+          category = {
+            bg = "#${config.theme.colors.bg}";
+            fg = "#${config.theme.colors.fg}";
+            border = {
+              top = "#${config.theme.colors.bg}";
+              bottom = "#${config.theme.colors.bg}";
+            };
+          };
+
+          odd.bg = "#${config.theme.colors.bg}";
+          even.bg = "#${config.theme.colors.bg}";
+
+          fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ];
+
+          match.fg = "#${config.theme.colors.primary-bg}";
+
+          item.selected = {
+            bg = "#${config.theme.colors.primary-bg}";
+            border.top = "#${config.theme.colors.primary-bg}";
+            border.bottom = "#${config.theme.colors.primary-bg}";
+            fg = "#${config.theme.colors.primary-fg}";
+            match.fg = "#${config.theme.colors.primary-fg}";
+          };
+        };
+
+        statusbar = {
+          normal.bg = "#${config.theme.colors.bg}";
+          normal.fg = "#${config.theme.colors.fg}";
+          private.bg = "#${config.theme.colors.bg}";
+          private.fg = "#${config.theme.colors.fg}";
+          insert.bg = "#${config.theme.colors.primary-bg}";
+          insert.fg = "#${config.theme.colors.primary-fg}";
+          command = {
+            bg = "#${config.theme.colors.alt-bg}";
+            fg = "#${config.theme.colors.alt-fg}";
+            private.bg = "#${config.theme.colors.alt-bg}";
+            private.fg = "#${config.theme.colors.alt-fg}";
+          };
+        };
+
+        messages = {
+          info = {
+            bg = "#${config.theme.colors.alt-bg}";
+            fg = "#${config.theme.colors.alt-fg}";
+            border = "#${config.theme.colors.alt-bg}";
+          };
+
+          error = {
+            bg = "#${config.theme.colors.color1}";
+            fg = "#${config.theme.colors.alt-fg}";
+            border = "#${config.theme.colors.color1}";
+          };
+        };
+
+        #webpage.darkmode.enabled = true; # Enable dark mode for all websites (Weird on images)
+        webpage.preferred_color_scheme =
+          "dark"; # Enable dark mode for websites that support it
+      };
+
+      fonts = { default_family = "${config.theme.font}"; };
+
+      completion = {
+        height = "30%";
+        open_categories = [ "history" ];
+        scrollbar = {
+          padding = 0;
+          width = 0;
+        };
+        show = "always";
+        shrink = true;
+        timestamp_format = "";
+        web_history.max_items = 7;
+      };
+
+      content = {
+        autoplay = false;
+        javascript.clipboard = "access";
+        javascript.enabled = true;
+        pdfjs = true;
+      };
+
+      downloads = {
+        position = "bottom";
+        remove_finished = 0;
+      };
+
+      hints = {
+        border = "none";
+        radius = 1;
+      };
+
+      scrolling = {
+        bar = "never";
+        smooth = true;
+      };
+
+      tabs = {
+        show = "multiple";
+        last_close = "close";
+        mode_on_change = "restore";
+        close_mouse_button = "right";
+      };
+
+      zoom.default = "100%";
+
+      qt.force_software_rendering = "chromium";
+    };
+
+    keyBindings = {
+      normal = {
+        "gh" = "open ${config.home.homeDirectory}/.config/startpage/index.html";
+
+        " p" = "tab-move -";
+        " n" = "tab-move +";
+        " w" = "tab-close";
+
+        " 1" = "tab-focus 1";
+        " 2" = "tab-focus 2";
+        " 3" = "tab-focus 3";
+        " 4" = "tab-focus 4";
+        " 5" = "tab-focus 5";
+        " 6" = "tab-focus 6";
+        " 7" = "tab-focus 7";
+        " 8" = "tab-focus 8";
+        " 9" = "tab-focus 9";
+        " 0" = "tab-focus 10";
+
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+
+      command = {
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+
+      insert = {
+        "<Ctrl-w>" = "tab-close";
+        "<Ctrl-n>" = "open -w";
+        "<Ctrl-1>" = "tab-focus 1";
+        "<Ctrl-2>" = "tab-focus 2";
+        "<Ctrl-3>" = "tab-focus 3";
+        "<Ctrl-4>" = "tab-focus 4";
+        "<Ctrl-5>" = "tab-focus 5";
+        "<Ctrl-6>" = "tab-focus 6";
+        "<Ctrl-7>" = "tab-focus 7";
+        "<Ctrl-8>" = "tab-focus 8";
+        "<Ctrl-9>" = "tab-focus 9";
+        "<Ctrl-0>" = "tab-focus 10";
+      };
+    };
+
+    extraConfig = ''
+      config.unbind("gm")
+      config.unbind("gd")
+      config.unbind("gb")
+      config.unbind("tl")
+      config.unbind("gt")
+
+      c.tabs.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
+
+      config.load_autoconfig(True)
+    '';
+  };
+}
@@ -1,9 +1,10 @@
 { config, ... }: {
-  home.file.".duckduckgo-colorscheme.js".text = ''
+
+  xdg.configFile."duckduckgo-colorscheme.js".text = ''
    // Go to DuckDuckGo settings page, open the console, paste the code and hit enter.
    // based on https://ddg.codingcodax.dev/
    // Cookies string for your theme
-    const cookie = '7=${config.var.theme.colors.bg}; j=${config.var.theme.colors.bg}; 9=${config.var.theme.colors.fg}; aa=${config.var.theme.colors.fgalt}; 8=${config.var.theme.colors.c7}; x=${config.var.theme.colors.accent}; 21=${config.var.theme.colors.bgalt};';
+    const cookie = '7=${config.theme.colors.bg}; j=${config.theme.colors.bg}; 9=${config.theme.colors.fg}; aa=${config.theme.colors.alt-fg}; 8=${config.theme.colors.color7}; x=${config.theme.colors.primary-bg}; 21=${config.theme.colors.alt-bg};';

    // Converts cookie string into formatted JSON
    const cookieToJSON = (cookieRaw) => {
@@ -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.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.theme.colors.bg}; color: #${config.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.theme.colors.primary-bg};"></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.theme.colors.alt-fg};"
+
+              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>
+  '';
+}
@@ -0,0 +1,40 @@
+{ pkgs, config, lib, spicetify-nix, ... }:
+let spicePkgs = spicetify-nix.packages.${pkgs.system}.default;
+in {
+
+  imports = [ spicetify-nix.homeManagerModules.default ];
+  nixpkgs.config.allowUnfreePredicate = pkg:
+    builtins.elem (lib.getName pkg) [ "spotify" ];
+  programs.spicetify = {
+    enable = true;
+    theme = spicePkgs.themes.text;
+    colorScheme = "custom";
+
+    customColorScheme = {
+      text = "${config.theme.colors.fg}";
+      subtext = "${config.theme.colors.alt-fg}";
+      sidebar-text = "${config.theme.colors.alt-fg}";
+      main = "${config.theme.colors.bg}";
+      sidebar = "${config.theme.colors.bg}";
+      background = "${config.theme.colors.bg}";
+      player = "${config.theme.colors.bg}";
+      card = "${config.theme.colors.bg}";
+      shadow = "000000";
+      selected-row = "${config.theme.colors.alt-bg}";
+      button = "${config.theme.colors.primary-bg}";
+      button-active = "${config.theme.colors.primary-bg}";
+      button-disabled = "${config.theme.colors.alt-bg}";
+      tab-active = "${config.theme.colors.primary-bg}";
+      misc = "${config.theme.colors.alt-fg}";
+    };
+
+    enabledExtensions = with spicePkgs.extensions; [
+      playlistIcons
+      lastfm
+      historyShortcut
+      hidePodcasts
+      fullAppDisplay
+      shuffle
+    ];
+  };
+}
@@ -12,7 +12,6 @@
      bind-key j select-pane -D
      bind-key k select-pane -U
      bind-key l select-pane -R
-      set -gq allow-passthrough on
    '';

    plugins = with pkgs; [
@@ -32,7 +31,7 @@
          set -g @catppuccin_window_current_fill "number"
          set -g @catppuccin_window_current_text "#W"

-          set -g @catppuccin_status_modules_right ""
+          set -g @catppuccin_status_modules_right "directory session"
          set -g @catppuccin_status_left_separator  " "
          set -g @catppuccin_status_right_separator ""
          set -g @catppuccin_status_fill "icon"
@@ -35,15 +35,15 @@
      /** ********** Fonts ********** **/

      * {
-        font-family: "${config.var.theme.font}";
+        font-family: "${config.theme.font}";
        font-weight: 500;
-        font-size: ${toString config.var.theme.font-size}px;
+        font-size: 12px;
      }

      #window {
-        background-color: #${config.var.theme.colors.bgalt};
-        color: #${config.var.theme.colors.fgalt};
-        border-radius: ${toString config.var.theme.rounding}px;
+        background-color: #${config.theme.colors.alt-bg};
+        color: #${config.theme.colors.alt-fg};
+        border-radius: ${toString config.theme.rounding}px;
      }

      #outer-box {
@@ -51,8 +51,8 @@
      }

      #input {
-        background-color: #${config.var.theme.colors.bg};
-        border: 0px solid #${config.var.theme.colors.accent};
+        background-color: #${config.theme.colors.bg};
+        border: 0px solid #${config.theme.colors.primary-bg};
        padding: 8px 12px;
      }

@@ -67,11 +67,11 @@
      }

      #text {
-        color: #${config.var.theme.colors.c7};
+        color: #${config.theme.colors.color7};
      }

      #text:selected {
-        color: #${config.var.theme.colors.fg};
+        color: #${config.theme.colors.fg};
      }

      #entry {
@@ -79,8 +79,8 @@
      }

      #entry:selected {
-        background-color: #${config.var.theme.colors.accent};
-        color: #${config.var.theme.colors.accentFg};
+        background-color: #${config.theme.colors.primary-bg};
+        color: #${config.theme.colors.primary-fg};
      }

      #unselected {}
@@ -89,7 +89,7 @@

      #input,
      #entry:selected {
-        border-radius: ${toString config.var.theme.rounding}px;
+        border-radius: ${toString (config.theme.rounding - 10)}px;
      }
    '';
  };
@@ -0,0 +1,61 @@
+{ pkgs, ... }:
+let variable = import ../variables.nix;
+in {
+
+  imports = [ ./themes ./system ./scripts ./apps ];
+
+  home = {
+    username = variable.username;
+    homeDirectory = variable.homeDirectory;
+
+    packages = with pkgs; [
+      swappy
+      imv
+      discord
+      obsidian
+      btop
+      xfce.thunar
+      bitwarden
+      vlc
+
+      # Dev
+      go
+      cargo
+      nodejs
+      python3
+      jq
+
+      # Utils
+      sops # Secrets
+      age # Secrets
+      fd
+      bc
+      gcc
+      blueman
+      zip
+      unzip
+      xdg_utils
+      tldr
+      wget
+      curl
+      ripgrep
+      neovide
+      wf-recorder
+      tree # temp
+
+      # Just cool
+      peaclock
+      cbonsai
+      pipes
+      cmatrix
+
+      # Backup
+      vscode
+      firefox
+      tor-browser
+    ];
+
+    stateVersion = variable.stateVersion;
+  };
+  programs.home-manager.enable = true;
+}
@@ -1,103 +0,0 @@
-{ pkgs, config, ... }: {
-
-  imports = [
-    ../hosts/laptop/variables.nix # CHANGEME, replace with your host
-
-    # Programs
-    ./programs/btop
-    ./programs/cava
-    ./programs/kitty
-    ./programs/nextcloud
-    ./programs/nvim
-    ./programs/qutebrowser
-    ./programs/spicetify
-    ./programs/zathura
-    ./programs/shell
-    ./programs/git
-
-    # Scripts
-    ./scripts # All scripts
-
-    # System (Desktop environment like stuff)
-    ./system/dunst
-    ./system/gtk
-    ./system/hyprland
-    ./system/waybar
-    ./system/wlogout
-    ./system/wofi
-    ./system/mime
-    ./system/udiskie
-
-    ./system/sops/laptop.nix # You should probably remove this line
-  ];
-
-  home = {
-    inherit (config.var) username;
-    inherit (config.var) homeDirectory;
-
-    packages = with pkgs; [
-      swappy
-      imv
-      discord
-      obsidian
-      xfce.thunar
-      bitwarden
-      vlc
-      nextcloud-client
-      tailscale
-
-      # Dev
-      go
-      cargo
-      nodejs
-      python3
-      jq
-      git-ignore
-      nurl
-      prefetch-npm-deps
-      figlet
-
-      # Utils
-      fd
-      bc
-      gcc
-      blueman
-      zip
-      unzip
-      xdg_utils
-      wget
-      curl
-      wf-recorder
-      glow
-      nwg-displays
-      wireguard-tools
-      bitwarden-cli
-      optipng
-      pfetch
-      usbutils
-
-      # Just cool
-      peaclock
-      cbonsai
-      pipes
-      cmatrix
-
-      # Backup
-      vscode
-      tor-browser
-      firefox
-      neovide
-    ];
-
-    # Import wallpapers into $HOME/wallpapers
-    file."wallpapers" = {
-      recursive = true;
-      source = ./wallpapers;
-    };
-
-    stateVersion = "24.05";
-  };
-
-  programs.home-manager.enable = true;
-
-}
@@ -1,9 +0,0 @@
-{
-  programs.btop = {
-    enable = true;
-    settings = {
-      color_theme = "Default";
-      theme_background = false;
-    };
-  };
-}
@@ -1,50 +0,0 @@
-{ config, ... }: {
-  programs.git = {
-    enable = true;
-    userName = config.var.git.username;
-    userEmail = config.var.git.email;
-    ignores = [
-      ".cache/"
-      ".DS_Store"
-      ".idea/"
-      "*.swp"
-      "*.elc"
-      "auto-save-list"
-      ".direnv/"
-      "node_modules"
-      "result"
-      "result-*"
-    ];
-    extraConfig = {
-      init.defaultBranch = "main";
-      push.autoSetupRemote = true;
-    };
-    aliases = {
-      essa = "push --force";
-      co = "checkout";
-      fuck = "commit --amend -m";
-      c = "commit -m";
-      ca = "commit -am";
-      forgor = "commit --amend --no-edit";
-      graph = "log --all --decorate --graph --oneline";
-      oops = "checkout --";
-      l = "log";
-      r = "rebase";
-      s = "status --short";
-      ss = "status";
-      d = "diff";
-      ps = "!git push origin $(git rev-parse --abbrev-ref HEAD)";
-      pl = "!git pull origin $(git rev-parse --abbrev-ref HEAD)";
-      af = "!git add $(git ls-files -m -o --exclude-standard | sk -m)";
-      st = "status";
-      br = "branch";
-      df = "!git hist | peco | awk '{print $2}' | xargs -I {} git diff {}^ {}";
-      hist = ''
-        log --pretty=format:"%Cgreen%h %Creset%cd %Cblue[%cn] %Creset%s%C(yellow)%d%C(reset)" --graph --date=relative --decorate --all'';
-      llog = ''
-        log --graph --name-status --pretty=format:"%C(red)%h %C(reset)(%cd) %C(green)%an %Creset%s %C(yellow)%d%Creset" --date=relative'';
-      edit-unmerged =
-        "!f() { git ls-files --unmerged | cut -f2 | sort -u ; }; hx `f`";
-    };
-  };
-}
@@ -1,48 +0,0 @@
-{ config, pkgs, ... }: {
-  programs.kitty = {
-    enable = true;
-    settings = {
-      scrollback_lines = 10000;
-      initial_window_width = 1200;
-      initial_window_height = 600;
-      update_check_interval = 0;
-      enable_audio_bell = false;
-      confirm_os_window_close = "0";
-      remember_window_size = "no";
-      disable_ligatures = "never";
-      shell = "${pkgs.tmux}/bin/tmux";
-      url_style = "curly";
-      cursor_shape = "Underline";
-      cursor_underline_thickness = config.var.theme.border-size;
-      window_padding_width = config.var.theme.gaps-in;
-
-      # Font
-      font_family = config.var.theme.font-mono;
-      font_size = config.var.theme.font-size;
-
-      # Colors
-      background = "#" + config.var.theme.colors.bg;
-      url_color = "#" + config.var.theme.colors.accent;
-      color0 = "#" + config.var.theme.colors.c0;
-      color8 = "#" + config.var.theme.colors.c8;
-      color1 = "#" + config.var.theme.colors.c1;
-      color9 = "#" + config.var.theme.colors.c9;
-      color2 = "#" + config.var.theme.colors.c2;
-      color10 = "#" + config.var.theme.colors.c10;
-      color3 = "#" + config.var.theme.colors.c3;
-      color11 = "#" + config.var.theme.colors.c11;
-      color4 = "#" + config.var.theme.colors.c4;
-      color12 = "#" + config.var.theme.colors.c12;
-      color5 = "#" + config.var.theme.colors.c5;
-      color13 = "#" + config.var.theme.colors.c13;
-      color6 = "#" + config.var.theme.colors.c6;
-      color14 = "#" + config.var.theme.colors.c14;
-      color7 = "#" + config.var.theme.colors.c7;
-      color15 = "#" + config.var.theme.colors.c15;
-      cursor = "#" + config.var.theme.colors.fg;
-      cursor_text_color = "#" + config.var.theme.colors.bg;
-      selection_foreground = "#" + config.var.theme.colors.accentFg;
-      selection_background = "#" + config.var.theme.colors.accent;
-    };
-  };
-}
@@ -1,6 +0,0 @@
-{
-    services.nextcloud-client = {
-        enable = true;
-        startInBackground = true;
-    };
-}
@@ -1,9 +0,0 @@
-{
-  programs.nixvim = {
-    enable = true;
-    colorschemes.catppuccin = {
-      enable = true;
-      settings = { transparent_background = true; };
-    };
-  };
-}
@@ -1,31 +0,0 @@
-{ inputs, ... }: {
-  imports = [
-    inputs.nixvim.homeManagerModules.nixvim
-    ./plugins/auto-pairs.nix
-    ./plugins/bufferline.nix
-    ./plugins/lazygit.nix
-    ./plugins/telescope.nix
-    ./plugins/nvim-tree.nix
-    ./plugins/lightline.nix
-    ./plugins/git.nix
-    ./plugins/cmp.nix
-    ./plugins/none-ls.nix
-    ./plugins/wilder.nix
-    ./plugins/lsp.nix
-    ./plugins/treesitter.nix
-    ./plugins/toggleterm.nix
-    ./plugins/copilot.nix
-    ./plugins/whichkey.nix
-    ./plugins/alpha.nix
-    ./plugins/keymaps.nix
-    ./plugins/comment.nix
-    ./plugins/oil.nix
-    ./plugins/trouble.nix
-    ./plugins/tmux-navigator.nix
-    ./plugins/noice.nix
-    ./plugins/obsidian.nix
-    ./plugins/image.nix
-    ./options.nix
-    ./colorscheme.nix
-  ];
-}
@@ -1 +0,0 @@
-{ programs.nixvim.plugins.image = { enable = true; }; }
@@ -1 +0,0 @@
-{ programs.nixvim.plugins.noice = { enable = true; }; }
@@ -1,335 +0,0 @@
-{ pkgs, config, ... }:
-let
-  settings = ''
-    {
-      "config": {
-        "title" : "Welcome Home",
-        "openLinksInNewTab": false,
-        "locale": "fr-FR",
-        "colors": {
-          "primary": "#${config.var.theme.colors.accent}",
-          "background": "#${config.var.theme.colors.bg}",
-          "foreground": "#${config.var.theme.colors.fg}",
-          "muted": "#${config.var.theme.colors.c8}"
-        },
-        "folders": [
-          {
-            "name": "Bookmarks",
-            "links": [
-              {"title": "MyNixOs", "url": "https://mynixos.com", "icon": "󱄅"},
-              {"title": "Github", "url": "https://github.com", "icon": ""},
-              {"title": "Proton", "url": "https://mail.proton.me/u/0/inbox", "icon": ""},
-              {"title": "Cloudflare One", "url": "https://one.dash.cloudflare.com/", "icon": ""},
-              {"title": "Chat GPT", "url": "https://chat.openai.com/", "icon": "󰭹"},
-              {"title": "Nixvim", "url": "https://nix-community.github.io/nixvim/", "icon": ""},
-              {"title": "Hyprland Wiki", "url": "https://wiki.hyprland.org/", "icon": "󰖬"},
-              {"title": "Nerdfont", "url": "https://www.nerdfonts.com/cheat-sheet", "icon": ""},
-              {"title": "Youtube", "url": "https://youtube.com", "icon": "󰗃"},
-              {"title": "Server", "url": "https://home.anotherhadi.com", "icon": ""}
-            ]
-          },
-          {
-            "name": "Work",
-            "links": [
-              {"title": "Outlook", "url": "https://outlook.office.com/mail/", "icon": "󰴢"},
-              {"title": "Office", "url": "https://www.office.com/?auth=2", "icon": "󰏆"},
-              {"title": "Teams", "url": "https://teams.microsoft.com/_", "icon": "󰊻"}
-            ]
-          }
-        ]
-      }
-    }
-  '';
-
-  homepage = pkgs.buildNpmPackage {
-    pname = "homepage";
-    version = "0.0.0";
-
-    src = pkgs.fetchFromGitHub {
-      owner = "anotherhadi";
-      repo = "homepage";
-      rev = "40286c5e03bcfb9993cce354b4f12c00a1b4966d";
-      hash = "sha256-zlJ/bzFWE64HpUCxiRT5E9wrjVVwSTSgIOrifWKxphU=";
-    };
-
-    # npmDepsHash = lib.fakeHash;
-    npmDepsHash = "sha256-bG+CHTq2Rst3JMxsjAC81KhK+G7WwsTVD1eyP87g0z4=";
-
-    buildPhase = ''
-      npm install
-      cp ${
-        pkgs.writeText "src/routes/config.json" settings
-      } src/routes/config.json
-      npm run build
-      mkdir $out
-      mv build $out
-    '';
-
-    meta = {
-      description = "homepage";
-      homepage = "https://github.com/anotherhadi/homepage";
-    };
-  };
-
-in {
-
-  imports = [ ./duckduckgo-colorscheme.nix ];
-
-  programs.qutebrowser = {
-    enable = true;
-
-    searchEngines = {
-      "DEFAULT" = "https://duckduckgo.com/?q={}&ia=web";
-      "d" = "https://duckduckgo.com/?q={}&ia=web";
-      "g" = "https://google.com/search?q={}";
-      "y" = "https://youtube.com/results?search_query={}";
-      "ya" = "https://yandex.com/search/?text={}";
-      "n" = "https://mynixos.com/search?q={}";
-      "nixo" = "https://search.nixos.org/options?channel=unstable&query={}";
-      "nixp" = "https://search.nixos.org/packages?channel=unstable&query={}";
-      "gt" = "https://github.com/search?q={}&type=repositories";
-    };
-
-    quickmarks = {
-      home = "${homepage}/build/index.html";
-      server = "https://home.anotherhadi.com";
-      jack = "https://home.anotherhadi.com";
-      mynixos = "https://mynixos.com";
-      github = "https://github.com";
-      outlook = "https://outlook.office.com/mail/";
-      office = "https://www.office.com/?auth=2";
-      teams = "https://teams.microsoft.com/_";
-      casa = "http://192.168.2.16:8081/#/";
-      proton = "https://mail.proton.me/u/0/inbox";
-      cloudflare-one = "https://one.dash.cloudflare.com/";
-      chatgpt = "https://chat.openai.com/";
-      nixvim = "https://nix-community.github.io/nixvim/";
-      hyprland = "https://wiki.hyprland.org/";
-      nerdfont = "https://www.nerdfonts.com/cheat-sheet";
-      youtube = "https://youtube.com/";
-      cloudflare = "https://dash.cloudflare.com/";
-    };
-
-    settings = {
-      url = {
-        default_page = "${homepage}/build/index.html";
-        start_pages = [ "${homepage}/build/index.html" ];
-      };
-
-      colors = {
-        tabs = {
-          odd.bg = "#${config.var.theme.colors.bg}";
-          odd.fg = "#${config.var.theme.colors.fg}";
-          even.bg = "#${config.var.theme.colors.bg}";
-          even.fg = "#${config.var.theme.colors.fg}";
-          selected = {
-            odd = {
-              bg = "#${config.var.theme.colors.accent}";
-              fg = "#${config.var.theme.colors.accentFg}";
-            };
-            even = {
-              bg = "#${config.var.theme.colors.accent}";
-              fg = "#${config.var.theme.colors.accentFg}";
-            };
-          };
-          indicator = {
-            error = "#${config.var.theme.colors.c1}";
-            start = "#${config.var.theme.colors.bgalt}";
-            stop = "#${config.var.theme.colors.bgalt}";
-          };
-        };
-
-        hints = {
-          bg = "#${config.var.theme.colors.bgalt}";
-          fg = "#${config.var.theme.colors.fgalt}";
-          match.fg = "#${config.var.theme.colors.bg}";
-        };
-
-        completion = {
-          category = {
-            bg = "#${config.var.theme.colors.bg}";
-            fg = "#${config.var.theme.colors.fg}";
-            border = {
-              top = "#${config.var.theme.colors.bg}";
-              bottom = "#${config.var.theme.colors.bg}";
-            };
-          };
-
-          odd.bg = "#${config.var.theme.colors.bg}";
-          even.bg = "#${config.var.theme.colors.bg}";
-
-          fg = [ "#FFFFFF" "#FFFFFF" "#FFFFFF" ];
-
-          match.fg = "#${config.var.theme.colors.accent}";
-
-          item.selected = {
-            bg = "#${config.var.theme.colors.accent}";
-            border.top = "#${config.var.theme.colors.accent}";
-            border.bottom = "#${config.var.theme.colors.accent}";
-            fg = "#${config.var.theme.colors.accentFg}";
-            match.fg = "#${config.var.theme.colors.accentFg}";
-          };
-        };
-
-        statusbar = {
-          normal.bg = "#${config.var.theme.colors.bg}";
-          normal.fg = "#${config.var.theme.colors.fg}";
-          private.bg = "#${config.var.theme.colors.bg}";
-          private.fg = "#${config.var.theme.colors.fg}";
-          insert.bg = "#${config.var.theme.colors.accent}";
-          insert.fg = "#${config.var.theme.colors.accentFg}";
-          command = {
-            bg = "#${config.var.theme.colors.bgalt}";
-            fg = "#${config.var.theme.colors.fgalt}";
-            private.bg = "#${config.var.theme.colors.bgalt}";
-            private.fg = "#${config.var.theme.colors.fgalt}";
-          };
-        };
-
-        messages = {
-          info = {
-            bg = "#${config.var.theme.colors.bgalt}";
-            fg = "#${config.var.theme.colors.fgalt}";
-            border = "#${config.var.theme.colors.bgalt}";
-          };
-
-          error = {
-            bg = "#${config.var.theme.colors.c1}";
-            fg = "#${config.var.theme.colors.fgalt}";
-            border = "#${config.var.theme.colors.c1}";
-          };
-        };
-
-        #webpage.darkmode.enabled = true; # Enable dark mode for all websites (Weird on images)
-        webpage.preferred_color_scheme =
-          "dark"; # Enable dark mode for websites that support it
-      };
-
-      fonts = { default_family = "${config.var.theme.font}"; };
-
-      completion = {
-        height = "30%";
-        open_categories = [ "history" ];
-        scrollbar = {
-          padding = 0;
-          width = 0;
-        };
-        show = "always";
-        shrink = true;
-        timestamp_format = "";
-        web_history.max_items = 7;
-      };
-
-      content = {
-        autoplay = false;
-        javascript.clipboard = "access";
-        javascript.enabled = true;
-        pdfjs = true;
-      };
-
-      downloads = {
-        position = "bottom";
-        remove_finished = 0;
-      };
-
-      hints = {
-        border = "none";
-        radius = 1;
-      };
-
-      scrolling = {
-        bar = "never";
-        smooth = true;
-      };
-
-      tabs = {
-        show = "multiple";
-        last_close = "close";
-        mode_on_change = "restore";
-        close_mouse_button = "right";
-      };
-
-      zoom.default = "100%";
-
-      qt.force_software_rendering = "chromium";
-    };
-
-    keyBindings = {
-      normal = {
-        "gh" = "open ${homepage}/build/index.html";
-        "gs" = "open https://home.anotherhadi.com";
-
-        " p" = "tab-move -";
-        " n" = "tab-move +";
-        " w" = "tab-close";
-
-        " 1" = "tab-focus 1";
-        " 2" = "tab-focus 2";
-        " 3" = "tab-focus 3";
-        " 4" = "tab-focus 4";
-        " 5" = "tab-focus 5";
-        " 6" = "tab-focus 6";
-        " 7" = "tab-focus 7";
-        " 8" = "tab-focus 8";
-        " 9" = "tab-focus 9";
-        " 0" = "tab-focus 10";
-
-        "<Ctrl-w>" = "tab-close";
-        "<Ctrl-n>" = "open -w";
-
-        "<Ctrl-1>" = "tab-focus 1";
-        "<Ctrl-2>" = "tab-focus 2";
-        "<Ctrl-3>" = "tab-focus 3";
-        "<Ctrl-4>" = "tab-focus 4";
-        "<Ctrl-5>" = "tab-focus 5";
-        "<Ctrl-6>" = "tab-focus 6";
-        "<Ctrl-7>" = "tab-focus 7";
-        "<Ctrl-8>" = "tab-focus 8";
-        "<Ctrl-9>" = "tab-focus 9";
-        "<Ctrl-0>" = "tab-focus 10";
-      };
-
-      command = {
-        "<Ctrl-w>" = "tab-close";
-        "<Ctrl-n>" = "open -w";
-        "<Ctrl-1>" = "tab-focus 1";
-        "<Ctrl-2>" = "tab-focus 2";
-        "<Ctrl-3>" = "tab-focus 3";
-        "<Ctrl-4>" = "tab-focus 4";
-        "<Ctrl-5>" = "tab-focus 5";
-        "<Ctrl-6>" = "tab-focus 6";
-        "<Ctrl-7>" = "tab-focus 7";
-        "<Ctrl-8>" = "tab-focus 8";
-        "<Ctrl-9>" = "tab-focus 9";
-        "<Ctrl-0>" = "tab-focus 10";
-      };
-
-      insert = {
-        "<Ctrl-w>" = "tab-close";
-        "<Ctrl-n>" = "open -w";
-        "<Ctrl-1>" = "tab-focus 1";
-        "<Ctrl-2>" = "tab-focus 2";
-        "<Ctrl-3>" = "tab-focus 3";
-        "<Ctrl-4>" = "tab-focus 4";
-        "<Ctrl-5>" = "tab-focus 5";
-        "<Ctrl-6>" = "tab-focus 6";
-        "<Ctrl-7>" = "tab-focus 7";
-        "<Ctrl-8>" = "tab-focus 8";
-        "<Ctrl-9>" = "tab-focus 9";
-        "<Ctrl-0>" = "tab-focus 10";
-      };
-    };
-
-    extraConfig = ''
-      config.unbind("gm")
-      config.unbind("gd")
-      config.unbind("gb")
-      config.unbind("tl")
-      config.unbind("gt")
-
-      c.tabs.padding = {"bottom": 6, "left": 7, "right": 7, "top": 6}
-
-      config.load_autoconfig(True)
-    '';
-  };
-}
@@ -1,13 +0,0 @@
-{
-  programs.eza = {
-    enable = true;
-    icons = true;
-
-    extraOptions = [
-      "--group-directories-first"
-      "--no-quotes"
-      "--git-ignore"
-      "--icons=always"
-    ];
-  };
-}
@@ -1 +0,0 @@
-{ imports = [ ./neofetch ./nerdfetch ]; }
@@ -1,40 +0,0 @@
-{ pkgs, config, lib, inputs, ... }:
-let spicePkgs = inputs.spicetify-nix.packages.${pkgs.system}.default;
-in {
-
-  imports = [ inputs.spicetify-nix.homeManagerModules.default ];
-  nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) [ "spotify" ];
-  programs.spicetify = {
-    enable = true;
-    theme = spicePkgs.themes.text;
-    colorScheme = "custom";
-
-    customColorScheme = {
-      text = "${config.var.theme.colors.fg}";
-      subtext = "${config.var.theme.colors.fgalt}";
-      sidebar-text = "${config.var.theme.colors.fgalt}";
-      main = "${config.var.theme.colors.bg}";
-      sidebar = "${config.var.theme.colors.bg}";
-      background = "${config.var.theme.colors.bg}";
-      player = "${config.var.theme.colors.bg}";
-      card = "${config.var.theme.colors.bg}";
-      shadow = "000000";
-      selected-row = "${config.var.theme.colors.bgalt}";
-      button = "${config.var.theme.colors.accent}";
-      button-active = "${config.var.theme.colors.accent}";
-      button-disabled = "${config.var.theme.colors.bgalt}";
-      tab-active = "${config.var.theme.colors.accent}";
-      misc = "${config.var.theme.colors.fgalt}";
-    };
-
-    enabledExtensions = with spicePkgs.extensions; [
-      playlistIcons
-      lastfm
-      historyShortcut
-      hidePodcasts
-      fullAppDisplay
-      shuffle
-    ];
-  };
-}
@@ -1,17 +0,0 @@
-# PDF viewer
-{
-  programs.zathura = {
-    enable = true;
-
-    options = {
-      guioptions = "v";
-      adjust-open = "width";
-      statusbar-basename = true;
-      render-loading = false;
-      scroll-step = 120;
-
-      # highlight-color = ");
-      # highlight-active-color = mkForce (rgba "base0D");
-    };
-  };
-}
@@ -1,36 +0,0 @@
-{ pkgs, ... }:
-let
-  battery-watch = pkgs.writeShellScriptBin "battery-watch" ''
-    while true;do
-      battery-plugged &
-      battery-level &
-      sleep 60
-    done
-  '';
-
-  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
-        notif "battery" "󰚦 Battery is unplugged"
-      else
-        notif "battery" "󰚥 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
-      notif "battery" "󰁻  Low battery" "Battery level is $BATTERY_LEVEL%"
-    elif [[ $BATTERY_LEVEL -le 10 ]] && [[ $BATTERY_STATUS == "Discharging" ]]; then
-      notif "battery" "󰁺  Very low battery" "Battery level is $BATTERY_LEVEL%"
-    # elif [[ $BATTERY_LEVEL -eq 100 ]] && [[ $BATTERY_STATUS -ne "Discharging" ]]; then
-    #   notif "battery" "󰁹 Fully charged"
-    fi
-  '';
-
-in { home.packages = [ battery-watch battery-plugged battery-level ]; }
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:

 let
  increments = "5";
@@ -13,7 +13,9 @@ let

    message="󰃠  Brightness: $brightness_level%"

-    notif "brightness" "$message" "extraargs=-h int:value:$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" ''
@@ -24,4 +26,10 @@ let
    brightness-change down ${increments}
  '';

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

-in { home.packages = [ caffeine-status caffeine ]; }
+in { home.packages = with pkgs; [ caffeine-status caffeine ]; }
@@ -1,6 +1,7 @@
 {
  imports = [
    ./nixy
+    ./nerdfetch
    ./sounds
    ./brightness
    ./caffeine
@@ -8,10 +9,9 @@
    ./screenshot
    ./startup
    ./nerdfont_fzf
-    ./notification
-    ./battery
-    ./compress
-    ./misc
-    ./tofi
+    ./system
+    ./zip
+
+    ./misc.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 ]; }
@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-
-let
-  menu = pkgs.writeShellScriptBin "menu" ''
-    if pgrep wofi; then
-    	pkill wofi
-    else
-    	wofi --show drun
-    fi
-  '';
-
-  powermenu = pkgs.writeShellScriptBin "powermenu" ''
-    if pgrep wlogout; then
-    	pkill wlogout
-    else
-      ${pkgs.wlogout}/bin/wlogout
-    fi
-  '';
-
-  lock = pkgs.writeShellScriptBin "lock" ''
-    ${pkgs.hyprlock}/bin/hyprlock
-  '';
-
-in { home.packages = [ menu powermenu lock ]; }
@@ -1,3 +1,4 @@
+# Nerdfetch: https://github.com/ThatOneCalculator/NerdFetch
 { pkgs, config, ... }:
 let
  nerdfetch = pkgs.writeShellScriptBin "nerdfetch" ''
@@ -345,9 +346,9 @@ let

          ## USER VARIABLES -- YOU CAN CHANGE THESE

-          lc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
-          nc="$reset$bold''$${config.var.theme.colors.accentName}" # labels
-          hn="$reset$bold''$${config.var.theme.colors.accentName}" # labels
+          lc="$reset$bold''$${config.theme.colors.primary-ansi-16}" # labels
+          nc="$reset$bold''$${config.theme.colors.primary-ansi-16}" # labels
+          hn="$reset$bold''$${config.theme.colors.primary-ansi-16}" # labels
          ic="$reset$white"          # info
          c0="$reset$grey"           # first color
          c1="$reset$white"          # second color
@@ -366,4 +367,4 @@ let
        """
  '';

-in { home.packages = [ nerdfetch ]; }
+in { home.packages = with pkgs; [ nerdfetch ]; }
@@ -26,9 +26,10 @@ let
  '';

 in {
-  home.packages = [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];
+  home.packages = with pkgs; [ nerdfont-fzf nerdfont-fzf-fetch nerdfont-popup ];

  xdg.configFile."nerdfont_glyphnames.json" = {
    source = ./nerdfont_glyphnames.json;
  };
+
 }
@@ -1,34 +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.wlsunset}/bin/wlsunset -t ${default}"
    message="󰖔  Night-Shift Activated"
-    notif "night-shift" "$message"
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
  '';
-
  night-shift-off = pkgs.writeShellScriptBin "night-shift-off" ''
    pkill wlsunset
    message="󰖔  Night-Shift Deactivated"
-    notif "night-shift" "$message"
+    ${pkgs.libnotify}/bin/notify-send "$message" \
+      --replace-id="$(cat "/tmp/nixy-notification" 2>/dev/null || echo 0)" --print-id > "/tmp/nixy-notification"
  '';

-  night-shift-toggle = pkgs.writeShellScriptBin "night-shift-toggle" ''
-    if pgrep wlsunset; then
-      night-shift-off
-    else
-      night-shift-on
-    fi
-  '';
-
-  night-shift-status = pkgs.writeShellScriptBin "night-shift-status" ''
-    if pgrep wlsunset; then
-      echo "1"
-    else
-      echo "0"
-    fi
-  '';
-
-in { home.packages = [ night-shift-on night-shift-off night-shift-toggle night-shift-status ]; }
+in { home.packages = with pkgs; [ night-shift-on night-shift-off ]; }
@@ -1,60 +1,39 @@
 { pkgs, config, ... }:

 let
+  homedir = config.home.homeDirectory;

-  nixy = pkgs.writeShellScriptBin "nixy" ''
-    function exec() {
-      $@
-    }
+  nixy-rebuild = pkgs.writeShellScriptBin "nixy-rebuild" ''
+    sudo nixos-rebuild switch --flake ${homedir}/.config/nixos#nixy
+  '';

-    function ui(){
-      DEFAULT_ICON="󰘳"
+  nixy-edit = pkgs.writeShellScriptBin "nixy-edit" ''
+    $EDITOR ${homedir}/.config/nixos/
+  '';

-      # "icon;name;command"[]
-      apps=(
-        ";Rebuild;nixy-rebuild"
-        ";Upgrade;nixy-upgrade"
-        ";Update;nixy-update"
-        ";Collect Garbage;nixy-gc"
-        ";Clean Boot Menu;nixy-cb"
-      )
+  nixy-upgrade = pkgs.writeShellScriptBin "nixy-upgrade" ''
+    sudo nixos-rebuild switch --upgrade --flake ${homedir}/.config/nixos#nixy
+  '';

-      # Apply default icons if empty:
-      for i in "''${!apps[@]}"; do
-        apps[i]=$(echo "''${apps[i]}" | sed 's/^;/'$DEFAULT_ICON';/')
-      done
+  nixy-update = pkgs.writeShellScriptBin "nixy-update" ''
+    cd ${homedir}/.config/nixos && sudo nix flake update
+  '';

-      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/^[^;]*;//')
+  nixy-gc = pkgs.writeShellScriptBin "nixy-gc" ''
+    cd ${homedir}/.config/nixos && sudo nix-collect-garbage -d
+  '';

-      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
+  nixy-cb = pkgs.writeShellScriptBin "nixy-cb" ''
+    sudo /run/current-system/bin/switch-to-configuration boot
  '';

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

 let
-  # TODO: Broken - hypshot not working (jq error)
+  homedir = config.home.homeDirectory;
+
  screenshot = pkgs.writeShellScriptBin "screenshot" ''
    if [[ $2 == "swappy" ]];then
      folder="/tmp"
@@ -30,4 +31,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 ]; }
@@ -26,7 +26,9 @@ let
      message="󰕾 Volume: $volume%"
    fi

-    notif "sound" "$message" "extraargs=-h int:value:$volume"
+    ${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" ''
@@ -81,6 +83,11 @@ let
  '';

 in {
-  home.packages =
-    [ sound-output sound-change sound-up sound-down sound-toggle ];
+  home.packages = with pkgs; [
+    sound-output
+    sound-change
+    sound-up
+    sound-down
+    sound-toggle
+  ];
 }
@@ -1,17 +1,43 @@
 # File runned at startup by Hyprland
-{ pkgs, config, ... }:
+{ pkgs, ... }:
 let
-  startup = pkgs.writeShellScriptBin "startup" ''
-    # Startup is a script called by Hyprland on startup
-    # Because HM enabling services suck.
+  variable = import ../../../variables.nix;

-    [[ ${toString config.var.sops} == "1" ]] && systemctl --user start sops-nix
+  nextcloud-watch = pkgs.writeShellScriptBin "nextcloud-watch" ''
+    # Start nextcloud if I'm on my networks
+    while true;do
+      ssid=$(nmcli -t -f name connection show --active | head -n1)
+      status=$(pgrep -n nextcloud)
+      if [[ -z $status ]]; then
+        service_status="inactive"
+      else
+        service_status="active"
+      fi

-    battery-watch &
-    ${pkgs.waybar}/bin/waybar &
-
-
-    wlr-randr --output "Unknown-1" --off # FIX: REMOVE WEIRD GHOST MONITOR
+      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
+            pkill nextcloud
+        fi
+      fi
+      sleep 120
+    done
  '';

-in { home.packages = [ startup ]; }
+  startup = pkgs.writeShellScriptBin "startup" ''
+    # Because HM enabling services suck.
+
+    [[ ${
+      toString variable.enableSops
+    } == "1" ]] && systemctl --user start sops-nix
+
+    [[ ${toString variable.enableNextcloud} == "1" ]] && nextcloud-watch &
+
+    system-notif &
+    ${pkgs.waybar}/bin/waybar &
+  '';
+
+in { home.packages = with pkgs; [ startup nextcloud-watch nextcloud-client ]; }
@@ -0,0 +1,43 @@
+{ pkgs, ... }:
+
+let
+  notify-system = pkgs.writeShellScriptBin "notify-system" ''
+    function minute() {
+      while true;do
+        battery-plugged &
+        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 ]]; 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
+  '';
+
+in {
+  home.packages = with pkgs; [ notify-system battery-plugged battery-level ];
+}
@@ -1,62 +0,0 @@
-{ pkgs, config, ... }:
-
-let
-
-  tofi = pkgs.writeShellScriptBin "tofi" ''
-    hyprexec="hyprctl dispatch exec"
-    function exec() {
-      $@
-    }
-
-    function ui(){
-      DEFAULT_ICON="󰘳"
-
-      # "icon;name;command"[]
-      apps=(
-        ";Nixy;nixy"
-        ";Nerdfont FZF;nerdfont-fzf"
-        ";Brightness Up;brightness-up"
-        ";Brightness Down;brightness-down"
-        ";Sound Up;sound-up"
-        ";Sound Down;sound-down"
-        ";Sound Toggle Mute;sound-toggle"
-        ";Sound Change Output;sound-output"
-        ";Caffeine;caffeine"
-        ";Night Shift Toggle;night-shift-toggle"
-        ";Firefox;$hyprexec firefox"
-        ";Qutebrowser;$hyprexec qutebrowser"
-        ";Kitty;$hyprexec kitty"
-        ";Thunar;$hyprexec thunar"
-        ";Powermenu;powermenu"
-        ";Wofi;menu"
-        ";Lock;lock"
-        ";Bitwarden;$hyprexec bitwarden"
-        ";Clock; peaclock"
-        ";Nextcloud;$hyprexec nextcloud"
-        ";Spotify;$hyprexec spotify"
-        ";Btop;btop"
-        ";Cava;cava"
-        ";Discord;$hyprexec discord"
-        ";Vlc;$hyprexec vlc"
-        ";Obsidian;$hyprexec obsidian"
-      )
-
-      # 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
-    }
-
-    ui
-  '';
-
-in { home.packages = [ tofi ]; }
@@ -11,7 +11,6 @@ let
        echo "Wrong number of arguments..."
    fi
  '';
-
  extract = pkgs.writeShellScriptBin "extract" ''
     for i in "$@" ; do
        tar -xvzf $i
@@ -19,4 +18,4 @@ let
    done 
  '';

-in { home.packages = [ compress extract ]; }
+in { home.packages = with pkgs; [ compress extract ]; }
@@ -1,46 +0,0 @@
-{ pkgs, config, ... }: {
-
-  imports = [
-    ../hosts/server/variables.nix
-
-    # Programs
-    ./programs/btop
-    ./programs/nvim
-    ./programs/git
-    ./programs/shell
-
-    # Scripts
-    ./scripts # All scripts
-  ];
-
-  home = {
-    inherit (config.var) username;
-    inherit (config.var) homeDirectory;
-
-    packages = with pkgs; [
-      # Dev
-      go
-      cargo
-      nodejs
-      python3
-      jq
-
-      # Utils
-      fd
-      bc
-      gcc
-      zip
-      unzip
-      wget
-      curl
-      glow
-      wireguard-tools
-      pfetch
-    ];
-
-    stateVersion = "24.05";
-  };
-
-  programs.home-manager.enable = true;
-
-}
@@ -0,0 +1,4 @@
+{
+  imports =
+    [ ./git ./dunst ./hyprland ./shell ./sops ./waybar ./wlogout ./sops ];
+}
@@ -34,17 +34,17 @@
        sticky_history = "yes";
        history_length = 20;
        always_run_script = true;
-        corner_radius = config.var.theme.rounding;
+        corner_radius = config.theme.rounding;
        follow = "mouse";
-        font = config.var.theme.font;
+        font = config.theme.font;
        format = "<b>%s</b>\\n%b";
-        progress_bar_corner_radius = config.var.theme.rounding - 10;
+        progress_bar_corner_radius = config.theme.rounding - 10;
        #format = ''
-        #  <span foreground='#${config.var.theme.colors.accent}'><b>%s %p</b></span>
+        #  <span foreground='#${config.theme.colors.primary-bg}'><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_color = "#" + config.theme.colors.bg;
+        highlight = "#" + config.theme.colors.primary-bg;
+        foreground = "#" + config.theme.colors.fg;
        frame_width = 1;
        offset = "0x10";
        horizontal_padding = 10;
@@ -67,16 +67,16 @@
      fullscreen_delay_everything = { fullscreen = "delay"; };

      urgency_critical = {
-        background = "#" + config.var.theme.colors.c1;
-        foreground = "#" + config.var.theme.colors.c0;
+        background = "#" + config.theme.colors.color1;
+        foreground = "#" + config.theme.colors.color0;
      };
      urgency_low = {
-        background = "#" + config.var.theme.colors.bgalt;
-        foreground = "#" + config.var.theme.colors.fgalt;
+        background = "#" + config.theme.colors.alt-bg;
+        foreground = "#" + config.theme.colors.alt-fg;
      };
      urgency_normal = {
-        background = "#" + config.var.theme.colors.bgalt;
-        foreground = "#" + config.var.theme.colors.fgalt;
+        background = "#" + config.theme.colors.alt-bg;
+        foreground = "#" + config.theme.colors.alt-fg;
      };
    };
  };
@@ -0,0 +1,12 @@
+let variable = import ../../../variables.nix;
+in {
+  programs.git = {
+    enable = true;
+    userName = variable.git.username;
+    userEmail = variable.git.email;
+    extraConfig = {
+      init.defaultBranch = "main";
+      push.autoSetupRemote = true;
+    };
+  };
+}
@@ -1,97 +0,0 @@
-{ config, pkgs, ... }: {
-
-  qt = {
-    enable = true;
-    platformTheme.name = "gtk2";
-    style.name = "gtk2";
-  };
-
-  gtk = {
-    enable = true;
-
-    theme = { name = "FlatColor"; };
-
-    iconTheme = {
-      package = pkgs.moka-icon-theme;
-      name = "Moka";
-    };
-
-    font = {
-      name = config.var.theme.font;
-      size = config.var.theme.font-size;
-    };
-  };
-
-  home.pointerCursor = {
-    gtk.enable = true;
-    package = pkgs.bibata-cursors;
-    name = "Bibata-Modern-Classic";
-    size = 14;
-  };
-
-  home.file = {
-    ".local/share/themes/FlatColor" = {
-      recursive = true;
-      source = ./theme;
-    };
-
-    ".local/share/themes/FlatColor/colors2".text = ''
-      bg_color:#${config.var.theme.colors.bg}
-      color0:#${config.var.theme.colors.c0}
-      color1:#${config.var.theme.colors.c1}
-      color2:#${config.var.theme.colors.c2}
-      color3:#${config.var.theme.colors.c3}
-      color4:#${config.var.theme.colors.c4}
-      color5:#${config.var.theme.colors.c5}
-      color6:#${config.var.theme.colors.c6}
-      color7:#${config.var.theme.colors.c7}
-      color8:#${config.var.theme.colors.c8}
-      color9:#${config.var.theme.colors.c9}
-      color10:#${config.var.theme.colors.c10}
-      color11:#${config.var.theme.colors.c11}
-      color12:#${config.var.theme.colors.c12}
-      color13:#${config.var.theme.colors.c13}
-      color14:#${config.var.theme.colors.c14}
-      color15:#${config.var.theme.colors.c15}
-      text_color:#${config.var.theme.colors.fg}
-      selected_bg_color:#${config.var.theme.colors.accent}
-      selected_fg_color:#${config.var.theme.colors.accentFg}
-      tooltip_bg_color:#${config.var.theme.colors.bgalt}
-      tooltip_fg_color:#${config.var.theme.colors.fgalt}
-      titlebar_bg_color:#${config.var.theme.colors.bgalt}
-      titlebar_fg_color:#${config.var.theme.colors.fgalt}
-      menu_bg_color:#${config.var.theme.colors.bgalt}
-      menu_fg_color:#${config.var.theme.colors.fgalt}
-      link_color:#${config.var.theme.colors.accent}
-    '';
-
-    ".local/share/themes/FlatColor/colors3".text = ''
-      @define-color color0 #${config.var.theme.colors.c0};
-      @define-color color1 #${config.var.theme.colors.c1};
-      @define-color color2 #${config.var.theme.colors.c2};
-      @define-color color3 #${config.var.theme.colors.c3};
-      @define-color color4 #${config.var.theme.colors.c4};
-      @define-color color5 #${config.var.theme.colors.c5};
-      @define-color color6 #${config.var.theme.colors.c6};
-      @define-color color7 #${config.var.theme.colors.c7};
-      @define-color color8 #${config.var.theme.colors.c8};
-      @define-color color9 #${config.var.theme.colors.c9};
-      @define-color color10 #${config.var.theme.colors.c10};
-      @define-color color11 #${config.var.theme.colors.c11};
-      @define-color color12 #${config.var.theme.colors.c12};
-      @define-color color13 #${config.var.theme.colors.c13};
-      @define-color color14 #${config.var.theme.colors.c14};
-      @define-color color15 #${config.var.theme.colors.c15};
-      @define-color selected_bg_color #${config.var.theme.colors.accent};
-      @define-color selected_fg_color #${config.var.theme.colors.accentFg};
-
-      @define-color bg_color #${config.var.theme.colors.bg};
-      @define-color fg_color #${config.var.theme.colors.fg};
-      @define-color base_color @bg_color;
-      @define-color text_color @fg_color;
-      @define-color text_color_disabled mix(@text_color, @base_color, 0.4);
-      @define-color tooltip_bg_color #${config.var.theme.colors.bgalt};
-      @define-color tooltip_fg_color #${config.var.theme.colors.fgalt};
-    '';
-  };
-}
@@ -1,771 +0,0 @@
-#modded Numix gtkrc
-
-gtk-color-scheme = "include ../colors2"
-gtk-auto-mnemonics	= 1
-
-# Default Style
-# DO --NOT-- CHANGE ACTIVE
-# IT's THE COLOR THAT WPGTK REPLACES
-# FEEL FREE TO MODIFY EVERYTHING ELSE IN gtkrc.base
-
-style "murrine-default" {
-	GtkArrow::arrow-scaling= 0.6
-
-	GtkButton::child-displacement-x = 0
-	GtkButton::child-displacement-y = 0
-
-	GtkButton::default-border = { 0, 0, 0, 0 }
-
-	GtkButtonBox::child-min-height = 26
-
-	GtkCheckButton::indicator-size = 16
-
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry::honors-transparent-bg-hint = 1
-	GtkEntry::state-hint = 0
-
-	GtkExpander::expander-size = 16
-
-	GtkImage::x-ayatana-indicator-dynamic = 1
-
-	GtkMenu::horizontal-padding = 0
-	GtkMenu::vertical-padding = 0
-
-	GtkMenuBar::internal-padding = 0
-	GtkMenuBar::window-dragging = 1
-
-	GtkMenuItem::arrow-scaling= 0.5
-
-	GtkPaned::handle-size = 1
-
-	GtkProgressBar::min-horizontal-bar-height = 12
-	GtkProgressBar::min-vertical-bar-width = 12
-
-	GtkRange::trough-border = 0
-	GtkRange::slider-width = 8
-	GtkRange::stepper-size = 12
-	GtkRange::stepper_spacing = 0
-	GtkRange::trough-under-steppers = 1
-
-	GtkScale::slider-length = 16
-	GtkScale::slider-width = 16
-	GtkScale::trough-side-details = 1
-
-	GtkScrollbar::activate-slider = 1
-	GtkScrollbar::has-backward-stepper = 0
-	GtkScrollbar::has-forward-stepper = 0
-	GtkScrollbar::has-secondary-backward-stepper = 0
-	GtkScrollbar::has-secondary-forward-stepper = 0
-	GtkScrollbar::min-slider-length = 80
-	GtkScrollbar::slider-width = 8
-	GtkScrollbar::trough-border = 0
-
-	GtkScrolledWindow::scrollbar-spacing = 0
-	GtkScrolledWindow::scrollbars-within-bevel = 1
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-
-	GtkToolbar::internal-padding = 0
-
-	GtkTreeView::expander-size = 11
-	GtkTreeView::vertical-separator = 0
-
-	GtkWidget::focus-line-width = 1
-	# The following line prevents the Firefox tabs
-	# from jumping a few pixels when you create a new tab
-	GtkWidget::focus-padding = 0
-
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 1
-
-	GtkWindow::resize-grip-height = 0
-	GtkWindow::resize-grip-width = 0
-
-	WnckTasklist::fade-overlay-rect = 0
-
-	GnomeHRef::link_color = @link_color
-	GtkHTML::link-color = @link_color
- 	GtkIMHtmlr::hyperlink-color = @link_color
-	GtkIMHtml::hyperlink-color = @link_color
-	GtkWidget::link-color = @link_color
-	GtkWidget::visited-link-color = @text_color
-
-	GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified
-	GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified
-
-	xthickness = 1
-	ythickness = 1
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @bg_color
-	bg[INSENSITIVE] = @bg_color
-
-	base[NORMAL] = shade(0.85, @color0)
-	base[PRELIGHT] = shade (0.85, @color0)
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		animation = FALSE
-		arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
-		border_shades = { 1.0, 1.0 } # gradient to draw on border
-		colorize_scrollbar = TRUE
-		comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
-		contrast = 0.0 # overal contrast with borders
-		focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
-		glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
-		glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides
-		glow_shade = 1.0 # amount of glow
-		gradient_shades = { 1.0, 1.0, 1.0, 1.0 } # gradient to draw on widgets
-		highlight_shade = 1.0 # amount of highlight
-		lightborder_shade = 1.0 # amount of inset light border
-		lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line
-		menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
-		menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped
-		menustyle = 0 # 0 = none, 1 = vertical striped
-		progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
-		reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		roundness = 0 # roundness of widgets
-		scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		sliderstyle = 0 # 0 = none, 1 = handles
-		stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles
-		toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
-   }
-}
-
-style "murrine-wide" {
-	xthickness = 2
-	ythickness = 2
-}
-
-style "murrine-wider" {
-	xthickness = 3
-	ythickness = 3
-}
-
-style "murrine-thin" {
-	xthickness = 0
-	ythickness = 0
-}
-
-# Notebook
-
-style "murrine-notebook-bg" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade (0.70, @bg_color)
-}
-
-style "murrine-notebook" = "murrine-notebook-bg" {
-	xthickness = 2
-	ythickness = 2
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-# Various Standard Widgets
-
-style "murrine-button"  = "murrine-wider" {
-	bg[NORMAL] = shade (1.3, @bg_color)
-	bg[PRELIGHT] = shade (0.80, @selected_bg_color)
-	bg[ACTIVE] = shade (1.00, @selected_bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-  	engine "murrine" {
-	}
-}
-
-style "murrine-scrollbar" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = mix (0.31, @text_color, @bg_color)
-	bg[ACTIVE] = @selected_bg_color
-
-	engine "murrine" {
-		roundness = 0
-		contrast = 0.0
-		border_shades = { 0.9, 0.9 }
-		trough_shades = { 0.97, 0.97 }
-		trough_border_shades = { 1.0, 1.0 }
-	}
-}
-
-style "murrine-overlay-scrollbar" {
-	bg[ACTIVE] = shade (0.8, @bg_color)
-	bg[INSENSITIVE] = shade (0.97, @bg_color)
-
-	base[SELECTED] = shade (0.6, @bg_color)
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-}
-
-style "murrine-scale" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = @bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[INSENSITIVE] = shade (0.95, @bg_color)
-
-	engine "murrine" {
-		roundness = 8
-		gradient_shades = { 1.08, 1.08, 1.08, 1.08 }
-		border_shades = { 1.0, 1.0 }
-		trough_shades = { 1.08, 1.08 }
-		trough_border_shades = { 0.8, 0.8 }
-	}
-}
-
-style "murrine-progressbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade(0.60, @bg_color)
-
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {
-		roundness = 0
-		border_shades = { 1.2, 1.2 }
-		trough_border_shades = { 0.8, 0.8 }
-	}
-}
-
-style "murrine-treeview-header" = "murrine-button" {
-  	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-treeview" {
-  	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-frame-title" {
-	fg[NORMAL] = lighter (@text_color)
-}
-
-style "murrine-tooltips" {
-	xthickness = 5
-	ythickness = 5
-
-	bg[NORMAL] = @tooltip_bg_color
-	bg[SELECTED] = @tooltip_bg_color
-
-	fg[NORMAL] = @text_color
-
-	engine "murrine" {
-		textstyle = 0
-		roundness = 0
-		rgba = FALSE
-	}
-}
-
-style "murrine-spinbutton" = "murrine-button" {
-	engine "murrine" {
-	}
-}
-
-style "murrine-radiocheck" = "murrine-default" {
-	bg[SELECTED] = @bg_color
-
-	text[NORMAL] = @selected_bg_color
-	text[PRELIGHT] = @selected_bg_color
-}
-
-style "murrine-entry" = "murrine-wider" {
-        bg[SELECTED] = @selected_bg_color
-
-	engine "murrine" {
-		border_shades = { 1.15, 1.15 }
-	}
-}
-
-style "metacity-frame" = "murrine-default" {
-	bg[SELECTED] = @selected_bg_color
-}
-
-style "murrine-statusbar" { 
-  bg[NORMAL] = @bg_color
-}
-style "murrine-comboboxentry" = "murrine-entry" { }
-style "murrine-hscale" = "murrine-scale" { }
-style "murrine-vscale" = "murrine-scale" { }
-style "murrine-hscrollbar" = "murrine-scrollbar" { }
-style "murrine-vscrollbar" = "murrine-scrollbar" { }
-
-# Menus
-
-style "murrine-menu" = "murrine-thin" {
-	bg[NORMAL] = shade(0.8, @menu_bg_color)
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	text[NORMAL] = @menu_fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-menu-item" = "murrine-wider" {
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {
-		textstyle = 0
-		border_shades = { 1.2, 1.2 }
-	}
-}
-
-style "murrine-separator-menu-item" = "murrine-thin" { }
-
-style "murrine-menubar" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  mix (0.21, @text_color, @bg_color)
-	bg[SELECTED] =  mix (0.21, @text_color, @bg_color)
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-style "murrine-menubaritem" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  @selected_bg_color
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-# Toolbars
-
-style "murrine-toolbar" = "murrine-thin" {
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-	}
-}
-
-style "murrine-toolbutton" = "murrine-button" {
-	bg[NORMAL] = shade (1.08, @bg_color)
-	bg[PRELIGHT] = shade (1.10, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.95, @bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {
-	}
-}
-
-class "GtkToolbar" style "murrine-toolbar"
-class "GtkHandleBox" style "murrine-toolbar"
-widget_class "*Toolbar*.*Separator*" style "murrine-toolbar"
-
-# Panels
-
-style "murrine-panel" = "murrine-thin" {
-	xthickness = 2
-
-	bg[NORMAL] = @menu_bg_color
-	bg[PRELIGHT] =  shade(0.8, @selected_bg_color)
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @text_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = shade(0.8, @text_color)
-
-	base[NORMAL] = @menu_bg_color
-	base[PRELIGHT] =  mix (0.21, @text_color, @menu_bg_color)
-	base[SELECTED] =  @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = @menu_bg_color
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = shade (1.08, @text_color)
-	text[SELECTED] = shade (1.08, @text_color)
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @text_color)
-
-	engine "murrine" {
-		roundness = 0
-		contrast = 0.0
-	}
-}
-
-widget "*PanelWidget*" style "murrine-panel"
-widget "*PanelApplet*" style "murrine-panel"
-widget "*fast-user-switch*" style "murrine-panel"
-widget "*CPUFreq*Applet*" style "murrine-panel"
-widget "*indicator-applet*" style "murrine-panel"
-class "PanelApp*" style "murrine-panel"
-class "PanelToplevel*" style "murrine-panel"
-widget_class "*PanelToplevel*" style "murrine-panel"
-widget_class "*notif*" style "murrine-panel"
-widget_class "*Notif*" style "murrine-panel"
-widget_class "*Tray*" style "murrine-panel" 
-widget_class "*tray*" style "murrine-panel"
-widget_class "*computertemp*" style "murrine-panel"
-widget_class "*Applet*Tomboy*" style "murrine-panel"
-widget_class "*Applet*Netstatus*" style "murrine-panel"
-widget "*gdm-user-switch-menubar*" style "murrine-panel"
-
-style "bold-panel-item" {
-	font_name = "Bold"
-
-	engine "murrine" {
-		roundness = 0
-	}
-}
-
-widget "*Panel*MenuBar*" style "bold-panel-item"
-widget "*gimmie*" style "bold-panel-item"
-
-# widget_class "*Mail*" style "murrine-panel" # Disabled to fix Evolution bug
-# class "*Panel*" style "murrine-panel" # Disabled to fix bug
-
-# XFCE Styles
-
-style "workspace-switcher" = "murrine-panel" {
-	bg[SELECTED] = @selected_bg_color
-}
-
-style "xfce-header" {
-	bg[NORMAL] = shade (0.9, @bg_color)
-	base[NORMAL] = shade (1.18, @bg_color)
-}
-
-style "xfdesktop-windowlist" {
-	bg[NORMAL] = @bg_color
-	fg[INSENSITIVE] = shade (0.95, @bg_color)
-	text[INSENSITIVE] = shade (0.95, @bg_color)
-}
-
-style "xfdesktop-icon-view" {
-	XfdesktopIconView::label-alpha = 0
-	XfdesktopIconView::selected-label-alpha = 60
-	XfdesktopIconVIew::ellipsize-icon-labels = 1
-
-	base[NORMAL] = @selected_bg_color
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-
-	engine "murrine" {
-		textstyle = 5
-		text_shade = 0.05
-	}
-}
-
-style "xfwm-tabwin" {
-	Xfwm4TabwinWidget::border-width = 0
-	Xfwm4TabwinWidget::icon-size = 64
-
-	bg[NORMAL] = @menu_bg_color
-	fg[NORMAL] = @menu_fg_color
-
-	engine "murrine" {
-		focusstyle = 0
-	}
-}
-
-style "xfsm-logout" {
-	bg[NORMAL] = @menu_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[PRELIGHT] = shade (1.1, @menu_bg_color)
-	bg[SELECTED] = shade (0.5, @menu_bg_color)
-	bg[INSENSITIVE] = shade (1.3, @menu_bg_color)
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @menu_fg_color
-
-	text[NORMAL] = @menu_fg_color
-
-	engine "murrine" {
-	}
-}
-
-style "xfsm-logout-button" {
-	bg[NORMAL] = shade (1.2, @menu_bg_color)
-	bg[PRELIGHT] = shade (1.4, @menu_bg_color)
-
-	engine "murrine" {
-	}
-}
-
-widget "*WnckPager*" style "workspace-switcher"
-
-widget "*Xfce*Panel*" style "murrine-panel"
-class "*Xfce*Panel*" style "murrine-panel"
-
-# Thunar Styles
-
-style "sidepane" {
-	base[NORMAL] = @bg_color
-	base[INSENSITIVE] = shade(0.90, @bg_color)
-	bg[NORMAL] = @bg_color
-	text[NORMAL] = @text_color
-}
-
-widget_class "*ThunarShortcutsView*" style "sidepane"
-widget_class "*ThunarTreeView*" style "sidepane"
-widget_class "*ThunarLocationEntry*" style "murrine-entry"
-
-# Gtk2 Open-File Dialog
-
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane"
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-
-# Google Chrome/Chromium Styles (requires 9.0.597 or newer)
-
-style "chromium-toolbar-button" {
-	engine "murrine" {
-		roundness = 2
-		textstyle = 0
-	}
-}
-
-style "chrome-gtk-frame" {
-	ChromeGtkFrame::frame-color = @titlebar_bg_color
-	ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 0
-	ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 0
-	ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = @bg_color
-	ChromeGtkFrame::scrollbar-slider-normal-color =  mix (0.21, @text_color, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color =  mix (0.31, @text_color, @bg_color)
-}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-
-widget_class "*Chrom*Button*" style "chromium-toolbar-button"
-
-# General Styles
-
-class "GtkWidget" style "murrine-default"
-
-class "GtkFrame" style "murrine-wide"
-class "MetaFrames" style "metacity-frame"
-class "GtkWindow" style "metacity-frame"
-
-class "GtkSeparator" style "murrine-wide"
-class "GtkCalendar" style "murrine-wide"
-
-class "GtkSpinButton" style "murrine-spinbutton"
-
-class "GtkScale" style "murrine-scale"
-class "GtkVScale" style "murrine-vscale"
-class "GtkHScale" style "murrine-hscale"
-class "GtkScrollbar" style "murrine-scrollbar"
-class "GtkVScrollbar" style "murrine-vscrollbar"
-class "GtkHScrollbar" style "murrine-hscrollbar"
-
-class "GtkRadio*" style "murrine-radiocheck"
-class "GtkCheck*" style "murrine-radiocheck"
-
-class "GtkEntry" style "murrine-entry"
-
-widget_class "*<GtkNotebook>" style "murrine-notebook"
-widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook-bg"
-widget_class "*.GtkNotebook.*.GtkViewport" style "murrine-notebook"
-
-widget_class "*<GtkButton>" style "murrine-button"
-widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
-widget_class "*<GtkProgress>" style "murrine-progressbar"
-widget_class "*<GtkProgressBar>" style "murrine-progressbar"
-
-widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
-
-widget_class "*<GtkMenu>*" style "murrine-menu"
-widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
-widget_class "*Menu*.*Sepa*"  style "murrine-separator-menu-item"
-widget_class "*<GtkMenuBar>*" style "murrine-menubar"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "murrine-menubaritem"
-
-widget_class "*GtkToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToggleToolButton*" style "murrine-toolbutton"
-widget_class "*GtkMenuToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToolbar*Button" style "murrine-toolbutton"
-
-widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
-
-widget_class "*.<GtkTreeView>*" style "murrine-treeview"
-widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
-
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-widget_class "*<GtkScrolledWindow>*<OsScrollbar>" style "murrine-overlay-scrollbar"
-
-# Workarounds and Non-Standard Styling
-
-style "text-is-fg-color-workaround" {
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-}
-
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround"
-
-style "fg-is-text-color-workaround" {
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[INSENSITIVE] = darker (@text_color)
-}
-
-widget_class "*<GtkListItem>*" style "fg-is-text-color-workaround"
-widget_class "*<GtkCList>" style "fg-is-text-color-workaround"
-widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
-
-style "murrine-evo-new-button-workaround" {
-	engine "murrine" {
-		toolbarstyle = 0
-	}
-}
-
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
-
-style "inkscape-toolbar-fix" {
-	engine "murrine" {
-		gradient_shades = { 1.0, 1.0, 1.0, 1.0 }
-		highlight_shade = 1.0
-	}
-}
-
-#widget "*GtkHandleBox*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*CommandsToolbar*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*SnapToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SelectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*NodeToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*TweakToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ZoomToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*StarToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*RectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*3DBoxToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ArcToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SpiralToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PencilToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PenToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*CalligraphyToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*EraserToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*LPEToolToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix"
-
-# Performance Fixes
-
-style "performance-fix" {
-	engine "murrine" {
-		textstyle = 0
-	}
-}
-
-widget_class "*gtkmm__GtkWindow*" style "performance-fix" # Inkscape
-widget_class "*GimpDisplayShell*" style "performance-fix" # Gimp
-widget_class "*GimpToolbox*" style "performance-fix"
-widget_class "*GimpMenuDock*" style "performance-fix"
-widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice
-widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.)
-
-widget_class "*XfceHeading*" style "xfce-header"
-widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-widget "xfwm4-tabwin*" style "xfwm-tabwin"
-widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
-widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button"
@@ -1,797 +0,0 @@
-#modded Numix gtkrc
-
-gtk-color-scheme = "bg_color:{color0}
-color0:{color0}
-color1:{color1}
-color2:{color2}
-color3:{color3}
-color4:{color4}
-color5:{color5}
-color6:{color6}
-color7:{color7}
-color8:{color8}
-color9:{color9}
-color10:{color10}
-color11:{color11}
-color12:{color12}
-color13:{color13}
-color14:{color14}
-color15:{color15}
-text_color:{color15}
-selected_bg_color:{active}
-selected_fg_color:{color15}
-tooltip_bg_color:{color0}
-tooltip_fg_color:{color15}
-titlebar_bg_color:{color0}
-titlebar_fg_color:{color15}
-menu_bg_color:{color0}
-menu_fg_color:{color15}
-link_color:{active}"
-gtk-auto-mnemonics	= 1
-
-# Default Style
-# DO --NOT-- CHANGE ACTIVE
-# IT's THE COLOR THAT WPGTK REPLACES
-# FEEL FREE TO MODIFY EVERYTHING ELSE IN gtkrc.base
-
-style "murrine-default" {{
-	GtkArrow::arrow-scaling= 0.6
-
-	GtkButton::child-displacement-x = 0
-	GtkButton::child-displacement-y = 0
-
-	GtkButton::default-border = {{ 0, 0, 0, 0 }}
-
-	GtkButtonBox::child-min-height = 26
-
-	GtkCheckButton::indicator-size = 16
-
-	# The following line hints to gecko (and possibly other appliations)
-	# that the entry should be drawn transparently on the canvas.
-	# Without this, gecko will fill in the background of the entry.
-	GtkEntry::honors-transparent-bg-hint = 1
-	GtkEntry::state-hint = 0
-
-	GtkExpander::expander-size = 16
-
-	GtkImage::x-ayatana-indicator-dynamic = 1
-
-	GtkMenu::horizontal-padding = 0
-	GtkMenu::vertical-padding = 0
-
-	GtkMenuBar::internal-padding = 0
-	GtkMenuBar::window-dragging = 1
-
-	GtkMenuItem::arrow-scaling= 0.5
-
-	GtkPaned::handle-size = 1
-
-	GtkProgressBar::min-horizontal-bar-height = 12
-	GtkProgressBar::min-vertical-bar-width = 12
-
-	GtkRange::trough-border = 0
-	GtkRange::slider-width = 8
-	GtkRange::stepper-size = 12
-	GtkRange::stepper_spacing = 0
-	GtkRange::trough-under-steppers = 1
-
-	GtkScale::slider-length = 16
-	GtkScale::slider-width = 16
-	GtkScale::trough-side-details = 1
-
-	GtkScrollbar::activate-slider = 1
-	GtkScrollbar::has-backward-stepper = 0
-	GtkScrollbar::has-forward-stepper = 0
-	GtkScrollbar::has-secondary-backward-stepper = 0
-	GtkScrollbar::has-secondary-forward-stepper = 0
-	GtkScrollbar::min-slider-length = 80
-	GtkScrollbar::slider-width = 8
-	GtkScrollbar::trough-border = 0
-
-	GtkScrolledWindow::scrollbar-spacing = 0
-	GtkScrolledWindow::scrollbars-within-bevel = 1
-
-	GtkSeparatorMenuItem::horizontal-padding = 0
-
-	GtkToolbar::internal-padding = 0
-
-	GtkTreeView::expander-size = 11
-	GtkTreeView::vertical-separator = 0
-
-	GtkWidget::focus-line-width = 1
-	# The following line prevents the Firefox tabs
-	# from jumping a few pixels when you create a new tab
-	GtkWidget::focus-padding = 0
-
-	GtkWidget::wide-separators = 1
-	GtkWidget::separator-width = 1
-	GtkWidget::separator-height = 1
-
-	GtkWindow::resize-grip-height = 0
-	GtkWindow::resize-grip-width = 0
-
-	WnckTasklist::fade-overlay-rect = 0
-
-	GnomeHRef::link_color = @link_color
-	GtkHTML::link-color = @link_color
- 	GtkIMHtmlr::hyperlink-color = @link_color
-	GtkIMHtml::hyperlink-color = @link_color
-	GtkWidget::link-color = @link_color
-	GtkWidget::visited-link-color = @text_color
-
-	GtkToolbar::shadow-type = GTK_SHADOW_NONE # Makes toolbars flat and unified
-	GtkMenuBar::shadow-type = GTK_SHADOW_NONE # Makes menubars flat and unified
-
-	xthickness = 1
-	ythickness = 1
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @bg_color
-	bg[INSENSITIVE] = @bg_color
-
-	base[NORMAL] = shade(0.85, @color0)
-	base[PRELIGHT] = shade (0.85, @color0)
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		animation = FALSE
-		arrowstyle = 1 # 0 = normal arrows, 1 = filled arrows
-		border_shades = {{ 1.0, 1.0 }} # gradient to draw on border
-		colorize_scrollbar = TRUE
-		comboboxstyle = 0 # 0 = normal combobox, 1 = colorized combobox below arrow
-		contrast = 0.0 # overal contrast with borders
-		focusstyle = 1 # 0 = none, 1 = grey dotted, 2 = colored with fill, 3 = colored glow
-		glazestyle = 0 # 0 = flat highlight, 1 = curved highlight, 2 = concave, 3 = top curved highlight, 4 = beryl highlight
-		glowstyle = 0 # 0 = glow on top, 1 = glow on bottom, 2 = glow on top and bottom, 3 = glow on middle vertically, 4 = glow on middle horizontally, 5 = glow on all sides
-		glow_shade = 1.0 # amount of glow
-		gradient_shades = {{ 1.0, 1.0, 1.0, 1.0 }} # gradient to draw on widgets
-		highlight_shade = 1.0 # amount of highlight
-		lightborder_shade = 1.0 # amount of inset light border
-		lightborderstyle = 1 # 0 = lightborder on top side, 1 = lightborder on all sides
-		listviewheaderstyle = 0 # 0 = flat, 1 = glassy, 2 = raised
-		listviewstyle = 0 # 0 = none, 1 = dotted, 2 = line
-		menubaritemstyle = 0 # 0 = menuitem look, 1 = button look
-		menubarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient, 3 = striped
-		menuitemstyle = 0 # 0 = flat, 1 = glassy, 2 = striped
-		menustyle = 0 # 0 = none, 1 = vertical striped
-		progressbarstyle = 0 # 0 = none, 1 = diagonal striped, 2 = vertical striped
-		reliefstyle = 0 # 0 = flat, 1 = inset, 2 = shadow, 3 = shadow with gradient, 4 = stronger shadow with gradient
-		roundness = 0 # roundness of widgets
-		scrollbarstyle = 0 # 0 = none, 1 = circles, 2 = handles, 3 = diagonal stripes, 4 = diagonal stripes and handles, 5 = horizontal stripes, 6 = horizontal stripes and handles
-		sliderstyle = 0 # 0 = none, 1 = handles
-		stepperstyle = 1 # 0 = standard, 1 = integrated stepper handles
-		toolbarstyle = 0 # 0 = flat, 1 = glassy, 2 = gradient
-   }}
-}}
-
-style "murrine-wide" {{
-	xthickness = 2
-	ythickness = 2
-}}
-
-style "murrine-wider" {{
-	xthickness = 3
-	ythickness = 3
-}}
-
-style "murrine-thin" {{
-	xthickness = 0
-	ythickness = 0
-}}
-
-# Notebook
-
-style "murrine-notebook-bg" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade (0.70, @bg_color)
-}}
-
-style "murrine-notebook" = "murrine-notebook-bg" {{
-	xthickness = 2
-	ythickness = 2
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-# Various Standard Widgets
-
-style "murrine-button"  = "murrine-wider" {{
-	bg[NORMAL] = shade (1.3, @bg_color)
-	bg[PRELIGHT] = shade (0.80, @selected_bg_color)
-	bg[ACTIVE] = shade (1.00, @selected_bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-  	engine "murrine" {{
-	}}
-}}
-
-style "murrine-scrollbar" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = mix (0.31, @text_color, @bg_color)
-	bg[ACTIVE] = @selected_bg_color
-
-	engine "murrine" {{
-		roundness = 0
-		contrast = 0.0
-		border_shades = {{ 0.9, 0.9 }}
-		trough_shades = {{ 0.97, 0.97 }}
-		trough_border_shades = {{ 1.0, 1.0 }}
-	}}
-}}
-
-style "murrine-overlay-scrollbar" {{
-	bg[ACTIVE] = shade (0.8, @bg_color)
-	bg[INSENSITIVE] = shade (0.97, @bg_color)
-
-	base[SELECTED] = shade (0.6, @bg_color)
-	base[INSENSITIVE] = shade (0.85, @bg_color)
-}}
-
-style "murrine-scale" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = @bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[INSENSITIVE] = shade (0.95, @bg_color)
-
-	engine "murrine" {{
-		roundness = 8
-		gradient_shades = {{ 1.08, 1.08, 1.08, 1.08 }}
-		border_shades = {{ 1.0, 1.0 }}
-		trough_shades = {{ 1.08, 1.08 }}
-		trough_border_shades = {{ 0.8, 0.8 }}
-	}}
-}}
-
-style "murrine-progressbar" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[ACTIVE] = shade(0.60, @bg_color)
-
-	fg[PRELIGHT] = @selected_fg_color
-
-	engine "murrine" {{
-		roundness = 0
-		border_shades = {{ 1.2, 1.2 }}
-		trough_border_shades = {{ 0.8, 0.8 }}
-	}}
-}}
-
-style "murrine-treeview-header" = "murrine-button" {{
-  	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-treeview" {{
-  	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-frame-title" {{
-	fg[NORMAL] = lighter (@text_color)
-}}
-
-style "murrine-tooltips" {{
-	xthickness = 5
-	ythickness = 5
-
-	bg[NORMAL] = @tooltip_bg_color
-	bg[SELECTED] = @tooltip_bg_color
-
-	fg[NORMAL] = @text_color
-
-	engine "murrine" {{
-		textstyle = 0
-		roundness = 0
-		rgba = FALSE
-	}}
-}}
-
-style "murrine-spinbutton" = "murrine-button" {{
-	engine "murrine" {{
-	}}
-}}
-
-style "murrine-radiocheck" = "murrine-default" {{
-	bg[SELECTED] = @bg_color
-
-	text[NORMAL] = @selected_bg_color
-	text[PRELIGHT] = @selected_bg_color
-}}
-
-style "murrine-entry" = "murrine-wider" {{
-        bg[SELECTED] = @selected_bg_color
-
-	engine "murrine" {{
-		border_shades = {{ 1.15, 1.15 }}
-	}}
-}}
-
-style "metacity-frame" = "murrine-default" {{
-	bg[SELECTED] = @selected_bg_color
-}}
-
-style "murrine-statusbar" {{ 
-  bg[NORMAL] = @bg_color
-}}
-style "murrine-comboboxentry" = "murrine-entry" {{ }}
-style "murrine-hscale" = "murrine-scale" {{ }}
-style "murrine-vscale" = "murrine-scale" {{ }}
-style "murrine-hscrollbar" = "murrine-scrollbar" {{ }}
-style "murrine-vscrollbar" = "murrine-scrollbar" {{ }}
-
-# Menus
-
-style "murrine-menu" = "murrine-thin" {{
-	bg[NORMAL] = shade(0.8, @menu_bg_color)
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	text[NORMAL] = @menu_fg_color
-	text[PRELIGHT] = @selected_fg_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @selected_fg_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-menu-item" = "murrine-wider" {{
-	bg[PRELIGHT] = @selected_bg_color
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @menu_fg_color # Fix for XFCE menu text
-	fg[PRELIGHT] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[INSENSITIVE] = mix (0.5, @menu_bg_color, @menu_fg_color)
-
-	engine "murrine" {{
-		textstyle = 0
-		border_shades = {{ 1.2, 1.2 }}
-	}}
-}}
-
-style "murrine-separator-menu-item" = "murrine-thin" {{ }}
-
-style "murrine-menubar" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  mix (0.21, @text_color, @bg_color)
-	bg[SELECTED] =  mix (0.21, @text_color, @bg_color)
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-style "murrine-menubaritem" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] =  @selected_bg_color
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = shade (1.08, @text_color)
-	fg[SELECTED] = shade (1.08, @text_color)
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-# Toolbars
-
-style "murrine-toolbar" = "murrine-thin" {{
-	bg[NORMAL] = @bg_color
-	bg[PRELIGHT] = shade (1.02, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.9, @bg_color)
-	bg[INSENSITIVE] = @bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-style "murrine-toolbutton" = "murrine-button" {{
-	bg[NORMAL] = shade (1.08, @bg_color)
-	bg[PRELIGHT] = shade (1.10, @bg_color)
-	bg[SELECTED] = @selected_bg_color
-	bg[ACTIVE] = shade (0.95, @bg_color)
-	bg[INSENSITIVE] = shade (0.85, @bg_color)
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-class "GtkToolbar" style "murrine-toolbar"
-class "GtkHandleBox" style "murrine-toolbar"
-widget_class "*Toolbar*.*Separator*" style "murrine-toolbar"
-
-# Panels
-
-style "murrine-panel" = "murrine-thin" {{
-	xthickness = 2
-
-	bg[NORMAL] = @menu_bg_color
-	bg[PRELIGHT] =  shade(0.8, @selected_bg_color)
-	bg[SELECTED] =  @selected_bg_color
-	bg[ACTIVE] = @selected_bg_color
-	bg[INSENSITIVE] = @menu_bg_color
-
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[SELECTED] = @text_color
-	fg[ACTIVE] = @text_color
-	fg[INSENSITIVE] = shade(0.8, @text_color)
-
-	base[NORMAL] = @menu_bg_color
-	base[PRELIGHT] =  mix (0.21, @text_color, @menu_bg_color)
-	base[SELECTED] =  @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-	base[INSENSITIVE] = @menu_bg_color
-
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = shade (1.08, @text_color)
-	text[SELECTED] = shade (1.08, @text_color)
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @menu_bg_color, @text_color)
-
-	engine "murrine" {{
-		roundness = 0
-		contrast = 0.0
-	}}
-}}
-
-widget "*PanelWidget*" style "murrine-panel"
-widget "*PanelApplet*" style "murrine-panel"
-widget "*fast-user-switch*" style "murrine-panel"
-widget "*CPUFreq*Applet*" style "murrine-panel"
-widget "*indicator-applet*" style "murrine-panel"
-class "PanelApp*" style "murrine-panel"
-class "PanelToplevel*" style "murrine-panel"
-widget_class "*PanelToplevel*" style "murrine-panel"
-widget_class "*notif*" style "murrine-panel"
-widget_class "*Notif*" style "murrine-panel"
-widget_class "*Tray*" style "murrine-panel" 
-widget_class "*tray*" style "murrine-panel"
-widget_class "*computertemp*" style "murrine-panel"
-widget_class "*Applet*Tomboy*" style "murrine-panel"
-widget_class "*Applet*Netstatus*" style "murrine-panel"
-widget "*gdm-user-switch-menubar*" style "murrine-panel"
-
-style "bold-panel-item" {{
-	font_name = "Bold"
-
-	engine "murrine" {{
-		roundness = 0
-	}}
-}}
-
-widget "*Panel*MenuBar*" style "bold-panel-item"
-widget "*gimmie*" style "bold-panel-item"
-
-# widget_class "*Mail*" style "murrine-panel" # Disabled to fix Evolution bug
-# class "*Panel*" style "murrine-panel" # Disabled to fix bug
-
-# XFCE Styles
-
-style "workspace-switcher" = "murrine-panel" {{
-	bg[SELECTED] = @selected_bg_color
-}}
-
-style "xfce-header" {{
-	bg[NORMAL] = shade (0.9, @bg_color)
-	base[NORMAL] = shade (1.18, @bg_color)
-}}
-
-style "xfdesktop-windowlist" {{
-	bg[NORMAL] = @bg_color
-	fg[INSENSITIVE] = shade (0.95, @bg_color)
-	text[INSENSITIVE] = shade (0.95, @bg_color)
-}}
-
-style "xfdesktop-icon-view" {{
-	XfdesktopIconView::label-alpha = 0
-	XfdesktopIconView::selected-label-alpha = 60
-	XfdesktopIconVIew::ellipsize-icon-labels = 1
-
-	base[NORMAL] = @selected_bg_color
-	base[SELECTED] = @selected_bg_color
-	base[ACTIVE] = @selected_bg_color
-
-	fg[NORMAL] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[ACTIVE] = @selected_fg_color
-
-	engine "murrine" {{
-		textstyle = 5
-		text_shade = 0.05
-	}}
-}}
-
-style "xfwm-tabwin" {{
-	Xfwm4TabwinWidget::border-width = 0
-	Xfwm4TabwinWidget::icon-size = 64
-
-	bg[NORMAL] = @menu_bg_color
-	fg[NORMAL] = @menu_fg_color
-
-	engine "murrine" {{
-		focusstyle = 0
-	}}
-}}
-
-style "xfsm-logout" {{
-	bg[NORMAL] = @menu_bg_color
-	bg[ACTIVE] = @menu_bg_color
-	bg[PRELIGHT] = shade (1.1, @menu_bg_color)
-	bg[SELECTED] = shade (0.5, @menu_bg_color)
-	bg[INSENSITIVE] = shade (1.3, @menu_bg_color)
-
-	fg[NORMAL] = @menu_fg_color
-	fg[PRELIGHT] = @menu_fg_color
-
-	text[NORMAL] = @menu_fg_color
-
-	engine "murrine" {{
-	}}
-}}
-
-style "xfsm-logout-button" {{
-	bg[NORMAL] = shade (1.2, @menu_bg_color)
-	bg[PRELIGHT] = shade (1.4, @menu_bg_color)
-
-	engine "murrine" {{
-	}}
-}}
-
-widget "*WnckPager*" style "workspace-switcher"
-
-widget "*Xfce*Panel*" style "murrine-panel"
-class "*Xfce*Panel*" style "murrine-panel"
-
-# Thunar Styles
-
-style "sidepane" {{
-	base[NORMAL] = @bg_color
-	base[INSENSITIVE] = shade(0.90, @bg_color)
-	bg[NORMAL] = @bg_color
-	text[NORMAL] = @text_color
-}}
-
-widget_class "*ThunarShortcutsView*" style "sidepane"
-widget_class "*ThunarTreeView*" style "sidepane"
-widget_class "*ThunarLocationEntry*" style "murrine-entry"
-
-# Gtk2 Open-File Dialog
-
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.GtkTreeView*" style "sidepane"
-widget_class "*GtkFileChooserWidget.GtkFileChooserDefault.GtkVBox.GtkHPaned.GtkVBox.GtkScrolledWindow.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-
-# Google Chrome/Chromium Styles (requires 9.0.597 or newer)
-
-style "chromium-toolbar-button" {{
-	engine "murrine" {{
-		roundness = 2
-		textstyle = 0
-	}}
-}}
-
-style "chrome-gtk-frame" {{
-	ChromeGtkFrame::frame-color = @titlebar_bg_color
-	ChromeGtkFrame::inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::frame-gradient-size = 0
-	ChromeGtkFrame::frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-color = @titlebar_bg_color
-	ChromeGtkFrame::incognito-inactive-frame-color = @titlebar_bg_color
-
-	ChromeGtkFrame::incognito-frame-gradient-size = 0
-	ChromeGtkFrame::incognito-frame-gradient-color = @titlebar_bg_color
-
-	ChromeGtkFrame::scrollbar-trough-color = @bg_color
-	ChromeGtkFrame::scrollbar-slider-normal-color =  mix (0.21, @text_color, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color =  mix (0.31, @text_color, @bg_color)
-}}
-
-class "ChromeGtkFrame" style "chrome-gtk-frame"
-
-widget_class "*Chrom*Button*" style "chromium-toolbar-button"
-
-# General Styles
-
-class "GtkWidget" style "murrine-default"
-
-class "GtkFrame" style "murrine-wide"
-class "MetaFrames" style "metacity-frame"
-class "GtkWindow" style "metacity-frame"
-
-class "GtkSeparator" style "murrine-wide"
-class "GtkCalendar" style "murrine-wide"
-
-class "GtkSpinButton" style "murrine-spinbutton"
-
-class "GtkScale" style "murrine-scale"
-class "GtkVScale" style "murrine-vscale"
-class "GtkHScale" style "murrine-hscale"
-class "GtkScrollbar" style "murrine-scrollbar"
-class "GtkVScrollbar" style "murrine-vscrollbar"
-class "GtkHScrollbar" style "murrine-hscrollbar"
-
-class "GtkRadio*" style "murrine-radiocheck"
-class "GtkCheck*" style "murrine-radiocheck"
-
-class "GtkEntry" style "murrine-entry"
-
-widget_class "*<GtkNotebook>" style "murrine-notebook"
-widget_class "*<GtkNotebook>*<GtkEventBox>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "murrine-notebook-bg"
-widget_class "*<GtkNotebook>*<GtkLayout>" style "murrine-notebook-bg"
-widget_class "*.GtkNotebook.*.GtkViewport" style "murrine-notebook"
-
-widget_class "*<GtkButton>" style "murrine-button"
-widget_class "*<GtkStatusbar>*" style "murrine-statusbar"
-widget_class "*<GtkProgress>" style "murrine-progressbar"
-widget_class "*<GtkProgressBar>" style "murrine-progressbar"
-
-widget_class "*<GtkComboBoxEntry>*" style "murrine-comboboxentry"
-widget_class "*<GtkCombo>*" style "murrine-comboboxentry"
-
-widget_class "*<GtkMenu>*" style "murrine-menu"
-widget_class "*<GtkMenuItem>*" style "murrine-menu-item"
-widget_class "*<GtkSeparatorMenuItem>*" style "murrine-separator-menu-item"
-widget_class "*Menu*.*Sepa*"  style "murrine-separator-menu-item"
-widget_class "*<GtkMenuBar>*" style "murrine-menubar"
-widget_class "*<GtkMenuBar>*<GtkMenuItem>*" style "murrine-menubaritem"
-
-widget_class "*GtkToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToggleToolButton*" style "murrine-toolbutton"
-widget_class "*GtkMenuToolButton*" style "murrine-toolbutton"
-widget_class "*GtkToolbar*Button" style "murrine-toolbutton"
-
-widget_class "*.<GtkFrame>.<GtkLabel>" style "murrine-frame-title"
-
-widget_class "*.<GtkTreeView>*" style "murrine-treeview"
-widget_class "*.<GtkTreeView>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header"
-widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header"
-
-widget "gtk-tooltip*" style "murrine-tooltips"
-
-widget_class "*<GtkScrolledWindow>*<OsScrollbar>" style "murrine-overlay-scrollbar"
-
-# Workarounds and Non-Standard Styling
-
-style "text-is-fg-color-workaround" {{
-	text[NORMAL] = @text_color
-	text[PRELIGHT] = @text_color
-	text[SELECTED] = @selected_fg_color
-	text[ACTIVE] = @text_color
-	text[INSENSITIVE] = mix (0.5, @bg_color, @text_color)
-}}
-
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "text-is-fg-color-workaround"
-
-style "fg-is-text-color-workaround" {{
-	fg[NORMAL] = @text_color
-	fg[PRELIGHT] = @text_color
-	fg[ACTIVE] = @selected_fg_color
-	fg[SELECTED] = @selected_fg_color
-	fg[INSENSITIVE] = darker (@text_color)
-}}
-
-widget_class "*<GtkListItem>*" style "fg-is-text-color-workaround"
-widget_class "*<GtkCList>" style "fg-is-text-color-workaround"
-widget_class "*<EelEditableLabel>" style "fg-is-text-color-workaround"
-
-style "murrine-evo-new-button-workaround" {{
-	engine "murrine" {{
-		toolbarstyle = 0
-	}}
-}}
-
-widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "murrine-evo-new-button-workaround"
-
-style "inkscape-toolbar-fix" {{
-	engine "murrine" {{
-		gradient_shades = {{ 1.0, 1.0, 1.0, 1.0 }}
-		highlight_shade = 1.0
-	}}
-}}
-
-#widget "*GtkHandleBox*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*CommandsToolbar*" style "inkscape-toolbar-fix"
-#widget "*HandleBox*SnapToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SelectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*NodeToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*TweakToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ZoomToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*StarToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*RectToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*3DBoxToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ArcToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*SpiralToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PencilToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PenToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*CalligraphyToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*EraserToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*LPEToolToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*DropperToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*ConnectorToolbar*" style "inkscape-toolbar-fix"
-widget "*HandleBox*PaintbucketToolbar*" style "inkscape-toolbar-fix"
-
-# Performance Fixes
-
-style "performance-fix" {{
-	engine "murrine" {{
-		textstyle = 0
-	}}
-}}
-
-widget_class "*gtkmm__GtkWindow*" style "performance-fix" # Inkscape
-widget_class "*GimpDisplayShell*" style "performance-fix" # Gimp
-widget_class "*GimpToolbox*" style "performance-fix"
-widget_class "*GimpMenuDock*" style "performance-fix"
-widget "*OOoFixed*" style "performance-fix" # Openoffice/Libreoffice
-widget_class "*MozContainer*" style "performance-fix" # Firefox (Not sure if this one does anything though.)
-
-widget_class "*XfceHeading*" style "xfce-header"
-widget_class "*XfceDesktop*" style "xfdesktop-windowlist"
-widget_class "*XfdesktopIconView*" style "xfdesktop-icon-view"
-widget "xfwm4-tabwin*" style "xfwm-tabwin"
-widget_class "*XfsmLogoutDialog*" style "xfsm-logout"
-widget_class "*XfsmLogoutDialog*GtkButton" style "xfsm-logout-button"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Hadi	5182276d1e	Update Former-commit-id: `dff9dcc8d5`	2024-05-09 16:51:42 +02:00
Hadi	d18e69ee75	Update Former-commit-id: `31913ccdcc`	2024-05-09 16:50:46 +02:00
Hadi	f363249e41	Add lazygit Former-commit-id: `8400e5fd4d`	2024-05-09 16:46:30 +02:00
Hadi	342fbc2fcc	Add lazygit Former-commit-id: `8d0216e1fc`	2024-05-09 16:44:39 +02:00
Hadi	150617ca7a	Update Former-commit-id: `c4f8d05c0d`	2024-05-09 16:33:24 +02:00
Hadi	7196117da7	Update Former-commit-id: `6d4bc5a9e8`	2024-05-09 13:33:51 +02:00
Hadi	ba1feb92ec	Add new theme Former-commit-id: `6065afd390`	2024-05-09 13:33:44 +02:00
Hadi	7452406a00	Fix spacing Former-commit-id: `abfe7ca839`	2024-05-09 13:33:18 +02:00
Hadi	2c910092c8	Update Former-commit-id: `a26fbaa2c3`	2024-05-09 10:54:19 +02:00
Hadi	c3d9df2cb0	Rearrange folder struct Former-commit-id: `e58fda9896`	2024-05-04 22:51:33 +02:00
Hadi	b573560024	Fix renamed Former-commit-id: `d026643105`	2024-05-04 22:46:46 +02:00
Hadi	1633e21d9b	Delete /tmp dir on boot Former-commit-id: `984a25c111`	2024-05-04 22:45:51 +02:00
Hadi	406d7ae6e9	Update Former-commit-id: `2c2b451d40`	2024-05-04 22:36:06 +02:00
Hadi	2055d2da9a	Waybar git to solve issue w/hyprland Former-commit-id: `1af3617b32`	2024-05-02 18:16:39 +02:00
Hadi	ec4fc1864c	Update Former-commit-id: `6d1912703c`	2024-05-02 15:46:16 +02:00
Hadi	fa0aa29974	Update Former-commit-id: `81ab14b256`	2024-05-02 15:40:12 +02:00
Hadi	8e4d046365	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/572af610f6151fd41c212f897c71f7056e3fb518' (2024-04-23) → 'github:nixos/nixpkgs/58a1abdbae3217ca6b702f03d3b35125d88a2994' (2024-04-27) Former-commit-id: `92ec6a5ea8`	2024-05-02 12:44:43 +02:00
Hadi	aec2c05778	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/6143fc5eeb9c4f00163267708e26191d1e918932' (2024-04-21) → 'github:nixos/nixpkgs/572af610f6151fd41c212f897c71f7056e3fb518' (2024-04-23) Former-commit-id: `62029890cd`	2024-04-25 22:44:44 +02:00
Hadi	5cd78b81d1	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/5c24cf2f0a12ad855f444c30b2421d044120c66f' (2024-04-19) → 'github:nixos/nixpkgs/6143fc5eeb9c4f00163267708e26191d1e918932' (2024-04-21) Former-commit-id: `6cec1f00f0`	2024-04-22 17:39:48 +02:00
Hadi	d906e2675d	Update Former-commit-id: `7dd8af5bf8`	2024-04-20 11:50:19 +02:00
Hadi	ac5949e2a0	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/66adc1e47f8784803f2deb6cacd5e07264ec2d5c' (2024-04-16) → 'github:nixos/nixpkgs/5c24cf2f0a12ad855f444c30b2421d044120c66f' (2024-04-19) Former-commit-id: `86175a04e5`	2024-04-20 11:31:07 +02:00
Hadi	72111e6c3a	Fix typo Former-commit-id: `de607e2eea`	2024-04-20 01:05:50 +02:00
Hadi	dad7e92a41	Delete .sops.yaml Former-commit-id: `e8dd18e32c`	2024-04-20 00:41:50 +02:00
Hadi	8cf07d7418	Fix Former-commit-id: `3fe07d3ba5`	2024-04-20 00:39:15 +02:00
Hadi	3ae887ef0e	Add github search engine Former-commit-id: `52ccccc2d9`	2024-04-20 00:23:32 +02:00
Hadi	ac34c94aad	Fix 2 file explorer Former-commit-id: `805917511e`	2024-04-20 00:19:15 +02:00
Hadi	dd54fa49f0	Fix Former-commit-id: `950e1cfcf2`	2024-04-20 00:16:05 +02:00
Hadi	4f1920ac35	Fix Former-commit-id: `637accfc1c`	2024-04-20 00:02:59 +02:00
Hadi	7693435eab	Fix font Former-commit-id: `a37de9940f`	2024-04-19 23:46:15 +02:00
Hadi	5451b4cfb4	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/cfd6b5fc90b15709b780a5a1619695a88505a176' (2024-04-12) → 'github:nixos/nixpkgs/66adc1e47f8784803f2deb6cacd5e07264ec2d5c' (2024-04-16) Former-commit-id: `14bca81e37`	2024-04-19 23:35:51 +02:00
Hadi	3677d8f6a1	Update Former-commit-id: `767e9d182d`	2024-04-14 21:59:30 +02:00
Hadi	8f3fd2e2a5	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6' (2024-04-08) → 'github:nixos/nixpkgs/1042fd8b148a9105f3c0aca3a6177fd1d9360ba5' (2024-04-10) Former-commit-id: `21ce99bfe8`	2024-04-14 17:01:34 +02:00
Hadi	d7a1249a3f	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/ff0dbd94265ac470dda06a657d5fe49de93b4599' (2024-04-06) → 'github:nixos/nixpkgs/4cba8b53da471aea2ab2b0c1f30a81e7c451f4b6' (2024-04-08) Former-commit-id: `3aeedf0ed7`	2024-04-10 18:25:46 +02:00
Hadi	290cfca8b3	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/08b9151ed40350725eb40b1fe96b0b86304a654b' (2024-04-03) → 'github:nixos/nixpkgs/ff0dbd94265ac470dda06a657d5fe49de93b4599' (2024-04-06) Former-commit-id: `cd04bd89c0`	2024-04-07 15:47:33 +02:00
Hadi	5717331eb6	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089' (2024-03-29) → 'github:nixos/nixpkgs/08b9151ed40350725eb40b1fe96b0b86304a654b' (2024-04-03) Former-commit-id: `331fc331df`	2024-04-04 11:35:03 +02:00
Hadi	0bf5355641	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/20f77aa09916374aa3141cbc605c955626762c9a' (2024-03-21) → 'github:nixos/nixpkgs/d8fe5e6c92d0d190646fb9f1056741a229980089' (2024-03-29) Former-commit-id: `b9775975ea`	2024-03-30 12:09:12 +01:00
Hadi	b4c0b61815	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/b06025f1533a1e07b6db3e75151caa155d1c7eb3' (2024-03-19) → 'github:nixos/nixpkgs/20f77aa09916374aa3141cbc605c955626762c9a' (2024-03-21) Former-commit-id: `7a8ebb778a`	2024-03-22 14:16:16 +01:00
Hadi	011c084203	I hate wl clipboard Former-commit-id: `24a8438694`	2024-03-20 23:26:53 +01:00
Hadi	10215a086f	Woopsi Former-commit-id: `ce2e0c2fa8`	2024-03-20 22:44:32 +01:00
Hadi	882c3f0c76	Nerdfont icons finder, folder arch.. Former-commit-id: `e97e2705b5`	2024-03-20 22:38:49 +01:00
Hadi	c3151cc1f5	Up Former-commit-id: `cb98842775`	2024-03-20 21:47:50 +01:00
Hadi	cb1b2c04c7	Up Former-commit-id: `95562dce0e`	2024-03-20 20:04:09 +01:00
Hadi	8ab6e708f6	keybindings Former-commit-id: `bb47c6a943`	2024-03-20 18:58:16 +01:00
Hadi	06805d8d27	Themes Former-commit-id: `5ad31e7602`	2024-03-20 18:31:59 +01:00
Hadi	557b1d375e	oops Former-commit-id: `35de81a46d`	2024-03-20 18:05:24 +01:00
Hadi	b9cf6573bd	up Former-commit-id: `0fee3682d0`	2024-03-20 18:01:15 +01:00
Hadi	2cd17956fa	Fix powermenu management Former-commit-id: `aa25061ad7`	2024-03-18 22:48:11 +01:00
Hadi	435d82cfba	Fix neofetch on floating window Former-commit-id: `69bd97e1bd`	2024-03-18 22:40:15 +01:00
Hadi	c1b7e8d56c	Fix windows name & padding Former-commit-id: `1dd92201d0`	2024-03-18 22:37:03 +01:00
Hadi	2956e1599a	Up Former-commit-id: `ef3489075f`	2024-03-18 22:26:32 +01:00
Hadi	4545f906ef	License Former-commit-id: `6a562ff64c`	2024-03-17 17:35:11 +01:00
Hadi	ae7d092e1a	Details README Former-commit-id: `441b45846e`	2024-03-17 17:17:03 +01:00
Hadi	7252a96939	Up Former-commit-id: `381b3228dc`	2024-03-17 17:11:49 +01:00
Hadi	b24abc3831	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d691274a972b3165335d261cc4671335f5c67de9' (2024-03-14) → 'github:nixos/nixpkgs/c75037bbf9093a2acb617804ee46320d6d1fea5a' (2024-03-16) Former-commit-id: `bb869d6897`	2024-03-17 16:47:28 +01:00
Hadi	22395725a3	Up Former-commit-id: `a230692b90`	2024-03-17 01:14:16 +01:00
Hadi	9beb7bc157	Up Former-commit-id: `f86a0271b6`	2024-03-16 22:26:30 +01:00
Hadi	f0d8a6b811	flake.lock: Update Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/0ad13a6833440b8e238947e47bea7f11071dc2b2' (2024-03-12) → 'github:nixos/nixpkgs/d691274a972b3165335d261cc4671335f5c67de9' (2024-03-14) Former-commit-id: `3f2ba75a5e`	2024-03-16 18:26:14 +01:00
Hadi	202ac3ca3b	Secrets, scripts, clean.. Former-commit-id: `5e98256a82`	2024-03-15 21:26:34 +01:00
Hadi	1f6075cae7	Up Former-commit-id: `05fc3fbcd9`	2024-03-14 18:42:15 +01:00
Hadi	0ab8844d04	Up Former-commit-id: `77eba6e2c2`	2024-03-14 01:30:17 +01:00
Hadi	1bb1112db2	Up Former-commit-id: `d5bd3270f7`	2024-03-14 01:05:29 +01:00
Hadi	61804bcbe7	Add caffeine Former-commit-id: `13ae5ad530`	2024-03-14 00:10:13 +01:00
Hadi	31ace98f68	Up Former-commit-id: `8bda501d16`	2024-03-13 23:32:40 +01:00
Hadi	e9480830d8	Up Former-commit-id: `6ed623bd6f`	2024-03-13 21:56:32 +01:00
Hadi	7490f1ef84	Up Former-commit-id: `3fe2c8913f`	2024-03-13 21:38:55 +01:00
Hadi	f7e41e3653	Add wallpapers Former-commit-id: `a1f05792e4`	2024-03-13 19:58:46 +01:00
				`@@ -1 +0,0 @@`
				`{ programs.nixvim.plugins.image = { enable = true; }; }`
				`@@ -1 +0,0 @@`
				`{ programs.nixvim.plugins.noice = { enable = true; }; }`