-
- 
-
@@ -35,12 +27,20 @@
**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.
+*Key points:*
+
+- Hyprecosystem first (Hyprland, hyprlock, hyprpanel, hypridle, ...)
+- Stylix/base16 themes
+
## Table of Content
+- [Nixy](#nixy)
- [Table of Content](#table-of-content)
- [Gallery](#gallery)
- [Architecture](#architecture)
- [🏠 `home`](#-home)
+ - [`nixos`](#nixos)
+ - [`themes`](#themes)
- [💻 `hosts`](#-hosts)
- [Installation](#installation)
- [Documentation](#documentation)
@@ -64,18 +64,15 @@ Those are the dotfiles and configuration files for user-level configuration
- `system` is some "desktop environment" configuration
- `wallpapers` are... wallpapers
+### `nixos`
+
+### `themes`
+
### 💻 `hosts`
Those are the host-specific configurations
Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
-**Subfolders:**
-
-- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
-- 📦 `modules` are the nix modules that you can import
-- `laptop` is my configuration for my laptop with Nvidia that you can copy
-- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)
-
## Installation
```sh
@@ -96,10 +93,9 @@ 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
- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
-- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
+- [WALLPAPERS.md](https://github.com/anotherhadi/nixy-wallpapers): A collection of wallpapers for Nixy.
- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
diff --git a/docs/APPS.md b/docs/APPS.md
deleted file mode 100644
index 7a12d30..0000000
--- a/docs/APPS.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Apps and services
-
-*non-exhaustive lists*
-
-## Laptop
-
-The laptop configuration is used by an Omen 16 laptop w/ nvidia and an amd gpu running NixOS.
-The configurations files can be found in the `hosts/laptop` directory.
-
-| Category | Name |
-| --------------------------------------- | -------------- |
-| WM | Hyprland |
-| | hyprlock |
-| | hyprpaper |
-| | hypridle |
-| | hyprcursor |
-| | wlogout |
-| Bar | hyprpanel |
-| Terminal | kitty |
-| Shell | zsh |
-| | tmux |
-| | starship |
-| | bat |
-| | eza |
-| | zoxide |
-| | fzf |
-| Editor | neovim(nixvim) |
-| File manager | thunar |
-| Browser | qutebrowser |
-| Music | spicetify |
-| Launcher | wofi |
-| DM | tuigreet |
-| Secrets | sops-nix |
-| See [hosts/laptop](../hosts/laptop/)... | |
-
-## Server
-
-The server configuration is used by a home server running NixOS.
-The configurations files can be found in the `hosts/server` directory.
-I mainly use it for self-hosting websites and services such as Nextcloud, Vaultwarden, jellyfin, ...
-I exposed some services to the internet using a reverse proxy (Nginx) and cloudflare-dyndns, others are accessed through a tailscale network
diff --git a/docs/THEMES.md b/docs/THEMES.md
index 0662511..7e798ec 100644
--- a/docs/THEMES.md
+++ b/docs/THEMES.md
@@ -1,6 +1,6 @@
# Themes
-Themes are defined in `hosts/themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
+Themes are defined in `themes`. Those themes define the colors, fonts, icons, etc, used by Hyprland and the apps/programs installed.
You can change the selected theme by changing the import statement of your host's variables.nix file.
> [!TIP]
@@ -9,7 +9,7 @@ You can change the selected theme by changing the import statement of your host'
## Create your theme
Create a copy of one of the existing themes and change the variables.
-Wallpapers are loaded from the `home/wallpapers` folder.
+Wallpapers are loaded from the [nixy-wallpapers](https://github.com/anotherhadi/nixy-wallpapers) repo.
## Gallery
diff --git a/docs/TODO.md b/docs/TODO.md
index bf86014..3c4949f 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -1,13 +1,16 @@
-# Todolist {
+# Todolist
feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
- [ ] Hyprshade (replacement for gammastep)
- [ ] !!! Qutebrowser Bitwarden integration (I need this.)
+
- [ ] Hyprland
- [ ] Fix screenshots (screenshot region's border shows up in the screenshot, hyprshot jq error?) and add in the scripts doc
+
- [ ] Nixy
- [ ] Open Keybindings
+
- [ ] Nixvim
- [ ] Markdown tab size 2
- [ ] Harpoon
@@ -16,15 +19,6 @@ feel free to contribute <3 ([CONTRIBUTING.md](CONTRIBUTING.md))
- [ ] nvim dap
- [ ]
- [ ]
+
- [ ] Update docs
- [ ] Workflow README
-- [ ] Put wallpapers in a separate repo, with a flake.nix
-
-## Server
-
-- [ ] Jackflix V2
- - Backup Radarr, Prowlarr, Sonarr config
- - Take a look into buildarr or build a custom solution with *arr apis
-- [ ] Bitcoin-git: broken
-- [ ] Secrets mode 0444: not secure
-- [ ] Adguard config
diff --git a/docs/WALLPAPERS.md b/docs/WALLPAPERS.md
deleted file mode 100644
index 9bf4f64..0000000
--- a/docs/WALLPAPERS.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Wallpapers
-
-Wallpapers can be found in the `/home/wallpapers` folder.
-
-| Name | Preview |
-|-----------------------|--------------------------------------------------------------------|
-| 20.png |  |
-| astronaut.png |  |
-| aurore.png |  |
-| barcode.png |  |
-| black-and-white.png |  |
-| cat-leaves.png |  |
-| city.png |  |
-| cloud.png |  |
-| clouds-2.png |  |
-| clouds2.png |  |
-| clouds-3.png |  |
-| clouds.png |  |
-| coffee.png |  |
-| crane.png |  |
-| dark_cloud.png |  |
-| dark-forest.png |  |
-| dark.png |  |
-| dark-waves.png |  |
-| degirled.png |  |
-| diner-lonely-road.png |  |
-| fuji-dark.png |  |
-| fuji-light.png |  |
-| galaxy.png |  |
-| horizon-2.png |  |
-| house-cloud.png |  |
-| key.png |  |
-| lavender-cat.png |  |
-| lofi-computer.png |  |
-| lofi-urban.png |  |
-| magma.png |  |
-| mountains-black.png |  |
-| mountains.png |  |
-| nasa-japan-dark.png |  |
-| nix.png |  |
-| pixel-galaxy.png |  |
-| problems.png |  |
-| rains-dark.png |  |
-| rocket-launch.png |  |
-| sea2.png |  |
-| sea.png |  |
-| space2.png |  |
-| space.png |  |
-| street.png |  |
-| sun.png |  |
-| the-road-black.png |  |
-| tokyo.png |  |
-| train.png |  |
-| windows.png |  |
-| wp.png |  |
diff --git a/docs/scripts/compress_png.sh b/docs/scripts/compress_png.sh
index 7a5e6a8..d4e38b5 100644
--- a/docs/scripts/compress_png.sh
+++ b/docs/scripts/compress_png.sh
@@ -13,8 +13,3 @@ done
for file in ./docs/src/*/*.png; do
optipng "$file"
done
-
-# Wallpapers
-for file in ./home/wallpapers/*.png; do
- optipng "$file"
-done
diff --git a/docs/scripts/create_preview_wallpapers.sh b/docs/scripts/create_preview_wallpapers.sh
deleted file mode 100644
index 76f0e06..0000000
--- a/docs/scripts/create_preview_wallpapers.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-# Create WALLPAPERS.md to preview wallpapers in ./home/wallpapers
-
-WALLPAPERS_FOLDER="./home/wallpapers"
-WALLPAPERS_MD="./docs/WALLPAPERS.md"
-[[ -d "$WALLPAPERS_FOLDER" ]] || (echo "Wallpapers folder not found" && exit 1)
-
-echo "# Wallpapers" >"$WALLPAPERS_MD"
-echo "" >>"$WALLPAPERS_MD"
-echo "Wallpapers can be found in the \`/home/wallpapers\` folder." >>"$WALLPAPERS_MD"
-echo "" >>"$WALLPAPERS_MD"
-echo "| Name | Preview |" >>"$WALLPAPERS_MD"
-echo "| -- | -- |" >>"$WALLPAPERS_MD"
-
-for file in "$WALLPAPERS_FOLDER"/*.png; do
- filename=$(basename "$file")
- echo "| $filename |  |" >>"$WALLPAPERS_MD"
-done
-
-pandoc -t commonmark_x "$WALLPAPERS_MD" -o "/tmp/wallpapers.md"
-mv "/tmp/wallpapers.md" "$WALLPAPERS_MD"
diff --git a/docs/scripts/create_readme.sh b/docs/scripts/create_readme.sh
index 6393cc3..3da3ef1 100644
--- a/docs/scripts/create_readme.sh
+++ b/docs/scripts/create_readme.sh
@@ -6,22 +6,15 @@
README_FILE="./README.md"
-header=$(cat "./docs/src/header.md")
table_of_content=$(md-table-of-contents ./docs/src/README_template.md) # https://github.com/anotherhadi/md-table-of-contents
-version=$(git describe --tags --abbrev=0)
readme_content=$(cat "./docs/src/README_template.md")
-description=$(curl -s https://api.github.com/repos/anotherhadi/nixy | jq .description)
-description="${description%\"}"
-description="${description#\"}"
-header=${header//\{date\}/$(date '+%D')}
-header=${header//\{primarycolor\}/89b4fa}
-header=${header//\{backgroundcolor\}/181825}
-header=${header//\{version\}/$version}
-header=${header//\{description\}/$description}
+# Replace variables
+readme_content=${readme_content//\{primarycolor\}/89b4fa}
+readme_content=${readme_content//\{backgroundcolor\}/181825}
readme_content=${readme_content//\{md_table_of_content\}/$table_of_content}
-echo "$header" >"$README_FILE"
+echo "[//]: # (This file is autogenerated)" >"$README_FILE"
echo "$readme_content" >>"$README_FILE"
sed 's/\r//' "$README_FILE" >"/tmp/readme.md"
mv "/tmp/readme.md" "$README_FILE"
diff --git a/docs/scripts/new_tag.sh b/docs/scripts/new_tag.sh
deleted file mode 100644
index d490c0f..0000000
--- a/docs/scripts/new_tag.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-[[ -d "./docs" ]] || (echo "Folder ./docs not found" && exit 1)
-
-TAG=$(git describe --tags --abbrev=0)
-echo "Current tag: $TAG"
-
-read -rp "Enter the new tag name: " NEW_TAG
-
-read -rp "Do you want to compress the png files? [y/N]: " COMPRESS_PNG
-if [[ "$COMPRESS_PNG" == "y" || "$COMPRESS_PNG" == "Y" ]]; then
- echo "Compresing png files..."
- bash ./docs/scripts/compress_png.sh
-fi
-
-echo "Creating wallpapers preview..."
-bash ./docs/scripts/create_preview_wallpapers.sh
-echo "Creating README.md..."
-bash ./docs/scripts/create_readme.sh
-echo "Creating keybindings.md..."
-bash ./docs/scripts/keybindings_to_markdown.sh
-
-git add .
-git commit -m "Release $NEW_TAG"
-git tag -a "$NEW_TAG" -m "Release $NEW_TAG"
-git push origin "$NEW_TAG"
diff --git a/docs/scripts/take_rice_screenshot.sh b/docs/scripts/take_rice_screenshot.sh
deleted file mode 100644
index e257906..0000000
--- a/docs/scripts/take_rice_screenshot.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-[ "$1" = "" ] && echo "Usage: $0 " && 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
diff --git a/docs/src/README_template.md b/docs/src/README_template.md
index 25f60be..b3b150b 100644
--- a/docs/src/README_template.md
+++ b/docs/src/README_template.md
@@ -1,7 +1,36 @@
+
+
+
+
+# Nixy
+
+
+
+
**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.
+*Key points:*
+
+- Hyprecosystem first (Hyprland, hyprlock, hyprpanel, hypridle, ...)
+- Stylix/base16 themes
+
## Table of Content
{md_table_of_content}
@@ -25,18 +54,15 @@ Those are the dotfiles and configuration files for user-level configuration
- `system` is some "desktop environment" configuration
- `wallpapers` are... wallpapers
+### `nixos`
+
+### `themes`
+
### 💻 `hosts`
Those are the host-specific configurations
Each host contains a `configuration.nix` for system-level configuration, a `home.nix` for user-level configuration, and a `variables.nix` for config wide variables.
-**Subfolders:**
-
-- 🎨 `themes` are the themes available *(see [THEMES.md](docs/THEMES.md))*
-- 📦 `modules` are the nix modules that you can import
-- `laptop` is my configuration for my laptop with Nvidia that you can copy
-- `server` is for my homeserver (w/nextcloud, nginx, vaultwarden, ...)
-
## Installation
```sh
@@ -57,10 +83,9 @@ 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
- [KEYBINDINGS.md](docs/KEYBINDINGS.md): Keybindings available in Hyprland
-- [WALLPAPERS.md](docs/WALLPAPERS.md): Preview of every wallpapers available
+- [WALLPAPERS.md](https://github.com/anotherhadi/nixy-wallpapers): A collection of wallpapers for Nixy.
- [TODO.md](docs/TODO.md): What's next (feel free to contribute)
- [CONTRIBUTING.md](docs/CONTRIBUTING.md): How to contribute
diff --git a/docs/src/header.md b/docs/src/header.md
deleted file mode 100644
index 0637264..0000000
--- a/docs/src/header.md
+++ /dev/null
@@ -1,33 +0,0 @@
-[//]: # (Title: Nixy)
-[//]: # (Description: {description})
-[//]: # (Author: Hadi)
-[//]: # (Date: {date})
-[//]: # (Version: {version})
-
-
-
-
-
-# Nixy
-
-
-
-
diff --git a/flake.lock b/flake.lock
index 4f50f1f..3d29347 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,7 +2,7 @@
"nodes": {
"ags": {
"inputs": {
- "nixpkgs": "nixpkgs_4",
+ "nixpkgs": "nixpkgs_3",
"systems": "systems_3"
},
"locked": {
@@ -19,28 +19,10 @@
"type": "github"
}
},
- "anotherhadi-portfolio": {
- "inputs": {
- "nixpkgs": "nixpkgs"
- },
- "locked": {
- "lastModified": 1725477372,
- "narHash": "sha256-ZCQkWSRzkGK4VKlFXR9YyUUX3XloLP0zUto2a5QDFTY=",
- "owner": "anotherhadi",
- "repo": "portfolio",
- "rev": "ac8633fbc621f2f2c48d12349669b395ea32b671",
- "type": "github"
- },
- "original": {
- "owner": "anotherhadi",
- "repo": "portfolio",
- "type": "github"
- }
- },
"apple-fonts": {
"inputs": {
"flake-utils": "flake-utils",
- "nixpkgs": "nixpkgs_2",
+ "nixpkgs": "nixpkgs",
"ny": "ny",
"sf-arabic": "sf-arabic",
"sf-compact": "sf-compact",
@@ -489,7 +471,7 @@
"hyprlang": "hyprlang",
"hyprutils": "hyprutils",
"hyprwayland-scanner": "hyprwayland-scanner",
- "nixpkgs": "nixpkgs_3",
+ "nixpkgs": "nixpkgs_2",
"systems": "systems_2",
"xdph": "xdph"
},
@@ -509,36 +491,6 @@
"url": "https://github.com/hyprwm/Hyprland"
}
},
- "hyprland-plugins": {
- "inputs": {
- "hyprland": [
- "hyprland"
- ],
- "nixpkgs": [
- "hyprland-plugins",
- "hyprland",
- "nixpkgs"
- ],
- "systems": [
- "hyprland-plugins",
- "hyprland",
- "systems"
- ]
- },
- "locked": {
- "lastModified": 1727705521,
- "narHash": "sha256-tR4bc6zONkxore1F7CRrwHs9NITht8NY0JTidPSmMXY=",
- "owner": "hyprwm",
- "repo": "hyprland-plugins",
- "rev": "9215288eb2ded9d0c08d468ea90ba68f43162c67",
- "type": "github"
- },
- "original": {
- "owner": "hyprwm",
- "repo": "hyprland-plugins",
- "type": "github"
- }
- },
"hyprland-protocols": {
"inputs": {
"nixpkgs": [
@@ -623,7 +575,7 @@
"hyprpanel": {
"inputs": {
"ags": "ags",
- "nixpkgs": "nixpkgs_5"
+ "nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1728101408,
@@ -728,15 +680,15 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1725103162,
- "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
- "owner": "NixOS",
+ "lastModified": 1727348695,
+ "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
+ "owner": "nixos",
"repo": "nixpkgs",
- "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
+ "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github"
},
"original": {
- "owner": "NixOS",
+ "owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@@ -762,35 +714,19 @@
"locked": {
"lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
- "owner": "nixos",
+ "owner": "NixOS",
"repo": "nixpkgs",
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"type": "github"
},
"original": {
- "owner": "nixos",
+ "owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
- "locked": {
- "lastModified": 1727348695,
- "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
- "owner": "NixOS",
- "repo": "nixpkgs",
- "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
- "type": "github"
- },
- "original": {
- "owner": "NixOS",
- "ref": "nixos-unstable",
- "repo": "nixpkgs",
- "type": "github"
- }
- },
- "nixpkgs_4": {
"locked": {
"lastModified": 1725634671,
"narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=",
@@ -806,7 +742,7 @@
"type": "github"
}
},
- "nixpkgs_5": {
+ "nixpkgs_4": {
"locked": {
"lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
@@ -822,7 +758,7 @@
"type": "github"
}
},
- "nixpkgs_6": {
+ "nixpkgs_5": {
"locked": {
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
@@ -838,7 +774,7 @@
"type": "github"
}
},
- "nixpkgs_7": {
+ "nixpkgs_6": {
"locked": {
"lastModified": 1725194671,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
@@ -882,6 +818,22 @@
"type": "github"
}
},
+ "nixy-wallpapers": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1728284470,
+ "narHash": "sha256-OCK5mTajkGATUGlayNZ25WaPr1Whl+shNi1nar1CKc8=",
+ "owner": "anotherhadi",
+ "repo": "nixy-wallpapers",
+ "rev": "c1a5f921b82ee4c128dbea42fe26b5ffec0232df",
+ "type": "github"
+ },
+ "original": {
+ "owner": "anotherhadi",
+ "repo": "nixy-wallpapers",
+ "type": "github"
+ }
+ },
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_2",
@@ -934,15 +886,14 @@
},
"root": {
"inputs": {
- "anotherhadi-portfolio": "anotherhadi-portfolio",
"apple-fonts": "apple-fonts",
"home-manager": "home-manager",
"hyprland": "hyprland",
- "hyprland-plugins": "hyprland-plugins",
"hyprpanel": "hyprpanel",
"nixos-hardware": "nixos-hardware",
- "nixpkgs": "nixpkgs_6",
+ "nixpkgs": "nixpkgs_5",
"nixvim": "nixvim",
+ "nixy-wallpapers": "nixy-wallpapers",
"plugin-markdown": "plugin-markdown",
"sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix",
@@ -1049,7 +1000,7 @@
"flake-utils": "flake-utils_3",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_3",
- "nixpkgs": "nixpkgs_7",
+ "nixpkgs": "nixpkgs_6",
"systems": "systems_5",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
diff --git a/flake.nix b/flake.nix
index fe6f120..6551b0e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,18 +24,18 @@
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
- hyprland-plugins = {
- url = "github:hyprwm/hyprland-plugins";
- inputs.hyprland.follows = "hyprland";
- };
apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
- anotherhadi-portfolio.url = "github:anotherhadi/portfolio";
plugin-markdown = {
+ # TODO: Put the new url
url = "github:MeanderingProgrammer/markdown.nvim";
flake = false;
};
+ nixy-wallpapers = {
+ url = "github:anotherhadi/nixy-wallpapers";
+ flake = false;
+ };
stylix.url = "github:danth/stylix";
};
@@ -54,17 +54,6 @@
./hosts/laptop/configuration.nix # CHANGEME
];
};
-
- jack = nixpkgs.lib.nixosSystem {
- system = "x86_64-linux";
- modules = [
- { _module.args = { inherit inputs; }; }
- inputs.sops-nix.nixosModules.sops
- inputs.home-manager.nixosModules.home-manager
- ./hosts/server/configuration.nix
- ];
- };
-
};
};
}
diff --git a/home/programs/nvim/keymaps.nix b/home/programs/nvim/keymaps.nix
index 2ad6fc5..6e50ea6 100644
--- a/home/programs/nvim/keymaps.nix
+++ b/home/programs/nvim/keymaps.nix
@@ -60,6 +60,12 @@
action = "Oil";
options.desc = "Oil";
}
+ {
+ key = "E";
+ action = "Neotree";
+ options.desc = "Neotree";
+ }
+
{
key = "";
action = "TmuxNavigateLeft";
diff --git a/home/programs/nvim/plugins/utils.nix b/home/programs/nvim/plugins/utils.nix
index 59d3c16..c82553c 100644
--- a/home/programs/nvim/plugins/utils.nix
+++ b/home/programs/nvim/plugins/utils.nix
@@ -14,6 +14,10 @@
telescope = {
enable = true;
extensions.fzf-native = { enable = true; };
+ settings = {
+ selection_caret = "/ ";
+ layout_config = { prompt_position = "top"; };
+ };
};
todo-comments.enable = true;
treesitter = {
diff --git a/home/programs/shell/fzf.nix b/home/programs/shell/fzf.nix
index b62fa37..9c9fcb6 100644
--- a/home/programs/shell/fzf.nix
+++ b/home/programs/shell/fzf.nix
@@ -1,15 +1,15 @@
-{ config, ... }: {
+{ config, lib, ... }: {
programs.fzf = {
enable = true;
enableZshIntegration = true;
- # colors = {
- # "fg+" = config.var.theme.colors.accentName;
- # "bg+" = "-1";
- # "fg" = "white";
- # "bg" = "-1";
- # "prompt" = "grey";
- # "pointer" = config.var.theme.colors.accentName;
- # };
+ colors = lib.mkForce {
+ "fg+" = "#" + config.lib.stylix.colors.base0D;
+ "bg+" = "-1";
+ "fg" = "#" + config.lib.stylix.colors.base05;
+ "bg" = "-1";
+ "prompt" = "#" + config.lib.stylix.colors.base03;
+ "pointer" = "#" + config.lib.stylix.colors.base0D;
+ };
defaultOptions = [
"--margin=1"
"--layout=reverse"
diff --git a/home/programs/shell/zsh.nix b/home/programs/shell/zsh.nix
index 8fd6a40..45638f6 100644
--- a/home/programs/shell/zsh.nix
+++ b/home/programs/shell/zsh.nix
@@ -60,11 +60,10 @@
sl = "ls";
open = "${pkgs.xdg_utils}/bin/xdg-open";
icat = "${pkgs.kitty}/bin/kitty +kitten icat";
+
wireguard-import = "nmcli connection import type wireguard file";
- neorg =
- "cd ~/nextcloud/neorg && vim -c ':ZenMode' -c ':Telescope find_files' index.norg";
- notes =
- "cd ~/nextcloud/Notes && vim -c ':ZenMode' -c ':Telescope find_files' index.md";
+
+ notes = "cd ~/nextcloud/Notes && -c ':Telescope find_files' index.md";
note = "notes";
# git
diff --git a/home/programs/spicetify/default.nix b/home/programs/spicetify/default.nix
index c776f26..88b15b3 100644
--- a/home/programs/spicetify/default.nix
+++ b/home/programs/spicetify/default.nix
@@ -9,6 +9,13 @@ in {
enable = true;
theme = lib.mkForce spicePkgs.themes.text;
+ # TODO: Colors not working
+ customColorScheme = lib.mkForce {
+ button = "#${config.lib.stylix.colors.base0D}";
+ button-active = "#${config.lib.stylix.colors.base0D}";
+ tab-active = "#${config.lib.stylix.colors.base0D}";
+ };
+
enabledExtensions = with spicePkgs.extensions; [
playlistIcons
lastfm
diff --git a/home/programs/yazi/default.nix b/home/programs/yazi/default.nix
index f089160..b4d4a16 100644
--- a/home/programs/yazi/default.nix
+++ b/home/programs/yazi/default.nix
@@ -12,28 +12,5 @@
sort_reverse = true;
};
};
-
- theme = {
- filetype = {
- rules = [
- {
- fg = "#7AD9E5";
- mime = "image/*";
- }
- {
- fg = "#F3D398";
- mime = "video/*";
- }
- {
- fg = "#F3D398";
- mime = "audio/*";
- }
- {
- fg = "#CD9EFC";
- mime = "application/x-bzip";
- }
- ];
- };
- };
};
}
diff --git a/home/scripts/hyprfocus/default.nix b/home/scripts/hyprfocus/default.nix
index 0626755..bfb72e0 100644
--- a/home/scripts/hyprfocus/default.nix
+++ b/home/scripts/hyprfocus/default.nix
@@ -27,9 +27,9 @@ let
# bash
''
if [ -f /tmp/hyprfocus ]; then
- hyprfocus-kill
+ hyprfocus-off
else
- hyprfocus
+ hyprfocus-on
fi
'';
in { home.packages = [ hyprfocus-on hyprfocus-off hyprfocus-toggle ]; }
diff --git a/home/scripts/system/default.nix b/home/scripts/system/default.nix
index 9725fe2..b7713c7 100644
--- a/home/scripts/system/default.nix
+++ b/home/scripts/system/default.nix
@@ -10,11 +10,7 @@ let
'';
powermenu = pkgs.writeShellScriptBin "powermenu" ''
- if pgrep wlogout; then
- pkill wlogout
- else
- ${pkgs.wlogout}/bin/wlogout
- fi
+ hyprpanel -t powerdropdownmenu
'';
lock = pkgs.writeShellScriptBin "lock" ''
diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix
index faec9eb..fd08b70 100644
--- a/home/system/hyprland/default.nix
+++ b/home/system/hyprland/default.nix
@@ -134,7 +134,7 @@
"XDG_SESSION_TYPE,wayland"
"SDL_VIDEODRIVER,wayland"
"CLUTTER_BACKEND,wayland"
- "AQ_DRM_DEVICES,/dev/dri/card2" # TODO: Why the fuck this is needed
+ "AQ_DRM_DEVICES,/dev/dri/card2" # FIXME: Why the fuck this is needed
];
cursor = {
diff --git a/home/wallpapers/20.png b/home/wallpapers/20.png
deleted file mode 100644
index 0bef893..0000000
Binary files a/home/wallpapers/20.png and /dev/null differ
diff --git a/home/wallpapers/astronaut.png b/home/wallpapers/astronaut.png
deleted file mode 100644
index 3f5cc89..0000000
Binary files a/home/wallpapers/astronaut.png and /dev/null differ
diff --git a/home/wallpapers/aurore.png b/home/wallpapers/aurore.png
deleted file mode 100644
index c7b7658..0000000
Binary files a/home/wallpapers/aurore.png and /dev/null differ
diff --git a/home/wallpapers/barcode.png b/home/wallpapers/barcode.png
deleted file mode 100644
index 630f4ab..0000000
Binary files a/home/wallpapers/barcode.png and /dev/null differ
diff --git a/home/wallpapers/black-and-white.png b/home/wallpapers/black-and-white.png
deleted file mode 100644
index 516cf61..0000000
Binary files a/home/wallpapers/black-and-white.png and /dev/null differ
diff --git a/home/wallpapers/cat-leaves.png b/home/wallpapers/cat-leaves.png
deleted file mode 100644
index be374e2..0000000
Binary files a/home/wallpapers/cat-leaves.png and /dev/null differ
diff --git a/home/wallpapers/city.png b/home/wallpapers/city.png
deleted file mode 100644
index 24a8294..0000000
Binary files a/home/wallpapers/city.png and /dev/null differ
diff --git a/home/wallpapers/cloud.png b/home/wallpapers/cloud.png
deleted file mode 100644
index dd1f759..0000000
Binary files a/home/wallpapers/cloud.png and /dev/null differ
diff --git a/home/wallpapers/clouds-2.png b/home/wallpapers/clouds-2.png
deleted file mode 100644
index 75b1288..0000000
Binary files a/home/wallpapers/clouds-2.png and /dev/null differ
diff --git a/home/wallpapers/clouds-3.png b/home/wallpapers/clouds-3.png
deleted file mode 100644
index 3addebd..0000000
Binary files a/home/wallpapers/clouds-3.png and /dev/null differ
diff --git a/home/wallpapers/clouds.png b/home/wallpapers/clouds.png
deleted file mode 100644
index 86282d0..0000000
Binary files a/home/wallpapers/clouds.png and /dev/null differ
diff --git a/home/wallpapers/clouds2.png b/home/wallpapers/clouds2.png
deleted file mode 100644
index f4685d7..0000000
Binary files a/home/wallpapers/clouds2.png and /dev/null differ
diff --git a/home/wallpapers/coffee.png b/home/wallpapers/coffee.png
deleted file mode 100644
index b8ee8a1..0000000
Binary files a/home/wallpapers/coffee.png and /dev/null differ
diff --git a/home/wallpapers/crane.png b/home/wallpapers/crane.png
deleted file mode 100644
index f343e5c..0000000
Binary files a/home/wallpapers/crane.png and /dev/null differ
diff --git a/home/wallpapers/dark-forest.png b/home/wallpapers/dark-forest.png
deleted file mode 100644
index 6064fd5..0000000
Binary files a/home/wallpapers/dark-forest.png and /dev/null differ
diff --git a/home/wallpapers/dark-waves.png b/home/wallpapers/dark-waves.png
deleted file mode 100644
index 972fd36..0000000
Binary files a/home/wallpapers/dark-waves.png and /dev/null differ
diff --git a/home/wallpapers/dark.png b/home/wallpapers/dark.png
deleted file mode 100644
index 19a11a0..0000000
Binary files a/home/wallpapers/dark.png and /dev/null differ
diff --git a/home/wallpapers/dark_cloud.png b/home/wallpapers/dark_cloud.png
deleted file mode 100644
index 1891c4b..0000000
Binary files a/home/wallpapers/dark_cloud.png and /dev/null differ
diff --git a/home/wallpapers/degirled.png b/home/wallpapers/degirled.png
deleted file mode 100644
index 5589d21..0000000
Binary files a/home/wallpapers/degirled.png and /dev/null differ
diff --git a/home/wallpapers/diner-lonely-road.png b/home/wallpapers/diner-lonely-road.png
deleted file mode 100644
index 3d41d1e..0000000
Binary files a/home/wallpapers/diner-lonely-road.png and /dev/null differ
diff --git a/home/wallpapers/fuji-dark.png b/home/wallpapers/fuji-dark.png
deleted file mode 100644
index 32e98b5..0000000
Binary files a/home/wallpapers/fuji-dark.png and /dev/null differ
diff --git a/home/wallpapers/fuji-light.png b/home/wallpapers/fuji-light.png
deleted file mode 100644
index afec5d4..0000000
Binary files a/home/wallpapers/fuji-light.png and /dev/null differ
diff --git a/home/wallpapers/galaxy.png b/home/wallpapers/galaxy.png
deleted file mode 100644
index 823e911..0000000
Binary files a/home/wallpapers/galaxy.png and /dev/null differ
diff --git a/home/wallpapers/horizon-2.png b/home/wallpapers/horizon-2.png
deleted file mode 100644
index 0d3f53e..0000000
Binary files a/home/wallpapers/horizon-2.png and /dev/null differ
diff --git a/home/wallpapers/house-cloud.png b/home/wallpapers/house-cloud.png
deleted file mode 100644
index 1a8d382..0000000
Binary files a/home/wallpapers/house-cloud.png and /dev/null differ
diff --git a/home/wallpapers/key.png b/home/wallpapers/key.png
deleted file mode 100644
index deca701..0000000
Binary files a/home/wallpapers/key.png and /dev/null differ
diff --git a/home/wallpapers/lavender-cat.png b/home/wallpapers/lavender-cat.png
deleted file mode 100644
index db00183..0000000
Binary files a/home/wallpapers/lavender-cat.png and /dev/null differ
diff --git a/home/wallpapers/lofi-computer.png b/home/wallpapers/lofi-computer.png
deleted file mode 100644
index 543bfdf..0000000
Binary files a/home/wallpapers/lofi-computer.png and /dev/null differ
diff --git a/home/wallpapers/lofi-urban.png b/home/wallpapers/lofi-urban.png
deleted file mode 100644
index ee44c09..0000000
Binary files a/home/wallpapers/lofi-urban.png and /dev/null differ
diff --git a/home/wallpapers/magma.png b/home/wallpapers/magma.png
deleted file mode 100644
index eb1543f..0000000
Binary files a/home/wallpapers/magma.png and /dev/null differ
diff --git a/home/wallpapers/mountains-black.png b/home/wallpapers/mountains-black.png
deleted file mode 100644
index fb88ce4..0000000
Binary files a/home/wallpapers/mountains-black.png and /dev/null differ
diff --git a/home/wallpapers/mountains.png b/home/wallpapers/mountains.png
deleted file mode 100644
index c7c6dc6..0000000
Binary files a/home/wallpapers/mountains.png and /dev/null differ
diff --git a/home/wallpapers/nasa-japan-dark.png b/home/wallpapers/nasa-japan-dark.png
deleted file mode 100644
index 6108d42..0000000
Binary files a/home/wallpapers/nasa-japan-dark.png and /dev/null differ
diff --git a/home/wallpapers/nix.png b/home/wallpapers/nix.png
deleted file mode 100644
index 71ca03c..0000000
Binary files a/home/wallpapers/nix.png and /dev/null differ
diff --git a/home/wallpapers/pixel-galaxy.png b/home/wallpapers/pixel-galaxy.png
deleted file mode 100644
index ff06020..0000000
Binary files a/home/wallpapers/pixel-galaxy.png and /dev/null differ
diff --git a/home/wallpapers/problems.png b/home/wallpapers/problems.png
deleted file mode 100644
index 48b72d1..0000000
Binary files a/home/wallpapers/problems.png and /dev/null differ
diff --git a/home/wallpapers/rains-dark.png b/home/wallpapers/rains-dark.png
deleted file mode 100644
index 4a2f798..0000000
Binary files a/home/wallpapers/rains-dark.png and /dev/null differ
diff --git a/home/wallpapers/rocket-launch.png b/home/wallpapers/rocket-launch.png
deleted file mode 100644
index 7d60de0..0000000
Binary files a/home/wallpapers/rocket-launch.png and /dev/null differ
diff --git a/home/wallpapers/sea.png b/home/wallpapers/sea.png
deleted file mode 100644
index 3c54a04..0000000
Binary files a/home/wallpapers/sea.png and /dev/null differ
diff --git a/home/wallpapers/sea2.png b/home/wallpapers/sea2.png
deleted file mode 100644
index 985cb43..0000000
Binary files a/home/wallpapers/sea2.png and /dev/null differ
diff --git a/home/wallpapers/space.png b/home/wallpapers/space.png
deleted file mode 100644
index cda4657..0000000
Binary files a/home/wallpapers/space.png and /dev/null differ
diff --git a/home/wallpapers/space2.png b/home/wallpapers/space2.png
deleted file mode 100644
index 0c8c452..0000000
Binary files a/home/wallpapers/space2.png and /dev/null differ
diff --git a/home/wallpapers/street.png b/home/wallpapers/street.png
deleted file mode 100644
index e16bf4b..0000000
Binary files a/home/wallpapers/street.png and /dev/null differ
diff --git a/home/wallpapers/sun.png b/home/wallpapers/sun.png
deleted file mode 100644
index 452cd01..0000000
Binary files a/home/wallpapers/sun.png and /dev/null differ
diff --git a/home/wallpapers/the-road-black.png b/home/wallpapers/the-road-black.png
deleted file mode 100644
index ccb2595..0000000
Binary files a/home/wallpapers/the-road-black.png and /dev/null differ
diff --git a/home/wallpapers/tokyo.png b/home/wallpapers/tokyo.png
deleted file mode 100644
index df26dfb..0000000
Binary files a/home/wallpapers/tokyo.png and /dev/null differ
diff --git a/home/wallpapers/train.png b/home/wallpapers/train.png
deleted file mode 100644
index 4bf3eff..0000000
Binary files a/home/wallpapers/train.png and /dev/null differ
diff --git a/home/wallpapers/windows.png b/home/wallpapers/windows.png
deleted file mode 100644
index b10ab34..0000000
Binary files a/home/wallpapers/windows.png and /dev/null differ
diff --git a/home/wallpapers/wp.png b/home/wallpapers/wp.png
deleted file mode 100644
index 5adea2c..0000000
Binary files a/home/wallpapers/wp.png and /dev/null differ
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index f365320..3902e70 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -45,18 +45,14 @@
nodejs
python3
jq
- nurl
- prefetch-npm-deps
figlet
# Utils
zip
unzip
- glow
optipng
pfetch
pandoc
- tailscale
btop
cava
@@ -72,12 +68,6 @@
neovide
];
- # Import wallpapers into $HOME/wallpapers
- file."wallpapers" = {
- recursive = true;
- source = ../../home/wallpapers;
- };
-
# Import my profile picture, used by the hyprpanel dashboard
file.".profile_picture.png" = { source = ./profile_picture.png; };
diff --git a/hosts/laptop/variables.nix b/hosts/laptop/variables.nix
index 4a483d9..ba4977f 100644
--- a/hosts/laptop/variables.nix
+++ b/hosts/laptop/variables.nix
@@ -41,7 +41,7 @@
bar = {
transparent = false;
- floating = false;
+ floating = true;
font-size = 16;
};
};
diff --git a/themes/nixy.nix b/themes/nixy.nix
index 6e2d053..3c72e8f 100644
--- a/themes/nixy.nix
+++ b/themes/nixy.nix
@@ -50,13 +50,8 @@
};
};
- # targets.nixvim.transparentBackground = {
- # main = true;
- # signColumn = true;
- # };
-
polarity = "dark";
- image = ../home/wallpapers/nix.png;
+ image = inputs.nixy-wallpapers + "/magma.png";
};
}
+ 
+ 
+ 
+ 
-