From 7a9ea3d539164adf5f7ebe1dbd398499a09094ac Mon Sep 17 00:00:00 2001 From: Kieran Klukas Date: Mon, 11 Aug 2025 18:47:01 -0400 Subject: [PATCH] feat: move to a modules and machines folder structure --- README.md | 39 +- {home-manager/dots => dots}/README.md | 0 {home-manager/dots => dots}/anthropic.sh | 0 {home-manager/dots => dots}/charge-alert.sh | 0 {home-manager/dots => dots}/copilot.sh | 0 {home-manager/dots => dots}/face.jpeg | Bin {home-manager/dots => dots}/hyprland.conf | 2 +- {home-manager/dots => dots}/hyprlock.conf | 0 {home-manager/dots => dots}/hyprpaper.conf | 0 {home-manager/dots => dots}/hyprrec.sh | 0 {home-manager/dots => dots}/lxde-pi-rc.xml | 0 {home-manager/dots => dots}/macchiato.conf | 0 {home-manager/dots => dots}/prettify-ss.sh | 0 {home-manager/dots => dots}/sunpaperconfig | 0 {home-manager/dots => dots}/tofi-emoji.sh | 0 {home-manager/dots => dots}/user.js | 0 .../dots => dots}/wallpapers/acon-forest.jpg | Bin .../dots => dots}/wallpapers/acon-fsh.jpg | Bin .../wallpapers/acon-gradient-clouds.jpg | Bin .../dots => dots}/wallpapers/acon-pier.jpg | Bin .../dots => dots}/wallpapers/acon-rocks.jpg | Bin .../dots => dots}/wallpapers/acon-star.jpg | Bin .../dots => dots}/wallpapers/annie-athena.jpg | Bin .../wallpapers/candy-stained-glass.jpg | Bin .../dots => dots}/wallpapers/highway.jpg | Bin .../wallpapers/kailing-canyon.jpg | Bin .../wallpapers/kailing-comet.jpg | Bin .../wallpapers/kailing-shooting-star.jpg | Bin .../wallpapers/kailing-swirls.jpg | Bin .../wallpapers/tongyu-catcat.jpg | Bin .../dots => dots}/wallpapers/tongyu-waves.jpg | Bin .../dots => dots}/wallpapers/yessa-cat.jpg | Bin flake.lock | 306 ++------------ flake.nix | 27 +- home-manager/dots/randomize-wallpaper.sh | 10 - .../modules/aesthetics/wallpapers.nix | 26 -- home-manager/modules/wm/hyprland/default.nix | 57 --- .../machines => machines}/ember/default.nix | 4 +- .../moonlark/default.nix | 375 ++++++++---------- .../moonlark/disk-config.nix | 0 .../moonlark/hardware-configuration.nix | 0 .../moonlark/home-manager.nix | 2 +- .../moonlark/home}/default.nix | 4 +- .../machines => machines}/nest/default.nix | 4 +- .../machines => machines}/tacyon/default.nix | 4 +- .../home}/aesthetics/theming.nix | 4 +- modules/home/aesthetics/wallpapers.nix | 45 +++ .../home}/apps/alacritty.nix | 4 +- .../modules => modules/home}/apps/crush.nix | 8 +- .../home/apps/crush}/_crush-options.nix | 0 .../home/apps/crush}/crush-module.nix | 4 - .../modules => modules/home}/apps/ghostty.nix | 4 +- .../modules => modules/home}/apps/git.nix | 4 +- .../modules => modules/home}/apps/irssi.nix | 4 +- .../home}/apps/qutebrowser.nix | 4 +- .../modules => modules/home}/apps/spotify.nix | 4 +- .../modules => modules/home}/apps/tofi.nix | 4 +- .../modules => modules/home}/apps/vscode.nix | 4 +- .../home}/system/nixpkgs.nix | 0 .../modules => modules/home}/system/shell.nix | 7 +- modules/home/wm/hyprland/default.nix | 57 +++ .../home}/wm/hyprland/hypridle.nix | 2 +- .../home}/wm/hyprland/waybar.nix | 2 +- .../nixos}/apps/tuigreet.nix | 4 +- .../nixos}/system/authentication.nix | 4 +- .../modules => modules/nixos}/system/wifi.nix | 8 +- 66 files changed, 383 insertions(+), 654 deletions(-) rename {home-manager/dots => dots}/README.md (100%) rename {home-manager/dots => dots}/anthropic.sh (100%) rename {home-manager/dots => dots}/charge-alert.sh (100%) rename {home-manager/dots => dots}/copilot.sh (100%) rename {home-manager/dots => dots}/face.jpeg (100%) rename {home-manager/dots => dots}/hyprland.conf (99%) rename {home-manager/dots => dots}/hyprlock.conf (100%) rename {home-manager/dots => dots}/hyprpaper.conf (100%) rename {home-manager/dots => dots}/hyprrec.sh (100%) rename {home-manager/dots => dots}/lxde-pi-rc.xml (100%) rename {home-manager/dots => dots}/macchiato.conf (100%) rename {home-manager/dots => dots}/prettify-ss.sh (100%) rename {home-manager/dots => dots}/sunpaperconfig (100%) rename {home-manager/dots => dots}/tofi-emoji.sh (100%) rename {home-manager/dots => dots}/user.js (100%) rename {home-manager/dots => dots}/wallpapers/acon-forest.jpg (100%) rename {home-manager/dots => dots}/wallpapers/acon-fsh.jpg (100%) rename {home-manager/dots => dots}/wallpapers/acon-gradient-clouds.jpg (100%) rename {home-manager/dots => dots}/wallpapers/acon-pier.jpg (100%) rename {home-manager/dots => dots}/wallpapers/acon-rocks.jpg (100%) rename {home-manager/dots => dots}/wallpapers/acon-star.jpg (100%) rename {home-manager/dots => dots}/wallpapers/annie-athena.jpg (100%) rename {home-manager/dots => dots}/wallpapers/candy-stained-glass.jpg (100%) rename {home-manager/dots => dots}/wallpapers/highway.jpg (100%) rename {home-manager/dots => dots}/wallpapers/kailing-canyon.jpg (100%) rename {home-manager/dots => dots}/wallpapers/kailing-comet.jpg (100%) rename {home-manager/dots => dots}/wallpapers/kailing-shooting-star.jpg (100%) rename {home-manager/dots => dots}/wallpapers/kailing-swirls.jpg (100%) rename {home-manager/dots => dots}/wallpapers/tongyu-catcat.jpg (100%) rename {home-manager/dots => dots}/wallpapers/tongyu-waves.jpg (100%) rename {home-manager/dots => dots}/wallpapers/yessa-cat.jpg (100%) delete mode 100755 home-manager/dots/randomize-wallpaper.sh delete mode 100644 home-manager/modules/aesthetics/wallpapers.nix delete mode 100644 home-manager/modules/wm/hyprland/default.nix rename {home-manager/machines => machines}/ember/default.nix (90%) rename nixos/machines/moonlark/configuration.nix => machines/moonlark/default.nix (64%) rename {nixos/machines => machines}/moonlark/disk-config.nix (100%) rename {nixos/machines => machines}/moonlark/hardware-configuration.nix (100%) rename {nixos/machines => machines}/moonlark/home-manager.nix (82%) rename {home-manager/machines/moonlark => machines/moonlark/home}/default.nix (92%) rename {home-manager/machines => machines}/nest/default.nix (90%) rename {home-manager/machines => machines}/tacyon/default.nix (95%) rename {home-manager/modules => modules/home}/aesthetics/theming.nix (82%) create mode 100644 modules/home/aesthetics/wallpapers.nix rename {home-manager/modules => modules/home}/apps/alacritty.nix (82%) rename {home-manager/modules => modules/home}/apps/crush.nix (95%) rename {home-manager/modules/apps => modules/home/apps/crush}/_crush-options.nix (100%) rename {home-manager/modules/apps => modules/home/apps/crush}/crush-module.nix (73%) rename {home-manager/modules => modules/home}/apps/ghostty.nix (68%) rename {home-manager/modules => modules/home}/apps/git.nix (97%) rename {home-manager/modules => modules/home}/apps/irssi.nix (79%) rename {home-manager/modules => modules/home}/apps/qutebrowser.nix (92%) rename {home-manager/modules => modules/home}/apps/spotify.nix (76%) rename {home-manager/modules => modules/home}/apps/tofi.nix (85%) rename {home-manager/modules => modules/home}/apps/vscode.nix (94%) rename {home-manager/modules => modules/home}/system/nixpkgs.nix (100%) rename {home-manager/modules => modules/home}/system/shell.nix (98%) create mode 100644 modules/home/wm/hyprland/default.nix rename {home-manager/modules => modules/home}/wm/hyprland/hypridle.nix (94%) rename {home-manager/modules => modules/home}/wm/hyprland/waybar.nix (99%) rename {nixos/modules => modules/nixos}/apps/tuigreet.nix (99%) rename {nixos/modules => modules/nixos}/system/authentication.nix (96%) rename {nixos/modules => modules/nixos}/system/wifi.nix (95%) diff --git a/README.md b/README.md index 262d670..c1c6a80 100644 --- a/README.md +++ b/README.md @@ -13,29 +13,28 @@ ```bash ~/dots # symlinked to /etc/nixos -├── home-manager # all the configs that use home manager are stored centrally here -│ ├── dots # any config files that need to be symlinked go here, e.g. my hyprland config -│ │ └── wallpapers -│ ├── machines # the different machines by hostname -│ │ ├── ember -│ │ ├── moonlark -│ │ ├── nest -│ │ └── tacyon -│ └── modules -│ ├── aesthetics # theming and wallpapers -│ ├── apps # any app specific config -│ ├── system # nxipkgs stuff mainly -│ └── wm # window managers; just hyprland for now -│ └── hyprland -├── nixos -│ ├── machines # again machines by hostname -│ │ └── moonlark -│ └── modules +├── dots # any config files that need to be symlinked go here, e.g. my hyprland config +│ └── wallpapers +├── machines +│ ├── ember # my dell r210 server (in my basement) +│ ├── moonlark # my framework 13 +│ │ └── home +│ ├── nest # shared tilde server through hc +│ └── tacyon # rpi 5 +├── modules +│ ├── home # home-manager modules +│ │ ├── aesthetics # theming and wallpapers +│ │ ├── apps # any app specific config +│ │ │ └── crush # vendored for now +│ │ ├── system # home-manager system configs +│ │ └── wm # window managers; just hyprland for now +│ │ └── hyprland +│ └── nixos # nixos modules │ ├── apps # also app specific configs │ └── system # pam and my fancy wifi module for now -└── secrets +└── secrets # keep your grubby hands off my passwords -16 directories +19 directories ``` ## Installation diff --git a/home-manager/dots/README.md b/dots/README.md similarity index 100% rename from home-manager/dots/README.md rename to dots/README.md diff --git a/home-manager/dots/anthropic.sh b/dots/anthropic.sh similarity index 100% rename from home-manager/dots/anthropic.sh rename to dots/anthropic.sh diff --git a/home-manager/dots/charge-alert.sh b/dots/charge-alert.sh similarity index 100% rename from home-manager/dots/charge-alert.sh rename to dots/charge-alert.sh diff --git a/home-manager/dots/copilot.sh b/dots/copilot.sh similarity index 100% rename from home-manager/dots/copilot.sh rename to dots/copilot.sh diff --git a/home-manager/dots/face.jpeg b/dots/face.jpeg similarity index 100% rename from home-manager/dots/face.jpeg rename to dots/face.jpeg diff --git a/home-manager/dots/hyprland.conf b/dots/hyprland.conf similarity index 99% rename from home-manager/dots/hyprland.conf rename to dots/hyprland.conf index 043881a..dfac04d 100644 --- a/home-manager/dots/hyprland.conf +++ b/dots/hyprland.conf @@ -12,7 +12,7 @@ xwayland { # Execute your favorite apps at launch exec-once = hyprpaper exec-once = hyprsunset -exec-once = sleep 1; ~/.config/hypr/randomize.sh +exec-once = sleep 1; chngwall exec-once = ~/.config/hypr/charge-alert.sh exec-once = lxsession exec-once = wluma diff --git a/home-manager/dots/hyprlock.conf b/dots/hyprlock.conf similarity index 100% rename from home-manager/dots/hyprlock.conf rename to dots/hyprlock.conf diff --git a/home-manager/dots/hyprpaper.conf b/dots/hyprpaper.conf similarity index 100% rename from home-manager/dots/hyprpaper.conf rename to dots/hyprpaper.conf diff --git a/home-manager/dots/hyprrec.sh b/dots/hyprrec.sh similarity index 100% rename from home-manager/dots/hyprrec.sh rename to dots/hyprrec.sh diff --git a/home-manager/dots/lxde-pi-rc.xml b/dots/lxde-pi-rc.xml similarity index 100% rename from home-manager/dots/lxde-pi-rc.xml rename to dots/lxde-pi-rc.xml diff --git a/home-manager/dots/macchiato.conf b/dots/macchiato.conf similarity index 100% rename from home-manager/dots/macchiato.conf rename to dots/macchiato.conf diff --git a/home-manager/dots/prettify-ss.sh b/dots/prettify-ss.sh similarity index 100% rename from home-manager/dots/prettify-ss.sh rename to dots/prettify-ss.sh diff --git a/home-manager/dots/sunpaperconfig b/dots/sunpaperconfig similarity index 100% rename from home-manager/dots/sunpaperconfig rename to dots/sunpaperconfig diff --git a/home-manager/dots/tofi-emoji.sh b/dots/tofi-emoji.sh similarity index 100% rename from home-manager/dots/tofi-emoji.sh rename to dots/tofi-emoji.sh diff --git a/home-manager/dots/user.js b/dots/user.js similarity index 100% rename from home-manager/dots/user.js rename to dots/user.js diff --git a/home-manager/dots/wallpapers/acon-forest.jpg b/dots/wallpapers/acon-forest.jpg similarity index 100% rename from home-manager/dots/wallpapers/acon-forest.jpg rename to dots/wallpapers/acon-forest.jpg diff --git a/home-manager/dots/wallpapers/acon-fsh.jpg b/dots/wallpapers/acon-fsh.jpg similarity index 100% rename from home-manager/dots/wallpapers/acon-fsh.jpg rename to dots/wallpapers/acon-fsh.jpg diff --git a/home-manager/dots/wallpapers/acon-gradient-clouds.jpg b/dots/wallpapers/acon-gradient-clouds.jpg similarity index 100% rename from home-manager/dots/wallpapers/acon-gradient-clouds.jpg rename to dots/wallpapers/acon-gradient-clouds.jpg diff --git a/home-manager/dots/wallpapers/acon-pier.jpg b/dots/wallpapers/acon-pier.jpg similarity index 100% rename from home-manager/dots/wallpapers/acon-pier.jpg rename to dots/wallpapers/acon-pier.jpg diff --git a/home-manager/dots/wallpapers/acon-rocks.jpg b/dots/wallpapers/acon-rocks.jpg similarity index 100% rename from home-manager/dots/wallpapers/acon-rocks.jpg rename to dots/wallpapers/acon-rocks.jpg diff --git a/home-manager/dots/wallpapers/acon-star.jpg b/dots/wallpapers/acon-star.jpg similarity index 100% rename from home-manager/dots/wallpapers/acon-star.jpg rename to dots/wallpapers/acon-star.jpg diff --git a/home-manager/dots/wallpapers/annie-athena.jpg b/dots/wallpapers/annie-athena.jpg similarity index 100% rename from home-manager/dots/wallpapers/annie-athena.jpg rename to dots/wallpapers/annie-athena.jpg diff --git a/home-manager/dots/wallpapers/candy-stained-glass.jpg b/dots/wallpapers/candy-stained-glass.jpg similarity index 100% rename from home-manager/dots/wallpapers/candy-stained-glass.jpg rename to dots/wallpapers/candy-stained-glass.jpg diff --git a/home-manager/dots/wallpapers/highway.jpg b/dots/wallpapers/highway.jpg similarity index 100% rename from home-manager/dots/wallpapers/highway.jpg rename to dots/wallpapers/highway.jpg diff --git a/home-manager/dots/wallpapers/kailing-canyon.jpg b/dots/wallpapers/kailing-canyon.jpg similarity index 100% rename from home-manager/dots/wallpapers/kailing-canyon.jpg rename to dots/wallpapers/kailing-canyon.jpg diff --git a/home-manager/dots/wallpapers/kailing-comet.jpg b/dots/wallpapers/kailing-comet.jpg similarity index 100% rename from home-manager/dots/wallpapers/kailing-comet.jpg rename to dots/wallpapers/kailing-comet.jpg diff --git a/home-manager/dots/wallpapers/kailing-shooting-star.jpg b/dots/wallpapers/kailing-shooting-star.jpg similarity index 100% rename from home-manager/dots/wallpapers/kailing-shooting-star.jpg rename to dots/wallpapers/kailing-shooting-star.jpg diff --git a/home-manager/dots/wallpapers/kailing-swirls.jpg b/dots/wallpapers/kailing-swirls.jpg similarity index 100% rename from home-manager/dots/wallpapers/kailing-swirls.jpg rename to dots/wallpapers/kailing-swirls.jpg diff --git a/home-manager/dots/wallpapers/tongyu-catcat.jpg b/dots/wallpapers/tongyu-catcat.jpg similarity index 100% rename from home-manager/dots/wallpapers/tongyu-catcat.jpg rename to dots/wallpapers/tongyu-catcat.jpg diff --git a/home-manager/dots/wallpapers/tongyu-waves.jpg b/dots/wallpapers/tongyu-waves.jpg similarity index 100% rename from home-manager/dots/wallpapers/tongyu-waves.jpg rename to dots/wallpapers/tongyu-waves.jpg diff --git a/home-manager/dots/wallpapers/yessa-cat.jpg b/dots/wallpapers/yessa-cat.jpg similarity index 100% rename from home-manager/dots/wallpapers/yessa-cat.jpg rename to dots/wallpapers/yessa-cat.jpg diff --git a/flake.lock b/flake.lock index b147994..5ee8605 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1750173260, - "narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -167,22 +167,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -349,57 +333,6 @@ "type": "github" } }, - "flake-utils_6": { - "inputs": { - "systems": "systems_7" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_7": { - "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "flare": { "inputs": { "flake-utils": "flake-utils_2", @@ -408,11 +341,11 @@ ] }, "locked": { - "lastModified": 1754095839, - "narHash": "sha256-WnTMsgVZb0TEgk7BPuD3kiEZ+rbhSN+z+hNsyfKyaRo=", + "lastModified": 1754248266, + "narHash": "sha256-WiCCjfyrdUIHFtEigika1nKpxYTZahovbxcZfBzIFYw=", "owner": "ByteAtATime", "repo": "flare", - "rev": "ed48facabbd099f3663df5b39438a1ff20f4d751", + "rev": "c593d2c88ece3efeca2f07933079947dc3249bac", "type": "github" }, "original": { @@ -444,28 +377,6 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_3", - "zig": "zig", - "zon2nix": "zon2nix" - }, - "locked": { - "lastModified": 1754060800, - "narHash": "sha256-UA3ppDUMw9XmmTzjW50j8m4sKb+A/zEqAnUiGcrrst8=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "469001b7f623f780cfdcb50cc4842f7a4e6386ab", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -490,11 +401,11 @@ }, "hardware": { "locked": { - "lastModified": 1753122741, - "narHash": "sha256-nFxE8lk9JvGelxClCmwuJYftbHqwnc01dRN4DVLUroM=", + "lastModified": 1754564048, + "narHash": "sha256-dz303vGuzWjzOPOaYkS9xSW+B93PSAJxvBd6CambXVA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cc66fddc6cb04ab479a1bb062f4d4da27c936a22", + "rev": "26ed7a0d4b8741fe1ef1ee6fa64453ca056ce113", "type": "github" }, "original": { @@ -611,41 +522,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1753306924, - "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=", - "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_5", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753282722, - "narHash": "sha256-KYMUrTV7H/RR5/HRnjV5R3rRIuBXMemyJzTLi50NFTs=", - "rev": "46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873.tar.gz?rev=46a9e8fcfe4be72b4c7c8082ee11d2c42da1e873" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz" - } - }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -669,15 +545,15 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_4" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1754100706, - "narHash": "sha256-ctRwk+Fjl/jxN+J6GjD9pYmnyHvgR2ub04q1pXeaAho=", + "lastModified": 1754878625, + "narHash": "sha256-lSPOfzl8u0MQ2MhHmyQ2aTmRx6Jm8fcI9s44iIxjNL8=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "1656ec240ab8de9f78eba6f38c5ae5f0d5c6d936", + "rev": "0f2ca2371a5b84d35791ac99073bb5b2ed45456f", "type": "github" }, "original": { @@ -688,16 +564,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745391562, - "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -719,11 +595,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1753939845, - "narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=", + "lastModified": 1754725699, + "narHash": "sha256-iAcj9T/Y+3DBy2J0N+yF9XQQQ8IEb5swLFzs23CdP88=", "owner": "nixos", "repo": "nixpkgs", - "rev": "94def634a20494ee057c76998843c015909d6311", + "rev": "85dbfc7aaf52ecb755f87e577ddbe6dbbdbc1054", "type": "github" }, "original": { @@ -750,19 +626,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1748189127, - "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -778,13 +641,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "lastModified": 1754767907, + "narHash": "sha256-8OnUzRQZkqtUol9vuUuQC30hzpMreKptNyET2T9lB6g=", "owner": "nixos", "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "rev": "c5f08b62ed75415439d48152c2a784e36909b1bc", "type": "github" }, "original": { @@ -794,7 +657,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1741246872, "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", @@ -810,7 +673,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1738797219, "narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", @@ -826,7 +689,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1730768919, "narHash": "sha256-8AKquNnnSaJRXZxc5YmF/WfmxiHX6MMZZasRP6RRQkE=", @@ -845,7 +708,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim_2", "pre-commit-hooks": "pre-commit-hooks" }, @@ -866,7 +729,7 @@ "nixvim_2": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nuschtosSearch": "nuschtosSearch" }, "locked": { @@ -891,11 +754,11 @@ ] }, "locked": { - "lastModified": 1754684884, - "narHash": "sha256-GH+UMIOJj7u/bW55dOOpD8HpVpc9WfU61iweM2nM68A=", + "lastModified": 1754921734, + "narHash": "sha256-rpxK4x5R/24ifhSiE2S3mKmcS/i5BkQRjoEACGb9+Y8=", "owner": "nix-community", "repo": "NUR", - "rev": "a7f9761c9dd71359cd9a6529078302a83e6deaac", + "rev": "562c625b7d509e75a150849b0e9738d5e7d64aa7", "type": "github" }, "original": { @@ -906,7 +769,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_5", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -930,9 +793,9 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gitignore": "gitignore", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1741350116, @@ -958,14 +821,12 @@ "disko": "disko", "flare": "flare", "frc-nix": "frc-nix", - "ghostty": "ghostty", "hardware": "hardware", "home-manager": "home-manager_2", "hyprland-contrib": "hyprland-contrib", "import-tree": "import-tree", - "lix-module": "lix-module", "nix-vscode-extensions": "nix-vscode-extensions", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "nur": "nur", @@ -979,14 +840,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_9" + "systems": "systems_7" }, "locked": { - "lastModified": 1753591727, - "narHash": "sha256-Ow+qyFckroPS4SQFHcFZ8mKh3HIQ2pQdC6DRjiYF9EE=", + "lastModified": 1754801101, + "narHash": "sha256-oxWjZ/SfhCvHFNePZcUu+LcE5j4xxuIt/yaoaSvMZk0=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "26c488b60360e15db372483d826cec89ac532980", + "rev": "fcbfc21572518c68317df992929b28df9a1d8468", "type": "github" }, "original": { @@ -1100,36 +961,6 @@ "type": "github" } }, - "systems_8": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "terminal-wakatime": { "inputs": { "nixpkgs": [ @@ -1171,61 +1002,6 @@ "repo": "zen-browser-nix", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty", - "flake-compat" - ], - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748261582, - "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "aafb1b093fb838f7a02613b719e85ec912914221", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zon2nix": { - "inputs": { - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1742104771, - "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=", - "owner": "jcollie", - "repo": "zon2nix", - "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", - "type": "github" - }, - "original": { - "owner": "jcollie", - "repo": "zon2nix", - "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 01fc577..46559c5 100644 --- a/flake.nix +++ b/flake.nix @@ -6,12 +6,6 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - # Lix - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.3-1.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # NixOS hardware configuration hardware.url = "github:NixOS/nixos-hardware/master"; @@ -41,10 +35,6 @@ nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; - ghostty = { - url = "github:ghostty-org/ghostty"; - }; - frc-nix = { url = "github:frc4451/frc-nix"; inputs.nixpkgs.follows = "nixpkgs"; @@ -95,7 +85,6 @@ self, nixpkgs, nixpkgs-unstable, - lix-module, agenix, home-manager, nur, @@ -107,6 +96,7 @@ nixpkgs.overlays = [ (final: prev: { unstable = import nixpkgs-unstable { + system = final.system; config.allowUnfree = true; }; @@ -125,27 +115,24 @@ in { # NixOS configuration entrypoint - # Available through 'nixos-rebuild --flake .#your-hostname' + # Available through 'nixos-rebuild --flake .#hostname' nixosConfigurations = { moonlark = nixpkgs.lib.nixosSystem { specialArgs = { inherit inputs outputs; }; - - # > Our main nixos configuration file < modules = [ - lix-module.nixosModules.default inputs.disko.nixosModules.disko { disko.devices.disk.disk1.device = "/dev/vda"; } agenix.nixosModules.default unstable-overlays { nixpkgs.hostPlatform = "x86_64-linux"; } - ./nixos/machines/moonlark/configuration.nix + ./machines/moonlark nur.modules.nixos.default ]; }; }; # Standalone home-manager configurations - # Available through 'home-manager --flake .#username@hostname' + # Available through 'home-manager --flake .#hostname' homeConfigurations = { "tacyon" = home-manager.lib.homeManagerConfiguration { extraSpecialArgs = { @@ -153,7 +140,7 @@ nixpkgs-unstable = nixpkgs-unstable; }; modules = [ - ./home-manager/machines/tacyon + ./machines/tacyon unstable-overlays { nixpgs.hostPlatform = "aarch64-linux"; } ]; @@ -165,7 +152,7 @@ nixpkgs-unstable = nixpkgs-unstable; }; modules = [ - ./home-manager/machines/nest + ./machines/nest unstable-overlays { nixpkgs.hostPlatform = "x86_64-linux"; } ]; @@ -177,7 +164,7 @@ nixpkgs-unstable = nixpkgs-unstable; }; modules = [ - ./home-manager/machines/ember + ./machines/ember unstable-overlays { nixpkgs.hostPlatform = "x86_64-linux"; } ]; diff --git a/home-manager/dots/randomize-wallpaper.sh b/home-manager/dots/randomize-wallpaper.sh deleted file mode 100755 index 86d254d..0000000 --- a/home-manager/dots/randomize-wallpaper.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -WALLPAPER_DIR="$HOME/.config/wallpapers" -CURRENT_WALL=$(hyprctl hyprpaper listloaded) - -# Get a random wallpaper that is not the current one -WALLPAPER=$(find -L "$WALLPAPER_DIR" -type f ! -name "$(basename "$CURRENT_WALL")" | shuf -n 1) - -# Apply the selected wallpaper -hyprctl hyprpaper reload ,"$WALLPAPER" diff --git a/home-manager/modules/aesthetics/wallpapers.nix b/home-manager/modules/aesthetics/wallpapers.nix deleted file mode 100644 index d214352..0000000 --- a/home-manager/modules/aesthetics/wallpapers.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, config, ... }: -{ - options.dots.wallpapers.enable = lib.mkEnableOption "symlink a bunch of wallpapers"; - config = lib.mkIf config.dots.wallpapers.enable { - xdg.configFile."wallpapers/randomize.sh".source = ../../dots/randomize-wallpaper.sh; - xdg.configFile."wallpapers/acon-pier.jpg".source = ../../dots/wallpapers/acon-pier.jpg; - xdg.configFile."wallpapers/acon-forest.jpg".source = ../../dots/wallpapers/acon-forest.jpg; - xdg.configFile."wallpapers/acon-gradient-clouds.jpg".source = - ../../dots/wallpapers/acon-gradient-clouds.jpg; - xdg.configFile."wallpapers/acon-fsh.jpg".source = ../../dots/wallpapers/acon-fsh.jpg; - xdg.configFile."wallpapers/tongyu-waves.jpg".source = ../../dots/wallpapers/tongyu-waves.jpg; - xdg.configFile."wallpapers/acon-rocks.jpg".source = ../../dots/wallpapers/acon-rocks.jpg; - xdg.configFile."wallpapers/kailing-comet.jpg".source = ../../dots/wallpapers/kailing-comet.jpg; - xdg.configFile."wallpapers/acon-star.jpg".source = ../../dots/wallpapers/acon-star.jpg; - xdg.configFile."wallpapers/kailing-canyon.jpg".source = ../../dots/wallpapers/kailing-canyon.jpg; - xdg.configFile."wallpapers/kailing-swirls.jpg".source = ../../dots/wallpapers/kailing-swirls.jpg; - xdg.configFile."wallpapers/highway.jpg".source = ../../dots/wallpapers/highway.jpg; - xdg.configFile."wallpapers/kailing-shooting-star.jpg".source = - ../../dots/wallpapers/kailing-shooting-star.jpg; - xdg.configFile."wallpapers/yessa-cat.jpg".source = ../../dots/wallpapers/yessa-cat.jpg; - xdg.configFile."wallpapers/annie-athena.jpg".source = ../../dots/wallpapers/annie-athena.jpg; - xdg.configFile."wallpapers/candy-stained-glass.jpg".source = - ../../dots/wallpapers/candy-stained-glass.jpg; - xdg.configFile."wallpapers/tongyu-catcat.jpg".source = ../../dots/wallpapers/tongyu-catcat.jpg; - }; -} diff --git a/home-manager/modules/wm/hyprland/default.nix b/home-manager/modules/wm/hyprland/default.nix deleted file mode 100644 index bbce003..0000000 --- a/home-manager/modules/wm/hyprland/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - lib, - pkgs, - config, - ... -}: -{ - options.dots.wm.hyprland.enable = lib.mkEnableOption "Enable Hyprland config"; - config = lib.mkIf config.dots.wm.hyprland.enable { - dots.apps.tofi.enable = true; - programs.hyprlock.enable = true; - - dots.wallpapers.enable = true; - - xdg.configFile."hypr/macchiato.conf".source = ../../../dots/macchiato.conf; - xdg.configFile."hypr/hyprland.conf".source = ../../../dots/hyprland.conf; - xdg.configFile."hypr/prettify-ss.sh".source = ../../../dots/prettify-ss.sh; - xdg.configFile."hypr/tofi-emoji.sh".source = ../../../dots/tofi-emoji.sh; - xdg.configFile."hypr/hyprlock.conf".source = ../../../dots/hyprlock.conf; - xdg.configFile."face.jpeg".source = ../../../dots/face.jpeg; - xdg.configFile."hypr/hyprpaper.conf".source = ../../../dots/hyprpaper.conf; - xdg.configFile."hypr/hyprrec.sh".source = ../../../dots/hyprrec.sh; - xdg.configFile."hypr/charge-alert.sh".source = ../../../dots/charge-alert.sh; - - xdg.portal = { - enable = true; - extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; - configPackages = with pkgs; [ xdg-desktop-portal-gtk ]; - }; - - services.mako = { - enable = true; - settings = { - default-timeout = 4000; - margin = "58,6"; - font = "Fira Sans 12"; - border-radius = 5; - }; - }; - - services.udiskie = { - enable = true; - settings = { - program_options = { - udisks_version = 2; - tray = false; - }; - notifications = { - device_unmounted = false; - device_added = -1; - device_removed = -1; - device_mounted = -1; - }; - }; - }; - }; -} diff --git a/home-manager/machines/ember/default.nix b/machines/ember/default.nix similarity index 90% rename from home-manager/machines/ember/default.nix rename to machines/ember/default.nix index 9994da7..2071aff 100644 --- a/home-manager/machines/ember/default.nix +++ b/machines/ember/default.nix @@ -5,7 +5,7 @@ }: { imports = [ - (inputs.import-tree ../../modules) + (inputs.import-tree ../../modules/home) ]; nixpkgs.enable = true; @@ -26,7 +26,7 @@ ]; }; - dots = { + atelier = { shell.enable = true; }; diff --git a/nixos/machines/moonlark/configuration.nix b/machines/moonlark/default.nix similarity index 64% rename from nixos/machines/moonlark/configuration.nix rename to machines/moonlark/default.nix index 5605037..76c9153 100644 --- a/nixos/machines/moonlark/configuration.nix +++ b/machines/moonlark/default.nix @@ -15,7 +15,7 @@ ./home-manager.nix ./disk-config.nix - (inputs.import-tree ../../modules) + (inputs.import-tree ../../modules/nixos) ]; nixpkgs = { @@ -53,205 +53,168 @@ time.timeZone = "America/New_York"; # grouped for readability - environment.systemPackages = map lib.lowPrio ( - let - core = [ - pkgs.coreutils - pkgs.calc - pkgs.screen - pkgs.xdg-user-dirs - pkgs.libnotify - pkgs.notify-desktop - pkgs.bc - pkgs.jq - pkgs.psmisc - ]; - terminals = [ - pkgs.alacritty - inputs.ghostty.packages.x86_64-linux.default - ]; - cli_utils = [ - pkgs.bat - pkgs.fd - pkgs.eza - pkgs.xh - pkgs.dust - pkgs.ripgrep - pkgs.ripgrep-all - pkgs.glow - pkgs.gitui - pkgs.lazygit - pkgs.clipse - pkgs.direnv - pkgs.nix-output-monitor - pkgs.nixpkgs-review - pkgs.nix-prefetch - pkgs.arduino-cli - pkgs.zsh - pkgs.starship - pkgs.gum - pkgs.unstable.wakatime-cli - inputs.terminal-wakatime.packages.x86_64-linux.default - ]; - networking = [ - pkgs.curl - pkgs.wget - pkgs.dogdns - pkgs.inetutils - pkgs.mosh - pkgs.ngrok - pkgs.networkmanagerapplet - pkgs.networkmanager-iodine - pkgs.iodine - ]; - nix_tools = [ - inputs.nixvim.packages.x86_64-linux.default - pkgs.nixd - pkgs.nil - pkgs.nixfmt-rfc-style - inputs.agenix.packages.x86_64-linux.default - ]; - security = [ - pkgs.openssl - pkgs.gpgme - pkgs.gnupg - pkgs.unstable.mitmproxy - pkgs.caido - ]; - editors = [ - inputs.zed.packages.x86_64-linux.default - pkgs.unstable.zed-editor - pkgs.arduino-ide - ]; - browsers = [ - pkgs.firefox - (pkgs.chromium.override { enableWideVine = true; }) - ]; - wayland = [ - pkgs.swww - pkgs.wluma - pkgs.brightnessctl - pkgs.hyprpaper - pkgs.hyprsunset - pkgs.wl-clipboard - pkgs.grim - pkgs.slurp - pkgs.wtype - pkgs.mako - pkgs.unstable.hyprpicker - pkgs.wl-screenrec - inputs.hyprland-contrib.packages.${pkgs.system}.grimblast - pkgs.playerctl - pkgs.libnotify - pkgs.notify-desktop - pkgs.lxde.lxsession - ]; - gnome = [ - pkgs.gnome-online-accounts - pkgs.gnome-online-accounts-gtk - pkgs.gnome-disk-utility - pkgs.baobab - pkgs.simple-scan - pkgs.file-roller - pkgs.font-manager - pkgs.nautilus - pkgs.loupe - pkgs.totem - pkgs.overskride - ]; - dev_langs = [ - pkgs.nodejs_22 - pkgs.unstable.bun - pkgs.python3 - pkgs.go - pkgs.gopls - pkgs.gotools - pkgs.go-tools - pkgs.gcc - pkgs.rustc - pkgs.cargo - pkgs.jdk23 - pkgs.ruby - pkgs.cmake - pkgs.unstable.biome - pkgs.unstable.apktool - pkgs.nodePackages_latest.prisma - pkgs.unstable.zola - ]; - media = [ - pkgs.ffmpeg - pkgs.video-trimmer - pkgs.pitivi - pkgs.audacity - pkgs.unstable.amberol - pkgs.zoom-us - ]; - graphics = [ - pkgs.imagemagick - pkgs.inkscape - pkgs.blender - pkgs.exiftool - pkgs.unstable.aseprite - pkgs.godot_4 - pkgs.unstable.kikit - pkgs.openboardview - pkgs.bambu-studio - pkgs.unstable.orca-slicer - pkgs.qflipper - ]; - office = [ - pkgs.slack - pkgs.libreoffice - pkgs.unstable.zotero - ]; - gaming = [ - pkgs.prismlauncher - pkgs.vesktop - pkgs.cava - pkgs.gobang - pkgs.love - ]; - frc = [ - inputs.frc-nix.packages.${pkgs.system}.elastic-dashboard - inputs.frc-nix.packages.${pkgs.system}.pathplanner - inputs.frc-nix.packages.${pkgs.system}.roborioteamnumbersetter - inputs.frc-nix.packages.${pkgs.system}.sysid - inputs.frc-nix.packages.${pkgs.system}.wpilib-utility - inputs.frc-nix.packages.${pkgs.system}.advantagescope - ]; - misc = [ - pkgs.invoice - pkgs.pop - pkgs.vhs - pkgs.torrential - inputs.flare.packages.x86_64-linux.default - pkgs.unstable.ollama - pkgs.unstable.claude-code - pkgs.udiskie - pkgs.neofetch - pkgs.unstable.kicad-testing - pkgs.zenity - pkgs.atproto-goat - ]; - in - core - ++ terminals - ++ cli_utils - ++ networking - ++ nix_tools - ++ security - ++ editors - ++ browsers - ++ wayland - ++ gnome - ++ dev_langs - ++ media - ++ graphics - ++ office - ++ gaming - ++ frc - ++ misc - ); + environment.systemPackages = [ + # core + pkgs.coreutils + pkgs.calc + pkgs.screen + pkgs.xdg-user-dirs + pkgs.libnotify + pkgs.notify-desktop + pkgs.bc + pkgs.jq + pkgs.psmisc + # terminals + pkgs.alacritty + pkgs.unstable.ghostty + # cli_utils + pkgs.bat + pkgs.fd + pkgs.eza + pkgs.xh + pkgs.dust + pkgs.ripgrep + pkgs.ripgrep-all + pkgs.glow + pkgs.gitui + pkgs.lazygit + pkgs.clipse + pkgs.direnv + pkgs.nix-output-monitor + pkgs.nixpkgs-review + pkgs.nix-prefetch + pkgs.arduino-cli + pkgs.zsh + pkgs.starship + pkgs.gum + pkgs.unstable.wakatime-cli + inputs.terminal-wakatime.packages.x86_64-linux.default + # networking + pkgs.curl + pkgs.wget + pkgs.dogdns + pkgs.inetutils + pkgs.mosh + pkgs.ngrok + pkgs.networkmanagerapplet + pkgs.networkmanager-iodine + pkgs.iodine + # nix_tools + inputs.nixvim.packages.x86_64-linux.default + pkgs.nixd + pkgs.nil + pkgs.nixfmt-rfc-style + inputs.agenix.packages.x86_64-linux.default + pkgs.lix + # security + pkgs.openssl + pkgs.gpgme + pkgs.gnupg + pkgs.unstable.mitmproxy + pkgs.caido + # editors + inputs.zed.packages.x86_64-linux.default + pkgs.unstable.zed-editor + pkgs.arduino-ide + # browsers + pkgs.firefox + (pkgs.chromium.override { enableWideVine = true; }) + # wayland + pkgs.swww + pkgs.wluma + pkgs.brightnessctl + pkgs.hyprpaper + pkgs.hyprsunset + pkgs.wl-clipboard + pkgs.grim + pkgs.slurp + pkgs.wtype + pkgs.mako + pkgs.unstable.hyprpicker + pkgs.wl-screenrec + inputs.hyprland-contrib.packages.${pkgs.system}.grimblast + pkgs.playerctl + pkgs.libnotify + pkgs.notify-desktop + pkgs.lxde.lxsession + # gnome + pkgs.gnome-online-accounts + pkgs.gnome-online-accounts-gtk + pkgs.gnome-disk-utility + pkgs.baobab + pkgs.simple-scan + pkgs.file-roller + pkgs.font-manager + pkgs.nautilus + pkgs.loupe + pkgs.totem + pkgs.overskride + # dev_langs + pkgs.nodejs_22 + pkgs.unstable.bun + pkgs.python3 + pkgs.go + pkgs.gopls + pkgs.gotools + pkgs.go-tools + pkgs.gcc + pkgs.rustc + pkgs.cargo + pkgs.jdk23 + pkgs.ruby + pkgs.cmake + pkgs.unstable.biome + pkgs.unstable.apktool + pkgs.nodePackages_latest.prisma + pkgs.unstable.zola + # media + pkgs.ffmpeg + pkgs.video-trimmer + pkgs.pitivi + pkgs.audacity + pkgs.unstable.amberol + pkgs.zoom-us + # graphics + pkgs.imagemagick + pkgs.inkscape + pkgs.blender + pkgs.exiftool + pkgs.unstable.aseprite + pkgs.godot_4 + pkgs.unstable.kikit + pkgs.openboardview + pkgs.qflipper + # office + pkgs.slack + pkgs.libreoffice + pkgs.unstable.zotero + # gaming + pkgs.prismlauncher + pkgs.vesktop + pkgs.cava + pkgs.gobang + pkgs.love + #frc + inputs.frc-nix.packages.${pkgs.system}.elastic-dashboard + inputs.frc-nix.packages.${pkgs.system}.pathplanner + inputs.frc-nix.packages.${pkgs.system}.roborioteamnumbersetter + inputs.frc-nix.packages.${pkgs.system}.sysid + inputs.frc-nix.packages.${pkgs.system}.wpilib-utility + inputs.frc-nix.packages.${pkgs.system}.advantagescope + # misc + pkgs.invoice + pkgs.pop + pkgs.vhs + pkgs.torrential + inputs.flare.packages.x86_64-linux.default + pkgs.unstable.ollama + pkgs.unstable.claude-code + pkgs.udiskie + pkgs.neofetch + pkgs.unstable.kicad-testing + pkgs.zenity + pkgs.atproto-goat + ]; programs.nh = { enable = true; @@ -276,24 +239,24 @@ ]; age.secrets = { wifi = { - file = ../../../secrets/wifi.age; + file = ../../secrets/wifi.age; owner = "kierank"; }; resend = { - file = ../../../secrets/resend.age; + file = ../../secrets/resend.age; owner = "kierank"; }; wakatime = { - file = ../../../secrets/wakatime.age; + file = ../../secrets/wakatime.age; path = "/home/kierank/.wakatime.cfg"; owner = "kierank"; }; bluesky = { - file = ../../../secrets/bluesky.age; + file = ../../secrets/bluesky.age; owner = "kierank"; }; iodine = { - file = ../../../secrets/iodine.age; + file = ../../secrets/iodine.age; owner = "kierank"; }; }; @@ -314,7 +277,7 @@ VISUAL = "nvim"; }; - modules = { + atelier = { authentication.enable = true; apps.tuigreet = { enable = true; diff --git a/nixos/machines/moonlark/disk-config.nix b/machines/moonlark/disk-config.nix similarity index 100% rename from nixos/machines/moonlark/disk-config.nix rename to machines/moonlark/disk-config.nix diff --git a/nixos/machines/moonlark/hardware-configuration.nix b/machines/moonlark/hardware-configuration.nix similarity index 100% rename from nixos/machines/moonlark/hardware-configuration.nix rename to machines/moonlark/hardware-configuration.nix diff --git a/nixos/machines/moonlark/home-manager.nix b/machines/moonlark/home-manager.nix similarity index 82% rename from nixos/machines/moonlark/home-manager.nix rename to machines/moonlark/home-manager.nix index da64e33..0da9355 100644 --- a/nixos/machines/moonlark/home-manager.nix +++ b/machines/moonlark/home-manager.nix @@ -11,7 +11,7 @@ }; users = { # Import your home-manager configuration - kierank = import ../../../home-manager/machines/moonlark; + kierank = import ./home; }; }; } diff --git a/home-manager/machines/moonlark/default.nix b/machines/moonlark/home/default.nix similarity index 92% rename from home-manager/machines/moonlark/default.nix rename to machines/moonlark/home/default.nix index bbe50e0..2f32f10 100644 --- a/home-manager/machines/moonlark/default.nix +++ b/machines/moonlark/home/default.nix @@ -1,7 +1,7 @@ { inputs, ... }: { imports = [ - (inputs.import-tree ../../modules) + (inputs.import-tree ../../../modules/home) ]; nixpkgs.enable = true; @@ -11,7 +11,7 @@ homeDirectory = "/home/kierank"; }; - dots = { + atelier = { shell = { enable = true; }; diff --git a/home-manager/machines/nest/default.nix b/machines/nest/default.nix similarity index 90% rename from home-manager/machines/nest/default.nix rename to machines/nest/default.nix index 21e8f1f..57a8121 100644 --- a/home-manager/machines/nest/default.nix +++ b/machines/nest/default.nix @@ -6,7 +6,7 @@ }: { imports = [ - (inputs.import-tree ../../modules) + (inputs.import-tree ../../modules/home) ]; nixpkgs.enable = true; @@ -21,7 +21,7 @@ ]; }; - dots = { + atelier = { shell.enable = true; }; diff --git a/home-manager/machines/tacyon/default.nix b/machines/tacyon/default.nix similarity index 95% rename from home-manager/machines/tacyon/default.nix rename to machines/tacyon/default.nix index 759a1af..7dfa28a 100644 --- a/home-manager/machines/tacyon/default.nix +++ b/machines/tacyon/default.nix @@ -6,7 +6,7 @@ }: { imports = [ - (inputs.import-tree ../../modules) + (inputs.import-tree ../../modules/home) ]; nixpkgs.enable = true; @@ -44,7 +44,7 @@ ]; }; - dots = { + atelier = { shell.enable = true; theming.enable = true; }; diff --git a/home-manager/modules/aesthetics/theming.nix b/modules/home/aesthetics/theming.nix similarity index 82% rename from home-manager/modules/aesthetics/theming.nix rename to modules/home/aesthetics/theming.nix index 58d0a3c..98f0860 100644 --- a/home-manager/modules/aesthetics/theming.nix +++ b/modules/home/aesthetics/theming.nix @@ -9,8 +9,8 @@ inputs.catppuccin.homeModules.catppuccin ]; - options.dots.theming.enable = lib.mkEnableOption "Enable Catppuccin and GTK/QT themeing"; - config = lib.mkIf config.dots.theming.enable { + options.atelier.theming.enable = lib.mkEnableOption "Enable Catppuccin and GTK/QT themeing"; + config = lib.mkIf config.atelier.theming.enable { catppuccin = { enable = true; accent = "green"; diff --git a/modules/home/aesthetics/wallpapers.nix b/modules/home/aesthetics/wallpapers.nix new file mode 100644 index 0000000..40bcc77 --- /dev/null +++ b/modules/home/aesthetics/wallpapers.nix @@ -0,0 +1,45 @@ +{ + lib, + config, + pkgs, + ... +}: +{ + options.atelier.wallpapers.enable = lib.mkEnableOption "symlink a bunch of wallpapers"; + config = lib.mkIf config.atelier.wallpapers.enable { + home.packages = with pkgs; [ + (writeShellScriptBin "chngwall" '' + #!/usr/bin/env bash + + WALLPAPER_DIR="$HOME/.config/wallpapers" + CURRENT_WALL=$(hyprctl hyprpaper listloaded) + + # Get a random wallpaper that is not the current one + WALLPAPER=$(find -L "$WALLPAPER_DIR" -type f ! -name "$(basename "$CURRENT_WALL")" | shuf -n 1) + + # Apply the selected wallpaper + hyprctl hyprpaper reload ,"$WALLPAPER" + '') + ]; + + xdg.configFile."wallpapers/acon-pier.jpg".source = ../../../dots/wallpapers/acon-pier.jpg; + xdg.configFile."wallpapers/acon-forest.jpg".source = ../../../dots/wallpapers/acon-forest.jpg; + xdg.configFile."wallpapers/acon-gradient-clouds.jpg".source = + ../../../dots/wallpapers/acon-gradient-clouds.jpg; + xdg.configFile."wallpapers/acon-fsh.jpg".source = ../../../dots/wallpapers/acon-fsh.jpg; + xdg.configFile."wallpapers/tongyu-waves.jpg".source = ../../../dots/wallpapers/tongyu-waves.jpg; + xdg.configFile."wallpapers/acon-rocks.jpg".source = ../../../dots/wallpapers/acon-rocks.jpg; + xdg.configFile."wallpapers/kailing-comet.jpg".source = ../../../dots/wallpapers/kailing-comet.jpg; + xdg.configFile."wallpapers/acon-star.jpg".source = ../../../dots/wallpapers/acon-star.jpg; + xdg.configFile."wallpapers/kailing-canyon.jpg".source = ../../../dots/wallpapers/kailing-canyon.jpg; + xdg.configFile."wallpapers/kailing-swirls.jpg".source = ../../../dots/wallpapers/kailing-swirls.jpg; + xdg.configFile."wallpapers/highway.jpg".source = ../../../dots/wallpapers/highway.jpg; + xdg.configFile."wallpapers/kailing-shooting-star.jpg".source = + ../../../dots/wallpapers/kailing-shooting-star.jpg; + xdg.configFile."wallpapers/yessa-cat.jpg".source = ../../../dots/wallpapers/yessa-cat.jpg; + xdg.configFile."wallpapers/annie-athena.jpg".source = ../../../dots/wallpapers/annie-athena.jpg; + xdg.configFile."wallpapers/candy-stained-glass.jpg".source = + ../../../dots/wallpapers/candy-stained-glass.jpg; + xdg.configFile."wallpapers/tongyu-catcat.jpg".source = ../../../dots/wallpapers/tongyu-catcat.jpg; + }; +} diff --git a/home-manager/modules/apps/alacritty.nix b/modules/home/apps/alacritty.nix similarity index 82% rename from home-manager/modules/apps/alacritty.nix rename to modules/home/apps/alacritty.nix index 4cb3eae..de25a29 100644 --- a/home-manager/modules/apps/alacritty.nix +++ b/modules/home/apps/alacritty.nix @@ -1,7 +1,7 @@ { lib, config, ... }: { - options.dots.terminal.alacritty.enable = lib.mkEnableOption "Enable Alacritty terminal config"; - config = lib.mkIf config.dots.terminal.alacritty.enable { + options.atelier.terminal.alacritty.enable = lib.mkEnableOption "Enable Alacritty terminal config"; + config = lib.mkIf config.atelier.terminal.alacritty.enable { catppuccin.alacritty.flavor = "mocha"; programs.alacritty = { enable = true; diff --git a/home-manager/modules/apps/crush.nix b/modules/home/apps/crush.nix similarity index 95% rename from home-manager/modules/apps/crush.nix rename to modules/home/apps/crush.nix index 3e32065..be1786c 100644 --- a/home-manager/modules/apps/crush.nix +++ b/modules/home/apps/crush.nix @@ -4,8 +4,8 @@ ... }: { - options.dots.apps.crush.enable = lib.mkEnableOption "Enable Crush config"; - config = lib.mkIf config.dots.apps.crush.enable { + options.atelier.apps.crush.enable = lib.mkEnableOption "Enable Crush config"; + config = lib.mkIf config.atelier.apps.crush.enable { programs.crush = { enable = true; settings = { @@ -182,7 +182,7 @@ }; }; - xdg.configFile."crush/copilot.sh".source = ../../dots/copilot.sh; - xdg.configFile."crush/anthropic.sh".source = ../../dots/anthropic.sh; + xdg.configFile."crush/copilot.sh".source = ../../../dots/copilot.sh; + xdg.configFile."crush/anthropic.sh".source = ../../../dots/anthropic.sh; }; } diff --git a/home-manager/modules/apps/_crush-options.nix b/modules/home/apps/crush/_crush-options.nix similarity index 100% rename from home-manager/modules/apps/_crush-options.nix rename to modules/home/apps/crush/_crush-options.nix diff --git a/home-manager/modules/apps/crush-module.nix b/modules/home/apps/crush/crush-module.nix similarity index 73% rename from home-manager/modules/apps/crush-module.nix rename to modules/home/apps/crush/crush-module.nix index c2ff664..d3d0091 100644 --- a/home-manager/modules/apps/crush-module.nix +++ b/modules/home/apps/crush/crush-module.nix @@ -20,9 +20,5 @@ home.file.".config/crush/crush.json" = lib.mkIf (config.programs.crush.settings != { }) { text = builtins.toJSON config.programs.crush.settings; }; - - # Optionally, add config file sources if needed - xdg.configFile."crush/copilot.sh".source = ../../dots/copilot.sh; - xdg.configFile."crush/anthropic.sh".source = ../../dots/anthropic.sh; }; } diff --git a/home-manager/modules/apps/ghostty.nix b/modules/home/apps/ghostty.nix similarity index 68% rename from home-manager/modules/apps/ghostty.nix rename to modules/home/apps/ghostty.nix index 4a95c81..63e132d 100644 --- a/home-manager/modules/apps/ghostty.nix +++ b/modules/home/apps/ghostty.nix @@ -1,7 +1,7 @@ { lib, config, ... }: { - options.dots.terminal.ghostty.enable = lib.mkEnableOption "Enable Ghostty terminal config"; - config = lib.mkIf config.dots.terminal.ghostty.enable { + options.atelier.terminal.ghostty.enable = lib.mkEnableOption "Enable Ghostty terminal config"; + config = lib.mkIf config.atelier.terminal.ghostty.enable { home.file.".config/ghostty/config".text = '' foreground = "#a7b1d3" mouse-hide-while-typing = true diff --git a/home-manager/modules/apps/git.nix b/modules/home/apps/git.nix similarity index 97% rename from home-manager/modules/apps/git.nix rename to modules/home/apps/git.nix index 5fa5918..b83997b 100644 --- a/home-manager/modules/apps/git.nix +++ b/modules/home/apps/git.nix @@ -1,9 +1,9 @@ { lib, config, ... }: { - options.dots.shell.git.enable = lib.mkEnableOption { + options.atelier.shell.git.enable = lib.mkEnableOption { description = "Enable global Git configuration"; }; - config = lib.mkIf config.dots.shell.git.enable { + config = lib.mkIf config.atelier.shell.git.enable { programs.git = { enable = true; userName = "Kieran Klukas"; diff --git a/home-manager/modules/apps/irssi.nix b/modules/home/apps/irssi.nix similarity index 79% rename from home-manager/modules/apps/irssi.nix rename to modules/home/apps/irssi.nix index dd08d84..29bd062 100644 --- a/home-manager/modules/apps/irssi.nix +++ b/modules/home/apps/irssi.nix @@ -1,7 +1,7 @@ { lib, config, ... }: { - options.dots.apps.irssi.enable = lib.mkEnableOption "Enable irssi config"; - config = lib.mkIf config.dots.apps.irssi.enable { + options.atelier.apps.irssi.enable = lib.mkEnableOption "Enable irssi config"; + config = lib.mkIf config.atelier.apps.irssi.enable { programs.irssi = { enable = true; extraConfig = '' diff --git a/home-manager/modules/apps/qutebrowser.nix b/modules/home/apps/qutebrowser.nix similarity index 92% rename from home-manager/modules/apps/qutebrowser.nix rename to modules/home/apps/qutebrowser.nix index bef52b7..c056aca 100644 --- a/home-manager/modules/apps/qutebrowser.nix +++ b/modules/home/apps/qutebrowser.nix @@ -1,7 +1,7 @@ { lib, config, ... }: { - options.dots.apps.qutebrowser.enable = lib.mkEnableOption "Enable Qutebrowser config"; - config = lib.mkIf config.dots.apps.qutebrowser.enable { + options.atelier.apps.qutebrowser.enable = lib.mkEnableOption "Enable Qutebrowser config"; + config = lib.mkIf config.atelier.apps.qutebrowser.enable { programs.qutebrowser = { enable = true; settings = { diff --git a/home-manager/modules/apps/spotify.nix b/modules/home/apps/spotify.nix similarity index 76% rename from home-manager/modules/apps/spotify.nix rename to modules/home/apps/spotify.nix index 8699ed3..30ff44b 100644 --- a/home-manager/modules/apps/spotify.nix +++ b/modules/home/apps/spotify.nix @@ -10,8 +10,8 @@ inputs.spicetify-nix.homeManagerModules.default ]; - options.dots.apps.spotify.enable = lib.mkEnableOption "Enable Spotify config (spicetify)"; - config = lib.mkIf config.dots.apps.spotify.enable { + options.atelier.apps.spotify.enable = lib.mkEnableOption "Enable Spotify config (spicetify)"; + config = lib.mkIf config.atelier.apps.spotify.enable { programs.spicetify = let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; diff --git a/home-manager/modules/apps/tofi.nix b/modules/home/apps/tofi.nix similarity index 85% rename from home-manager/modules/apps/tofi.nix rename to modules/home/apps/tofi.nix index 2f1ed34..eb60e38 100644 --- a/home-manager/modules/apps/tofi.nix +++ b/modules/home/apps/tofi.nix @@ -4,9 +4,9 @@ ... }: { - options.dots.apps.tofi.enable = lib.mkEnableOption "Enable tofi config"; + options.atelier.apps.tofi.enable = lib.mkEnableOption "Enable tofi config"; - config = lib.mkIf config.dots.apps.tofi.enable { + config = lib.mkIf config.atelier.apps.tofi.enable { catppuccin.tofi.enable = false; # tofi config diff --git a/home-manager/modules/apps/vscode.nix b/modules/home/apps/vscode.nix similarity index 94% rename from home-manager/modules/apps/vscode.nix rename to modules/home/apps/vscode.nix index 7390fe1..d663fe2 100644 --- a/home-manager/modules/apps/vscode.nix +++ b/modules/home/apps/vscode.nix @@ -6,8 +6,8 @@ ... }: { - options.dots.apps.vscode.enable = lib.mkEnableOption "Enable VSCode config"; - config = lib.mkIf config.dots.apps.vscode.enable { + options.atelier.apps.vscode.enable = lib.mkEnableOption "Enable VSCode config"; + config = lib.mkIf config.atelier.apps.vscode.enable { nixpkgs.overlays = [ inputs.nix-vscode-extensions.overlays.default inputs.catppuccin-vsc.overlays.default diff --git a/home-manager/modules/system/nixpkgs.nix b/modules/home/system/nixpkgs.nix similarity index 100% rename from home-manager/modules/system/nixpkgs.nix rename to modules/home/system/nixpkgs.nix diff --git a/home-manager/modules/system/shell.nix b/modules/home/system/shell.nix similarity index 98% rename from home-manager/modules/system/shell.nix rename to modules/home/system/shell.nix index e376f82..4ce3887 100644 --- a/home-manager/modules/system/shell.nix +++ b/modules/home/system/shell.nix @@ -6,8 +6,8 @@ ... }: { - options.dots.shell.enable = lib.mkEnableOption "Custom shell config"; - config = lib.mkIf config.dots.shell.enable { + options.atelier.shell.enable = lib.mkEnableOption "Custom shell config"; + config = lib.mkIf config.atelier.shell.enable { programs.oh-my-posh = { enable = true; enableZshIntegration = true; @@ -135,7 +135,6 @@ rr = "rm -Rf"; ghrpc = "gh repo create -c"; goops = "git commit --amend --no-edit && git push --force-with-lease"; - chngwall = "~/.config/hypr/randomize.sh"; vi = "nvim"; vim = "nvim"; }; @@ -483,6 +482,6 @@ neofetch ]; - dots.shell.git.enable = lib.mkDefault true; + atelier.shell.git.enable = lib.mkDefault true; }; } diff --git a/modules/home/wm/hyprland/default.nix b/modules/home/wm/hyprland/default.nix new file mode 100644 index 0000000..09bc8ce --- /dev/null +++ b/modules/home/wm/hyprland/default.nix @@ -0,0 +1,57 @@ +{ + lib, + pkgs, + config, + ... +}: +{ + options.atelier.wm.hyprland.enable = lib.mkEnableOption "Enable Hyprland config"; + config = lib.mkIf config.atelier.wm.hyprland.enable { + atelier.apps.tofi.enable = true; + programs.hyprlock.enable = true; + + atelier.wallpapers.enable = true; + + xdg.configFile."hypr/macchiato.conf".source = ../../../../dots/macchiato.conf; + xdg.configFile."hypr/hyprland.conf".source = ../../../../dots/hyprland.conf; + xdg.configFile."hypr/prettify-ss.sh".source = ../../../../dots/prettify-ss.sh; + xdg.configFile."hypr/tofi-emoji.sh".source = ../../../../dots/tofi-emoji.sh; + xdg.configFile."hypr/hyprlock.conf".source = ../../../../dots/hyprlock.conf; + xdg.configFile."face.jpeg".source = ../../../../dots/face.jpeg; + xdg.configFile."hypr/hyprpaper.conf".source = ../../../../dots/hyprpaper.conf; + xdg.configFile."hypr/hyprrec.sh".source = ../../../../dots/hyprrec.sh; + xdg.configFile."hypr/charge-alert.sh".source = ../../../../dots/charge-alert.sh; + + xdg.portal = { + enable = true; + extraPortals = with pkgs; [ xdg-desktop-portal-gtk ]; + configPackages = with pkgs; [ xdg-desktop-portal-gtk ]; + }; + + services.mako = { + enable = true; + settings = { + default-timeout = 4000; + margin = "58,6"; + font = "Fira Sans 12"; + border-radius = 5; + }; + }; + + services.udiskie = { + enable = true; + settings = { + program_options = { + udisks_version = 2; + tray = false; + }; + notifications = { + device_unmounted = false; + device_added = -1; + device_removed = -1; + device_mounted = -1; + }; + }; + }; + }; +} diff --git a/home-manager/modules/wm/hyprland/hypridle.nix b/modules/home/wm/hyprland/hypridle.nix similarity index 94% rename from home-manager/modules/wm/hyprland/hypridle.nix rename to modules/home/wm/hyprland/hypridle.nix index 801aef9..45a4011 100644 --- a/home-manager/modules/wm/hyprland/hypridle.nix +++ b/modules/home/wm/hyprland/hypridle.nix @@ -4,7 +4,7 @@ ... }: { - config = lib.mkIf config.dots.wm.hyprland.enable { + config = lib.mkIf config.atelier.wm.hyprland.enable { services.hypridle = { enable = true; settings = { diff --git a/home-manager/modules/wm/hyprland/waybar.nix b/modules/home/wm/hyprland/waybar.nix similarity index 99% rename from home-manager/modules/wm/hyprland/waybar.nix rename to modules/home/wm/hyprland/waybar.nix index d0e981e..184e354 100644 --- a/home-manager/modules/wm/hyprland/waybar.nix +++ b/modules/home/wm/hyprland/waybar.nix @@ -52,7 +52,7 @@ let }; in { - config = lib.mkIf config.dots.wm.hyprland.enable { + config = lib.mkIf config.atelier.wm.hyprland.enable { # Let it try to start a few more times systemd.user.services.waybar = { Unit.StartLimitBurst = 30; diff --git a/nixos/modules/apps/tuigreet.nix b/modules/nixos/apps/tuigreet.nix similarity index 99% rename from nixos/modules/apps/tuigreet.nix rename to modules/nixos/apps/tuigreet.nix index 1ad471b..ab89255 100644 --- a/nixos/modules/apps/tuigreet.nix +++ b/modules/nixos/apps/tuigreet.nix @@ -5,7 +5,7 @@ ... }: let - cfg = config.modules.apps.tuigreet; + cfg = config.atelier.apps.tuigreet; tuigreetBin = "${pkgs.greetd.tuigreet}/bin/tuigreet"; msg = cfg.greeting; baseArgs = @@ -115,7 +115,7 @@ let ); in { - options.modules.apps.tuigreet = { + options.atelier.apps.tuigreet = { enable = lib.mkEnableOption "Enable greetd with tuigreet"; command = lib.mkOption { diff --git a/nixos/modules/system/authentication.nix b/modules/nixos/system/authentication.nix similarity index 96% rename from nixos/modules/system/authentication.nix rename to modules/nixos/system/authentication.nix index 0146d2a..532ca37 100644 --- a/nixos/modules/system/authentication.nix +++ b/modules/nixos/system/authentication.nix @@ -5,10 +5,10 @@ ... }: let - cfg = config.modules.authentication; + cfg = config.atelier.authentication; in { - options.modules.authentication.enable = lib.mkEnableOption "Enable authentication stack (polkit, keyring, PAM with fprintd)"; + options.atelier.authentication.enable = lib.mkEnableOption "Enable authentication stack (polkit, keyring, PAM with fprintd)"; config = lib.mkIf cfg.enable { services.fprintd.enable = true; diff --git a/nixos/modules/system/wifi.nix b/modules/nixos/system/wifi.nix similarity index 95% rename from nixos/modules/system/wifi.nix rename to modules/nixos/system/wifi.nix index 63883bf..f28938e 100644 --- a/nixos/modules/system/wifi.nix +++ b/modules/nixos/system/wifi.nix @@ -2,10 +2,10 @@ # # This module provides a simpler way to declare wifi profiles with network manager. # - you can pass the PSK via environment variable, direct value, or file. -# - profiles are defined in `modules.network.wifi.profiles`. +# - profiles are defined in `atelier.network.wifi.profiles`. # # Example usage: -# modules.network.wifi = { +# atelier.network.wifi = { # enable = true; # profiles = { # "MySSID" = { psk = "supersecret"; }; @@ -19,7 +19,7 @@ ... }: let - cfg = config.modules.network.wifi; + cfg = config.atelier.network.wifi; mkProfile = name: { @@ -71,7 +71,7 @@ let base // sec; in { - options.modules.network.wifi = { + options.atelier.network.wifi = { enable = lib.mkEnableOption "Enable NetworkManager with simplified Wi-Fi profiles"; hostName = lib.mkOption { type = lib.types.str; -- 2.51.2