From 113e01513549d62cb40bcb34d2b6a3ab95c91d61 Mon Sep 17 00:00:00 2001 From: xunuwu Date: Thu, 16 Jan 2025 10:08:58 +0100 Subject: [PATCH] some reorganizing --- flake.lock | 59 ++++----- flake.nix | 116 ++++++++---------- home/editors/jetbrains/default.nix | 5 - home/{ => profiles}/default.nix | 0 home/{ => profiles}/develop/common.nix | 0 home/{ => profiles}/develop/devenv.nix | 0 home/{ => profiles}/develop/docs.nix | 0 home/{ => profiles}/develop/langs/c.nix | 0 home/{ => profiles}/develop/langs/haskell.nix | 0 home/{ => profiles}/develop/langs/lua.nix | 0 home/{ => profiles}/develop/langs/nix.nix | 0 home/{ => profiles}/develop/langs/rust.nix | 0 home/{ => profiles}/develop/langs/uiua.nix | 0 home/{ => profiles}/develop/langs/zig.nix | 0 home/{ => profiles}/develop/tools.nix | 0 home/{ => profiles}/editors/emacs.nix | 0 .../editors/jetbrains/android-studio.nix | 0 home/profiles/editors/jetbrains/rider.nix | 3 + home/{ => profiles}/editors/nvim.nix | 0 home/profiles/kidney/default.nix | 25 ---- home/profiles/nixdesk/default.nix | 94 -------------- .../programs/browsers/chromium.nix | 0 .../programs/browsers/firefox/default.nix | 0 .../browsers/firefox/search-engines.nix | 0 .../programs/browsers/firefox/userChrome.css | 0 home/{ => profiles}/programs/browsers/tor.nix | 0 .../programs/desktop/common/fuzzel.nix | 0 .../programs/desktop/common/wl-clipboard.nix | 0 .../programs/desktop/common/wob.nix | 0 .../programs/desktop/default.nix | 0 .../programs/desktop/sway/default.nix | 0 .../desktop/sway/waybar-workspace.patch | 0 .../programs/desktop/sway/waybar.nix | 0 .../{ => profiles}/programs/desktop/theme.nix | 0 .../{ => profiles}/programs/games/default.nix | 0 home/{ => profiles}/programs/games/heroic.nix | 0 .../{ => profiles}/programs/games/krunker.nix | 0 home/{ => profiles}/programs/games/lutris.nix | 0 .../programs/games/minecraft.nix | 0 home/{ => profiles}/programs/games/roblox.nix | 0 .../programs/media/jellyfin.nix | 0 home/{ => profiles}/programs/media/mpv.nix | 0 home/{ => profiles}/programs/misc/blender.nix | 0 home/{ => profiles}/programs/misc/discord.nix | 0 home/{ => profiles}/programs/misc/element.nix | 0 home/{ => profiles}/programs/misc/foliate.nix | 0 .../programs/misc/keepassxc.nix | 0 home/{ => profiles}/programs/misc/krita.nix | 0 .../programs/misc/libreoffice.nix | 0 home/{ => profiles}/programs/misc/obs.nix | 0 .../{ => profiles}/programs/misc/obsidian.nix | 0 .../programs/misc/pwvucontrol.nix | 0 .../{ => profiles}/programs/misc/qpwgraph.nix | 0 home/{ => profiles}/programs/music/cmus.nix | 0 home/{ => profiles}/programs/music/picard.nix | 0 .../programs/music/puddletag.nix | 0 home/{ => profiles}/secrets/default.nix | 0 home/{ => profiles}/secrets/wakatime | 0 home/{ => profiles}/secrets/wakatime.nix | 0 home/{ => profiles}/services/playerctl.nix | 0 home/{ => profiles}/services/polkit-agent.nix | 0 home/{ => profiles}/services/udiskie.nix | 0 .../{ => profiles}/terminal/emulator/foot.nix | 0 .../terminal/emulator/wezterm.nix | 0 .../terminal/programs/comma.nix | 0 .../terminal/programs/direnv.nix | 0 home/{ => profiles}/terminal/programs/git.nix | 0 .../terminal/programs/github.nix | 0 .../terminal/programs/irssi.nix | 0 .../terminal/programs/lazygit.nix | 0 home/{ => profiles}/terminal/programs/tdf.nix | 0 .../{ => profiles}/terminal/programs/tmux.nix | 0 home/{ => profiles}/terminal/programs/xdg.nix | 0 .../terminal/programs/zoxide.nix | 0 home/{ => profiles}/terminal/shell/zsh.nix | 0 home/suites/kidney/default.nix | 23 ++++ home/suites/nixdesk/default.nix | 97 +++++++++++++++ .../{profiles => suites}/nixdesk/defaults.nix | 0 home/{profiles => suites}/nixdesk/kanshi.nix | 0 lib/default.nix | 29 +++++ nix/machines/default.nix | 54 -------- nix/machines/hopper/default.nix | 34 ----- nix/machines/kidney/default.nix | 26 ---- nix/machines/nixdesk/default.nix | 91 -------------- .../services/virt/distrobox.nix | 3 - nix/systemProfiles/services/virt/docker.nix | 6 - nix/systemProfiles/services/virt/podman.nix | 7 -- pkgs/default.nix | 14 ++- shells/default.nix | 12 ++ sys/machines/hopper/default.nix | 38 ++++++ {nix => sys}/machines/hopper/hardware.nix | 0 {nix => sys}/machines/hopper/lab/default.nix | 0 {nix => sys}/machines/hopper/lab/samba.nix | 0 sys/machines/kidney/default.nix | 41 +++++++ {nix => sys}/machines/kidney/fonts.nix | 0 {nix => sys}/machines/kidney/hardware.nix | 0 {nix => sys}/machines/kidney/wsl.nix | 0 sys/machines/nixdesk/default.nix | 107 ++++++++++++++++ {nix => sys}/machines/nixdesk/hardware.nix | 0 .../machines/nixdesk/hibernate-boot.nix | 0 {nix => sys}/machines/nixdesk/samba-mount.nix | 0 .../profiles}/core/boot.nix | 0 .../profiles}/core/compat.nix | 0 .../profiles}/core/deploy.nix | 8 +- .../profiles}/core/docs.nix | 0 .../profiles}/core/gvfs.nix | 0 .../profiles}/core/locale.nix | 0 .../profiles}/core/security.nix | 0 .../profiles}/core/ssh.nix | 0 .../profiles}/core/tools.nix | 0 .../profiles}/core/users.nix | 0 .../profiles}/desktop/sway.nix | 0 .../profiles}/hardware/bluetooth.nix | 0 .../profiles}/hardware/graphics.nix | 0 .../profiles}/hardware/qmk.nix | 0 .../profiles}/hardware/steam-hardware.nix | 0 .../profiles}/network/avahi.nix | 0 .../profiles}/network/goldberg.nix | 0 .../profiles}/network/localsend.nix | 0 .../profiles}/network/networkd.nix | 0 .../profiles}/network/tailscale.nix | 0 .../profiles}/network/wifi.nix | 0 .../profiles}/nix/default.nix | 0 .../profiles}/nix/gc.nix | 0 .../profiles}/nix/substituters.nix | 0 .../profiles}/programs/RE/default.nix | 0 .../programs/RE/il2cppdumper/default.nix | 0 .../programs/RE/il2cppdumper/deps.nix | 0 .../profiles}/programs/RE/ilspy/default.nix | 0 .../profiles}/programs/RE/ilspy/deps.nix | 0 .../profiles}/programs/adb.nix | 0 .../profiles}/programs/corectrl.nix | 0 .../profiles}/programs/dconf.nix | 0 .../profiles}/programs/fonts.nix | 0 .../profiles}/programs/gamemode.nix | 0 .../profiles}/programs/gamescope.nix | 0 .../profiles}/programs/home-manager.nix | 0 .../profiles}/programs/kanidm.nix | 0 .../profiles}/programs/openrgb.nix | 0 .../profiles}/programs/qt.nix | 0 .../profiles}/programs/steam.nix | 0 .../profiles}/programs/thunar.nix | 0 .../profiles}/programs/tools.nix | 0 .../profiles}/programs/zsh.nix | 0 .../profiles}/secrets/default.nix | 0 .../profiles}/secrets/global/default.nix | 0 .../secrets/global/tailscale-auth.yaml | 0 .../profiles}/secrets/hopper/authelia.yaml | 0 .../profiles}/secrets/hopper/authentik | 0 .../profiles}/secrets/hopper/betanin | 0 .../profiles}/secrets/hopper/brawlstars | 0 .../profiles}/secrets/hopper/cloudflare | 0 .../profiles}/secrets/hopper/code-server | 0 .../profiles}/secrets/hopper/default.nix | 0 .../profiles}/secrets/hopper/grafana-pass | 0 .../profiles}/secrets/hopper/jackett | 0 .../profiles}/secrets/hopper/kanidm.yaml | 0 .../profiles}/secrets/hopper/keycloak.yaml | 0 .../profiles}/secrets/hopper/lldap.yaml | 0 .../profiles}/secrets/hopper/serverenv | 0 .../profiles}/secrets/hopper/slskd | 0 .../profiles}/secrets/hopper/transmission | 0 .../profiles}/secrets/hopper/wakapi | 0 .../profiles}/secrets/hopper/wireguard | 0 .../profiles}/secrets/hopper/wireguard-config | 0 .../profiles}/secrets/hopper/wireguard.yaml | 0 .../profiles}/secrets/nixdesk/brawlstars | 0 .../profiles}/secrets/nixdesk/cloudflare | 0 .../profiles}/secrets/nixdesk/default.nix | 0 .../profiles}/secrets/nixdesk/samba | 0 .../profiles}/secrets/nixdesk/wireguard | 0 .../profiles}/secrets/nixdesk/wireguard.yaml | 0 .../profiles}/services/default.nix | 0 .../profiles}/services/flatpak.nix | 0 .../profiles}/services/gnome-services.nix | 0 .../profiles}/services/pipewire.nix | 0 .../profiles}/services/sunshine.nix | 0 .../profiles}/services/syncthing.nix | 0 .../profiles/services}/virt-manager.nix | 0 .../profiles/services}/waydroid.nix | 0 .../profiles}/services/xdg-portals.nix | 0 .../profiles}/themes/dark.nix | 0 182 files changed, 443 insertions(+), 449 deletions(-) delete mode 100644 home/editors/jetbrains/default.nix rename home/{ => profiles}/default.nix (100%) rename home/{ => profiles}/develop/common.nix (100%) rename home/{ => profiles}/develop/devenv.nix (100%) rename home/{ => profiles}/develop/docs.nix (100%) rename home/{ => profiles}/develop/langs/c.nix (100%) rename home/{ => profiles}/develop/langs/haskell.nix (100%) rename home/{ => profiles}/develop/langs/lua.nix (100%) rename home/{ => profiles}/develop/langs/nix.nix (100%) rename home/{ => profiles}/develop/langs/rust.nix (100%) rename home/{ => profiles}/develop/langs/uiua.nix (100%) rename home/{ => profiles}/develop/langs/zig.nix (100%) rename home/{ => profiles}/develop/tools.nix (100%) rename home/{ => profiles}/editors/emacs.nix (100%) rename home/{ => profiles}/editors/jetbrains/android-studio.nix (100%) create mode 100644 home/profiles/editors/jetbrains/rider.nix rename home/{ => profiles}/editors/nvim.nix (100%) delete mode 100644 home/profiles/kidney/default.nix delete mode 100644 home/profiles/nixdesk/default.nix rename home/{ => profiles}/programs/browsers/chromium.nix (100%) rename home/{ => profiles}/programs/browsers/firefox/default.nix (100%) rename home/{ => profiles}/programs/browsers/firefox/search-engines.nix (100%) rename home/{ => profiles}/programs/browsers/firefox/userChrome.css (100%) rename home/{ => profiles}/programs/browsers/tor.nix (100%) rename home/{ => profiles}/programs/desktop/common/fuzzel.nix (100%) rename home/{ => profiles}/programs/desktop/common/wl-clipboard.nix (100%) rename home/{ => profiles}/programs/desktop/common/wob.nix (100%) rename home/{ => profiles}/programs/desktop/default.nix (100%) rename home/{ => profiles}/programs/desktop/sway/default.nix (100%) rename home/{ => profiles}/programs/desktop/sway/waybar-workspace.patch (100%) rename home/{ => profiles}/programs/desktop/sway/waybar.nix (100%) rename home/{ => profiles}/programs/desktop/theme.nix (100%) rename home/{ => profiles}/programs/games/default.nix (100%) rename home/{ => profiles}/programs/games/heroic.nix (100%) rename home/{ => profiles}/programs/games/krunker.nix (100%) rename home/{ => profiles}/programs/games/lutris.nix (100%) rename home/{ => profiles}/programs/games/minecraft.nix (100%) rename home/{ => profiles}/programs/games/roblox.nix (100%) rename home/{ => profiles}/programs/media/jellyfin.nix (100%) rename home/{ => profiles}/programs/media/mpv.nix (100%) rename home/{ => profiles}/programs/misc/blender.nix (100%) rename home/{ => profiles}/programs/misc/discord.nix (100%) rename home/{ => profiles}/programs/misc/element.nix (100%) rename home/{ => profiles}/programs/misc/foliate.nix (100%) rename home/{ => profiles}/programs/misc/keepassxc.nix (100%) rename home/{ => profiles}/programs/misc/krita.nix (100%) rename home/{ => profiles}/programs/misc/libreoffice.nix (100%) rename home/{ => profiles}/programs/misc/obs.nix (100%) rename home/{ => profiles}/programs/misc/obsidian.nix (100%) rename home/{ => profiles}/programs/misc/pwvucontrol.nix (100%) rename home/{ => profiles}/programs/misc/qpwgraph.nix (100%) rename home/{ => profiles}/programs/music/cmus.nix (100%) rename home/{ => profiles}/programs/music/picard.nix (100%) rename home/{ => profiles}/programs/music/puddletag.nix (100%) rename home/{ => profiles}/secrets/default.nix (100%) rename home/{ => profiles}/secrets/wakatime (100%) rename home/{ => profiles}/secrets/wakatime.nix (100%) rename home/{ => profiles}/services/playerctl.nix (100%) rename home/{ => profiles}/services/polkit-agent.nix (100%) rename home/{ => profiles}/services/udiskie.nix (100%) rename home/{ => profiles}/terminal/emulator/foot.nix (100%) rename home/{ => profiles}/terminal/emulator/wezterm.nix (100%) rename home/{ => profiles}/terminal/programs/comma.nix (100%) rename home/{ => profiles}/terminal/programs/direnv.nix (100%) rename home/{ => profiles}/terminal/programs/git.nix (100%) rename home/{ => profiles}/terminal/programs/github.nix (100%) rename home/{ => profiles}/terminal/programs/irssi.nix (100%) rename home/{ => profiles}/terminal/programs/lazygit.nix (100%) rename home/{ => profiles}/terminal/programs/tdf.nix (100%) rename home/{ => profiles}/terminal/programs/tmux.nix (100%) rename home/{ => profiles}/terminal/programs/xdg.nix (100%) rename home/{ => profiles}/terminal/programs/zoxide.nix (100%) rename home/{ => profiles}/terminal/shell/zsh.nix (100%) create mode 100644 home/suites/kidney/default.nix create mode 100644 home/suites/nixdesk/default.nix rename home/{profiles => suites}/nixdesk/defaults.nix (100%) rename home/{profiles => suites}/nixdesk/kanshi.nix (100%) create mode 100644 lib/default.nix delete mode 100644 nix/machines/default.nix delete mode 100644 nix/machines/hopper/default.nix delete mode 100644 nix/machines/kidney/default.nix delete mode 100644 nix/machines/nixdesk/default.nix delete mode 100644 nix/systemProfiles/services/virt/distrobox.nix delete mode 100644 nix/systemProfiles/services/virt/docker.nix delete mode 100644 nix/systemProfiles/services/virt/podman.nix create mode 100644 shells/default.nix create mode 100644 sys/machines/hopper/default.nix rename {nix => sys}/machines/hopper/hardware.nix (100%) rename {nix => sys}/machines/hopper/lab/default.nix (100%) rename {nix => sys}/machines/hopper/lab/samba.nix (100%) create mode 100644 sys/machines/kidney/default.nix rename {nix => sys}/machines/kidney/fonts.nix (100%) rename {nix => sys}/machines/kidney/hardware.nix (100%) rename {nix => sys}/machines/kidney/wsl.nix (100%) create mode 100644 sys/machines/nixdesk/default.nix rename {nix => sys}/machines/nixdesk/hardware.nix (100%) rename {nix => sys}/machines/nixdesk/hibernate-boot.nix (100%) rename {nix => sys}/machines/nixdesk/samba-mount.nix (100%) rename {nix/systemProfiles => sys/profiles}/core/boot.nix (100%) rename {nix/systemProfiles => sys/profiles}/core/compat.nix (100%) rename {nix/systemProfiles => sys/profiles}/core/deploy.nix (88%) rename {nix/systemProfiles => sys/profiles}/core/docs.nix (100%) rename {nix/systemProfiles => sys/profiles}/core/gvfs.nix (100%) rename {nix/systemProfiles => sys/profiles}/core/locale.nix (100%) rename {nix/systemProfiles => sys/profiles}/core/security.nix (100%) rename {nix/systemProfiles => sys/profiles}/core/ssh.nix (100%) rename {nix/systemProfiles => sys/profiles}/core/tools.nix (100%) rename {nix/systemProfiles => sys/profiles}/core/users.nix (100%) rename {nix/systemProfiles => sys/profiles}/desktop/sway.nix (100%) rename {nix/systemProfiles => sys/profiles}/hardware/bluetooth.nix (100%) rename {nix/systemProfiles => sys/profiles}/hardware/graphics.nix (100%) rename {nix/systemProfiles => sys/profiles}/hardware/qmk.nix (100%) rename {nix/systemProfiles => sys/profiles}/hardware/steam-hardware.nix (100%) rename {nix/systemProfiles => sys/profiles}/network/avahi.nix (100%) rename {nix/systemProfiles => sys/profiles}/network/goldberg.nix (100%) rename {nix/systemProfiles => sys/profiles}/network/localsend.nix (100%) rename {nix/systemProfiles => sys/profiles}/network/networkd.nix (100%) rename {nix/systemProfiles => sys/profiles}/network/tailscale.nix (100%) rename {nix/systemProfiles => sys/profiles}/network/wifi.nix (100%) rename {nix/systemProfiles => sys/profiles}/nix/default.nix (100%) rename {nix/systemProfiles => sys/profiles}/nix/gc.nix (100%) rename {nix/systemProfiles => sys/profiles}/nix/substituters.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/RE/default.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/RE/il2cppdumper/default.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/RE/il2cppdumper/deps.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/RE/ilspy/default.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/RE/ilspy/deps.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/adb.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/corectrl.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/dconf.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/fonts.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/gamemode.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/gamescope.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/home-manager.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/kanidm.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/openrgb.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/qt.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/steam.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/thunar.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/tools.nix (100%) rename {nix/systemProfiles => sys/profiles}/programs/zsh.nix (100%) rename {nix/systemProfiles => sys/profiles}/secrets/default.nix (100%) rename {nix/systemProfiles => sys/profiles}/secrets/global/default.nix (100%) rename {nix/systemProfiles => sys/profiles}/secrets/global/tailscale-auth.yaml (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/authelia.yaml (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/authentik (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/betanin (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/brawlstars (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/cloudflare (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/code-server (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/default.nix (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/grafana-pass (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/jackett (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/kanidm.yaml (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/keycloak.yaml (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/lldap.yaml (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/serverenv (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/slskd (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/transmission (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/wakapi (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/wireguard (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/wireguard-config (100%) rename {nix/systemProfiles => sys/profiles}/secrets/hopper/wireguard.yaml (100%) rename {nix/systemProfiles => sys/profiles}/secrets/nixdesk/brawlstars (100%) rename {nix/systemProfiles => sys/profiles}/secrets/nixdesk/cloudflare (100%) rename {nix/systemProfiles => sys/profiles}/secrets/nixdesk/default.nix (100%) rename {nix/systemProfiles => sys/profiles}/secrets/nixdesk/samba (100%) rename {nix/systemProfiles => sys/profiles}/secrets/nixdesk/wireguard (100%) rename {nix/systemProfiles => sys/profiles}/secrets/nixdesk/wireguard.yaml (100%) rename {nix/systemProfiles => sys/profiles}/services/default.nix (100%) rename {nix/systemProfiles => sys/profiles}/services/flatpak.nix (100%) rename {nix/systemProfiles => sys/profiles}/services/gnome-services.nix (100%) rename {nix/systemProfiles => sys/profiles}/services/pipewire.nix (100%) rename {nix/systemProfiles => sys/profiles}/services/sunshine.nix (100%) rename {nix/systemProfiles => sys/profiles}/services/syncthing.nix (100%) rename {nix/systemProfiles/services/virt => sys/profiles/services}/virt-manager.nix (100%) rename {nix/systemProfiles/services/virt => sys/profiles/services}/waydroid.nix (100%) rename {nix/systemProfiles => sys/profiles}/services/xdg-portals.nix (100%) rename {nix/systemProfiles => sys/profiles}/themes/dark.nix (100%) diff --git a/flake.lock b/flake.lock index 67fd149..87b2c61 100644 --- a/flake.lock +++ b/flake.lock @@ -75,11 +75,11 @@ ] }, "locked": { - "lastModified": 1728330715, - "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=", + "lastModified": 1735644329, + "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "owner": "numtide", "repo": "devshell", - "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef", + "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "type": "github" }, "original": { @@ -218,11 +218,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -331,19 +331,14 @@ "nvim-nix", "nixvim", "nixpkgs" - ], - "nixpkgs-stable": [ - "nvim-nix", - "nixvim", - "nixpkgs" ] }, "locked": { - "lastModified": 1734797603, - "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=", + "lastModified": 1735882644, + "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498", + "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", "type": "github" }, "original": { @@ -489,11 +484,11 @@ ] }, "locked": { - "lastModified": 1734862405, - "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=", + "lastModified": 1736508663, + "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "owner": "nix-community", "repo": "home-manager", - "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35", + "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "type": "github" }, "original": { @@ -562,11 +557,11 @@ ] }, "locked": { - "lastModified": 1733570843, - "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", + "lastModified": 1736370755, + "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "a35b08d09efda83625bef267eb24347b446c80b8", + "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", "type": "github" }, "original": { @@ -649,11 +644,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1735378670, - "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=", + "lastModified": 1736964246, + "narHash": "sha256-gb3ujURRlI/D5Jc8PUDOpJr8RyrTwnDDIDtnQK4upso=", "owner": "nix-community", "repo": "nixvim", - "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811", + "rev": "5b068e7f8f2b6beaa1fafe0c8b3604b63bcccc2d", "type": "github" }, "original": { @@ -673,11 +668,11 @@ ] }, "locked": { - "lastModified": 1733773348, - "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=", + "lastModified": 1735854821, + "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "owner": "NuschtOS", "repo": "search", - "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9", + "rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "type": "github" }, "original": { @@ -716,11 +711,11 @@ "nixvim": "nixvim" }, "locked": { - "lastModified": 1736692407, - "narHash": "sha256-KiqAcwCXi6vEf1W74SfZWgiWV8oxr4uD8aALP4e23+k=", + "lastModified": 1737010726, + "narHash": "sha256-VEWuUAySZQJ8pIwdtLC9VSa/W0SjdKp1USomSuVVoSA=", "owner": "xunuwu", "repo": "nvim-nix", - "rev": "8ae275a311eb7b1f5b82c540f653a45742d7d256", + "rev": "641634583f3ff6181a23b95f9fc8ff8eb7bbdc4a", "type": "github" }, "original": { @@ -941,11 +936,11 @@ ] }, "locked": { - "lastModified": 1734704479, - "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=", + "lastModified": 1736154270, + "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f", + "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bc7a4d3..ed047ef 100644 --- a/flake.nix +++ b/flake.nix @@ -1,32 +1,28 @@ { - outputs = inputs: - inputs.flake-parts.lib.mkFlake { - inherit inputs; - } { + outputs = { + self, + flake-parts, + nixpkgs, + ... + } @ inputs: let + mylib = import ./lib nixpkgs.lib; + systemProfiles = mylib.loadTree2 ./sys/profiles; + homeProfiles = mylib.loadTreeInf ./home/profiles; + homeSuites = mylib.loadBranch ./home/suites; + in + flake-parts.lib.mkFlake {inherit inputs;} { systems = ["x86_64-linux"]; - imports = [./nix/machines]; + flake._mylib = mylib; # for debugging :3 + flake.nixosConfigurations = mylib.loadConfigurations ./sys/machines { + inherit inputs self systemProfiles homeProfiles homeSuites; + }; perSystem = {pkgs, ...}: { - devShells.default = pkgs.mkShell { - packages = with pkgs; [ - alejandra - nil - nixd - git - just - home-manager - sops - colmena - git-agecrypt - inputs.nvfetcher.packages.${pkgs.system}.default - ]; - name = "dots"; - }; - - packages = import ./pkgs { - inherit pkgs; - }; + imports = [ + ./shells + ./pkgs + ]; formatter = pkgs.alejandra; }; @@ -34,47 +30,39 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - flake-parts = { - url = "github:hercules-ci/flake-parts"; - inputs.nixpkgs-lib.follows = "nixpkgs"; - }; + + flake-parts.url = "github:hercules-ci/flake-parts"; + flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; + hardware.url = "github:nixos/nixos-hardware"; - home-manager = { - url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nvim-nix = { - url = "github:xunuwu/nvim-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - stylix = { - url = "github:danth/stylix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - firefox-addons = { - url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - sops-nix = { - url = "github:Mic92/sops-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nix-index-database = { - url = "github:Mic92/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nixos-wsl = { - url = "github:nix-community/NixOS-WSL/main"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nvfetcher = { - url = "github:berberman/nvfetcher"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; + + nvim-nix.url = "github:xunuwu/nvim-nix"; + nvim-nix.inputs.nixpkgs.follows = "nixpkgs"; + + stylix.url = "github:danth/stylix"; + stylix.inputs.nixpkgs.follows = "nixpkgs"; + + firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; + firefox-addons.inputs.nixpkgs.follows = "nixpkgs"; + + sops-nix.url = "github:Mic92/sops-nix"; + sops-nix.inputs.nixpkgs.follows = "nixpkgs"; + + nix-index-database.url = "github:Mic92/nix-index-database"; + nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + + nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; + nixos-wsl.inputs.nixpkgs.follows = "nixpkgs"; + + nvfetcher.url = "github:berberman/nvfetcher"; + nvfetcher.inputs.nixpkgs.follows = "nixpkgs"; + vpn-confinement.url = "github:Maroka-chan/VPN-Confinement"; - sobercookie = { - url = "github:xunuwu/sobercookie"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + + sobercookie.url = "github:xunuwu/sobercookie"; + sobercookie.inputs.nixpkgs.follows = "nixpkgs"; }; } diff --git a/home/editors/jetbrains/default.nix b/home/editors/jetbrains/default.nix deleted file mode 100644 index 3bd9995..0000000 --- a/home/editors/jetbrains/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: { - home.packages = with pkgs.jetbrains; [ - rider - ]; -} diff --git a/home/default.nix b/home/profiles/default.nix similarity index 100% rename from home/default.nix rename to home/profiles/default.nix diff --git a/home/develop/common.nix b/home/profiles/develop/common.nix similarity index 100% rename from home/develop/common.nix rename to home/profiles/develop/common.nix diff --git a/home/develop/devenv.nix b/home/profiles/develop/devenv.nix similarity index 100% rename from home/develop/devenv.nix rename to home/profiles/develop/devenv.nix diff --git a/home/develop/docs.nix b/home/profiles/develop/docs.nix similarity index 100% rename from home/develop/docs.nix rename to home/profiles/develop/docs.nix diff --git a/home/develop/langs/c.nix b/home/profiles/develop/langs/c.nix similarity index 100% rename from home/develop/langs/c.nix rename to home/profiles/develop/langs/c.nix diff --git a/home/develop/langs/haskell.nix b/home/profiles/develop/langs/haskell.nix similarity index 100% rename from home/develop/langs/haskell.nix rename to home/profiles/develop/langs/haskell.nix diff --git a/home/develop/langs/lua.nix b/home/profiles/develop/langs/lua.nix similarity index 100% rename from home/develop/langs/lua.nix rename to home/profiles/develop/langs/lua.nix diff --git a/home/develop/langs/nix.nix b/home/profiles/develop/langs/nix.nix similarity index 100% rename from home/develop/langs/nix.nix rename to home/profiles/develop/langs/nix.nix diff --git a/home/develop/langs/rust.nix b/home/profiles/develop/langs/rust.nix similarity index 100% rename from home/develop/langs/rust.nix rename to home/profiles/develop/langs/rust.nix diff --git a/home/develop/langs/uiua.nix b/home/profiles/develop/langs/uiua.nix similarity index 100% rename from home/develop/langs/uiua.nix rename to home/profiles/develop/langs/uiua.nix diff --git a/home/develop/langs/zig.nix b/home/profiles/develop/langs/zig.nix similarity index 100% rename from home/develop/langs/zig.nix rename to home/profiles/develop/langs/zig.nix diff --git a/home/develop/tools.nix b/home/profiles/develop/tools.nix similarity index 100% rename from home/develop/tools.nix rename to home/profiles/develop/tools.nix diff --git a/home/editors/emacs.nix b/home/profiles/editors/emacs.nix similarity index 100% rename from home/editors/emacs.nix rename to home/profiles/editors/emacs.nix diff --git a/home/editors/jetbrains/android-studio.nix b/home/profiles/editors/jetbrains/android-studio.nix similarity index 100% rename from home/editors/jetbrains/android-studio.nix rename to home/profiles/editors/jetbrains/android-studio.nix diff --git a/home/profiles/editors/jetbrains/rider.nix b/home/profiles/editors/jetbrains/rider.nix new file mode 100644 index 0000000..a51f955 --- /dev/null +++ b/home/profiles/editors/jetbrains/rider.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = with pkgs.jetbrains; [rider]; +} diff --git a/home/editors/nvim.nix b/home/profiles/editors/nvim.nix similarity index 100% rename from home/editors/nvim.nix rename to home/profiles/editors/nvim.nix diff --git a/home/profiles/kidney/default.nix b/home/profiles/kidney/default.nix deleted file mode 100644 index f4442a6..0000000 --- a/home/profiles/kidney/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - inputs, - self, - ... -}: { - imports = [ - ../../editors/emacs.nix - ../../editors/nvim.nix - - ../../terminal/shell/zsh.nix - ../../terminal/programs/xdg.nix - ../../terminal/programs/direnv.nix - ../../terminal/programs/comma.nix - ../../terminal/programs/tmux.nix - ../../terminal/programs/irssi.nix - - ../../develop/langs/nix.nix - ../../develop/tools.nix - ../../develop/devenv.nix - - ../../terminal/programs/git.nix - ../../terminal/programs/github.nix - ../../terminal/programs/lazygit.nix - ]; -} diff --git a/home/profiles/nixdesk/default.nix b/home/profiles/nixdesk/default.nix deleted file mode 100644 index 3eee46e..0000000 --- a/home/profiles/nixdesk/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - self, - pkgs, - ... -}: { - imports = [ - ./defaults.nix - - ../../secrets - - ../../terminal/shell/zsh.nix - - ../../terminal/programs/xdg.nix - ../../terminal/programs/direnv.nix - ../../terminal/programs/tmux.nix - ../../terminal/programs/comma.nix - ../../terminal/programs/zoxide.nix - ../../terminal/programs/tdf.nix - ../../terminal/programs/irssi.nix - ../../terminal/programs/git.nix - ../../terminal/programs/github.nix - ../../terminal/programs/lazygit.nix - - ../../editors/emacs.nix - ../../editors/nvim.nix - ../../editors/jetbrains - ../../editors/jetbrains/android-studio.nix - - ../../programs/browsers/firefox - ../../programs/browsers/tor.nix - ../../programs/browsers/chromium.nix - - ../../terminal/emulator/wezterm.nix - ../../terminal/emulator/foot.nix - - # desktop - ../../programs/desktop - ../../programs/desktop/sway - - # development - ../../develop/common.nix - ../../develop/tools.nix - ../../develop/docs.nix - ../../develop/devenv.nix - - ../../develop/langs/haskell.nix - ../../develop/langs/rust.nix - ../../develop/langs/uiua.nix - ../../develop/langs/nix.nix - ../../develop/langs/zig.nix - ../../develop/langs/lua.nix - ../../develop/langs/c.nix - - # programs - ../../programs/misc/keepassxc.nix - ../../programs/misc/discord.nix - ../../programs/misc/element.nix - ../../programs/misc/obs.nix - ../../programs/misc/krita.nix - ../../programs/misc/foliate.nix - ../../programs/misc/blender.nix - ../../programs/misc/obsidian.nix - ../../programs/misc/pwvucontrol.nix - ../../programs/misc/qpwgraph.nix - ../../programs/misc/libreoffice.nix - ../../programs/music/puddletag.nix - ../../programs/music/picard.nix - ../../programs/music/cmus.nix - ../../programs/media/mpv.nix - ../../programs/media/jellyfin.nix - - # gaming - ../../programs/games/lutris.nix - ../../programs/games/heroic.nix - ../../programs/games/minecraft.nix - ../../programs/games/roblox.nix - ../../programs/games/krunker.nix - - ../../services/playerctl.nix - ../../services/polkit-agent.nix - ../../services/udiskie.nix # although i dont need this for usb memory, it is quite convenient for flashing qmk - ]; - - qt = { - enable = true; - platformTheme = { - name = "gtk3"; - package = [ - pkgs.libsForQt5.qtstyleplugins - pkgs.qt6.qtbase - ]; - }; - }; -} diff --git a/home/programs/browsers/chromium.nix b/home/profiles/programs/browsers/chromium.nix similarity index 100% rename from home/programs/browsers/chromium.nix rename to home/profiles/programs/browsers/chromium.nix diff --git a/home/programs/browsers/firefox/default.nix b/home/profiles/programs/browsers/firefox/default.nix similarity index 100% rename from home/programs/browsers/firefox/default.nix rename to home/profiles/programs/browsers/firefox/default.nix diff --git a/home/programs/browsers/firefox/search-engines.nix b/home/profiles/programs/browsers/firefox/search-engines.nix similarity index 100% rename from home/programs/browsers/firefox/search-engines.nix rename to home/profiles/programs/browsers/firefox/search-engines.nix diff --git a/home/programs/browsers/firefox/userChrome.css b/home/profiles/programs/browsers/firefox/userChrome.css similarity index 100% rename from home/programs/browsers/firefox/userChrome.css rename to home/profiles/programs/browsers/firefox/userChrome.css diff --git a/home/programs/browsers/tor.nix b/home/profiles/programs/browsers/tor.nix similarity index 100% rename from home/programs/browsers/tor.nix rename to home/profiles/programs/browsers/tor.nix diff --git a/home/programs/desktop/common/fuzzel.nix b/home/profiles/programs/desktop/common/fuzzel.nix similarity index 100% rename from home/programs/desktop/common/fuzzel.nix rename to home/profiles/programs/desktop/common/fuzzel.nix diff --git a/home/programs/desktop/common/wl-clipboard.nix b/home/profiles/programs/desktop/common/wl-clipboard.nix similarity index 100% rename from home/programs/desktop/common/wl-clipboard.nix rename to home/profiles/programs/desktop/common/wl-clipboard.nix diff --git a/home/programs/desktop/common/wob.nix b/home/profiles/programs/desktop/common/wob.nix similarity index 100% rename from home/programs/desktop/common/wob.nix rename to home/profiles/programs/desktop/common/wob.nix diff --git a/home/programs/desktop/default.nix b/home/profiles/programs/desktop/default.nix similarity index 100% rename from home/programs/desktop/default.nix rename to home/profiles/programs/desktop/default.nix diff --git a/home/programs/desktop/sway/default.nix b/home/profiles/programs/desktop/sway/default.nix similarity index 100% rename from home/programs/desktop/sway/default.nix rename to home/profiles/programs/desktop/sway/default.nix diff --git a/home/programs/desktop/sway/waybar-workspace.patch b/home/profiles/programs/desktop/sway/waybar-workspace.patch similarity index 100% rename from home/programs/desktop/sway/waybar-workspace.patch rename to home/profiles/programs/desktop/sway/waybar-workspace.patch diff --git a/home/programs/desktop/sway/waybar.nix b/home/profiles/programs/desktop/sway/waybar.nix similarity index 100% rename from home/programs/desktop/sway/waybar.nix rename to home/profiles/programs/desktop/sway/waybar.nix diff --git a/home/programs/desktop/theme.nix b/home/profiles/programs/desktop/theme.nix similarity index 100% rename from home/programs/desktop/theme.nix rename to home/profiles/programs/desktop/theme.nix diff --git a/home/programs/games/default.nix b/home/profiles/programs/games/default.nix similarity index 100% rename from home/programs/games/default.nix rename to home/profiles/programs/games/default.nix diff --git a/home/programs/games/heroic.nix b/home/profiles/programs/games/heroic.nix similarity index 100% rename from home/programs/games/heroic.nix rename to home/profiles/programs/games/heroic.nix diff --git a/home/programs/games/krunker.nix b/home/profiles/programs/games/krunker.nix similarity index 100% rename from home/programs/games/krunker.nix rename to home/profiles/programs/games/krunker.nix diff --git a/home/programs/games/lutris.nix b/home/profiles/programs/games/lutris.nix similarity index 100% rename from home/programs/games/lutris.nix rename to home/profiles/programs/games/lutris.nix diff --git a/home/programs/games/minecraft.nix b/home/profiles/programs/games/minecraft.nix similarity index 100% rename from home/programs/games/minecraft.nix rename to home/profiles/programs/games/minecraft.nix diff --git a/home/programs/games/roblox.nix b/home/profiles/programs/games/roblox.nix similarity index 100% rename from home/programs/games/roblox.nix rename to home/profiles/programs/games/roblox.nix diff --git a/home/programs/media/jellyfin.nix b/home/profiles/programs/media/jellyfin.nix similarity index 100% rename from home/programs/media/jellyfin.nix rename to home/profiles/programs/media/jellyfin.nix diff --git a/home/programs/media/mpv.nix b/home/profiles/programs/media/mpv.nix similarity index 100% rename from home/programs/media/mpv.nix rename to home/profiles/programs/media/mpv.nix diff --git a/home/programs/misc/blender.nix b/home/profiles/programs/misc/blender.nix similarity index 100% rename from home/programs/misc/blender.nix rename to home/profiles/programs/misc/blender.nix diff --git a/home/programs/misc/discord.nix b/home/profiles/programs/misc/discord.nix similarity index 100% rename from home/programs/misc/discord.nix rename to home/profiles/programs/misc/discord.nix diff --git a/home/programs/misc/element.nix b/home/profiles/programs/misc/element.nix similarity index 100% rename from home/programs/misc/element.nix rename to home/profiles/programs/misc/element.nix diff --git a/home/programs/misc/foliate.nix b/home/profiles/programs/misc/foliate.nix similarity index 100% rename from home/programs/misc/foliate.nix rename to home/profiles/programs/misc/foliate.nix diff --git a/home/programs/misc/keepassxc.nix b/home/profiles/programs/misc/keepassxc.nix similarity index 100% rename from home/programs/misc/keepassxc.nix rename to home/profiles/programs/misc/keepassxc.nix diff --git a/home/programs/misc/krita.nix b/home/profiles/programs/misc/krita.nix similarity index 100% rename from home/programs/misc/krita.nix rename to home/profiles/programs/misc/krita.nix diff --git a/home/programs/misc/libreoffice.nix b/home/profiles/programs/misc/libreoffice.nix similarity index 100% rename from home/programs/misc/libreoffice.nix rename to home/profiles/programs/misc/libreoffice.nix diff --git a/home/programs/misc/obs.nix b/home/profiles/programs/misc/obs.nix similarity index 100% rename from home/programs/misc/obs.nix rename to home/profiles/programs/misc/obs.nix diff --git a/home/programs/misc/obsidian.nix b/home/profiles/programs/misc/obsidian.nix similarity index 100% rename from home/programs/misc/obsidian.nix rename to home/profiles/programs/misc/obsidian.nix diff --git a/home/programs/misc/pwvucontrol.nix b/home/profiles/programs/misc/pwvucontrol.nix similarity index 100% rename from home/programs/misc/pwvucontrol.nix rename to home/profiles/programs/misc/pwvucontrol.nix diff --git a/home/programs/misc/qpwgraph.nix b/home/profiles/programs/misc/qpwgraph.nix similarity index 100% rename from home/programs/misc/qpwgraph.nix rename to home/profiles/programs/misc/qpwgraph.nix diff --git a/home/programs/music/cmus.nix b/home/profiles/programs/music/cmus.nix similarity index 100% rename from home/programs/music/cmus.nix rename to home/profiles/programs/music/cmus.nix diff --git a/home/programs/music/picard.nix b/home/profiles/programs/music/picard.nix similarity index 100% rename from home/programs/music/picard.nix rename to home/profiles/programs/music/picard.nix diff --git a/home/programs/music/puddletag.nix b/home/profiles/programs/music/puddletag.nix similarity index 100% rename from home/programs/music/puddletag.nix rename to home/profiles/programs/music/puddletag.nix diff --git a/home/secrets/default.nix b/home/profiles/secrets/default.nix similarity index 100% rename from home/secrets/default.nix rename to home/profiles/secrets/default.nix diff --git a/home/secrets/wakatime b/home/profiles/secrets/wakatime similarity index 100% rename from home/secrets/wakatime rename to home/profiles/secrets/wakatime diff --git a/home/secrets/wakatime.nix b/home/profiles/secrets/wakatime.nix similarity index 100% rename from home/secrets/wakatime.nix rename to home/profiles/secrets/wakatime.nix diff --git a/home/services/playerctl.nix b/home/profiles/services/playerctl.nix similarity index 100% rename from home/services/playerctl.nix rename to home/profiles/services/playerctl.nix diff --git a/home/services/polkit-agent.nix b/home/profiles/services/polkit-agent.nix similarity index 100% rename from home/services/polkit-agent.nix rename to home/profiles/services/polkit-agent.nix diff --git a/home/services/udiskie.nix b/home/profiles/services/udiskie.nix similarity index 100% rename from home/services/udiskie.nix rename to home/profiles/services/udiskie.nix diff --git a/home/terminal/emulator/foot.nix b/home/profiles/terminal/emulator/foot.nix similarity index 100% rename from home/terminal/emulator/foot.nix rename to home/profiles/terminal/emulator/foot.nix diff --git a/home/terminal/emulator/wezterm.nix b/home/profiles/terminal/emulator/wezterm.nix similarity index 100% rename from home/terminal/emulator/wezterm.nix rename to home/profiles/terminal/emulator/wezterm.nix diff --git a/home/terminal/programs/comma.nix b/home/profiles/terminal/programs/comma.nix similarity index 100% rename from home/terminal/programs/comma.nix rename to home/profiles/terminal/programs/comma.nix diff --git a/home/terminal/programs/direnv.nix b/home/profiles/terminal/programs/direnv.nix similarity index 100% rename from home/terminal/programs/direnv.nix rename to home/profiles/terminal/programs/direnv.nix diff --git a/home/terminal/programs/git.nix b/home/profiles/terminal/programs/git.nix similarity index 100% rename from home/terminal/programs/git.nix rename to home/profiles/terminal/programs/git.nix diff --git a/home/terminal/programs/github.nix b/home/profiles/terminal/programs/github.nix similarity index 100% rename from home/terminal/programs/github.nix rename to home/profiles/terminal/programs/github.nix diff --git a/home/terminal/programs/irssi.nix b/home/profiles/terminal/programs/irssi.nix similarity index 100% rename from home/terminal/programs/irssi.nix rename to home/profiles/terminal/programs/irssi.nix diff --git a/home/terminal/programs/lazygit.nix b/home/profiles/terminal/programs/lazygit.nix similarity index 100% rename from home/terminal/programs/lazygit.nix rename to home/profiles/terminal/programs/lazygit.nix diff --git a/home/terminal/programs/tdf.nix b/home/profiles/terminal/programs/tdf.nix similarity index 100% rename from home/terminal/programs/tdf.nix rename to home/profiles/terminal/programs/tdf.nix diff --git a/home/terminal/programs/tmux.nix b/home/profiles/terminal/programs/tmux.nix similarity index 100% rename from home/terminal/programs/tmux.nix rename to home/profiles/terminal/programs/tmux.nix diff --git a/home/terminal/programs/xdg.nix b/home/profiles/terminal/programs/xdg.nix similarity index 100% rename from home/terminal/programs/xdg.nix rename to home/profiles/terminal/programs/xdg.nix diff --git a/home/terminal/programs/zoxide.nix b/home/profiles/terminal/programs/zoxide.nix similarity index 100% rename from home/terminal/programs/zoxide.nix rename to home/profiles/terminal/programs/zoxide.nix diff --git a/home/terminal/shell/zsh.nix b/home/profiles/terminal/shell/zsh.nix similarity index 100% rename from home/terminal/shell/zsh.nix rename to home/profiles/terminal/shell/zsh.nix diff --git a/home/suites/kidney/default.nix b/home/suites/kidney/default.nix new file mode 100644 index 0000000..eab3631 --- /dev/null +++ b/home/suites/kidney/default.nix @@ -0,0 +1,23 @@ +{homeProfiles, ...}: { + imports = with homeProfiles; [ + default + + editors.emacs + editors.nvim + + terminal.shell.zsh + terminal.programs.xdg + terminal.programs.direnv + terminal.programs.comma + terminal.programs.tmux + terminal.programs.irssi + + develop.langs.nix + develop.tools + develop.devenv + + terminal.programs.git + terminal.programs.github + terminal.programs.lazygit + ]; +} diff --git a/home/suites/nixdesk/default.nix b/home/suites/nixdesk/default.nix new file mode 100644 index 0000000..84c07b7 --- /dev/null +++ b/home/suites/nixdesk/default.nix @@ -0,0 +1,97 @@ +{ + self, + pkgs, + homeProfiles, + ... +}: { + imports = with homeProfiles; [ + ./defaults.nix + + default + + secrets.default + + terminal.shell.zsh + + terminal.programs.xdg + terminal.programs.direnv + terminal.programs.tmux + terminal.programs.comma + terminal.programs.zoxide + terminal.programs.tdf + terminal.programs.irssi + terminal.programs.git + terminal.programs.github + terminal.programs.lazygit + + editors.emacs + editors.nvim + editors.jetbrains.rider + editors.jetbrains.android-studio + + programs.browsers.firefox.default + programs.browsers.tor + programs.browsers.chromium + + terminal.emulator.wezterm + terminal.emulator.foot + + # desktop + programs.desktop.default + programs.desktop.sway.default + + # development + develop.common + develop.tools + develop.docs + develop.devenv + + develop.langs.haskell + develop.langs.rust + develop.langs.uiua + develop.langs.nix + develop.langs.zig + develop.langs.lua + develop.langs.c + + # programs + programs.misc.keepassxc + programs.misc.discord + programs.misc.element + programs.misc.obs + programs.misc.krita + programs.misc.foliate + programs.misc.blender + programs.misc.obsidian + programs.misc.pwvucontrol + programs.misc.qpwgraph + programs.misc.libreoffice + programs.music.puddletag + programs.music.picard + programs.music.cmus + programs.media.mpv + programs.media.jellyfin + + # gaming + programs.games.lutris + programs.games.heroic + programs.games.minecraft + programs.games.roblox + programs.games.krunker + + services.playerctl + services.polkit-agent + services.udiskie # although i dont need this for usb memory, it is quite convenient for flashing qmk + ]; + + qt = { + enable = true; + platformTheme = { + name = "gtk3"; + package = [ + pkgs.libsForQt5.qtstyleplugins + pkgs.qt6.qtbase + ]; + }; + }; +} diff --git a/home/profiles/nixdesk/defaults.nix b/home/suites/nixdesk/defaults.nix similarity index 100% rename from home/profiles/nixdesk/defaults.nix rename to home/suites/nixdesk/defaults.nix diff --git a/home/profiles/nixdesk/kanshi.nix b/home/suites/nixdesk/kanshi.nix similarity index 100% rename from home/profiles/nixdesk/kanshi.nix rename to home/suites/nixdesk/kanshi.nix diff --git a/lib/default.nix b/lib/default.nix new file mode 100644 index 0000000..743f92d --- /dev/null +++ b/lib/default.nix @@ -0,0 +1,29 @@ +l: let + b = builtins; +in rec { + loadBranch = branch: + l.mapAttrs' (leaf: _: { + name = l.removeSuffix ".nix" leaf; + value = /${branch}/${leaf}; + }) (b.readDir /${branch}); + + loadTree2 = dir: (l.mapAttrs (branch: _: loadBranch /${dir}/${branch})) (b.readDir dir); + + loadTreeInf = dir: + l.mapAttrs' ( + name: value: { + name = l.removeSuffix ".nix" name; + value = + if value == "directory" + then loadTreeInf (dir + /${name}) + else (dir + /${name}); + } + ) (b.readDir dir); + + loadConfigurations = dir: specialArgs: + (b.mapAttrs (name: _: + l.nixosSystem { + modules = [(dir + /${name})]; + inherit specialArgs; + })) (b.readDir dir); +} diff --git a/nix/machines/default.nix b/nix/machines/default.nix deleted file mode 100644 index 7d9f34a..0000000 --- a/nix/machines/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ - self, - inputs, - ... -}: let - inherit (inputs.nixpkgs.lib) nixosSystem; - specialArgs = { - inherit inputs self; - }; -in { - flake.nixosConfigurations = { - kidney = nixosSystem { - modules = [ - ./kidney - { - home-manager = { - users.xun.imports = [ - ../../home - ../../home/profiles/kidney - {home.stateVersion = "24.05";} - ]; - extraSpecialArgs = specialArgs; - }; - } - ]; - - inherit specialArgs; - }; - nixdesk = nixosSystem { - modules = [ - ./nixdesk - { - home-manager = { - backupFileExtension = "hm-backup"; - users.xun.imports = [ - ../../home - ../../home/profiles/nixdesk - inputs.sops-nix.homeManagerModules.sops - {home.stateVersion = "23.11";} - ]; - extraSpecialArgs = specialArgs; - }; - } - ]; - - inherit specialArgs; - }; - hopper = nixosSystem { - modules = [./hopper]; - - inherit specialArgs; - }; - }; -} diff --git a/nix/machines/hopper/default.nix b/nix/machines/hopper/default.nix deleted file mode 100644 index 0a323ad..0000000 --- a/nix/machines/hopper/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{inputs, ...}: { - imports = [ - inputs.hardware.nixosModules.common-cpu-intel - inputs.vpn-confinement.nixosModules.default - - ./hardware.nix - ./lab - - ../../systemProfiles/secrets/default.nix - ../../systemProfiles/secrets/hopper/default.nix - - ../../systemProfiles/core/security.nix - ../../systemProfiles/core/locale.nix - ../../systemProfiles/core/tools.nix - ../../systemProfiles/core/ssh.nix - ../../systemProfiles/core/deploy.nix - - ../../systemProfiles/nix/default.nix # TODO slim this down - - ../../systemProfiles/network/tailscale.nix - ../../systemProfiles/network/avahi.nix - ../../systemProfiles/network/networkd.nix - - # ../../services/syncthing.nix # TODO make syncthing not rely on having "xun" user - ]; - - networking.hostName = "hopper"; - - swapDevices = []; - - networking.interfaces.eno1.wakeOnLan.enable = true; - - system.stateVersion = "23.11"; -} diff --git a/nix/machines/kidney/default.nix b/nix/machines/kidney/default.nix deleted file mode 100644 index dd4092d..0000000 --- a/nix/machines/kidney/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - imports = [ - ./wsl.nix - ./hardware.nix - ./fonts.nix - - ../../systemProfiles/core/tools.nix - ../../systemProfiles/core/users.nix - ../../systemProfiles/core/locale.nix - - ../../systemProfiles/programs/tools.nix - ../../systemProfiles/programs/zsh.nix - ../../systemProfiles/programs/home-manager.nix - ../../systemProfiles/hardware/graphics.nix - - ../../systemProfiles/services/flatpak.nix - ../../systemProfiles/services/xdg-portals.nix - - ../../systemProfiles/nix/default.nix - ../../systemProfiles/nix/gc.nix - ]; - - networking.hostName = "kidney"; - - system.stateVersion = "24.05"; -} diff --git a/nix/machines/nixdesk/default.nix b/nix/machines/nixdesk/default.nix deleted file mode 100644 index e7b0a86..0000000 --- a/nix/machines/nixdesk/default.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - lib, - inputs, - ... -}: { - imports = [ - ./hardware.nix - ./hibernate-boot.nix - ./samba-mount.nix - - inputs.stylix.nixosModules.stylix - - ../../systemProfiles/secrets/default.nix - ../../systemProfiles/secrets/nixdesk/default.nix - - ../../systemProfiles/core/security.nix - ../../systemProfiles/core/users.nix - ../../systemProfiles/core/ssh.nix - ../../systemProfiles/core/locale.nix - ../../systemProfiles/nix/default.nix - ../../systemProfiles/programs/zsh.nix - ../../systemProfiles/core/tools.nix - ../../systemProfiles/core/compat.nix - ../../systemProfiles/core/boot.nix - ../../systemProfiles/core/docs.nix - ../../systemProfiles/core/gvfs.nix - - ../../systemProfiles/nix/gc.nix - - ../../systemProfiles/hardware/graphics.nix - ../../systemProfiles/hardware/steam-hardware.nix - ../../systemProfiles/hardware/bluetooth.nix - ../../systemProfiles/hardware/qmk.nix - - ../../systemProfiles/network/networkd.nix - ../../systemProfiles/network/avahi.nix - ../../systemProfiles/network/localsend.nix - ../../systemProfiles/network/tailscale.nix - ../../systemProfiles/network/goldberg.nix - - ../../systemProfiles/desktop/sway.nix - - ../../systemProfiles/programs/dconf.nix - ../../systemProfiles/programs/fonts.nix - ../../systemProfiles/programs/home-manager.nix - # ../../systemProfiles/programs/qt.nix - ../../systemProfiles/programs/adb.nix - ../../systemProfiles/programs/kanidm.nix - ../../systemProfiles/programs/openrgb.nix - ../../systemProfiles/programs/tools.nix - ../../systemProfiles/programs/thunar.nix - ../../systemProfiles/programs/corectrl.nix - - ../../systemProfiles/services/default.nix - ../../systemProfiles/services/pipewire.nix - ../../systemProfiles/services/flatpak.nix - - ../../systemProfiles/services/syncthing.nix - ../../systemProfiles/services/virt/waydroid.nix - ../../systemProfiles/services/virt/virt-manager.nix - ../../systemProfiles/services/sunshine.nix - # ../../systemProfiles/network/wifi.nix - - ../../systemProfiles/themes/dark.nix - - ../../systemProfiles/programs/gamemode.nix - ../../systemProfiles/programs/gamescope.nix - ../../systemProfiles/programs/steam.nix - ../../systemProfiles/programs/RE/default.nix - ]; - - networking.hostName = "nixdesk"; - - nixpkgs.config = { - rocmSupport = true; - allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "steam" - "steam-unwrapped" - "discord" - "obsidian" - "rider" - "android-studio-stable" - ]; - android_sdk.accept_license = true; - }; - - networking.interfaces.eno1.wakeOnLan.enable = true; - - system.stateVersion = "23.11"; -} diff --git a/nix/systemProfiles/services/virt/distrobox.nix b/nix/systemProfiles/services/virt/distrobox.nix deleted file mode 100644 index 8c69856..0000000 --- a/nix/systemProfiles/services/virt/distrobox.nix +++ /dev/null @@ -1,3 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [distrobox]; -} diff --git a/nix/systemProfiles/services/virt/docker.nix b/nix/systemProfiles/services/virt/docker.nix deleted file mode 100644 index cc05b97..0000000 --- a/nix/systemProfiles/services/virt/docker.nix +++ /dev/null @@ -1,6 +0,0 @@ -{pkgs, ...}: { - environment.systemPackages = with pkgs; [docker-compose]; - virtualisation.docker = { - enable = true; - }; -} diff --git a/nix/systemProfiles/services/virt/podman.nix b/nix/systemProfiles/services/virt/podman.nix deleted file mode 100644 index 821b419..0000000 --- a/nix/systemProfiles/services/virt/podman.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - virtualisation.podman = { - enable = true; - autoPrune.enable = true; - dockerSocket.enable = true; - }; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index 9a68fbd..ae61b4c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,10 +1,12 @@ {pkgs, ...}: let nv_generated = pkgs.callPackage ../_sources/generated.nix {}; in { - jdnbtexplorer = pkgs.qt6Packages.callPackage ./jdnbtexplorer {}; - gamesand = pkgs.callPackage ./gamesand {}; - binaryninja-personal = pkgs.qt6Packages.callPackage ./binaryninja-personal {}; - krunker = pkgs.callPackage ./krunker {inherit nv_generated;}; - ida-pro = pkgs.callPackage ./ida-pro {}; - cartograph-cf = pkgs.callPackage ./cartograph-cf {}; + packages = { + jdnbtexplorer = pkgs.qt6Packages.callPackage ./jdnbtexplorer {}; + gamesand = pkgs.callPackage ./gamesand {}; + binaryninja-personal = pkgs.qt6Packages.callPackage ./binaryninja-personal {}; + krunker = pkgs.callPackage ./krunker {inherit nv_generated;}; + ida-pro = pkgs.callPackage ./ida-pro {}; + cartograph-cf = pkgs.callPackage ./cartograph-cf {}; + }; } diff --git a/shells/default.nix b/shells/default.nix new file mode 100644 index 0000000..23341b8 --- /dev/null +++ b/shells/default.nix @@ -0,0 +1,12 @@ +{pkgs, ...}: { + devShells.default = pkgs.mkShell { + name = "dots"; + packages = with pkgs; [ + alejandra + git + just + home-manager + sops + ]; + }; +} diff --git a/sys/machines/hopper/default.nix b/sys/machines/hopper/default.nix new file mode 100644 index 0000000..42ed2e1 --- /dev/null +++ b/sys/machines/hopper/default.nix @@ -0,0 +1,38 @@ +{ + inputs, + systemProfiles, + ... +}: { + imports = with systemProfiles; [ + inputs.hardware.nixosModules.common-cpu-intel + inputs.vpn-confinement.nixosModules.default + + ./hardware.nix + ./lab + + secrets.default + secrets.hopper + + core.security + core.locale + core.tools + core.ssh + core.deploy + + nix.default # TODO slim this down + + network.tailscale + network.avahi + network.networkd + + # services.syncthing # TODO make syncthing not rely on having "xun" user + ]; + + networking.hostName = "hopper"; + + swapDevices = []; + + networking.interfaces.eno1.wakeOnLan.enable = true; + + system.stateVersion = "23.11"; +} diff --git a/nix/machines/hopper/hardware.nix b/sys/machines/hopper/hardware.nix similarity index 100% rename from nix/machines/hopper/hardware.nix rename to sys/machines/hopper/hardware.nix diff --git a/nix/machines/hopper/lab/default.nix b/sys/machines/hopper/lab/default.nix similarity index 100% rename from nix/machines/hopper/lab/default.nix rename to sys/machines/hopper/lab/default.nix diff --git a/nix/machines/hopper/lab/samba.nix b/sys/machines/hopper/lab/samba.nix similarity index 100% rename from nix/machines/hopper/lab/samba.nix rename to sys/machines/hopper/lab/samba.nix diff --git a/sys/machines/kidney/default.nix b/sys/machines/kidney/default.nix new file mode 100644 index 0000000..028510d --- /dev/null +++ b/sys/machines/kidney/default.nix @@ -0,0 +1,41 @@ +{ + specialArgs, + systemProfiles, + homeSuites, + ... +}: { + imports = with systemProfiles; [ + ./wsl.nix + ./hardware.nix + ./fonts.nix + + core.tools + core.users + core.locale + + programs.tools + programs.zsh + programs.home-manager + hardware.graphics + + services.flatpak + services.xdg-portals + + nix.default + nix.gc + + { + home-manager = { + users.xun.imports = [ + homeSuites.kidney + {home.stateVersion = "24.05";} + ]; + extraSpecialArgs = specialArgs; + }; + } + ]; + + networking.hostName = "kidney"; + + system.stateVersion = "24.05"; +} diff --git a/nix/machines/kidney/fonts.nix b/sys/machines/kidney/fonts.nix similarity index 100% rename from nix/machines/kidney/fonts.nix rename to sys/machines/kidney/fonts.nix diff --git a/nix/machines/kidney/hardware.nix b/sys/machines/kidney/hardware.nix similarity index 100% rename from nix/machines/kidney/hardware.nix rename to sys/machines/kidney/hardware.nix diff --git a/nix/machines/kidney/wsl.nix b/sys/machines/kidney/wsl.nix similarity index 100% rename from nix/machines/kidney/wsl.nix rename to sys/machines/kidney/wsl.nix diff --git a/sys/machines/nixdesk/default.nix b/sys/machines/nixdesk/default.nix new file mode 100644 index 0000000..c165a30 --- /dev/null +++ b/sys/machines/nixdesk/default.nix @@ -0,0 +1,107 @@ +{ + lib, + inputs, + systemProfiles, + specialArgs, + self, + homeSuites, + ... +}: { + imports = with systemProfiles; [ + ./hardware.nix + ./hibernate-boot.nix + ./samba-mount.nix + + inputs.stylix.nixosModules.stylix + + secrets.default + secrets.nixdesk + + core.security + core.users + core.ssh + core.locale + nix.default + programs.zsh + core.tools + core.compat + core.boot + core.docs + core.gvfs + + nix.gc + + hardware.graphics + hardware.steam-hardware + hardware.bluetooth + hardware.qmk + + network.networkd + network.avahi + network.localsend + network.tailscale + network.goldberg + + desktop.sway + + programs.dconf + programs.fonts + programs.home-manager + # programs.qt + programs.adb + programs.kanidm + programs.openrgb + programs.tools + programs.thunar + programs.corectrl + + services.default + services.pipewire + services.flatpak + + services.syncthing + services.waydroid + services.virt-manager + services.sunshine + # network.wifi + + themes.dark + + programs.gamemode + programs.gamescope + programs.steam + programs.RE + + { + home-manager = { + backupFileExtension = "hm-backup"; + users.xun.imports = [ + homeSuites.nixdesk + inputs.sops-nix.homeManagerModules.sops + {home.stateVersion = "23.11";} + ]; + extraSpecialArgs = specialArgs; + }; + } + ]; + + networking.hostName = "nixdesk"; + + nixpkgs.config = { + rocmSupport = true; + allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "steam" + "steam-unwrapped" + "discord" + "obsidian" + "rider" + "android-studio-stable" + ]; + android_sdk.accept_license = true; + }; + + networking.interfaces.eno1.wakeOnLan.enable = true; + + system.stateVersion = "23.11"; +} diff --git a/nix/machines/nixdesk/hardware.nix b/sys/machines/nixdesk/hardware.nix similarity index 100% rename from nix/machines/nixdesk/hardware.nix rename to sys/machines/nixdesk/hardware.nix diff --git a/nix/machines/nixdesk/hibernate-boot.nix b/sys/machines/nixdesk/hibernate-boot.nix similarity index 100% rename from nix/machines/nixdesk/hibernate-boot.nix rename to sys/machines/nixdesk/hibernate-boot.nix diff --git a/nix/machines/nixdesk/samba-mount.nix b/sys/machines/nixdesk/samba-mount.nix similarity index 100% rename from nix/machines/nixdesk/samba-mount.nix rename to sys/machines/nixdesk/samba-mount.nix diff --git a/nix/systemProfiles/core/boot.nix b/sys/profiles/core/boot.nix similarity index 100% rename from nix/systemProfiles/core/boot.nix rename to sys/profiles/core/boot.nix diff --git a/nix/systemProfiles/core/compat.nix b/sys/profiles/core/compat.nix similarity index 100% rename from nix/systemProfiles/core/compat.nix rename to sys/profiles/core/compat.nix diff --git a/nix/systemProfiles/core/deploy.nix b/sys/profiles/core/deploy.nix similarity index 88% rename from nix/systemProfiles/core/deploy.nix rename to sys/profiles/core/deploy.nix index 6da229a..7f16d4f 100644 --- a/nix/systemProfiles/core/deploy.nix +++ b/sys/profiles/core/deploy.nix @@ -1,4 +1,8 @@ -{lib, ...}: { +{ + lib, + self, + ... +}: { nix.settings.trusted-users = ["deploy"]; # trust closures created by our user users.groups.deploy = {}; @@ -15,7 +19,7 @@ passwordFile = lib.mkForce null; openssh.authorizedKeys.keyFiles = [ - ../../../sshKeys/xun_nixdesk + (self + /sshKeys/xun_nixdesk) ]; }; } diff --git a/nix/systemProfiles/core/docs.nix b/sys/profiles/core/docs.nix similarity index 100% rename from nix/systemProfiles/core/docs.nix rename to sys/profiles/core/docs.nix diff --git a/nix/systemProfiles/core/gvfs.nix b/sys/profiles/core/gvfs.nix similarity index 100% rename from nix/systemProfiles/core/gvfs.nix rename to sys/profiles/core/gvfs.nix diff --git a/nix/systemProfiles/core/locale.nix b/sys/profiles/core/locale.nix similarity index 100% rename from nix/systemProfiles/core/locale.nix rename to sys/profiles/core/locale.nix diff --git a/nix/systemProfiles/core/security.nix b/sys/profiles/core/security.nix similarity index 100% rename from nix/systemProfiles/core/security.nix rename to sys/profiles/core/security.nix diff --git a/nix/systemProfiles/core/ssh.nix b/sys/profiles/core/ssh.nix similarity index 100% rename from nix/systemProfiles/core/ssh.nix rename to sys/profiles/core/ssh.nix diff --git a/nix/systemProfiles/core/tools.nix b/sys/profiles/core/tools.nix similarity index 100% rename from nix/systemProfiles/core/tools.nix rename to sys/profiles/core/tools.nix diff --git a/nix/systemProfiles/core/users.nix b/sys/profiles/core/users.nix similarity index 100% rename from nix/systemProfiles/core/users.nix rename to sys/profiles/core/users.nix diff --git a/nix/systemProfiles/desktop/sway.nix b/sys/profiles/desktop/sway.nix similarity index 100% rename from nix/systemProfiles/desktop/sway.nix rename to sys/profiles/desktop/sway.nix diff --git a/nix/systemProfiles/hardware/bluetooth.nix b/sys/profiles/hardware/bluetooth.nix similarity index 100% rename from nix/systemProfiles/hardware/bluetooth.nix rename to sys/profiles/hardware/bluetooth.nix diff --git a/nix/systemProfiles/hardware/graphics.nix b/sys/profiles/hardware/graphics.nix similarity index 100% rename from nix/systemProfiles/hardware/graphics.nix rename to sys/profiles/hardware/graphics.nix diff --git a/nix/systemProfiles/hardware/qmk.nix b/sys/profiles/hardware/qmk.nix similarity index 100% rename from nix/systemProfiles/hardware/qmk.nix rename to sys/profiles/hardware/qmk.nix diff --git a/nix/systemProfiles/hardware/steam-hardware.nix b/sys/profiles/hardware/steam-hardware.nix similarity index 100% rename from nix/systemProfiles/hardware/steam-hardware.nix rename to sys/profiles/hardware/steam-hardware.nix diff --git a/nix/systemProfiles/network/avahi.nix b/sys/profiles/network/avahi.nix similarity index 100% rename from nix/systemProfiles/network/avahi.nix rename to sys/profiles/network/avahi.nix diff --git a/nix/systemProfiles/network/goldberg.nix b/sys/profiles/network/goldberg.nix similarity index 100% rename from nix/systemProfiles/network/goldberg.nix rename to sys/profiles/network/goldberg.nix diff --git a/nix/systemProfiles/network/localsend.nix b/sys/profiles/network/localsend.nix similarity index 100% rename from nix/systemProfiles/network/localsend.nix rename to sys/profiles/network/localsend.nix diff --git a/nix/systemProfiles/network/networkd.nix b/sys/profiles/network/networkd.nix similarity index 100% rename from nix/systemProfiles/network/networkd.nix rename to sys/profiles/network/networkd.nix diff --git a/nix/systemProfiles/network/tailscale.nix b/sys/profiles/network/tailscale.nix similarity index 100% rename from nix/systemProfiles/network/tailscale.nix rename to sys/profiles/network/tailscale.nix diff --git a/nix/systemProfiles/network/wifi.nix b/sys/profiles/network/wifi.nix similarity index 100% rename from nix/systemProfiles/network/wifi.nix rename to sys/profiles/network/wifi.nix diff --git a/nix/systemProfiles/nix/default.nix b/sys/profiles/nix/default.nix similarity index 100% rename from nix/systemProfiles/nix/default.nix rename to sys/profiles/nix/default.nix diff --git a/nix/systemProfiles/nix/gc.nix b/sys/profiles/nix/gc.nix similarity index 100% rename from nix/systemProfiles/nix/gc.nix rename to sys/profiles/nix/gc.nix diff --git a/nix/systemProfiles/nix/substituters.nix b/sys/profiles/nix/substituters.nix similarity index 100% rename from nix/systemProfiles/nix/substituters.nix rename to sys/profiles/nix/substituters.nix diff --git a/nix/systemProfiles/programs/RE/default.nix b/sys/profiles/programs/RE/default.nix similarity index 100% rename from nix/systemProfiles/programs/RE/default.nix rename to sys/profiles/programs/RE/default.nix diff --git a/nix/systemProfiles/programs/RE/il2cppdumper/default.nix b/sys/profiles/programs/RE/il2cppdumper/default.nix similarity index 100% rename from nix/systemProfiles/programs/RE/il2cppdumper/default.nix rename to sys/profiles/programs/RE/il2cppdumper/default.nix diff --git a/nix/systemProfiles/programs/RE/il2cppdumper/deps.nix b/sys/profiles/programs/RE/il2cppdumper/deps.nix similarity index 100% rename from nix/systemProfiles/programs/RE/il2cppdumper/deps.nix rename to sys/profiles/programs/RE/il2cppdumper/deps.nix diff --git a/nix/systemProfiles/programs/RE/ilspy/default.nix b/sys/profiles/programs/RE/ilspy/default.nix similarity index 100% rename from nix/systemProfiles/programs/RE/ilspy/default.nix rename to sys/profiles/programs/RE/ilspy/default.nix diff --git a/nix/systemProfiles/programs/RE/ilspy/deps.nix b/sys/profiles/programs/RE/ilspy/deps.nix similarity index 100% rename from nix/systemProfiles/programs/RE/ilspy/deps.nix rename to sys/profiles/programs/RE/ilspy/deps.nix diff --git a/nix/systemProfiles/programs/adb.nix b/sys/profiles/programs/adb.nix similarity index 100% rename from nix/systemProfiles/programs/adb.nix rename to sys/profiles/programs/adb.nix diff --git a/nix/systemProfiles/programs/corectrl.nix b/sys/profiles/programs/corectrl.nix similarity index 100% rename from nix/systemProfiles/programs/corectrl.nix rename to sys/profiles/programs/corectrl.nix diff --git a/nix/systemProfiles/programs/dconf.nix b/sys/profiles/programs/dconf.nix similarity index 100% rename from nix/systemProfiles/programs/dconf.nix rename to sys/profiles/programs/dconf.nix diff --git a/nix/systemProfiles/programs/fonts.nix b/sys/profiles/programs/fonts.nix similarity index 100% rename from nix/systemProfiles/programs/fonts.nix rename to sys/profiles/programs/fonts.nix diff --git a/nix/systemProfiles/programs/gamemode.nix b/sys/profiles/programs/gamemode.nix similarity index 100% rename from nix/systemProfiles/programs/gamemode.nix rename to sys/profiles/programs/gamemode.nix diff --git a/nix/systemProfiles/programs/gamescope.nix b/sys/profiles/programs/gamescope.nix similarity index 100% rename from nix/systemProfiles/programs/gamescope.nix rename to sys/profiles/programs/gamescope.nix diff --git a/nix/systemProfiles/programs/home-manager.nix b/sys/profiles/programs/home-manager.nix similarity index 100% rename from nix/systemProfiles/programs/home-manager.nix rename to sys/profiles/programs/home-manager.nix diff --git a/nix/systemProfiles/programs/kanidm.nix b/sys/profiles/programs/kanidm.nix similarity index 100% rename from nix/systemProfiles/programs/kanidm.nix rename to sys/profiles/programs/kanidm.nix diff --git a/nix/systemProfiles/programs/openrgb.nix b/sys/profiles/programs/openrgb.nix similarity index 100% rename from nix/systemProfiles/programs/openrgb.nix rename to sys/profiles/programs/openrgb.nix diff --git a/nix/systemProfiles/programs/qt.nix b/sys/profiles/programs/qt.nix similarity index 100% rename from nix/systemProfiles/programs/qt.nix rename to sys/profiles/programs/qt.nix diff --git a/nix/systemProfiles/programs/steam.nix b/sys/profiles/programs/steam.nix similarity index 100% rename from nix/systemProfiles/programs/steam.nix rename to sys/profiles/programs/steam.nix diff --git a/nix/systemProfiles/programs/thunar.nix b/sys/profiles/programs/thunar.nix similarity index 100% rename from nix/systemProfiles/programs/thunar.nix rename to sys/profiles/programs/thunar.nix diff --git a/nix/systemProfiles/programs/tools.nix b/sys/profiles/programs/tools.nix similarity index 100% rename from nix/systemProfiles/programs/tools.nix rename to sys/profiles/programs/tools.nix diff --git a/nix/systemProfiles/programs/zsh.nix b/sys/profiles/programs/zsh.nix similarity index 100% rename from nix/systemProfiles/programs/zsh.nix rename to sys/profiles/programs/zsh.nix diff --git a/nix/systemProfiles/secrets/default.nix b/sys/profiles/secrets/default.nix similarity index 100% rename from nix/systemProfiles/secrets/default.nix rename to sys/profiles/secrets/default.nix diff --git a/nix/systemProfiles/secrets/global/default.nix b/sys/profiles/secrets/global/default.nix similarity index 100% rename from nix/systemProfiles/secrets/global/default.nix rename to sys/profiles/secrets/global/default.nix diff --git a/nix/systemProfiles/secrets/global/tailscale-auth.yaml b/sys/profiles/secrets/global/tailscale-auth.yaml similarity index 100% rename from nix/systemProfiles/secrets/global/tailscale-auth.yaml rename to sys/profiles/secrets/global/tailscale-auth.yaml diff --git a/nix/systemProfiles/secrets/hopper/authelia.yaml b/sys/profiles/secrets/hopper/authelia.yaml similarity index 100% rename from nix/systemProfiles/secrets/hopper/authelia.yaml rename to sys/profiles/secrets/hopper/authelia.yaml diff --git a/nix/systemProfiles/secrets/hopper/authentik b/sys/profiles/secrets/hopper/authentik similarity index 100% rename from nix/systemProfiles/secrets/hopper/authentik rename to sys/profiles/secrets/hopper/authentik diff --git a/nix/systemProfiles/secrets/hopper/betanin b/sys/profiles/secrets/hopper/betanin similarity index 100% rename from nix/systemProfiles/secrets/hopper/betanin rename to sys/profiles/secrets/hopper/betanin diff --git a/nix/systemProfiles/secrets/hopper/brawlstars b/sys/profiles/secrets/hopper/brawlstars similarity index 100% rename from nix/systemProfiles/secrets/hopper/brawlstars rename to sys/profiles/secrets/hopper/brawlstars diff --git a/nix/systemProfiles/secrets/hopper/cloudflare b/sys/profiles/secrets/hopper/cloudflare similarity index 100% rename from nix/systemProfiles/secrets/hopper/cloudflare rename to sys/profiles/secrets/hopper/cloudflare diff --git a/nix/systemProfiles/secrets/hopper/code-server b/sys/profiles/secrets/hopper/code-server similarity index 100% rename from nix/systemProfiles/secrets/hopper/code-server rename to sys/profiles/secrets/hopper/code-server diff --git a/nix/systemProfiles/secrets/hopper/default.nix b/sys/profiles/secrets/hopper/default.nix similarity index 100% rename from nix/systemProfiles/secrets/hopper/default.nix rename to sys/profiles/secrets/hopper/default.nix diff --git a/nix/systemProfiles/secrets/hopper/grafana-pass b/sys/profiles/secrets/hopper/grafana-pass similarity index 100% rename from nix/systemProfiles/secrets/hopper/grafana-pass rename to sys/profiles/secrets/hopper/grafana-pass diff --git a/nix/systemProfiles/secrets/hopper/jackett b/sys/profiles/secrets/hopper/jackett similarity index 100% rename from nix/systemProfiles/secrets/hopper/jackett rename to sys/profiles/secrets/hopper/jackett diff --git a/nix/systemProfiles/secrets/hopper/kanidm.yaml b/sys/profiles/secrets/hopper/kanidm.yaml similarity index 100% rename from nix/systemProfiles/secrets/hopper/kanidm.yaml rename to sys/profiles/secrets/hopper/kanidm.yaml diff --git a/nix/systemProfiles/secrets/hopper/keycloak.yaml b/sys/profiles/secrets/hopper/keycloak.yaml similarity index 100% rename from nix/systemProfiles/secrets/hopper/keycloak.yaml rename to sys/profiles/secrets/hopper/keycloak.yaml diff --git a/nix/systemProfiles/secrets/hopper/lldap.yaml b/sys/profiles/secrets/hopper/lldap.yaml similarity index 100% rename from nix/systemProfiles/secrets/hopper/lldap.yaml rename to sys/profiles/secrets/hopper/lldap.yaml diff --git a/nix/systemProfiles/secrets/hopper/serverenv b/sys/profiles/secrets/hopper/serverenv similarity index 100% rename from nix/systemProfiles/secrets/hopper/serverenv rename to sys/profiles/secrets/hopper/serverenv diff --git a/nix/systemProfiles/secrets/hopper/slskd b/sys/profiles/secrets/hopper/slskd similarity index 100% rename from nix/systemProfiles/secrets/hopper/slskd rename to sys/profiles/secrets/hopper/slskd diff --git a/nix/systemProfiles/secrets/hopper/transmission b/sys/profiles/secrets/hopper/transmission similarity index 100% rename from nix/systemProfiles/secrets/hopper/transmission rename to sys/profiles/secrets/hopper/transmission diff --git a/nix/systemProfiles/secrets/hopper/wakapi b/sys/profiles/secrets/hopper/wakapi similarity index 100% rename from nix/systemProfiles/secrets/hopper/wakapi rename to sys/profiles/secrets/hopper/wakapi diff --git a/nix/systemProfiles/secrets/hopper/wireguard b/sys/profiles/secrets/hopper/wireguard similarity index 100% rename from nix/systemProfiles/secrets/hopper/wireguard rename to sys/profiles/secrets/hopper/wireguard diff --git a/nix/systemProfiles/secrets/hopper/wireguard-config b/sys/profiles/secrets/hopper/wireguard-config similarity index 100% rename from nix/systemProfiles/secrets/hopper/wireguard-config rename to sys/profiles/secrets/hopper/wireguard-config diff --git a/nix/systemProfiles/secrets/hopper/wireguard.yaml b/sys/profiles/secrets/hopper/wireguard.yaml similarity index 100% rename from nix/systemProfiles/secrets/hopper/wireguard.yaml rename to sys/profiles/secrets/hopper/wireguard.yaml diff --git a/nix/systemProfiles/secrets/nixdesk/brawlstars b/sys/profiles/secrets/nixdesk/brawlstars similarity index 100% rename from nix/systemProfiles/secrets/nixdesk/brawlstars rename to sys/profiles/secrets/nixdesk/brawlstars diff --git a/nix/systemProfiles/secrets/nixdesk/cloudflare b/sys/profiles/secrets/nixdesk/cloudflare similarity index 100% rename from nix/systemProfiles/secrets/nixdesk/cloudflare rename to sys/profiles/secrets/nixdesk/cloudflare diff --git a/nix/systemProfiles/secrets/nixdesk/default.nix b/sys/profiles/secrets/nixdesk/default.nix similarity index 100% rename from nix/systemProfiles/secrets/nixdesk/default.nix rename to sys/profiles/secrets/nixdesk/default.nix diff --git a/nix/systemProfiles/secrets/nixdesk/samba b/sys/profiles/secrets/nixdesk/samba similarity index 100% rename from nix/systemProfiles/secrets/nixdesk/samba rename to sys/profiles/secrets/nixdesk/samba diff --git a/nix/systemProfiles/secrets/nixdesk/wireguard b/sys/profiles/secrets/nixdesk/wireguard similarity index 100% rename from nix/systemProfiles/secrets/nixdesk/wireguard rename to sys/profiles/secrets/nixdesk/wireguard diff --git a/nix/systemProfiles/secrets/nixdesk/wireguard.yaml b/sys/profiles/secrets/nixdesk/wireguard.yaml similarity index 100% rename from nix/systemProfiles/secrets/nixdesk/wireguard.yaml rename to sys/profiles/secrets/nixdesk/wireguard.yaml diff --git a/nix/systemProfiles/services/default.nix b/sys/profiles/services/default.nix similarity index 100% rename from nix/systemProfiles/services/default.nix rename to sys/profiles/services/default.nix diff --git a/nix/systemProfiles/services/flatpak.nix b/sys/profiles/services/flatpak.nix similarity index 100% rename from nix/systemProfiles/services/flatpak.nix rename to sys/profiles/services/flatpak.nix diff --git a/nix/systemProfiles/services/gnome-services.nix b/sys/profiles/services/gnome-services.nix similarity index 100% rename from nix/systemProfiles/services/gnome-services.nix rename to sys/profiles/services/gnome-services.nix diff --git a/nix/systemProfiles/services/pipewire.nix b/sys/profiles/services/pipewire.nix similarity index 100% rename from nix/systemProfiles/services/pipewire.nix rename to sys/profiles/services/pipewire.nix diff --git a/nix/systemProfiles/services/sunshine.nix b/sys/profiles/services/sunshine.nix similarity index 100% rename from nix/systemProfiles/services/sunshine.nix rename to sys/profiles/services/sunshine.nix diff --git a/nix/systemProfiles/services/syncthing.nix b/sys/profiles/services/syncthing.nix similarity index 100% rename from nix/systemProfiles/services/syncthing.nix rename to sys/profiles/services/syncthing.nix diff --git a/nix/systemProfiles/services/virt/virt-manager.nix b/sys/profiles/services/virt-manager.nix similarity index 100% rename from nix/systemProfiles/services/virt/virt-manager.nix rename to sys/profiles/services/virt-manager.nix diff --git a/nix/systemProfiles/services/virt/waydroid.nix b/sys/profiles/services/waydroid.nix similarity index 100% rename from nix/systemProfiles/services/virt/waydroid.nix rename to sys/profiles/services/waydroid.nix diff --git a/nix/systemProfiles/services/xdg-portals.nix b/sys/profiles/services/xdg-portals.nix similarity index 100% rename from nix/systemProfiles/services/xdg-portals.nix rename to sys/profiles/services/xdg-portals.nix diff --git a/nix/systemProfiles/themes/dark.nix b/sys/profiles/themes/dark.nix similarity index 100% rename from nix/systemProfiles/themes/dark.nix rename to sys/profiles/themes/dark.nix