From b212b05864e1ae0ecf02e1e9b8f243521e307eee Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 5 Feb 2025 17:58:34 -0600 Subject: [PATCH 1/5] feat: added stuff for server --- home/default.nix | 1 + .../cli/development/tooling/default.nix | 10 ++++++++++ .../elm}/default.nix | 0 .../tooling/javascript/default.nix | 16 ++++++++++++++++ templates/elm/flake.lock | 19 ++++++++++++++++++- 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100755 home/modules/cli/development/tooling/default.nix rename home/modules/cli/development/{langaugeServers => tooling/elm}/default.nix (100%) create mode 100755 home/modules/cli/development/tooling/javascript/default.nix diff --git a/home/default.nix b/home/default.nix index b27c8f2..59b976c 100755 --- a/home/default.nix +++ b/home/default.nix @@ -173,6 +173,7 @@ in imports = builtins.attrValues { inherit (modules) cli + tooling ; }; }; diff --git a/home/modules/cli/development/tooling/default.nix b/home/modules/cli/development/tooling/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/home/modules/cli/development/tooling/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/home/modules/cli/development/langaugeServers/default.nix b/home/modules/cli/development/tooling/elm/default.nix similarity index 100% rename from home/modules/cli/development/langaugeServers/default.nix rename to home/modules/cli/development/tooling/elm/default.nix diff --git a/home/modules/cli/development/tooling/javascript/default.nix b/home/modules/cli/development/tooling/javascript/default.nix new file mode 100755 index 0000000..a922cba --- /dev/null +++ b/home/modules/cli/development/tooling/javascript/default.nix @@ -0,0 +1,16 @@ +{ + pkgs, + ... +}: +{ + home.packages = builtins.attrValues { + inherit (pkgs.nodePackages_latest) + "@commitlint/config-conventional" + dotenv-cli + forever + nodejs + npm + typescript-language-server + ; + }; +} diff --git a/templates/elm/flake.lock b/templates/elm/flake.lock index 94a0bc8..846d196 100755 --- a/templates/elm/flake.lock +++ b/templates/elm/flake.lock @@ -45,10 +45,27 @@ "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" } } }, From 3811435d5b564f30e19621821a57a49dc500afd9 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 5 Feb 2025 18:01:26 -0600 Subject: [PATCH 2/5] feat: added stuff for server --- home/modules/cli/development/tooling/javascript/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/home/modules/cli/development/tooling/javascript/default.nix b/home/modules/cli/development/tooling/javascript/default.nix index a922cba..868a53b 100755 --- a/home/modules/cli/development/tooling/javascript/default.nix +++ b/home/modules/cli/development/tooling/javascript/default.nix @@ -5,9 +5,6 @@ { home.packages = builtins.attrValues { inherit (pkgs.nodePackages_latest) - "@commitlint/config-conventional" - dotenv-cli - forever nodejs npm typescript-language-server From 89814be57c56a197f967934944fd7f343c6c27b2 Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 5 Feb 2025 18:09:26 -0600 Subject: [PATCH 3/5] feat: added stuff for server --- home/modules/cli/development/tooling/javascript/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/home/modules/cli/development/tooling/javascript/default.nix b/home/modules/cli/development/tooling/javascript/default.nix index 868a53b..65279aa 100755 --- a/home/modules/cli/development/tooling/javascript/default.nix +++ b/home/modules/cli/development/tooling/javascript/default.nix @@ -4,10 +4,8 @@ }: { home.packages = builtins.attrValues { - inherit (pkgs.nodePackages_latest) + inherit (pkgs.nodePackages) nodejs - npm - typescript-language-server ; }; } From 2000adb56a16dadcdc818e7f718c5535d89ae05b Mon Sep 17 00:00:00 2001 From: Nick Date: Wed, 5 Feb 2025 20:15:36 -0600 Subject: [PATCH 4/5] refactor: cleaned up nixos dir --- flake.nix | 25 ++- nixos/default.nix | 148 ++++++------------ .../accounts/default.nix} | 0 nixos/modules/core/default.nix | 10 ++ .../{doas.nix => core/doas/default.nix} | 0 .../environment/default.nix} | 0 .../{flatpak.nix => core/flatpak/default.nix} | 0 .../{fonts.nix => core/fonts/default.nix} | 0 .../homeManager/default.nix} | 3 +- nixos/modules/core/locale/default.nix | 30 ++++ nixos/modules/{nh.nix => core/nh/default.nix} | 0 .../modules/{nix.nix => core/nix/default.nix} | 0 .../{rsyncd.nix => core/rsync/default.nix} | 0 .../modules/{ssh.nix => core/ssh/default.nix} | 0 .../{sysstat.nix => core/sysStat/default.nix} | 0 nixos/modules/core/system/default.nix | 1 + nixos/modules/dconf.nix | 3 - nixos/modules/default.nix | 10 ++ nixos/modules/desktop/default.nix | 10 ++ .../{gnome.nix => desktop/gnome/default.nix} | 2 + nixos/modules/desktop/hypr/default.nix | 10 ++ .../hypr/idle/default.nix} | 0 .../hypr/land/default.nix} | 0 .../plasma/default.nix} | 6 +- .../{river.nix => desktop/river/default.nix} | 0 .../{sddm.nix => desktop/sddm/default.nix} | 0 nixos/modules/desktop/wayland/default.nix | 10 ++ .../wayland/geoclue2/default.nix} | 0 .../wayland/greetd/default.nix} | 0 .../wayland/network/default.nix} | 0 .../wayland/regreet/default.nix} | 0 .../wayland/swaylock/default.nix} | 0 .../wayland/thunar/default.nix} | 0 .../wayland/wayland/default.nix} | 0 .../xserver/default.nix} | 0 nixos/modules/gvfs.nix | 3 - .../android/default.nix} | 6 +- .../{audio.nix => hardware/audio/default.nix} | 0 .../bluetooth/default.nix} | 0 nixos/modules/hardware/default.nix | 10 ++ .../printing/default.nix} | 0 .../tablet/default.nix} | 0 nixos/modules/hyprland/default.nix | 6 - nixos/modules/locale.nix | 27 ---- nixos/modules/ollama.nix | 62 -------- .../coreCtrl/default.nix} | 3 +- nixos/modules/programs/default.nix | 10 ++ .../{disks.nix => programs/disks/default.nix} | 0 .../firejail/default.nix} | 0 .../{steam.nix => programs/steam/default.nix} | 6 +- .../virtManager/default.nix} | 0 .../services/{acme.nix => acme/default.nix} | 0 .../services/{caddy.nix => caddy/default.nix} | 9 +- nixos/modules/services/default.nix | 28 +--- .../{forgejo.nix => forgejo/default.nix} | 0 .../hLedger/default.nix} | 0 .../{jellyfin.nix => jellyfin/default.nix} | 53 +++---- .../{logrotate.nix => logrotate/default.nix} | 0 .../mastodon/{ => config}/chars.patch | 0 .../mastodon/{ => config}/twitter.txt | 0 .../{minecraft.nix => minecraft/default.nix} | 48 +++--- .../mullvad/default.nix} | 0 .../{nextcloud.nix => nextcloud/default.nix} | 57 ++++--- nixos/modules/services/ollama.nix | 75 --------- nixos/modules/services/ollama/default.nix | 117 ++++++++++++++ .../{owncast.nix => owncast/default.nix} | 9 +- .../{peertube.nix => peertube/default.nix} | 0 .../default.nix} | 0 .../services/{samba.nix => samba/default.nix} | 9 +- .../syncthing/default.nix} | 0 .../default.nix} | 0 .../default.nix} | 9 +- nixos/modules/{sops.nix => sops/default.nix} | 2 +- nixos/modules/system.nix | 1 - nixos/modules/wayland/default.nix | 11 -- templates/elm/parts/config/devshells.nix | 18 ++- templates/haskell/parts/config/devshells.nix | 39 ++--- 77 files changed, 422 insertions(+), 464 deletions(-) mode change 100755 => 100644 nixos/default.nix rename nixos/modules/{accounts.nix => core/accounts/default.nix} (100%) create mode 100755 nixos/modules/core/default.nix rename nixos/modules/{doas.nix => core/doas/default.nix} (100%) rename nixos/modules/{environment.nix => core/environment/default.nix} (100%) rename nixos/modules/{flatpak.nix => core/flatpak/default.nix} (100%) rename nixos/modules/{fonts.nix => core/fonts/default.nix} (100%) rename nixos/modules/{home-manager.nix => core/homeManager/default.nix} (91%) create mode 100755 nixos/modules/core/locale/default.nix rename nixos/modules/{nh.nix => core/nh/default.nix} (100%) rename nixos/modules/{nix.nix => core/nix/default.nix} (100%) rename nixos/modules/{rsyncd.nix => core/rsync/default.nix} (100%) rename nixos/modules/{ssh.nix => core/ssh/default.nix} (100%) rename nixos/modules/{sysstat.nix => core/sysStat/default.nix} (100%) create mode 100755 nixos/modules/core/system/default.nix delete mode 100755 nixos/modules/dconf.nix create mode 100755 nixos/modules/default.nix create mode 100755 nixos/modules/desktop/default.nix rename nixos/modules/{gnome.nix => desktop/gnome/default.nix} (95%) create mode 100755 nixos/modules/desktop/hypr/default.nix rename nixos/modules/{hyprland/hypridle.nix => desktop/hypr/idle/default.nix} (100%) rename nixos/modules/{hyprland/hyprland.nix => desktop/hypr/land/default.nix} (100%) rename nixos/modules/{plasma.nix => desktop/plasma/default.nix} (82%) rename nixos/modules/{river.nix => desktop/river/default.nix} (100%) rename nixos/modules/{sddm.nix => desktop/sddm/default.nix} (100%) create mode 100755 nixos/modules/desktop/wayland/default.nix rename nixos/modules/{wayland/geoclue2.nix => desktop/wayland/geoclue2/default.nix} (100%) rename nixos/modules/{wayland/greetd.nix => desktop/wayland/greetd/default.nix} (100%) rename nixos/modules/{wayland/network.nix => desktop/wayland/network/default.nix} (100%) rename nixos/modules/{wayland/regreet.nix => desktop/wayland/regreet/default.nix} (100%) rename nixos/modules/{wayland/swaylock.nix => desktop/wayland/swaylock/default.nix} (100%) rename nixos/modules/{wayland/thunar.nix => desktop/wayland/thunar/default.nix} (100%) rename nixos/modules/{wayland/wayland.nix => desktop/wayland/wayland/default.nix} (100%) rename nixos/modules/{xserver.nix => desktop/xserver/default.nix} (100%) delete mode 100755 nixos/modules/gvfs.nix rename nixos/modules/{android.nix => hardware/android/default.nix} (80%) rename nixos/modules/{audio.nix => hardware/audio/default.nix} (100%) rename nixos/modules/{bluetooth.nix => hardware/bluetooth/default.nix} (100%) create mode 100755 nixos/modules/hardware/default.nix rename nixos/modules/{printing.nix => hardware/printing/default.nix} (100%) rename nixos/modules/{tablet.nix => hardware/tablet/default.nix} (100%) delete mode 100755 nixos/modules/hyprland/default.nix delete mode 100755 nixos/modules/locale.nix delete mode 100755 nixos/modules/ollama.nix rename nixos/modules/{corectrl.nix => programs/coreCtrl/default.nix} (90%) create mode 100755 nixos/modules/programs/default.nix rename nixos/modules/{disks.nix => programs/disks/default.nix} (100%) rename nixos/modules/{firejail.nix => programs/firejail/default.nix} (100%) rename nixos/modules/{steam.nix => programs/steam/default.nix} (85%) rename nixos/modules/{virtualization.nix => programs/virtManager/default.nix} (100%) rename nixos/modules/services/{acme.nix => acme/default.nix} (100%) rename nixos/modules/services/{caddy.nix => caddy/default.nix} (88%) rename nixos/modules/services/{forgejo.nix => forgejo/default.nix} (100%) rename nixos/modules/{hledger.nix => services/hLedger/default.nix} (100%) rename nixos/modules/services/{jellyfin.nix => jellyfin/default.nix} (71%) rename nixos/modules/services/{logrotate.nix => logrotate/default.nix} (100%) rename nixos/modules/services/mastodon/{ => config}/chars.patch (100%) rename nixos/modules/services/mastodon/{ => config}/twitter.txt (100%) rename nixos/modules/services/{minecraft.nix => minecraft/default.nix} (79%) rename nixos/modules/{mullvad.nix => services/mullvad/default.nix} (100%) rename nixos/modules/services/{nextcloud.nix => nextcloud/default.nix} (77%) delete mode 100755 nixos/modules/services/ollama.nix create mode 100755 nixos/modules/services/ollama/default.nix rename nixos/modules/services/{owncast.nix => owncast/default.nix} (91%) rename nixos/modules/services/{peertube.nix => peertube/default.nix} (100%) rename nixos/modules/services/{postgresql.nix => postgresql/default.nix} (100%) rename nixos/modules/services/{samba.nix => samba/default.nix} (90%) rename nixos/modules/{syncthing.nix => services/syncthing/default.nix} (100%) rename nixos/modules/services/{vaultwarden.nix => vaultwarden/default.nix} (100%) rename nixos/modules/services/{upRootNutrition.nix => website/default.nix} (87%) rename nixos/modules/{sops.nix => sops/default.nix} (96%) delete mode 100755 nixos/modules/system.nix delete mode 100755 nixos/modules/wayland/default.nix diff --git a/flake.nix b/flake.nix index 9044be5..18a923a 100755 --- a/flake.nix +++ b/flake.nix @@ -75,11 +75,9 @@ ./profiles/user0 ./profiles/user1 config.nixosModules.desktop - config.nixosModules.hyprland - config.nixosModules.wayland - config.nixosModules.personal - config.nixosModules.shared + config.nixosModules.core config.nixosModules.sops + config.nixosModules.system inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default inputs.nur.modules.nixos.default @@ -89,10 +87,9 @@ ./systems/fallaryn ./profiles/user2 config.nixosModules.fallaryn - config.nixosModules.personal - config.nixosModules.plasma - config.nixosModules.shared + config.nixosModules.core config.nixosModules.sops + config.nixosModules.system inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default inputs.sops-nix.nixosModules.sops @@ -101,9 +98,10 @@ ./systems/laptop ./profiles/user0 ./profiles/user1 - config.nixosModules.personal - config.nixosModules.shared + config.nixosModules.laptop + config.nixosModules.core config.nixosModules.sops + config.nixosModules.system inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default inputs.nur.modules.nixos.default @@ -112,9 +110,9 @@ bartholomew = inputs.self.lib.mkLinuxSystem [ ./systems/bartholomew ./profiles/user1 - config.nixosModules.gnome - config.nixosModules.personal - config.nixosModules.shared + config.nixosModules.laptop + config.nixosModules.core + config.nixosModules.system inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default ]; @@ -122,8 +120,9 @@ ./systems/server ./profiles/user0 config.nixosModules.server - config.nixosModules.shared + config.nixosModules.core config.nixosModules.sops + config.nixosModules.system inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default inputs.ngipkgs.nixosModules."services.peertube" diff --git a/nixos/default.nix b/nixos/default.nix old mode 100755 new mode 100644 index 2a73934..23c07fe --- a/nixos/default.nix +++ b/nixos/default.nix @@ -1,66 +1,38 @@ let - modulesPath = ./modules; - moduleImport = - path: nameTransform: + collectDirs = + path: + let + content = builtins.readDir path; + subdirs = builtins.filter (name: content.${name} == "directory") (builtins.attrNames content); + buildPath = name: path + "/${name}"; + + thisDirs = map buildPath subdirs; + subDirs = builtins.concatMap collectDirs thisDirs; + in + [ path ] ++ subDirs; + + directoryImport = + path: builtins.listToAttrs ( - map - (name: { - name = nameTransform name; - value = import (path + "/${name}"); - }) - ( - builtins.filter ( - name: (builtins.readDir path).${name} == "regular" && builtins.match ".*\\.nix$" name != null - ) (builtins.attrNames (builtins.readDir path)) - ) + map (dir: { + name = baseNameOf (toString dir); + value = import dir; + }) (collectDirs path) ); - modules = - moduleImport modulesPath (name: builtins.replaceStrings [ ".nix" ] [ "" ] name) - // ( - path: - builtins.listToAttrs ( - map - (name: { - name = name; - value = import (path + "/${name}"); - }) - ( - builtins.filter (name: (builtins.readDir path).${name} == "directory") ( - builtins.attrNames (builtins.readDir path) - ) - ) - ) - ) - modulesPath; + + modules = directoryImport ./.; in { flake.nixosModules = { - personal = { - imports = builtins.attrValues { - inherit (modules) - android - audio - bluetooth - corectrl - dconf - disks - firejail - flatpak - fonts - printing - steam - sysstat - virtualization - ; - }; - }; - desktop = { imports = builtins.attrValues { inherit (modules) + hypr + wayland mullvad syncthing ollama + xserver ; }; }; @@ -68,48 +40,18 @@ in fallaryn = { imports = builtins.attrValues { inherit (modules) + plasma + sddm tablet ; }; }; - plasma = { - imports = builtins.attrValues { - inherit (modules) - plasma - sddm - ; - }; - }; - - gnome = { + laptop = { imports = builtins.attrValues { inherit (modules) gnome - ; - }; - }; - - hyprland = { - imports = builtins.attrValues { - inherit (modules) - hyprland - ; - }; - }; - - river = { - imports = builtins.attrValues { - inherit (modules) - river - ; - }; - }; - - wayland = { - imports = builtins.attrValues { - inherit (modules) - wayland + xserver ; }; }; @@ -117,7 +59,18 @@ in server = { imports = builtins.attrValues { inherit (modules) - services + acme + caddy + jellyfin + logrotate + mastodon + minecraft + ollama + website + postgresql + samba + vaultwarden + forgejo ; }; }; @@ -130,20 +83,19 @@ in }; }; - shared = { + system = { imports = builtins.attrValues { inherit (modules) - accounts - doas - environment - gvfs - home-manager - locale - nh - nix - rsyncd - ssh - system + hardware + programs + ; + }; + }; + + core = { + imports = builtins.attrValues { + inherit (modules) + core xserver ; }; diff --git a/nixos/modules/accounts.nix b/nixos/modules/core/accounts/default.nix similarity index 100% rename from nixos/modules/accounts.nix rename to nixos/modules/core/accounts/default.nix diff --git a/nixos/modules/core/default.nix b/nixos/modules/core/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/nixos/modules/core/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/nixos/modules/doas.nix b/nixos/modules/core/doas/default.nix similarity index 100% rename from nixos/modules/doas.nix rename to nixos/modules/core/doas/default.nix diff --git a/nixos/modules/environment.nix b/nixos/modules/core/environment/default.nix similarity index 100% rename from nixos/modules/environment.nix rename to nixos/modules/core/environment/default.nix diff --git a/nixos/modules/flatpak.nix b/nixos/modules/core/flatpak/default.nix similarity index 100% rename from nixos/modules/flatpak.nix rename to nixos/modules/core/flatpak/default.nix diff --git a/nixos/modules/fonts.nix b/nixos/modules/core/fonts/default.nix similarity index 100% rename from nixos/modules/fonts.nix rename to nixos/modules/core/fonts/default.nix diff --git a/nixos/modules/home-manager.nix b/nixos/modules/core/homeManager/default.nix similarity index 91% rename from nixos/modules/home-manager.nix rename to nixos/modules/core/homeManager/default.nix index f0c3cda..4ac060a 100755 --- a/nixos/modules/home-manager.nix +++ b/nixos/modules/core/homeManager/default.nix @@ -1,4 +1,5 @@ -{flake, ...}: { +{ flake, ... }: +{ home-manager = { useGlobalPkgs = true; useUserPackages = true; diff --git a/nixos/modules/core/locale/default.nix b/nixos/modules/core/locale/default.nix new file mode 100755 index 0000000..2fcad5c --- /dev/null +++ b/nixos/modules/core/locale/default.nix @@ -0,0 +1,30 @@ +{ + time.timeZone = "America/Winnipeg"; + + i18n = + let + locale = "en_CA.UTF-8"; + in + { + defaultLocale = locale; + + extraLocaleSettings = builtins.listToAttrs ( + map + (option: { + name = option; + value = locale; + }) + [ + "LC_ADDRESS" + "LC_IDENTIFICATION" + "LC_MEASUREMENT" + "LC_MONETARY" + "LC_NAME" + "LC_NUMERIC" + "LC_PAPER" + "LC_TELEPHONE" + "LC_TIME" + ] + ); + }; +} diff --git a/nixos/modules/nh.nix b/nixos/modules/core/nh/default.nix similarity index 100% rename from nixos/modules/nh.nix rename to nixos/modules/core/nh/default.nix diff --git a/nixos/modules/nix.nix b/nixos/modules/core/nix/default.nix similarity index 100% rename from nixos/modules/nix.nix rename to nixos/modules/core/nix/default.nix diff --git a/nixos/modules/rsyncd.nix b/nixos/modules/core/rsync/default.nix similarity index 100% rename from nixos/modules/rsyncd.nix rename to nixos/modules/core/rsync/default.nix diff --git a/nixos/modules/ssh.nix b/nixos/modules/core/ssh/default.nix similarity index 100% rename from nixos/modules/ssh.nix rename to nixos/modules/core/ssh/default.nix diff --git a/nixos/modules/sysstat.nix b/nixos/modules/core/sysStat/default.nix similarity index 100% rename from nixos/modules/sysstat.nix rename to nixos/modules/core/sysStat/default.nix diff --git a/nixos/modules/core/system/default.nix b/nixos/modules/core/system/default.nix new file mode 100755 index 0000000..958608a --- /dev/null +++ b/nixos/modules/core/system/default.nix @@ -0,0 +1 @@ +_: { } diff --git a/nixos/modules/dconf.nix b/nixos/modules/dconf.nix deleted file mode 100755 index 5424db3..0000000 --- a/nixos/modules/dconf.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - programs.dconf.enable = true; -} diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/nixos/modules/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/nixos/modules/desktop/default.nix b/nixos/modules/desktop/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/nixos/modules/desktop/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/nixos/modules/gnome.nix b/nixos/modules/desktop/gnome/default.nix similarity index 95% rename from nixos/modules/gnome.nix rename to nixos/modules/desktop/gnome/default.nix index bece9b8..a91c293 100755 --- a/nixos/modules/gnome.nix +++ b/nixos/modules/desktop/gnome/default.nix @@ -20,6 +20,7 @@ gnome-settings-daemon ; }; + gvfs.enable = true; }; environment = { variables = { @@ -50,4 +51,5 @@ ; }; }; + programs.dconf.enable = true; } diff --git a/nixos/modules/desktop/hypr/default.nix b/nixos/modules/desktop/hypr/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/nixos/modules/desktop/hypr/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/nixos/modules/hyprland/hypridle.nix b/nixos/modules/desktop/hypr/idle/default.nix similarity index 100% rename from nixos/modules/hyprland/hypridle.nix rename to nixos/modules/desktop/hypr/idle/default.nix diff --git a/nixos/modules/hyprland/hyprland.nix b/nixos/modules/desktop/hypr/land/default.nix similarity index 100% rename from nixos/modules/hyprland/hyprland.nix rename to nixos/modules/desktop/hypr/land/default.nix diff --git a/nixos/modules/plasma.nix b/nixos/modules/desktop/plasma/default.nix similarity index 82% rename from nixos/modules/plasma.nix rename to nixos/modules/desktop/plasma/default.nix index dc86c87..fddd69a 100755 --- a/nixos/modules/plasma.nix +++ b/nixos/modules/desktop/plasma/default.nix @@ -1,10 +1,10 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ services = { desktopManager.plasma6.enable = true; }; environment.plasma6.excludePackages = builtins.attrValues { - inherit - (pkgs.kdePackages) + inherit (pkgs.kdePackages) plasma-browser-integration konsole kate diff --git a/nixos/modules/river.nix b/nixos/modules/desktop/river/default.nix similarity index 100% rename from nixos/modules/river.nix rename to nixos/modules/desktop/river/default.nix diff --git a/nixos/modules/sddm.nix b/nixos/modules/desktop/sddm/default.nix similarity index 100% rename from nixos/modules/sddm.nix rename to nixos/modules/desktop/sddm/default.nix diff --git a/nixos/modules/desktop/wayland/default.nix b/nixos/modules/desktop/wayland/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/nixos/modules/desktop/wayland/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/nixos/modules/wayland/geoclue2.nix b/nixos/modules/desktop/wayland/geoclue2/default.nix similarity index 100% rename from nixos/modules/wayland/geoclue2.nix rename to nixos/modules/desktop/wayland/geoclue2/default.nix diff --git a/nixos/modules/wayland/greetd.nix b/nixos/modules/desktop/wayland/greetd/default.nix similarity index 100% rename from nixos/modules/wayland/greetd.nix rename to nixos/modules/desktop/wayland/greetd/default.nix diff --git a/nixos/modules/wayland/network.nix b/nixos/modules/desktop/wayland/network/default.nix similarity index 100% rename from nixos/modules/wayland/network.nix rename to nixos/modules/desktop/wayland/network/default.nix diff --git a/nixos/modules/wayland/regreet.nix b/nixos/modules/desktop/wayland/regreet/default.nix similarity index 100% rename from nixos/modules/wayland/regreet.nix rename to nixos/modules/desktop/wayland/regreet/default.nix diff --git a/nixos/modules/wayland/swaylock.nix b/nixos/modules/desktop/wayland/swaylock/default.nix similarity index 100% rename from nixos/modules/wayland/swaylock.nix rename to nixos/modules/desktop/wayland/swaylock/default.nix diff --git a/nixos/modules/wayland/thunar.nix b/nixos/modules/desktop/wayland/thunar/default.nix similarity index 100% rename from nixos/modules/wayland/thunar.nix rename to nixos/modules/desktop/wayland/thunar/default.nix diff --git a/nixos/modules/wayland/wayland.nix b/nixos/modules/desktop/wayland/wayland/default.nix similarity index 100% rename from nixos/modules/wayland/wayland.nix rename to nixos/modules/desktop/wayland/wayland/default.nix diff --git a/nixos/modules/xserver.nix b/nixos/modules/desktop/xserver/default.nix similarity index 100% rename from nixos/modules/xserver.nix rename to nixos/modules/desktop/xserver/default.nix diff --git a/nixos/modules/gvfs.nix b/nixos/modules/gvfs.nix deleted file mode 100755 index b045ed2..0000000 --- a/nixos/modules/gvfs.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - services.gvfs.enable = true; -} diff --git a/nixos/modules/android.nix b/nixos/modules/hardware/android/default.nix similarity index 80% rename from nixos/modules/android.nix rename to nixos/modules/hardware/android/default.nix index 32c2d19..6384ddb 100755 --- a/nixos/modules/android.nix +++ b/nixos/modules/hardware/android/default.nix @@ -1,11 +1,11 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs = { adb.enable = true; droidcam.enable = true; }; services.udev.packages = builtins.attrValues { - inherit - (pkgs) + inherit (pkgs) android-udev-rules ; }; diff --git a/nixos/modules/audio.nix b/nixos/modules/hardware/audio/default.nix similarity index 100% rename from nixos/modules/audio.nix rename to nixos/modules/hardware/audio/default.nix diff --git a/nixos/modules/bluetooth.nix b/nixos/modules/hardware/bluetooth/default.nix similarity index 100% rename from nixos/modules/bluetooth.nix rename to nixos/modules/hardware/bluetooth/default.nix diff --git a/nixos/modules/hardware/default.nix b/nixos/modules/hardware/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/nixos/modules/hardware/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/nixos/modules/printing.nix b/nixos/modules/hardware/printing/default.nix similarity index 100% rename from nixos/modules/printing.nix rename to nixos/modules/hardware/printing/default.nix diff --git a/nixos/modules/tablet.nix b/nixos/modules/hardware/tablet/default.nix similarity index 100% rename from nixos/modules/tablet.nix rename to nixos/modules/hardware/tablet/default.nix diff --git a/nixos/modules/hyprland/default.nix b/nixos/modules/hyprland/default.nix deleted file mode 100755 index 96acb58..0000000 --- a/nixos/modules/hyprland/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = map (file: ./${file}.nix) [ - "hypridle" - "hyprland" - ]; -} diff --git a/nixos/modules/locale.nix b/nixos/modules/locale.nix deleted file mode 100755 index 07b202f..0000000 --- a/nixos/modules/locale.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - time.timeZone = "America/Winnipeg"; - - i18n = let - locale = "en_CA.UTF-8"; - in { - defaultLocale = locale; - - extraLocaleSettings = - builtins.listToAttrs - (map (option: { - name = option; - value = locale; - }) - [ - "LC_ADDRESS" - "LC_IDENTIFICATION" - "LC_MEASUREMENT" - "LC_MONETARY" - "LC_NAME" - "LC_NUMERIC" - "LC_PAPER" - "LC_TELEPHONE" - "LC_TIME" - ]); - }; -} diff --git a/nixos/modules/ollama.nix b/nixos/modules/ollama.nix deleted file mode 100755 index 48eff9a..0000000 --- a/nixos/modules/ollama.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ - flake, - pkgs, - ... -}: -let - inherit (flake.config.services.instances) - ollama - web - ; - service = ollama; - localhost = web.localhost.address0; -in -{ - services = { - ollama = { - acceleration = "rocm"; - package = pkgs.ollama.override { - config = { - rocmSupport = true; - cudaSupport = false; - }; - }; - enable = true; - group = service.name; - host = "http://${localhost}"; - models = service.paths.path1; - user = service.name; - }; - open-webui = { - enable = true; - host = localhost; - port = service.ports.port0; - environment = { - ENABLE_OLLAMA_API = "True"; - ANONYMIZED_TELEMETRY = "False"; - DO_NOT_TRACK = "True"; - SCARF_NO_ANALYTICS = "True"; - OLLAMA_BASE_URL = "http://${localhost}:${toString service.ports.port1}"; - WEBUI_AUTH = "True"; - }; - }; - }; - - users.users.${service.name}.extraGroups = [ - "users" - ]; - - systemd.tmpfiles.rules = [ - "Z ${service.paths.path1} 0777 ${service.name} ${service.name} -" - ]; - - networking = { - firewall = { - allowedTCPPorts = [ - # 8080 - service.ports.port0 - service.ports.port1 - ]; - }; - }; -} diff --git a/nixos/modules/corectrl.nix b/nixos/modules/programs/coreCtrl/default.nix similarity index 90% rename from nixos/modules/corectrl.nix rename to nixos/modules/programs/coreCtrl/default.nix index 6150119..63fbcfb 100755 --- a/nixos/modules/corectrl.nix +++ b/nixos/modules/programs/coreCtrl/default.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs.corectrl = { enable = true; package = pkgs.corectrl; diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/nixos/modules/programs/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/nixos/modules/disks.nix b/nixos/modules/programs/disks/default.nix similarity index 100% rename from nixos/modules/disks.nix rename to nixos/modules/programs/disks/default.nix diff --git a/nixos/modules/firejail.nix b/nixos/modules/programs/firejail/default.nix similarity index 100% rename from nixos/modules/firejail.nix rename to nixos/modules/programs/firejail/default.nix diff --git a/nixos/modules/steam.nix b/nixos/modules/programs/steam/default.nix similarity index 85% rename from nixos/modules/steam.nix rename to nixos/modules/programs/steam/default.nix index ffe6607..b3fee58 100755 --- a/nixos/modules/steam.nix +++ b/nixos/modules/programs/steam/default.nix @@ -1,12 +1,12 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ programs = { steam = { enable = true; remotePlay.openFirewall = true; dedicatedServer.openFirewall = true; extraPackages = builtins.attrValues { - inherit - (pkgs) + inherit (pkgs) curl ; }; diff --git a/nixos/modules/virtualization.nix b/nixos/modules/programs/virtManager/default.nix similarity index 100% rename from nixos/modules/virtualization.nix rename to nixos/modules/programs/virtManager/default.nix diff --git a/nixos/modules/services/acme.nix b/nixos/modules/services/acme/default.nix similarity index 100% rename from nixos/modules/services/acme.nix rename to nixos/modules/services/acme/default.nix diff --git a/nixos/modules/services/caddy.nix b/nixos/modules/services/caddy/default.nix similarity index 88% rename from nixos/modules/services/caddy.nix rename to nixos/modules/services/caddy/default.nix index 97cd08c..00ac4a8 100755 --- a/nixos/modules/services/caddy.nix +++ b/nixos/modules/services/caddy/default.nix @@ -1,6 +1,6 @@ -{flake, ...}: let - inherit - (flake.config.services.instances) +{ flake, ... }: +let + inherit (flake.config.services.instances) caddy web ; @@ -8,7 +8,8 @@ domain0 = web.domains.url0; service = caddy; -in { +in +{ services.caddy = { enable = true; virtualHosts = { diff --git a/nixos/modules/services/default.nix b/nixos/modules/services/default.nix index aa0e1e8..f106bc5 100755 --- a/nixos/modules/services/default.nix +++ b/nixos/modules/services/default.nix @@ -1,22 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in { - imports = - (map (folder: ./${folder}) [ - "mastodon" - ]) - ++ (map (file: ./${file}.nix) [ - "acme" - "caddy" - "jellyfin" - "logrotate" - "minecraft" - "ollama" - "upRootNutrition" - # "peertube" - "postgresql" - # "owncast" - "samba" - "vaultwarden" - "forgejo" - # "nextcloud" - ]); + imports = importList; } diff --git a/nixos/modules/services/forgejo.nix b/nixos/modules/services/forgejo/default.nix similarity index 100% rename from nixos/modules/services/forgejo.nix rename to nixos/modules/services/forgejo/default.nix diff --git a/nixos/modules/hledger.nix b/nixos/modules/services/hLedger/default.nix similarity index 100% rename from nixos/modules/hledger.nix rename to nixos/modules/services/hLedger/default.nix diff --git a/nixos/modules/services/jellyfin.nix b/nixos/modules/services/jellyfin/default.nix similarity index 71% rename from nixos/modules/services/jellyfin.nix rename to nixos/modules/services/jellyfin/default.nix index 8153d30..2cf6cb3 100755 --- a/nixos/modules/services/jellyfin.nix +++ b/nixos/modules/services/jellyfin/default.nix @@ -1,21 +1,20 @@ -{flake, ...}: let - inherit - (flake.config.people) +{ flake, ... }: +let + inherit (flake.config.people) user0 ; - inherit - (flake.config.machines.devices) + inherit (flake.config.machines.devices) server ; - inherit - (flake.config.services.instances) + inherit (flake.config.services.instances) jellyfin web ; service = jellyfin; localhost = web.localhost.address0; host = "${service.subdomain}.${web.domains.url0}"; -in { +in +{ services = { jellyfin = { enable = true; @@ -42,28 +41,26 @@ in { }; }; - fileSystems = let - settings = { - fsType = "none"; - options = [ - "bind" - ]; - depends = [ - server.storage0.mount - ]; - }; - in { - "/var/lib/${service.name}" = - { + fileSystems = + let + settings = { + fsType = "none"; + options = [ + "bind" + ]; + depends = [ + server.storage0.mount + ]; + }; + in + { + "/var/lib/${service.name}" = { device = service.paths.path0; - } - // settings; - "/var/cache/${service.name}" = - { + } // settings; + "/var/cache/${service.name}" = { device = "${service.paths.path0}/cache"; - } - // settings; - }; + } // settings; + }; systemd.tmpfiles.rules = [ "Z ${service.paths.path0} 0755 ${user0} ${service.name} -" diff --git a/nixos/modules/services/logrotate.nix b/nixos/modules/services/logrotate/default.nix similarity index 100% rename from nixos/modules/services/logrotate.nix rename to nixos/modules/services/logrotate/default.nix diff --git a/nixos/modules/services/mastodon/chars.patch b/nixos/modules/services/mastodon/config/chars.patch similarity index 100% rename from nixos/modules/services/mastodon/chars.patch rename to nixos/modules/services/mastodon/config/chars.patch diff --git a/nixos/modules/services/mastodon/twitter.txt b/nixos/modules/services/mastodon/config/twitter.txt similarity index 100% rename from nixos/modules/services/mastodon/twitter.txt rename to nixos/modules/services/mastodon/config/twitter.txt diff --git a/nixos/modules/services/minecraft.nix b/nixos/modules/services/minecraft/default.nix similarity index 79% rename from nixos/modules/services/minecraft.nix rename to nixos/modules/services/minecraft/default.nix index 462417a..9ce53bf 100755 --- a/nixos/modules/services/minecraft.nix +++ b/nixos/modules/services/minecraft/default.nix @@ -2,17 +2,17 @@ config, flake, ... -}: let - inherit - (flake.config.machines.devices) +}: +let + inherit (flake.config.machines.devices) server ; - inherit - (flake.config.services.instances) + inherit (flake.config.services.instances) minecraft ; service = minecraft; -in { +in +{ services = { minecraft-server = { enable = true; @@ -55,24 +55,26 @@ in { }; }; }; - sops = let - sopsPath = secret: { - path = "${service.sops.path0}/${service.name}-${secret}"; - owner = service.name; - mode = "600"; + sops = + let + sopsPath = secret: { + path = "${service.sops.path0}/${service.name}-${secret}"; + owner = service.name; + mode = "600"; + }; + in + { + secrets = builtins.listToAttrs ( + map + (secret: { + name = "${service.name}-${secret}"; + value = sopsPath secret; + }) + [ + "pass" + ] + ); }; - in { - secrets = builtins.listToAttrs ( - map - (secret: { - name = "${service.name}-${secret}"; - value = sopsPath secret; - }) - [ - "pass" - ] - ); - }; fileSystems."/var/lib/${service.name}" = { device = service.paths.path0; diff --git a/nixos/modules/mullvad.nix b/nixos/modules/services/mullvad/default.nix similarity index 100% rename from nixos/modules/mullvad.nix rename to nixos/modules/services/mullvad/default.nix diff --git a/nixos/modules/services/nextcloud.nix b/nixos/modules/services/nextcloud/default.nix similarity index 77% rename from nixos/modules/services/nextcloud.nix rename to nixos/modules/services/nextcloud/default.nix index dc9fa3d..4e82ba5 100755 --- a/nixos/modules/services/nextcloud.nix +++ b/nixos/modules/services/nextcloud/default.nix @@ -3,21 +3,18 @@ config, pkgs, ... -}: let - inherit - (flake.config.people) +}: +let + inherit (flake.config.people) user0 ; - inherit - (flake.config.people.users.${user0}) + inherit (flake.config.people.users.${user0}) name ; - inherit - (flake.config.machines.devices) + inherit (flake.config.machines.devices) server ; - inherit - (flake.config.services.instances) + inherit (flake.config.services.instances) nextcloud nginx web @@ -25,7 +22,8 @@ service = nextcloud; localhost = web.localhost.address0; host = "${service.subdomain}.${web.domains.url1}"; -in { +in +{ services = { nextcloud = { appstoreEnable = true; @@ -38,8 +36,7 @@ in { phpOptions."opcache.interned_strings_buffer" = "24"; extraAppsEnable = true; extraApps = { - inherit - (config.services.service.package.packages.apps) + inherit (config.services.service.package.packages.apps) contacts calendar ; @@ -88,24 +85,26 @@ in { }; }; - sops = let - sopsPath = secret: { - path = "${service.sops.path0}/${service.name}-${secret}"; - owner = service.name; - mode = "600"; + sops = + let + sopsPath = secret: { + path = "${service.sops.path0}/${service.name}-${secret}"; + owner = service.name; + mode = "600"; + }; + in + { + secrets = builtins.listToAttrs ( + map + (secret: { + name = "${service.name}-${secret}"; + value = sopsPath secret; + }) + [ + "pass" + ] + ); }; - in { - secrets = builtins.listToAttrs ( - map - (secret: { - name = "${service.name}-${secret}"; - value = sopsPath secret; - }) - [ - "pass" - ] - ); - }; fileSystems."/var/lib/${service.name}" = { device = service.paths.path0; diff --git a/nixos/modules/services/ollama.nix b/nixos/modules/services/ollama.nix deleted file mode 100755 index 48086c9..0000000 --- a/nixos/modules/services/ollama.nix +++ /dev/null @@ -1,75 +0,0 @@ -{flake, ...}: let - inherit - (flake.config.machines.devices) - server - ; - inherit - (flake.config.services.instances) - ollama - web - ; - service = ollama; - localhost = web.localhost.address0; - host = "${service.subdomain}.${web.domains.url0}"; -in { - services = { - ollama = { - acceleration = false; - enable = true; - group = service.name; - host = "http://${localhost}"; - port = service.ports.port1; - user = service.name; - }; - - open-webui = { - enable = true; - host = localhost; - port = service.ports.port0; - environment = { - ENABLE_OLLAMA_API = "True"; - ANONYMIZED_TELEMETRY = "False"; - DO_NOT_TRACK = "True"; - SCARF_NO_ANALYTICS = "True"; - OLLAMA_BASE_URL = "http://${localhost}:${toString service.ports.port1}"; - WEBUI_AUTH = "True"; - }; - }; - - caddy = { - virtualHosts = { - ${host} = { - extraConfig = '' - reverse_proxy ${localhost}:${toString service.ports.port0} - - tls ${service.ssl.cert} ${service.ssl.key} - ''; - }; - }; - }; - }; - - fileSystems."/var/lib/${service.name}" = { - device = service.paths.path0; - fsType = "none"; - options = [ - "bind" - ]; - depends = [ - server.storage0.mount - ]; - }; - - systemd.tmpfiles.rules = [ - "Z ${service.paths.path0} 0755 ${service.name} ${service.name} -" - ]; - - networking = { - firewall = { - allowedTCPPorts = [ - service.ports.port0 - service.ports.port1 - ]; - }; - }; -} diff --git a/nixos/modules/services/ollama/default.nix b/nixos/modules/services/ollama/default.nix new file mode 100755 index 0000000..3c4913a --- /dev/null +++ b/nixos/modules/services/ollama/default.nix @@ -0,0 +1,117 @@ +{ + flake, + config, + pkgs, + ... +}: +let + inherit (flake.config.machines.devices) + desktop + server + ; + inherit (flake.config.services.instances) + ollama + web + ; + service = ollama; + localhost = web.localhost.address0; + hostname = config.networking.hostName; + host = "${service.subdomain}.${web.domains.url0}"; + + caddyLogic = + if hostname == server.name then + { + caddy = { + virtualHosts = { + ${host} = { + extraConfig = '' + reverse_proxy ${localhost}:${toString service.ports.port0} + + tls ${service.ssl.cert} ${service.ssl.key} + ''; + }; + }; + }; + } + else + { }; + + mountLogic = + if hostname == server.name then + { + "/var/lib/${service.name}" = { + device = service.paths.path0; + fsType = "none"; + options = [ + "bind" + ]; + depends = [ + server.storage0.mount + ]; + }; + } + else + { }; +in +{ + services = { + ollama = + { + enable = true; + group = service.name; + host = "http://${localhost}"; + user = service.name; + } + // ( + if hostname == desktop.name then + { + acceleration = "rocm"; + package = pkgs.ollama.override { + config = { + rocmSupport = true; + cudaSupport = false; + }; + }; + } + else + { + port = service.ports.port1; + acceleration = false; + models = service.paths.path1; + } + ); + open-webui = { + enable = true; + host = localhost; + port = service.ports.port0; + environment = { + ENABLE_OLLAMA_API = "True"; + ANONYMIZED_TELEMETRY = "False"; + DO_NOT_TRACK = "True"; + SCARF_NO_ANALYTICS = "True"; + OLLAMA_BASE_URL = "http://${localhost}:${toString service.ports.port1}"; + WEBUI_AUTH = "True"; + }; + }; + } // caddyLogic; + + systemd.tmpfiles.rules = [ + ( + if hostname == desktop.name then + "Z ${service.paths.path1} 0777 ${service.name} ${service.name} -" + else + "Z ${service.paths.path0} 0755 ${service.name} ${service.name} -" + ) + ]; + + networking = { + firewall = { + allowedTCPPorts = [ + # 8080 + service.ports.port0 + service.ports.port1 + ]; + }; + }; + fileSystems = mountLogic; +} diff --git a/nixos/modules/services/owncast.nix b/nixos/modules/services/owncast/default.nix similarity index 91% rename from nixos/modules/services/owncast.nix rename to nixos/modules/services/owncast/default.nix index 95c15bf..b35ed40 100755 --- a/nixos/modules/services/owncast.nix +++ b/nixos/modules/services/owncast/default.nix @@ -1,13 +1,14 @@ -{flake, ...}: let - inherit - (flake.config.services.instances) +{ flake, ... }: +let + inherit (flake.config.services.instances) owncast web ; service = owncast; localhost = web.localhost.address1; host = "${service.subdomain}.${web.domains.url1}"; -in { +in +{ services = { owncast = { enable = true; diff --git a/nixos/modules/services/peertube.nix b/nixos/modules/services/peertube/default.nix similarity index 100% rename from nixos/modules/services/peertube.nix rename to nixos/modules/services/peertube/default.nix diff --git a/nixos/modules/services/postgresql.nix b/nixos/modules/services/postgresql/default.nix similarity index 100% rename from nixos/modules/services/postgresql.nix rename to nixos/modules/services/postgresql/default.nix diff --git a/nixos/modules/services/samba.nix b/nixos/modules/services/samba/default.nix similarity index 90% rename from nixos/modules/services/samba.nix rename to nixos/modules/services/samba/default.nix index c7a9a46..30463c6 100755 --- a/nixos/modules/services/samba.nix +++ b/nixos/modules/services/samba/default.nix @@ -2,14 +2,15 @@ pkgs, flake, ... -}: let - inherit - (flake.config.services.instances) +}: +let + inherit (flake.config.services.instances) samba jellyfin ; service = samba; -in { +in +{ # If you ever need to start fresh, you need to add yourself to the Samba users database: # sudo smbpasswd -a username services = { diff --git a/nixos/modules/syncthing.nix b/nixos/modules/services/syncthing/default.nix similarity index 100% rename from nixos/modules/syncthing.nix rename to nixos/modules/services/syncthing/default.nix diff --git a/nixos/modules/services/vaultwarden.nix b/nixos/modules/services/vaultwarden/default.nix similarity index 100% rename from nixos/modules/services/vaultwarden.nix rename to nixos/modules/services/vaultwarden/default.nix diff --git a/nixos/modules/services/upRootNutrition.nix b/nixos/modules/services/website/default.nix similarity index 87% rename from nixos/modules/services/upRootNutrition.nix rename to nixos/modules/services/website/default.nix index 18c373a..1974e89 100755 --- a/nixos/modules/services/upRootNutrition.nix +++ b/nixos/modules/services/website/default.nix @@ -1,12 +1,13 @@ -{flake, ...}: let - inherit - (flake.config.services.instances) +{ flake, ... }: +let + inherit (flake.config.services.instances) upRootNutrition web ; service = upRootNutrition; host = web.domains.url3; -in { +in +{ services = { caddy = { virtualHosts = { diff --git a/nixos/modules/sops.nix b/nixos/modules/sops/default.nix similarity index 96% rename from nixos/modules/sops.nix rename to nixos/modules/sops/default.nix index 04e1d1d..7742422 100755 --- a/nixos/modules/sops.nix +++ b/nixos/modules/sops/default.nix @@ -25,7 +25,7 @@ let in { sops = { - defaultSopsFile = ../../secrets/secrets.yaml; + defaultSopsFile = ../../../secrets/secrets.yaml; validateSopsFiles = false; age = { keyFile = "/var/lib/sops-nix/key.txt"; diff --git a/nixos/modules/system.nix b/nixos/modules/system.nix deleted file mode 100755 index eed7124..0000000 --- a/nixos/modules/system.nix +++ /dev/null @@ -1 +0,0 @@ -_: {} diff --git a/nixos/modules/wayland/default.nix b/nixos/modules/wayland/default.nix deleted file mode 100755 index e45833b..0000000 --- a/nixos/modules/wayland/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - imports = map (file: ./${file}.nix) [ - "geoclue2" - "greetd" - "network" - "regreet" - "swaylock" - "thunar" - "wayland" - ]; -} diff --git a/templates/elm/parts/config/devshells.nix b/templates/elm/parts/config/devshells.nix index 8ebc22b..165955c 100755 --- a/templates/elm/parts/config/devshells.nix +++ b/templates/elm/parts/config/devshells.nix @@ -2,18 +2,21 @@ pkgs, pkgs-stable, ... -}: { +}: +{ devShells = { default = pkgs.mkShell { packages = builtins.attrValues { - inherit - (pkgs) + inherit (pkgs) + age just - nixd nil + nixd + sops + ssh-to-age + nixfmt-rfc-style ; - inherit - (pkgs-stable.elmPackages) + inherit (pkgs-stable.elmPackages) elm elm-format elm-land @@ -21,8 +24,7 @@ elm-review elm-test ; - inherit - (pkgs.haskellPackages) + inherit (pkgs.haskellPackages) nixfmt ; }; diff --git a/templates/haskell/parts/config/devshells.nix b/templates/haskell/parts/config/devshells.nix index f3c519c..020ccee 100755 --- a/templates/haskell/parts/config/devshells.nix +++ b/templates/haskell/parts/config/devshells.nix @@ -2,57 +2,38 @@ pkgs, config, ... -}: { +}: +{ haskellProjects.default = { devShell = { enable = true; tools = hp: { - inherit - (hp) + inherit (hp) cabal-fmt haskell-language-server ; - inherit - (pkgs) + inherit (pkgs) dhall dhall-json dhall-lsp-server helix-gpt - nixd + age just - libz - ngrep nil + nixd sops ssh-to-age + nixfmt-rfc-style + libz + ngrep stripe-cli vscode-langservers-extracted zlib ; - inherit - (pkgs.elmPackages) - elm - elm-format - elm-land - elm-language-server - elm-review - elm-test - ; - - inherit - (pkgs.nodePackages_latest) - "@commitlint/config-conventional" - dotenv-cli - forever - nodejs - npm - typescript-language-server - ; - inherit - (pkgs.haskellPackages) + inherit (pkgs.haskellPackages) nixfmt ; }; From 824a91d4055e7cdc9a4f23a6c713ef81f36dae93 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 6 Feb 2025 00:51:06 -0600 Subject: [PATCH 5/5] refactor: cleaned up nixos and home dirs --- config/devices/default.nix | 65 -------- flake.lock | 143 +++++++++++++----- flake.nix | 14 +- {config => modules/config}/default.nix | 0 .../config}/devices/config/bartholomew.nix | 0 .../config}/devices/config/desktop.nix | 0 .../config}/devices/config/fallaryn.nix | 0 .../config}/devices/config/laptop.nix | 0 .../config}/devices/config/phone.nix | 0 .../devices/config/printers/printer0.nix | 9 +- .../devices/config/printers/printer1.nix | 9 +- .../config}/devices/config/server.nix | 0 .../config}/devices/config/synology.nix | 0 .../config}/devices/config/tablet.nix | 0 modules/config/devices/default.nix | 76 ++++++++++ .../config}/instances/config/acme.nix | 9 +- .../config}/instances/config/caddy.nix | 9 +- .../config}/instances/config/forgejo.nix | 0 .../config}/instances/config/jellyfin.nix | 9 +- .../config}/instances/config/mastodon.nix | 0 .../config}/instances/config/matrix.nix | 9 +- .../config}/instances/config/minecraft.nix | 9 +- .../config}/instances/config/nextcloud.nix | 9 +- .../config}/instances/config/ollama.nix | 9 +- .../config}/instances/config/owncast.nix | 9 +- .../config}/instances/config/peertube.nix | 9 +- .../config}/instances/config/postfix.nix | 0 .../config}/instances/config/postgresql.nix | 9 +- .../config}/instances/config/samba.nix | 9 +- .../config}/instances/config/smtp.nix | 0 .../config}/instances/config/syncthing.nix | 9 +- .../config}/instances/config/synology.nix | 9 +- .../instances/config/upRootNutrition.nix | 9 +- .../config}/instances/config/vaultwarden.nix | 9 +- .../config}/instances/config/web.nix | 9 +- .../config}/instances/default.nix | 0 {config => modules/config}/themes/default.nix | 0 .../themes/palettes/brogrammer/default.nix | 0 .../palettes/catppuccin/frappe/default.nix | 0 .../palettes/catppuccin/latte/default.nix | 0 .../palettes/catppuccin/macchiato/default.nix | 0 .../palettes/catppuccin/mocha/default.nix | 0 .../config}/themes/palettes/chalk/default.nix | 0 .../palettes/deep-oceanic-next/default.nix | 0 .../themes/palettes/dracula/default.nix | 0 .../themes/palettes/espresso/default.nix | 0 .../config}/themes/palettes/flat/default.nix | 0 .../themes/palettes/framer/default.nix | 0 .../themes/palettes/github/default.nix | 0 .../themes/palettes/hardcore/default.nix | 0 .../themes/palettes/one/black/default.nix | 0 .../themes/palettes/one/dark/default.nix | 0 .../themes/palettes/one/light/default.nix | 0 .../themes/palettes/sparky/default.nix | 0 .../config}/users/config/user0.nix | 6 +- .../config}/users/config/user1.nix | 6 +- .../config}/users/config/user2.nix | 0 {config => modules/config}/users/default.nix | 0 .../cli/android => modules}/default.nix | 0 {home => modules/home}/default.nix | 2 +- .../android/androidFileTransfer/default.nix | 0 .../cli/android/androidTools/default.nix | 0 .../home/modules/cli/android}/default.nix | 0 .../cli/android/simpleMtpfs/default.nix | 0 .../home/modules/cli}/default.nix | 0 .../home/modules/cli/development}/default.nix | 0 .../cli/development/editing}/default.nix | 0 .../editing/helix/config/languages.nix | 0 .../editing/helix/config/settings.nix | 0 .../cli/development/editing/helix/default.nix | 0 .../development/editing/neovim/default.nix | 0 .../cli/development/tooling}/default.nix | 0 .../cli/development/tooling/elm/default.nix | 0 .../tooling/javascript/default.nix | 0 .../cli/development/versioning}/default.nix | 0 .../development/versioning/git/default.nix | 0 .../versioning/lazygit/default.nix | 0 .../home/modules/cli/files}/default.nix | 0 .../modules/cli/files/fileRoller/default.nix | 0 .../home}/modules/cli/files/ncdu/default.nix | 0 .../home}/modules/cli/files/samba/default.nix | 0 .../home}/modules/cli/files/unrar/default.nix | 0 .../home}/modules/cli/files/unzip/default.nix | 0 .../modules/cli/files/yazi/config/keymap.nix | 0 .../cli/files/yazi/config/settings.nix | 0 .../home}/modules/cli/files/yazi/default.nix | 0 .../home}/modules/cli/files/zip/default.nix | 0 .../home}/modules/cli/fun/aniCli/default.nix | 0 .../home/modules/cli/fun}/default.nix | 0 .../cli/fun/fastFetch/config/settings.nix | 0 .../modules/cli/fun/fastFetch/default.nix | 0 .../modules/cli/fun/libgenCli/default.nix | 0 .../home}/modules/cli/fun/nyanCat/default.nix | 0 .../modules/cli/fun/yaBridge/default.nix | 0 .../cli/fun/yt-dlp/config/extraConfig.nix | 0 .../cli/fun/yt-dlp/config/settings.nix | 0 .../home}/modules/cli/fun/yt-dlp/default.nix | 0 .../home/modules/cli/shell}/default.nix | 0 .../modules/cli/shell/nushell/default.nix | 0 .../cli/shell/starship/config/settings.nix | 0 .../modules/cli/shell/starship/default.nix | 0 .../modules/cli/shell/zellij/default.nix | 0 .../modules/cli/shell/zoxide/default.nix | 0 .../cli/utilities/alsaUtils/default.nix | 0 .../cli/utilities/bottom/config/settings.nix | 0 .../modules/cli/utilities/bottom/default.nix | 0 .../cli/utilities/brightnessCtl/default.nix | 0 .../cli/utilities/cifsUtils/default.nix | 0 .../home/modules/cli/utilities}/default.nix | 0 .../modules/cli/utilities/direnv/default.nix | 0 .../modules/cli/utilities/ffmpeg/default.nix | 0 .../modules/cli/utilities/flac/default.nix | 0 .../modules/cli/utilities/gLib/default.nix | 0 .../cli/utilities/hardInfo/default.nix | 0 .../cli/utilities/homeManager/default.nix | 0 .../cli/utilities/inetUtils/default.nix | 0 .../cli/utilities/libnatpmp/default.nix | 0 .../modules/cli/utilities/paMixer/default.nix | 0 .../modules/cli/utilities/parted/default.nix | 0 .../cli/utilities/pciUtils/default.nix | 0 .../cli/utilities/pinEntry/default.nix | 0 .../cli/utilities/playerCtl/default.nix | 0 .../cli/utilities/protonVpn/default.nix | 0 .../cli/utilities/speedTest/default.nix | 0 .../modules/cli/utilities/sshfs/default.nix | 0 .../modules/cli/utilities/tokei/default.nix | 0 .../modules/cli/utilities/tomb/default.nix | 0 .../modules/cli/utilities/wget/default.nix | 0 .../modules/cli/utilities/wine/default.nix | 0 .../cli/utilities/xdgUtils/default.nix | 0 .../modules/cli/utilities/xdoTool/default.nix | 0 .../home/modules}/default.nix | 0 .../apps/browsers/brave/config/extensions.nix | 0 .../gui/apps/browsers/brave/default.nix | 0 .../gui/apps/browsers/braveNix/default.nix | 0 .../gui/apps/browsers/chrome/default.nix | 0 .../modules/gui/apps/browsers}/default.nix | 0 .../gui/apps/browsers/edge/default.nix | 0 .../gui/apps/browsers/epiphany/default.nix | 0 .../config/bookmarks/config/academic.nix | 0 .../config/bookmarks/config/development.nix | 0 .../config/bookmarks/config/finances.nix | 0 .../bookmarks/config/flake/selfHosted.nix | 0 .../config/bookmarks/config/gaming.nix | 0 .../config/bookmarks/config/shopping.nix | 0 .../config/bookmarks/config/socialMedia.nix | 0 .../firefox/config/bookmarks/config/tools.nix | 0 .../config/bookmarks/config/tracking.nix | 0 .../firefox/config/bookmarks/default.nix | 0 .../firefox/config/extensions/default.nix | 0 .../firefox/config/search/config/academic.nix | 0 .../config/search/config/development.nix | 0 .../config/search/config/flake/icons/jf.png | Bin .../config/search/config/flake/icons/pt.png | Bin .../config/search/config/flake/selfHosted.nix | 0 .../firefox/config/search/config/gaming.nix | 0 .../firefox/config/search/config/hidden.nix | 0 .../firefox/config/search/config/icons/13.png | Bin .../firefox/config/search/config/icons/al.png | Bin .../firefox/config/search/config/icons/am.png | Bin .../firefox/config/search/config/icons/br.png | Bin .../firefox/config/search/config/icons/cr.png | Bin .../firefox/config/search/config/icons/dn.png | Bin .../firefox/config/search/config/icons/do.png | Bin .../firefox/config/search/config/icons/fy.png | Bin .../firefox/config/search/config/icons/ha.png | Bin .../firefox/config/search/config/icons/ho.png | Bin .../firefox/config/search/config/icons/ka.png | Bin .../firefox/config/search/config/icons/ki.png | Bin .../firefox/config/search/config/icons/me.png | Bin .../firefox/config/search/config/icons/ne.png | Bin .../firefox/config/search/config/icons/nx.png | Bin .../firefox/config/search/config/icons/pd.png | Bin .../firefox/config/search/config/icons/ph.png | Bin .../firefox/config/search/config/icons/pi.png | Bin .../firefox/config/search/config/icons/re.png | Bin .../firefox/config/search/config/icons/rz.png | Bin .../firefox/config/search/config/icons/sb.png | Bin .../firefox/config/search/config/icons/sc.png | Bin .../firefox/config/search/config/icons/sd.png | Bin .../firefox/config/search/config/icons/sk.png | Bin .../firefox/config/search/config/icons/tl.png | Bin .../firefox/config/search/config/icons/tw.png | Bin .../firefox/config/search/config/icons/ur.png | Bin .../firefox/config/search/config/icons/vs.png | Bin .../firefox/config/search/config/icons/wi.png | Bin .../firefox/config/search/config/icons/xh.png | Bin .../firefox/config/search/config/icons/xv.png | Bin .../firefox/config/search/config/icons/yo.png | Bin .../firefox/config/search/config/shopping.nix | 0 .../config/search/config/socialMedia.nix | 0 .../firefox/config/search/config/spank.nix | 0 .../firefox/config/search/config/tools.nix | 0 .../firefox/config/search/config/tracking.nix | 0 .../firefox/config/search/config/web.nix | 0 .../firefox/config/search/default.nix | 0 .../config/settings/config/cosmetics.nix | 0 .../config/settings/config/diskAvoidance.nix | 0 .../config/settings/config/fingerprinting.nix | 0 .../config/settings/config/formFill.nix | 0 .../config/settings/config/geolocation.nix | 0 .../config/settings/config/hardening.nix | 0 .../firefox/config/settings/config/https.nix | 0 .../firefox/config/settings/config/misc.nix | 0 .../config/settings/config/noTouching.nix | 0 .../firefox/config/settings/config/opSec.nix | 0 .../config/settings/config/outbound.nix | 0 .../config/settings/config/passwords.nix | 0 .../config/settings/config/privacy.nix | 0 .../firefox/config/settings/config/proxy.nix | 0 .../config/settings/config/startup.nix | 0 .../config/settings/config/telemetry.nix | 0 .../firefox/config/settings/default.nix | 0 .../config/themes/config/userChrome.css | 0 .../firefox/config/themes/default.nix | 0 .../gui/apps/browsers/firefox/default.nix | 0 .../gui/apps/browsers/firefoxNix/default.nix | 0 .../gui/apps/browsers/ladybird/default.nix | 0 .../gui/apps/browsers/opera/default.nix | 0 .../modules/gui/apps/browsers/tor/default.nix | 0 .../gui/apps/browsers/vivaldi/default.nix | 0 .../modules/gui/apps/code/cursor/default.nix | 0 .../home/modules/gui/apps/code}/default.nix | 0 .../apps/code/vsCode/config/extensions.nix | 0 .../apps/code/vsCode/config/keybindings.nix | 0 .../apps/code/vsCode/config/userSettings.nix | 0 .../modules/gui/apps/code/vsCode/default.nix | 0 .../code/zed/config/extensions/default.nix | 0 .../code/zed/config/extraPackages/default.nix | 0 .../code/zed/config/userKeymaps/default.nix | 0 .../userSettings/config/assistant/default.nix | 0 .../userSettings/config/git/default.nix | 0 .../userSettings/config/interface/default.nix | 0 .../userSettings/config/languages/default.nix | 0 .../userSettings/config/lsp/default.nix | 0 .../userSettings/config/misc/default.nix | 0 .../userSettings/config/terminal/default.nix | 0 .../userSettings/config/theme/default.nix | 0 .../code/zed/config/userSettings/default.nix | 0 .../modules/gui/apps/code/zed/default.nix | 0 .../home/modules/gui/apps}/default.nix | 0 .../modules/gui/apps/emulators}/default.nix | 0 .../emulators/ghostty/config/settings.nix | 0 .../apps/emulators/ghostty/config/themes.nix | 0 .../gui/apps/emulators/ghostty/default.nix | 0 .../gui/apps/emulators/kitty/default.nix | 0 .../emulators/wezterm/config/extraConfig.nix | 0 .../gui/apps/emulators/wezterm/default.nix | 0 .../home/modules/gui/apps/gaming}/default.nix | 0 .../gui/apps/gaming/heroic/default.nix | 0 .../gui/apps/gaming/lutris/default.nix | 0 .../gui/apps/gaming/prismLauncher/default.nix | 0 .../modules/gui/apps/gaming/steam/default.nix | 0 .../gui/apps/gaming/steam/steam_dev.cfg | 0 .../gui/apps/media/3d/blender/default.nix | 0 .../modules/gui/apps/media/3d}/default.nix | 0 .../gui/apps/media/3d/sweetHome/default.nix | 0 .../audioMetadata/beets/default.nix | 0 .../audioEditing/audioMetadata}/default.nix | 0 .../audioMetadata/kid3/default.nix | 0 .../audioMetadata/mp3Gain/default.nix | 0 .../audioMetadata/puddleTag/default.nix | 0 .../audioEditing/audioProduction}/default.nix | 0 .../audioProduction/reaper/default.nix | 0 .../media/audio/audioEditing}/default.nix | 0 .../media/audio/audioPlaying}/default.nix | 0 .../audio/audioPlaying/feishin/default.nix | 0 .../audio/audioPlaying/spotify/default.nix | 0 .../modules/gui/apps/media/audio}/default.nix | 0 .../home/modules/gui/apps/media}/default.nix | 0 .../modules/gui/apps/media/docs}/default.nix | 0 .../apps/media/docs/docEditing}/default.nix | 0 .../docs/docEditing/libreOffice/default.nix | 0 .../media/docs/docEditing/logseq/default.nix | 0 .../docs/docEditing/obsidian/default.nix | 0 .../docs/docEditing/wpsOffice/default.nix | 0 .../apps/media/docs/docViewing}/default.nix | 0 .../media/docs/docViewing/okular/default.nix | 0 .../gui/apps/media/images}/default.nix | 0 .../images/imageEditing/blender/default.nix | 0 .../images/imageEditing/darktable/default.nix | 0 .../media/images/imageEditing}/default.nix | 0 .../images/imageEditing/gimp/default.nix | 0 .../images/imageEditing/inkscape/default.nix | 0 .../imageEditing/kolourPaint/default.nix | 0 .../images/imageEditing/krita/default.nix | 0 .../media/images/imageViewing}/default.nix | 0 .../images/imageViewing/gwenview/default.nix | 0 .../images/imageViewing/nomacs/default.nix | 0 .../gui/apps/media/llms/alpaca/default.nix | 0 .../modules/gui/apps/media/llms}/default.nix | 0 .../gui/apps/media/llms/oterm/default.nix | 0 .../modules/gui/apps/media/video}/default.nix | 0 .../video/videoEditing/daVinci/default.nix | 0 .../media/video/videoEditing}/default.nix | 0 .../video/videoEditing/kdenlive/default.nix | 0 .../video/videoEditing/obsStudio/default.nix | 0 .../themes/Catppuccin Frappe (compact).qss | 0 .../obsStudio/themes/Catppuccin Frappe.qss | 0 .../themes/Catppuccin Latte (compact).qss | 0 .../obsStudio/themes/Catppuccin Latte.qss | 0 .../themes/Catppuccin Macchiato (compact).qss | 0 .../obsStudio/themes/Catppuccin Macchiato.qss | 0 .../themes/Catppuccin Mocha (compact).qss | 0 .../obsStudio/themes/Catppuccin Mocha.qss | 0 .../themes/Catppuccin/Dark/alert.svg | 0 .../Catppuccin/Dark/checkbox_checked.svg | 0 .../Dark/checkbox_checked_disabled.svg | 0 .../Dark/checkbox_checked_focus.svg | 0 .../Catppuccin/Dark/checkbox_unchecked.svg | 0 .../Dark/checkbox_unchecked_disabled.svg | 0 .../Dark/checkbox_unchecked_focus.svg | 0 .../themes/Catppuccin/Dark/close.svg | 0 .../obsStudio/themes/Catppuccin/Dark/cogs.svg | 0 .../themes/Catppuccin/Dark/collapse.svg | 0 .../themes/Catppuccin/Dark/dots-vert.svg | 0 .../obsStudio/themes/Catppuccin/Dark/dots.svg | 0 .../obsStudio/themes/Catppuccin/Dark/down.svg | 0 .../themes/Catppuccin/Dark/entry-clear.svg | 0 .../themes/Catppuccin/Dark/expand.svg | 0 .../themes/Catppuccin/Dark/filter.svg | 0 .../themes/Catppuccin/Dark/interact.svg | 0 .../obsStudio/themes/Catppuccin/Dark/left.svg | 0 .../themes/Catppuccin/Dark/locked.svg | 0 .../themes/Catppuccin/Dark/media-pause.svg | 0 .../Catppuccin/Dark/media/media_next.svg | 0 .../Catppuccin/Dark/media/media_pause.svg | 0 .../Catppuccin/Dark/media/media_play.svg | 0 .../Catppuccin/Dark/media/media_previous.svg | 0 .../Catppuccin/Dark/media/media_restart.svg | 0 .../Catppuccin/Dark/media/media_stop.svg | 0 .../themes/Catppuccin/Dark/minus.svg | 0 .../obsStudio/themes/Catppuccin/Dark/mute.svg | 0 .../themes/Catppuccin/Dark/no_sources.svg | 0 .../obsStudio/themes/Catppuccin/Dark/plus.svg | 0 .../themes/Catppuccin/Dark/popout.svg | 0 .../themes/Catppuccin/Dark/refresh.svg | 0 .../themes/Catppuccin/Dark/revert.svg | 0 .../themes/Catppuccin/Dark/right.svg | 0 .../obsStudio/themes/Catppuccin/Dark/save.svg | 0 .../Dark/settings/accessibility.svg | 0 .../Catppuccin/Dark/settings/advanced.svg | 0 .../themes/Catppuccin/Dark/settings/audio.svg | 0 .../Catppuccin/Dark/settings/general.svg | 0 .../Catppuccin/Dark/settings/hotkeys.svg | 0 .../Catppuccin/Dark/settings/output.svg | 0 .../Catppuccin/Dark/settings/stream.svg | 0 .../themes/Catppuccin/Dark/settings/video.svg | 0 .../themes/Catppuccin/Dark/sources/brush.svg | 0 .../themes/Catppuccin/Dark/sources/camera.svg | 0 .../Catppuccin/Dark/sources/default.svg | 0 .../Catppuccin/Dark/sources/gamepad.svg | 0 .../themes/Catppuccin/Dark/sources/globe.svg | 0 .../themes/Catppuccin/Dark/sources/group.svg | 0 .../themes/Catppuccin/Dark/sources/image.svg | 0 .../themes/Catppuccin/Dark/sources/media.svg | 0 .../Catppuccin/Dark/sources/microphone.svg | 0 .../themes/Catppuccin/Dark/sources/scene.svg | 0 .../Catppuccin/Dark/sources/slideshow.svg | 0 .../themes/Catppuccin/Dark/sources/text.svg | 0 .../themes/Catppuccin/Dark/sources/window.svg | 0 .../Catppuccin/Dark/sources/windowaudio.svg | 0 .../themes/Catppuccin/Dark/trash.svg | 0 .../obsStudio/themes/Catppuccin/Dark/up.svg | 0 .../themes/Catppuccin/Dark/updown.svg | 0 .../themes/Catppuccin/Dark/visible.svg | 0 .../themes/Catppuccin/Light/alert.svg | 0 .../Catppuccin/Light/checkbox_checked.svg | 0 .../Light/checkbox_checked_disabled.svg | 0 .../Light/checkbox_checked_focus.svg | 0 .../Catppuccin/Light/checkbox_unchecked.svg | 0 .../Light/checkbox_unchecked_disabled.svg | 0 .../Light/checkbox_unchecked_focus.svg | 0 .../themes/Catppuccin/Light/close.svg | 0 .../themes/Catppuccin/Light/cogs.svg | 0 .../themes/Catppuccin/Light/collapse.svg | 0 .../themes/Catppuccin/Light/dots-vert.svg | 0 .../themes/Catppuccin/Light/dots.svg | 0 .../themes/Catppuccin/Light/down.svg | 0 .../themes/Catppuccin/Light/entry-clear.svg | 0 .../themes/Catppuccin/Light/expand.svg | 0 .../themes/Catppuccin/Light/filter.svg | 0 .../themes/Catppuccin/Light/interact.svg | 0 .../themes/Catppuccin/Light/left.svg | 0 .../themes/Catppuccin/Light/locked.svg | 0 .../themes/Catppuccin/Light/media-pause.svg | 0 .../Catppuccin/Light/media/media_next.svg | 0 .../Catppuccin/Light/media/media_pause.svg | 0 .../Catppuccin/Light/media/media_play.svg | 0 .../Catppuccin/Light/media/media_previous.svg | 0 .../Catppuccin/Light/media/media_restart.svg | 0 .../Catppuccin/Light/media/media_stop.svg | 0 .../themes/Catppuccin/Light/minus.svg | 0 .../themes/Catppuccin/Light/mute.svg | 0 .../themes/Catppuccin/Light/no_sources.svg | 0 .../themes/Catppuccin/Light/plus.svg | 0 .../themes/Catppuccin/Light/popout.svg | 0 .../themes/Catppuccin/Light/refresh.svg | 0 .../themes/Catppuccin/Light/revert.svg | 0 .../themes/Catppuccin/Light/right.svg | 0 .../themes/Catppuccin/Light/save.svg | 0 .../Light/settings/accessibility.svg | 0 .../Catppuccin/Light/settings/advanced.svg | 0 .../Catppuccin/Light/settings/audio.svg | 0 .../Catppuccin/Light/settings/general.svg | 0 .../Catppuccin/Light/settings/hotkeys.svg | 0 .../Catppuccin/Light/settings/output.svg | 0 .../Catppuccin/Light/settings/stream.svg | 0 .../Catppuccin/Light/settings/video.svg | 0 .../themes/Catppuccin/Light/sources/brush.svg | 0 .../Catppuccin/Light/sources/camera.svg | 0 .../Catppuccin/Light/sources/default.svg | 0 .../Catppuccin/Light/sources/gamepad.svg | 0 .../themes/Catppuccin/Light/sources/globe.svg | 0 .../themes/Catppuccin/Light/sources/group.svg | 0 .../themes/Catppuccin/Light/sources/image.svg | 0 .../themes/Catppuccin/Light/sources/media.svg | 0 .../Catppuccin/Light/sources/microphone.svg | 0 .../themes/Catppuccin/Light/sources/scene.svg | 0 .../Catppuccin/Light/sources/slideshow.svg | 0 .../themes/Catppuccin/Light/sources/text.svg | 0 .../Catppuccin/Light/sources/window.svg | 0 .../Catppuccin/Light/sources/windowaudio.svg | 0 .../themes/Catppuccin/Light/trash.svg | 0 .../obsStudio/themes/Catppuccin/Light/up.svg | 0 .../themes/Catppuccin/Light/updown.svg | 0 .../themes/Catppuccin/Light/visible.svg | 0 .../video/videoEditing/shotcut/default.nix | 0 .../media/video/videoPlaying}/default.nix | 0 .../videoPlaying/freetube/config/settings.nix | 0 .../video/videoPlaying/freetube/default.nix | 0 .../video/videoPlaying/jellyfin/default.nix | 0 .../media/video/videoPlaying/mpv/default.nix | 0 .../video/videoPlaying/stremio/default.nix | 0 .../video/videoPlaying/syncplay/default.nix | 0 .../media/video/videoPlaying/vlc/default.nix | 0 .../modules/gui/apps/messaging}/default.nix | 0 .../gui/apps/messaging/discord}/default.nix | 0 .../discord/discordCanary/default.nix | 0 .../discord/discordOfficial/default.nix | 0 .../messaging/discord/vesktop/default.nix | 0 .../messaging/discord/webcord/default.nix | 0 .../gui/apps/messaging/matrix}/default.nix | 0 .../apps/messaging/matrix/element/default.nix | 0 .../apps/messaging/matrix/nheko/default.nix | 0 .../gui/apps/messaging/signal/default.nix | 0 .../gui/apps/messaging/slack/default.nix | 0 .../gui/apps/messaging/tdesktop/default.nix | 0 .../gui/apps/messaging/teams/default.nix | 0 .../gui/apps/messaging/whatsApp/default.nix | 0 .../gui/apps/messaging/zoom/default.nix | 0 .../modules/gui/apps/sharing}/default.nix | 0 .../gui/apps/sharing/nicotinePlus/default.nix | 0 .../qBittorrent/catppuccin-macchiato.qbtheme | Bin .../gui/apps/sharing/qBittorrent/default.nix | 0 .../gui/apps/sharing/soulseekQt/default.nix | 0 .../gui/apps/tools/bitwarden/default.nix | 0 .../gui/apps/tools/celeste/default.nix | 0 .../home/modules/gui/apps/tools}/default.nix | 0 .../gui/apps/tools/deskreen/default.nix | 0 .../gui/apps/tools/droidCam/default.nix | 0 .../modules/gui/apps/tools/emote/default.nix | 0 .../gui/apps/tools/flameshot/default.nix | 0 .../apps/tools/gnomeCalculator/default.nix | 0 .../modules/gui/apps/tools/ledger/default.nix | 0 .../gui/apps/tools/mullvad/default.nix | 0 .../gui/apps/tools/openRgb/default.nix | 0 .../gui/apps/tools/openTablet/default.nix | 0 .../modules/gui/apps/tools/scrcpy/default.nix | 0 .../gui/apps/tools/synologyDrive/default.nix | 0 .../gui/apps/tools/usbImager/default.nix | 0 .../gui/apps/tools/virtManager/default.nix | 0 .../home/modules/gui}/default.nix | 0 .../home/modules/gui/desktop}/default.nix | 0 .../modules/gui/desktop/gnome/default.nix | 0 .../modules/gui/desktop/hypr}/default.nix | 0 .../desktop/hypr/idle}/config/settings.nix | 0 .../gui/desktop/hypr/idle}/default.nix | 0 .../desktop/hypr/land}/config/animations.nix | 0 .../gui/desktop/hypr/land}/config/bind.nix | 0 .../gui/desktop/hypr/land}/config/bindl.nix | 0 .../gui/desktop/hypr/land}/config/bindm.nix | 0 .../gui/desktop/hypr/land}/config/binds.nix | 0 .../desktop/hypr/land}/config/decoration.nix | 0 .../gui/desktop/hypr/land}/config/dwindle.nix | 0 .../desktop/hypr/land}/config/exec-once.nix | 0 .../gui/desktop/hypr/land}/config/general.nix | 0 .../gui/desktop/hypr/land}/config/input.nix | 0 .../gui/desktop/hypr/land}/config/misc.nix | 0 .../hypr/land}/config/windowrulev2.nix | 0 .../desktop/hypr/land}/config/xwayland.nix | 0 .../gui/desktop/hypr/land}/default.nix | 0 .../modules/gui/desktop/river/config/map.nix | 12 +- .../gui/desktop/river/config/spawn.nix | 0 .../modules/gui/desktop/river/default.nix | 0 .../modules/gui/desktop/theming}/default.nix | 0 .../theming/gtk/config/cursorTheme.nix | 0 .../gui/desktop/theming/gtk/config/gtk3.nix | 0 .../desktop/theming/gtk/config/homeCursor.nix | 0 .../desktop/theming/gtk/config/iconTheme.nix | 0 .../gui/desktop/theming/gtk/config/theme.nix | 0 .../gui/desktop/theming/gtk/default.nix | 0 .../gui/desktop/theming/qt/default.nix | 0 .../modules/gui/desktop/wayland}/default.nix | 0 .../desktop/wayland/dunst/config/settings.nix | 0 .../gui/desktop/wayland/dunst/default.nix | 0 .../desktop/wayland/easyEffects/default.nix | 0 .../gui/desktop/wayland/gammastep/default.nix | 0 .../gui/desktop/wayland/network/default.nix | 0 .../gui/desktop/wayland/nwgLook/default.nix | 0 .../gui/desktop/wayland/plasmaNm/default.nix | 0 .../wayland/swaylock/config/settings.nix | 0 .../gui/desktop/wayland/swaylock/default.nix | 0 .../desktop/wayland/tofi/config/settings.nix | 0 .../gui/desktop/wayland/tofi/default.nix | 0 .../gui/desktop/wayland/udiskie/default.nix | 0 .../gui/desktop/wayland/wallet/default.nix | 0 .../waybar/config/scripts/get_weather.sh | 0 .../wayland/waybar/config/settings.nix | 0 .../desktop/wayland/waybar/config/style.nix | 0 .../gui/desktop/wayland/waybar/default.nix | 0 .../desktop/wayland/wlClipboard/default.nix | 0 .../gui/desktop/wayland/wpaperd/default.nix | 0 .../wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg | Bin .../wayland/wpaperd/wallpaper/pinksky.png | Bin .../wpaperd/wallpaper/u6ne2q214dx71.jpg | Bin .../wpaperd/wallpaper/wallhaven-0wj757.jpg | Bin .../wpaperd/wallpaper/wallhaven-2ege2g.jpg | Bin .../wpaperd/wallpaper/wallhaven-4dj2qo.png | Bin .../wpaperd/wallpaper/wallhaven-4xq6vv.png | Bin .../wpaperd/wallpaper/wallhaven-5dyvy3.jpg | Bin .../wpaperd/wallpaper/wallhaven-735xv3.jpg | Bin .../wpaperd/wallpaper/wallhaven-8xe25y.jpg | Bin .../wpaperd/wallpaper/wallhaven-g8ky73.jpg | Bin .../wpaperd/wallpaper/wallhaven-j8wzvp.jpg | Bin .../wpaperd/wallpaper/wallhaven-nekxjk.png | Bin .../wpaperd/wallpaper/wallhaven-nryz87.jpg | Bin .../wpaperd/wallpaper/wallhaven-r7yey1.jpg | Bin .../wpaperd/wallpaper/wallhaven-vge32m.jpg | Bin .../wpaperd/wallpaper/wallhaven-vgxgem.jpg | Bin .../wallpaperflare.com_wallpaper (1).jpg | Bin .../wallpaperflare.com_wallpaper (10).jpg | Bin .../wallpaperflare.com_wallpaper (11).jpg | Bin .../wallpaperflare.com_wallpaper (12).jpg | Bin .../wallpaperflare.com_wallpaper (13).jpg | Bin .../wallpaperflare.com_wallpaper (14).jpg | Bin .../wallpaperflare.com_wallpaper (15).jpg | Bin .../wallpaperflare.com_wallpaper (16).jpg | Bin .../wallpaperflare.com_wallpaper (17).jpg | Bin .../wallpaperflare.com_wallpaper (19).jpg | Bin .../wallpaperflare.com_wallpaper (2).jpg | Bin .../wallpaperflare.com_wallpaper (20).jpg | Bin .../wallpaperflare.com_wallpaper (21).jpg | Bin .../wallpaperflare.com_wallpaper (22).jpg | Bin .../wallpaperflare.com_wallpaper (23).jpg | Bin .../wallpaperflare.com_wallpaper (24).jpg | Bin .../wallpaperflare.com_wallpaper (26).jpg | Bin .../wallpaperflare.com_wallpaper (27).jpg | Bin .../wallpaperflare.com_wallpaper (28).jpg | Bin .../wallpaperflare.com_wallpaper (29).jpg | Bin .../wallpaperflare.com_wallpaper (3).jpg | Bin .../wallpaperflare.com_wallpaper (30).jpg | Bin .../wallpaperflare.com_wallpaper (31).jpg | Bin .../wallpaperflare.com_wallpaper (32).jpg | Bin .../wallpaperflare.com_wallpaper (34).jpg | Bin .../wallpaperflare.com_wallpaper (35).jpg | Bin .../wallpaperflare.com_wallpaper (37).jpg | Bin .../wallpaperflare.com_wallpaper (38).jpg | Bin .../wallpaperflare.com_wallpaper (4).jpg | Bin .../wallpaperflare.com_wallpaper (5).jpg | Bin .../wallpaperflare.com_wallpaper (6).jpg | Bin .../wallpaperflare.com_wallpaper (7).jpg | Bin .../wallpaperflare.com_wallpaper (8).jpg | Bin .../wallpaperflare.com_wallpaper (9).jpg | Bin .../wallpaperflare.com_wallpaper.jpg | Bin {nixos => modules/nixos}/default.nix | 4 +- .../nixos}/modules/core/accounts/default.nix | 0 .../nixos/modules/core}/default.nix | 0 .../nixos}/modules/core/doas/default.nix | 0 .../modules/core/environment/default.nix | 0 .../nixos}/modules/core/flatpak/default.nix | 0 .../nixos}/modules/core/fonts/default.nix | 0 .../modules/core/homeManager/default.nix | 0 .../nixos}/modules/core/locale/default.nix | 0 .../nixos}/modules/core/nh/default.nix | 0 .../nixos}/modules/core/nix/default.nix | 0 .../nixos}/modules/core/rsync/default.nix | 0 .../nixos}/modules/core/ssh/default.nix | 0 .../nixos}/modules/core/sysStat/default.nix | 0 .../nixos}/modules/core/system/default.nix | 0 .../nixos/modules}/default.nix | 0 .../nixos/modules/desktop/cosmic/default.nix | 16 ++ .../nixos/modules/desktop}/default.nix | 0 .../nixos}/modules/desktop/gnome/default.nix | 0 .../nixos/modules/desktop/hypr}/default.nix | 0 .../modules/desktop/hypr/idle/default.nix | 0 .../modules/desktop/hypr/land/default.nix | 0 .../nixos}/modules/desktop/plasma/default.nix | 0 .../nixos}/modules/desktop/river/default.nix | 0 .../nixos}/modules/desktop/sddm/default.nix | 0 .../modules/desktop/wayland}/default.nix | 0 .../desktop/wayland/geoclue2/default.nix | 0 .../desktop/wayland/greetd/default.nix | 0 .../desktop/wayland/network/default.nix | 0 .../desktop/wayland/regreet/default.nix | 0 .../desktop/wayland/swaylock/default.nix | 0 .../desktop/wayland/thunar/default.nix | 0 .../desktop/wayland/wayland/default.nix | 0 .../modules/desktop/xserver/default.nix | 0 .../modules/hardware/android/default.nix | 0 .../nixos}/modules/hardware/audio/default.nix | 0 .../modules/hardware/bluetooth/default.nix | 0 .../nixos/modules/hardware}/default.nix | 0 .../modules/hardware/printing/default.nix | 0 .../modules/hardware/tablet/default.nix | 0 .../modules/programs/coreCtrl/default.nix | 0 .../nixos/modules/programs}/default.nix | 0 .../nixos}/modules/programs/disks/default.nix | 0 .../modules/programs/firejail/default.nix | 0 .../nixos}/modules/programs/steam/default.nix | 0 .../modules/programs/virtManager/default.nix | 0 .../nixos}/modules/services/acme/default.nix | 0 .../nixos}/modules/services/caddy/default.nix | 0 modules/nixos/modules/services/default.nix | 10 ++ .../modules/services/forgejo/default.nix | 0 .../modules/services/hLedger/default.nix | 0 .../modules/services/jellyfin/default.nix | 0 .../modules/services/logrotate/default.nix | 0 .../services/mastodon/config/chars.patch | 0 .../services/mastodon/config/twitter.txt | 0 .../modules/services/mastodon/default.nix | 0 .../modules/services/minecraft/default.nix | 0 .../modules/services/mullvad/default.nix | 0 .../modules/services/nextcloud/default.nix | 0 .../modules/services/ollama/default.nix | 0 .../modules/services/owncast/default.nix | 0 .../modules/services/peertube/default.nix | 0 .../modules/services/postgresql/default.nix | 0 .../nixos}/modules/services/samba/default.nix | 0 .../modules/services/syncthing/default.nix | 0 .../modules/services/vaultwarden/default.nix | 0 .../modules/services/website/default.nix | 0 .../nixos}/modules/sops/default.nix | 2 +- 643 files changed, 323 insertions(+), 195 deletions(-) delete mode 100755 config/devices/default.nix rename {config => modules/config}/default.nix (100%) rename {config => modules/config}/devices/config/bartholomew.nix (100%) rename {config => modules/config}/devices/config/desktop.nix (100%) rename {config => modules/config}/devices/config/fallaryn.nix (100%) rename {config => modules/config}/devices/config/laptop.nix (100%) rename {config => modules/config}/devices/config/phone.nix (100%) rename {config => modules/config}/devices/config/printers/printer0.nix (60%) rename {config => modules/config}/devices/config/printers/printer1.nix (64%) rename {config => modules/config}/devices/config/server.nix (100%) rename {config => modules/config}/devices/config/synology.nix (100%) rename {config => modules/config}/devices/config/tablet.nix (100%) create mode 100755 modules/config/devices/default.nix rename {config => modules/config}/instances/config/acme.nix (76%) rename {config => modules/config}/instances/config/caddy.nix (76%) rename {config => modules/config}/instances/config/forgejo.nix (100%) rename {config => modules/config}/instances/config/jellyfin.nix (89%) rename {config => modules/config}/instances/config/mastodon.nix (100%) rename {config => modules/config}/instances/config/matrix.nix (82%) rename {config => modules/config}/instances/config/minecraft.nix (88%) rename {config => modules/config}/instances/config/nextcloud.nix (88%) rename {config => modules/config}/instances/config/ollama.nix (89%) rename {config => modules/config}/instances/config/owncast.nix (90%) rename {config => modules/config}/instances/config/peertube.nix (91%) rename {config => modules/config}/instances/config/postfix.nix (100%) rename {config => modules/config}/instances/config/postgresql.nix (82%) rename {config => modules/config}/instances/config/samba.nix (84%) rename {config => modules/config}/instances/config/smtp.nix (100%) rename {config => modules/config}/instances/config/syncthing.nix (88%) rename {config => modules/config}/instances/config/synology.nix (78%) rename {config => modules/config}/instances/config/upRootNutrition.nix (89%) rename {config => modules/config}/instances/config/vaultwarden.nix (90%) rename {config => modules/config}/instances/config/web.nix (84%) rename {config => modules/config}/instances/default.nix (100%) rename {config => modules/config}/themes/default.nix (100%) rename {config => modules/config}/themes/palettes/brogrammer/default.nix (100%) rename {config => modules/config}/themes/palettes/catppuccin/frappe/default.nix (100%) rename {config => modules/config}/themes/palettes/catppuccin/latte/default.nix (100%) rename {config => modules/config}/themes/palettes/catppuccin/macchiato/default.nix (100%) rename {config => modules/config}/themes/palettes/catppuccin/mocha/default.nix (100%) rename {config => modules/config}/themes/palettes/chalk/default.nix (100%) rename {config => modules/config}/themes/palettes/deep-oceanic-next/default.nix (100%) rename {config => modules/config}/themes/palettes/dracula/default.nix (100%) rename {config => modules/config}/themes/palettes/espresso/default.nix (100%) rename {config => modules/config}/themes/palettes/flat/default.nix (100%) rename {config => modules/config}/themes/palettes/framer/default.nix (100%) rename {config => modules/config}/themes/palettes/github/default.nix (100%) rename {config => modules/config}/themes/palettes/hardcore/default.nix (100%) rename {config => modules/config}/themes/palettes/one/black/default.nix (100%) rename {config => modules/config}/themes/palettes/one/dark/default.nix (100%) rename {config => modules/config}/themes/palettes/one/light/default.nix (100%) rename {config => modules/config}/themes/palettes/sparky/default.nix (100%) rename {config => modules/config}/users/config/user0.nix (96%) rename {config => modules/config}/users/config/user1.nix (89%) rename {config => modules/config}/users/config/user2.nix (100%) rename {config => modules/config}/users/default.nix (100%) rename {home/modules/cli/android => modules}/default.nix (100%) rename {home => modules/home}/default.nix (99%) rename {home => modules/home}/modules/cli/android/androidFileTransfer/default.nix (100%) rename {home => modules/home}/modules/cli/android/androidTools/default.nix (100%) rename {home/modules/cli => modules/home/modules/cli/android}/default.nix (100%) rename {home => modules/home}/modules/cli/android/simpleMtpfs/default.nix (100%) rename {home/modules/cli/development => modules/home/modules/cli}/default.nix (100%) rename {home/modules/cli/development/editing => modules/home/modules/cli/development}/default.nix (100%) rename {home/modules/cli/development/tooling => modules/home/modules/cli/development/editing}/default.nix (100%) rename {home => modules/home}/modules/cli/development/editing/helix/config/languages.nix (100%) rename {home => modules/home}/modules/cli/development/editing/helix/config/settings.nix (100%) rename {home => modules/home}/modules/cli/development/editing/helix/default.nix (100%) rename {home => modules/home}/modules/cli/development/editing/neovim/default.nix (100%) rename {home/modules/cli/development/versioning => modules/home/modules/cli/development/tooling}/default.nix (100%) rename {home => modules/home}/modules/cli/development/tooling/elm/default.nix (100%) rename {home => modules/home}/modules/cli/development/tooling/javascript/default.nix (100%) rename {home/modules/cli/files => modules/home/modules/cli/development/versioning}/default.nix (100%) rename {home => modules/home}/modules/cli/development/versioning/git/default.nix (100%) rename {home => modules/home}/modules/cli/development/versioning/lazygit/default.nix (100%) rename {home/modules/cli/fun => modules/home/modules/cli/files}/default.nix (100%) rename {home => modules/home}/modules/cli/files/fileRoller/default.nix (100%) rename {home => modules/home}/modules/cli/files/ncdu/default.nix (100%) rename {home => modules/home}/modules/cli/files/samba/default.nix (100%) rename {home => modules/home}/modules/cli/files/unrar/default.nix (100%) rename {home => modules/home}/modules/cli/files/unzip/default.nix (100%) rename {home => modules/home}/modules/cli/files/yazi/config/keymap.nix (100%) rename {home => modules/home}/modules/cli/files/yazi/config/settings.nix (100%) rename {home => modules/home}/modules/cli/files/yazi/default.nix (100%) rename {home => modules/home}/modules/cli/files/zip/default.nix (100%) rename {home => modules/home}/modules/cli/fun/aniCli/default.nix (100%) rename {home/modules/cli/shell => modules/home/modules/cli/fun}/default.nix (100%) rename {home => modules/home}/modules/cli/fun/fastFetch/config/settings.nix (100%) rename {home => modules/home}/modules/cli/fun/fastFetch/default.nix (100%) rename {home => modules/home}/modules/cli/fun/libgenCli/default.nix (100%) rename {home => modules/home}/modules/cli/fun/nyanCat/default.nix (100%) rename {home => modules/home}/modules/cli/fun/yaBridge/default.nix (100%) rename {home => modules/home}/modules/cli/fun/yt-dlp/config/extraConfig.nix (100%) rename {home => modules/home}/modules/cli/fun/yt-dlp/config/settings.nix (100%) rename {home => modules/home}/modules/cli/fun/yt-dlp/default.nix (100%) rename {home/modules/cli/utilities => modules/home/modules/cli/shell}/default.nix (100%) rename {home => modules/home}/modules/cli/shell/nushell/default.nix (100%) rename {home => modules/home}/modules/cli/shell/starship/config/settings.nix (100%) rename {home => modules/home}/modules/cli/shell/starship/default.nix (100%) rename {home => modules/home}/modules/cli/shell/zellij/default.nix (100%) rename {home => modules/home}/modules/cli/shell/zoxide/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/alsaUtils/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/bottom/config/settings.nix (100%) rename {home => modules/home}/modules/cli/utilities/bottom/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/brightnessCtl/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/cifsUtils/default.nix (100%) rename {home/modules => modules/home/modules/cli/utilities}/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/direnv/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/ffmpeg/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/flac/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/gLib/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/hardInfo/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/homeManager/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/inetUtils/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/libnatpmp/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/paMixer/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/parted/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/pciUtils/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/pinEntry/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/playerCtl/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/protonVpn/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/speedTest/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/sshfs/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/tokei/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/tomb/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/wget/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/wine/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/xdgUtils/default.nix (100%) rename {home => modules/home}/modules/cli/utilities/xdoTool/default.nix (100%) rename {home/modules/gui/apps/browsers => modules/home/modules}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/brave/config/extensions.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/brave/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/braveNix/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/chrome/default.nix (100%) rename {home/modules/gui/apps/code => modules/home/modules/gui/apps/browsers}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/edge/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/epiphany/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/bookmarks/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/extensions/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/academic.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/development.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/gaming.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/hidden.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/13.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/al.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/am.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/br.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/cr.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/dn.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/do.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/fy.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/ha.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/ho.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/ka.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/ki.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/me.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/ne.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/nx.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/pd.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/ph.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/pi.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/re.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/rz.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/sb.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/sc.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/sd.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/sk.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/tl.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/tw.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/ur.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/vs.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/wi.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/xh.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/xv.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/icons/yo.png (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/shopping.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/socialMedia.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/spank.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/tools.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/tracking.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/config/web.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/search/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/formFill.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/geolocation.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/hardening.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/https.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/misc.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/noTouching.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/opSec.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/outbound.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/passwords.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/privacy.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/proxy.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/startup.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/config/telemetry.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/settings/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/config/themes/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefox/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/firefoxNix/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/ladybird/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/opera/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/tor/default.nix (100%) rename {home => modules/home}/modules/gui/apps/browsers/vivaldi/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/cursor/default.nix (100%) rename {home/modules/gui/apps => modules/home/modules/gui/apps/code}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/vsCode/config/extensions.nix (100%) rename {home => modules/home}/modules/gui/apps/code/vsCode/config/keybindings.nix (100%) rename {home => modules/home}/modules/gui/apps/code/vsCode/config/userSettings.nix (100%) rename {home => modules/home}/modules/gui/apps/code/vsCode/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/extensions/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/extraPackages/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/userKeymaps/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/userSettings/config/assistant/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/userSettings/config/git/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/userSettings/config/interface/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/userSettings/config/languages/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/userSettings/config/lsp/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/userSettings/config/misc/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/userSettings/config/terminal/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/userSettings/config/theme/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/config/userSettings/default.nix (100%) rename {home => modules/home}/modules/gui/apps/code/zed/default.nix (100%) rename {home/modules/gui/apps/emulators => modules/home/modules/gui/apps}/default.nix (100%) rename {home/modules/gui/apps/gaming => modules/home/modules/gui/apps/emulators}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/emulators/ghostty/config/settings.nix (100%) rename {home => modules/home}/modules/gui/apps/emulators/ghostty/config/themes.nix (100%) rename {home => modules/home}/modules/gui/apps/emulators/ghostty/default.nix (100%) rename {home => modules/home}/modules/gui/apps/emulators/kitty/default.nix (100%) rename {home => modules/home}/modules/gui/apps/emulators/wezterm/config/extraConfig.nix (100%) rename {home => modules/home}/modules/gui/apps/emulators/wezterm/default.nix (100%) rename {home/modules/gui/apps/media/3d => modules/home/modules/gui/apps/gaming}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/gaming/heroic/default.nix (100%) rename {home => modules/home}/modules/gui/apps/gaming/lutris/default.nix (100%) rename {home => modules/home}/modules/gui/apps/gaming/prismLauncher/default.nix (100%) rename {home => modules/home}/modules/gui/apps/gaming/steam/default.nix (100%) rename {home => modules/home}/modules/gui/apps/gaming/steam/steam_dev.cfg (100%) rename {home => modules/home}/modules/gui/apps/media/3d/blender/default.nix (100%) rename {home/modules/gui/apps/media/audio/audioEditing/audioMetadata => modules/home/modules/gui/apps/media/3d}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/3d/sweetHome/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/audio/audioEditing/audioMetadata/beets/default.nix (100%) rename {home/modules/gui/apps/media/audio/audioEditing/audioProduction => modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/audio/audioEditing/audioMetadata/kid3/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/audio/audioEditing/audioMetadata/mp3Gain/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/audio/audioEditing/audioMetadata/puddleTag/default.nix (100%) rename {home/modules/gui/apps/media/audio/audioEditing => modules/home/modules/gui/apps/media/audio/audioEditing/audioProduction}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/audio/audioEditing/audioProduction/reaper/default.nix (100%) rename {home/modules/gui/apps/media/audio/audioPlaying => modules/home/modules/gui/apps/media/audio/audioEditing}/default.nix (100%) rename {home/modules/gui/apps/media/audio => modules/home/modules/gui/apps/media/audio/audioPlaying}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix (100%) rename {home/modules/gui/apps/media => modules/home/modules/gui/apps/media/audio}/default.nix (100%) rename {home/modules/gui/apps/media/docs => modules/home/modules/gui/apps/media}/default.nix (100%) rename {home/modules/gui/apps/media/docs/docEditing => modules/home/modules/gui/apps/media/docs}/default.nix (100%) rename {home/modules/gui/apps/media/docs/docViewing => modules/home/modules/gui/apps/media/docs/docEditing}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/docs/docEditing/libreOffice/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/docs/docEditing/logseq/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/docs/docEditing/obsidian/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/docs/docEditing/wpsOffice/default.nix (100%) rename {home/modules/gui/apps/media/images => modules/home/modules/gui/apps/media/docs/docViewing}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/docs/docViewing/okular/default.nix (100%) rename {home/modules/gui/apps/media/images/imageEditing => modules/home/modules/gui/apps/media/images}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/images/imageEditing/blender/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/images/imageEditing/darktable/default.nix (100%) rename {home/modules/gui/apps/media/images/imageViewing => modules/home/modules/gui/apps/media/images/imageEditing}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/images/imageEditing/gimp/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/images/imageEditing/inkscape/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/images/imageEditing/krita/default.nix (100%) rename {home/modules/gui/apps/media/llms => modules/home/modules/gui/apps/media/images/imageViewing}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/images/imageViewing/gwenview/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/images/imageViewing/nomacs/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/llms/alpaca/default.nix (100%) rename {home/modules/gui/apps/media/video => modules/home/modules/gui/apps/media/llms}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/llms/oterm/default.nix (100%) rename {home/modules/gui/apps/media/video/videoEditing => modules/home/modules/gui/apps/media/video}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/daVinci/default.nix (100%) rename {home/modules/gui/apps/media/video/videoPlaying => modules/home/modules/gui/apps/media/video/videoEditing}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe (compact).qss (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe.qss (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte (compact).qss (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte.qss (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato (compact).qss (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato.qss (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha (compact).qss (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha.qss (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/alert.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_focus.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/close.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/cogs.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/collapse.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots-vert.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/down.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/entry-clear.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/expand.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/filter.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/interact.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/left.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/locked.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media-pause.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_next.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_pause.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_play.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_previous.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_restart.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_stop.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/minus.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/mute.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/no_sources.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/plus.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/popout.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/refresh.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/revert.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/right.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/save.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/accessibility.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/advanced.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/audio.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/general.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/hotkeys.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/output.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/stream.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/video.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/brush.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/camera.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/default.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/gamepad.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/globe.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/group.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/image.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/media.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/microphone.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/scene.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/slideshow.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/text.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/window.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/windowaudio.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/trash.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/up.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/updown.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/visible.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/alert.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_disabled.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_focus.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/close.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/cogs.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/collapse.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots-vert.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/down.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/entry-clear.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/expand.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/filter.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/interact.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/left.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/locked.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media-pause.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_next.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_pause.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_play.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_previous.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_restart.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_stop.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/minus.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/mute.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/no_sources.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/plus.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/popout.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/refresh.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/revert.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/right.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/save.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/accessibility.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/advanced.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/audio.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/general.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/hotkeys.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/output.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/stream.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/video.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/brush.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/camera.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/default.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/gamepad.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/globe.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/group.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/image.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/media.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/microphone.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/scene.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/slideshow.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/text.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/window.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/windowaudio.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/trash.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/up.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/updown.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/visible.svg (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoEditing/shotcut/default.nix (100%) rename {home/modules/gui/apps/messaging => modules/home/modules/gui/apps/media/video/videoPlaying}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoPlaying/freetube/config/settings.nix (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoPlaying/freetube/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoPlaying/jellyfin/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoPlaying/mpv/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoPlaying/stremio/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix (100%) rename {home => modules/home}/modules/gui/apps/media/video/videoPlaying/vlc/default.nix (100%) rename {home/modules/gui/apps/messaging/discord => modules/home/modules/gui/apps/messaging}/default.nix (100%) rename {home/modules/gui/apps/messaging/matrix => modules/home/modules/gui/apps/messaging/discord}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/discord/discordCanary/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/discord/discordOfficial/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/discord/vesktop/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/discord/webcord/default.nix (100%) rename {home/modules/gui/apps/sharing => modules/home/modules/gui/apps/messaging/matrix}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/matrix/element/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/matrix/nheko/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/signal/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/slack/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/tdesktop/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/teams/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/whatsApp/default.nix (100%) rename {home => modules/home}/modules/gui/apps/messaging/zoom/default.nix (100%) rename {home/modules/gui/apps/tools => modules/home/modules/gui/apps/sharing}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/sharing/nicotinePlus/default.nix (100%) rename {home => modules/home}/modules/gui/apps/sharing/qBittorrent/catppuccin-macchiato.qbtheme (100%) rename {home => modules/home}/modules/gui/apps/sharing/qBittorrent/default.nix (100%) rename {home => modules/home}/modules/gui/apps/sharing/soulseekQt/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/bitwarden/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/celeste/default.nix (100%) rename {home/modules/gui => modules/home/modules/gui/apps/tools}/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/deskreen/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/droidCam/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/emote/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/flameshot/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/gnomeCalculator/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/ledger/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/mullvad/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/openRgb/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/openTablet/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/scrcpy/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/synologyDrive/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/usbImager/default.nix (100%) rename {home => modules/home}/modules/gui/apps/tools/virtManager/default.nix (100%) rename {home/modules/gui/desktop => modules/home/modules/gui}/default.nix (100%) rename {home/modules/gui/desktop/hypr => modules/home/modules/gui/desktop}/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/gnome/default.nix (100%) rename {home/modules/gui/desktop/theming => modules/home/modules/gui/desktop/hypr}/default.nix (100%) rename {home/modules/gui/desktop/hypr/hypridle => modules/home/modules/gui/desktop/hypr/idle}/config/settings.nix (100%) rename {home/modules/gui/desktop/hypr/hypridle => modules/home/modules/gui/desktop/hypr/idle}/default.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/animations.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/bind.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/bindl.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/bindm.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/binds.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/decoration.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/dwindle.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/exec-once.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/general.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/input.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/misc.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/windowrulev2.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/config/xwayland.nix (100%) rename {home/modules/gui/desktop/hypr/hyprland => modules/home/modules/gui/desktop/hypr/land}/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/river/config/map.nix (53%) rename {home => modules/home}/modules/gui/desktop/river/config/spawn.nix (100%) rename {home => modules/home}/modules/gui/desktop/river/default.nix (100%) rename {home/modules/gui/desktop/wayland => modules/home/modules/gui/desktop/theming}/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/theming/gtk/config/cursorTheme.nix (100%) rename {home => modules/home}/modules/gui/desktop/theming/gtk/config/gtk3.nix (100%) rename {home => modules/home}/modules/gui/desktop/theming/gtk/config/homeCursor.nix (100%) rename {home => modules/home}/modules/gui/desktop/theming/gtk/config/iconTheme.nix (100%) rename {home => modules/home}/modules/gui/desktop/theming/gtk/config/theme.nix (100%) rename {home => modules/home}/modules/gui/desktop/theming/gtk/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/theming/qt/default.nix (100%) rename {nixos/modules/core => modules/home/modules/gui/desktop/wayland}/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/dunst/config/settings.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/dunst/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/easyEffects/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/gammastep/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/network/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/nwgLook/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/plasmaNm/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/swaylock/config/settings.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/swaylock/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/tofi/config/settings.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/tofi/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/udiskie/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wallet/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh (100%) rename {home => modules/home}/modules/gui/desktop/wayland/waybar/config/settings.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/waybar/config/style.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/waybar/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wlClipboard/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/default.nix (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg (100%) rename {home => modules/home}/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg (100%) rename {nixos => modules/nixos}/default.nix (100%) mode change 100644 => 100755 rename {nixos => modules/nixos}/modules/core/accounts/default.nix (100%) rename {nixos/modules => modules/nixos/modules/core}/default.nix (100%) rename {nixos => modules/nixos}/modules/core/doas/default.nix (100%) rename {nixos => modules/nixos}/modules/core/environment/default.nix (100%) rename {nixos => modules/nixos}/modules/core/flatpak/default.nix (100%) rename {nixos => modules/nixos}/modules/core/fonts/default.nix (100%) rename {nixos => modules/nixos}/modules/core/homeManager/default.nix (100%) rename {nixos => modules/nixos}/modules/core/locale/default.nix (100%) rename {nixos => modules/nixos}/modules/core/nh/default.nix (100%) rename {nixos => modules/nixos}/modules/core/nix/default.nix (100%) rename {nixos => modules/nixos}/modules/core/rsync/default.nix (100%) rename {nixos => modules/nixos}/modules/core/ssh/default.nix (100%) rename {nixos => modules/nixos}/modules/core/sysStat/default.nix (100%) rename {nixos => modules/nixos}/modules/core/system/default.nix (100%) rename {nixos/modules/desktop => modules/nixos/modules}/default.nix (100%) create mode 100755 modules/nixos/modules/desktop/cosmic/default.nix rename {nixos/modules/desktop/hypr => modules/nixos/modules/desktop}/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/gnome/default.nix (100%) rename {nixos/modules/desktop/wayland => modules/nixos/modules/desktop/hypr}/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/hypr/idle/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/hypr/land/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/plasma/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/river/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/sddm/default.nix (100%) rename {nixos/modules/hardware => modules/nixos/modules/desktop/wayland}/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/wayland/geoclue2/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/wayland/greetd/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/wayland/network/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/wayland/regreet/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/wayland/swaylock/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/wayland/thunar/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/wayland/wayland/default.nix (100%) rename {nixos => modules/nixos}/modules/desktop/xserver/default.nix (100%) rename {nixos => modules/nixos}/modules/hardware/android/default.nix (100%) rename {nixos => modules/nixos}/modules/hardware/audio/default.nix (100%) rename {nixos => modules/nixos}/modules/hardware/bluetooth/default.nix (100%) rename {nixos/modules/programs => modules/nixos/modules/hardware}/default.nix (100%) rename {nixos => modules/nixos}/modules/hardware/printing/default.nix (100%) rename {nixos => modules/nixos}/modules/hardware/tablet/default.nix (100%) rename {nixos => modules/nixos}/modules/programs/coreCtrl/default.nix (100%) rename {nixos/modules/services => modules/nixos/modules/programs}/default.nix (100%) rename {nixos => modules/nixos}/modules/programs/disks/default.nix (100%) rename {nixos => modules/nixos}/modules/programs/firejail/default.nix (100%) rename {nixos => modules/nixos}/modules/programs/steam/default.nix (100%) rename {nixos => modules/nixos}/modules/programs/virtManager/default.nix (100%) rename {nixos => modules/nixos}/modules/services/acme/default.nix (100%) rename {nixos => modules/nixos}/modules/services/caddy/default.nix (100%) create mode 100755 modules/nixos/modules/services/default.nix rename {nixos => modules/nixos}/modules/services/forgejo/default.nix (100%) rename {nixos => modules/nixos}/modules/services/hLedger/default.nix (100%) rename {nixos => modules/nixos}/modules/services/jellyfin/default.nix (100%) rename {nixos => modules/nixos}/modules/services/logrotate/default.nix (100%) rename {nixos => modules/nixos}/modules/services/mastodon/config/chars.patch (100%) rename {nixos => modules/nixos}/modules/services/mastodon/config/twitter.txt (100%) rename {nixos => modules/nixos}/modules/services/mastodon/default.nix (100%) rename {nixos => modules/nixos}/modules/services/minecraft/default.nix (100%) rename {nixos => modules/nixos}/modules/services/mullvad/default.nix (100%) rename {nixos => modules/nixos}/modules/services/nextcloud/default.nix (100%) rename {nixos => modules/nixos}/modules/services/ollama/default.nix (100%) rename {nixos => modules/nixos}/modules/services/owncast/default.nix (100%) rename {nixos => modules/nixos}/modules/services/peertube/default.nix (100%) rename {nixos => modules/nixos}/modules/services/postgresql/default.nix (100%) rename {nixos => modules/nixos}/modules/services/samba/default.nix (100%) rename {nixos => modules/nixos}/modules/services/syncthing/default.nix (100%) rename {nixos => modules/nixos}/modules/services/vaultwarden/default.nix (100%) rename {nixos => modules/nixos}/modules/services/website/default.nix (100%) rename {nixos => modules/nixos}/modules/sops/default.nix (95%) diff --git a/config/devices/default.nix b/config/devices/default.nix deleted file mode 100755 index 28f0f91..0000000 --- a/config/devices/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -let - configPath = ./config; - printerPath = configPath + /printers; - - devicesFunctions = { - ownerWriteOthersReadMask = [ - "fmask=0022" - "dmask=0022" - ]; - ownerExclusiveReadWriteMask = [ - "fmask=0077" - "dmask=0077" - ]; - readWritePermissions = [ - "rw" - ]; - sambaPermissions = [ - "rw" - "gid=100" - "vers=3.0" - "x-systemd.automount" - "x-systemd.requires=network-online.target" - ]; - fileModeAndDirMode = [ - "file_mode=0644" - "dir_mode=0755" - ]; - userIdForUser0 = [ - "uid=1000" - ]; - userIdForUser1 = [ - "uid=1001" - ]; - dummy = [ - ]; - }; - - deviceswithFunctions = builtins.listToAttrs (map (name: { - name = builtins.substring 0 (builtins.stringLength name - 4) name; - value = import (configPath + "/${name}") { - inherit - devicesFunctions - ; - }; - }) - (builtins.filter (name: - builtins.match ".*\\.nix$" name != null) (builtins.attrNames - (builtins.readDir configPath)))); - - devicesPrinters = builtins.listToAttrs (map (name: { - name = builtins.substring 0 (builtins.stringLength name - 4) name; - value = import (printerPath + "/${name}") { - inherit - devicesFunctions - ; - }; - }) - (builtins.filter (name: - builtins.match ".*\\.nix$" name != null) (builtins.attrNames - (builtins.readDir printerPath)))); - - devices = deviceswithFunctions // devicesPrinters; -in { - devices = devices; -} diff --git a/flake.lock b/flake.lock index 9e03233..a1305a7 100755 --- a/flake.lock +++ b/flake.lock @@ -175,6 +175,22 @@ } }, "flake-compat_5": { + "flake": false, + "locked": { + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1696426674, @@ -190,7 +206,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1733328505, @@ -206,7 +222,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_8": { "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -400,11 +416,11 @@ "zig": "zig" }, "locked": { - "lastModified": 1738619868, - "narHash": "sha256-q4h4SY1kVkZG4t/59CmJvaKjlx+xjojhdU1HqxiQhrQ=", + "lastModified": 1738781852, + "narHash": "sha256-fTr3m5Ktg1vWeAbscpYS7BTjOIACXMjkG1xazeRGvAc=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "f0d276062b78658fc1f3857e9ea104788f1f4e58", + "rev": "4eb588501735e2df2910b54ed0dc8ad934b5d42f", "type": "github" }, "original": { @@ -488,11 +504,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1738625866, - "narHash": "sha256-0GibVm6Pfm99Lu5fcH68YGa3jO0zUdoO+V3DqmAcJTc=", + "lastModified": 1738723095, + "narHash": "sha256-5l7ghUJb++dh59VlaZlmAKDoaJgCtT7pCKP87bRNFZE=", "owner": "helix-editor", "repo": "helix", - "rev": "8995ccaae25b1af2e052d0d78ed74e7d225dec5a", + "rev": "b0e1eaf50d01257a743b8508f9eb29b78882c403", "type": "github" }, "original": { @@ -535,11 +551,11 @@ ] }, "locked": { - "lastModified": 1738610386, - "narHash": "sha256-yb6a5efA1e8xze1vcdN2HBxqYr340EsxFMrDUHL3WZM=", + "lastModified": 1738789832, + "narHash": "sha256-HdlMPfObPu5y7oDfH/w3vvlU3UTQ/bQjSULChZARm5M=", "owner": "nix-community", "repo": "home-manager", - "rev": "066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe", + "rev": "30ea6fed4e4b41693cebc2263373dd810de4de49", "type": "github" }, "original": { @@ -624,11 +640,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1738622170, - "narHash": "sha256-M9lm/lbT10cOXcfMMEzRFLehDlVWnkiy38xVDPWyqk4=", + "lastModified": 1738770121, + "narHash": "sha256-A51F7pmZXFrVB1AIhlTPL4cHlgkRKC0ffMs5y9zSazc=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "5e7292434a9189d0550187f8a6fb687848194a41", + "rev": "8a6778f0a087cdfc4bc1d3751b0be2c2bf3322aa", "type": "github" }, "original": { @@ -985,11 +1001,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1738530522, - "narHash": "sha256-6PdmWHiMmUEtDP324tKbHmgwYmeTvJju17DIN49ylqM=", + "lastModified": 1738663672, + "narHash": "sha256-+727mTmrCMOHQwOrAT5Ax4QsR7fQ0oPpAjaRP9sTu5s=", "owner": "ngi-nix", "repo": "ngipkgs", - "rev": "f3fb5a5b58f69fd79f432b7927fad41af5f71f59", + "rev": "d721deaf9a5f0359984dcebeadadfea8ec75081c", "type": "github" }, "original": { @@ -998,6 +1014,26 @@ "type": "github" } }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat_5", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable_3" + }, + "locked": { + "lastModified": 1738805812, + "narHash": "sha256-3wupg+xSzRPUius7y29btqCR2l28GpCjwS9q83uK9uU=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "bbab2cc88af97520259c5575bf29c83bf391424c", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1738422722, @@ -1046,6 +1082,22 @@ "type": "github" } }, + "nixpkgs-stable_3": { + "locked": { + "lastModified": 1738702386, + "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1733229606, @@ -1064,11 +1116,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738546358, - "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=", + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", "type": "github" }, "original": { @@ -1079,6 +1131,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1738680400, + "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "799ba5bffed04ced7067a91798353d360788b30d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1737003892, "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", @@ -1103,11 +1171,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1738362438, - "narHash": "sha256-EO2dVkMVLThWqv4hobEZEZGWBEuH2Z9SYqQDrbLSclU=", + "lastModified": 1738816609, + "narHash": "sha256-y5cbTsuUCMYigHjV9cD9+zcqpwu+oJIUnVtcnCWmIhg=", "owner": "nix-community", "repo": "NUR", - "rev": "95ddad0ff0e67c90314c6ca46324dce5f9a910d2", + "rev": "e853d733b274463ff290f6f756f985406e740f30", "type": "github" }, "original": { @@ -1141,7 +1209,7 @@ }, "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "gitignore": "gitignore_3", "nixpkgs": [ "nixpkgs" @@ -1235,7 +1303,8 @@ "hyprland-portal": "hyprland-portal", "lix-module": "lix-module", "ngipkgs": "ngipkgs", - "nixpkgs": "nixpkgs_2", + "nixos-cosmic": "nixos-cosmic", + "nixpkgs": "nixpkgs_3", "nur": "nur", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "sops-nix": "sops-nix_2", @@ -1537,17 +1606,17 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1738399335, - "narHash": "sha256-OvtDGDUX0P5oz/LzhzeAcGfd6ihlUHPMKR4CZgnScTA=", + "lastModified": 1738752268, + "narHash": "sha256-v2AXqro8mL5/IZNHNUAnRqLlR/vBiHxEXshYLiRAnTI=", "owner": "Alexays", "repo": "Waybar", - "rev": "0d5a4f82eca6df03b73908244d1dcd5fec2c3584", + "rev": "c32d5e3883558db2913dcd09c1b96a7e6c467c25", "type": "github" }, "original": { @@ -1600,15 +1669,15 @@ "yazi": { "inputs": { "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1738657731, - "narHash": "sha256-TfqSe8oywhZEIBs//PI7WXy+PtfkJTEbmFJ5tfXHvcM=", + "lastModified": 1738762515, + "narHash": "sha256-0LIVLou8bMYf4guwRy6YTNhMwwKWC4Ty1pg0bHm4588=", "owner": "sxyazi", "repo": "yazi", - "rev": "4e96341f512522d948977f5dc97a32c0c88f447b", + "rev": "e9fcab3b375afef4b0083687388b90e060a55a37", "type": "github" }, "original": { @@ -1620,18 +1689,18 @@ "zed-editor": { "inputs": { "crane": "crane_2", - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_8", "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1738656328, - "narHash": "sha256-bxFVQC8OuL2pdz4DYb8s0y+1pSftXGc375PDO0ZQRtk=", + "lastModified": 1738822025, + "narHash": "sha256-ME4bjL8qSnJuDf7rPnO0P8A3IVFPm89gp7yKuSuVQac=", "owner": "zed-industries", "repo": "zed", - "rev": "386cfacb25aae8e89d337f2893f5f8ec14cfee6b", + "rev": "c61f12dd225ffabd3913aa29adfdf3feb1a62522", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 18a923a..e1f3eeb 100755 --- a/flake.nix +++ b/flake.nix @@ -37,10 +37,7 @@ url = "github:helix-editor/helix"; inputs.nixpkgs.follows = "nixpkgs"; }; - waybar = { - url = "github:Alexays/Waybar"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + nixos-cosmic.url = "github:lilyinstarlight/nixos-cosmic"; hyprland = { url = "github:hyprwm/Hyprland"; inputs.nixpkgs.follows = "nixpkgs"; @@ -49,6 +46,10 @@ url = "github:hyprwm/xdg-desktop-portal-hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; + waybar = { + url = "github:Alexays/Waybar"; + inputs.nixpkgs.follows = "nixpkgs"; + }; zed-editor = { url = "github:zed-industries/zed"; inputs.nixpkgs.follows = "nixpkgs"; @@ -59,11 +60,9 @@ inputs.flake-parts.lib.mkFlake { inherit inputs; } { imports = [ inputs.pre-commit-hooks-nix.flakeModule - ./home ./lib - ./nixos + ./modules ./parts - ./config ]; flake = @@ -78,6 +77,7 @@ config.nixosModules.core config.nixosModules.sops config.nixosModules.system + inputs.nixos-cosmic.nixosModules.default inputs.home-manager.nixosModules.home-manager inputs.lix-module.nixosModules.default inputs.nur.modules.nixos.default diff --git a/config/default.nix b/modules/config/default.nix similarity index 100% rename from config/default.nix rename to modules/config/default.nix diff --git a/config/devices/config/bartholomew.nix b/modules/config/devices/config/bartholomew.nix similarity index 100% rename from config/devices/config/bartholomew.nix rename to modules/config/devices/config/bartholomew.nix diff --git a/config/devices/config/desktop.nix b/modules/config/devices/config/desktop.nix similarity index 100% rename from config/devices/config/desktop.nix rename to modules/config/devices/config/desktop.nix diff --git a/config/devices/config/fallaryn.nix b/modules/config/devices/config/fallaryn.nix similarity index 100% rename from config/devices/config/fallaryn.nix rename to modules/config/devices/config/fallaryn.nix diff --git a/config/devices/config/laptop.nix b/modules/config/devices/config/laptop.nix similarity index 100% rename from config/devices/config/laptop.nix rename to modules/config/devices/config/laptop.nix diff --git a/config/devices/config/phone.nix b/modules/config/devices/config/phone.nix similarity index 100% rename from config/devices/config/phone.nix rename to modules/config/devices/config/phone.nix diff --git a/config/devices/config/printers/printer0.nix b/modules/config/devices/config/printers/printer0.nix similarity index 60% rename from config/devices/config/printers/printer0.nix rename to modules/config/devices/config/printers/printer0.nix index f1164d9..9404b98 100755 --- a/config/devices/config/printers/printer0.nix +++ b/modules/config/devices/config/printers/printer0.nix @@ -1,9 +1,10 @@ -{devicesFunctions}: let - inherit - (devicesFunctions) +{ devicesFunctions }: +let + inherit (devicesFunctions) dummy ; -in { +in +{ name = dummy; label = "Canon-TR7620a"; ip = { diff --git a/config/devices/config/printers/printer1.nix b/modules/config/devices/config/printers/printer1.nix similarity index 64% rename from config/devices/config/printers/printer1.nix rename to modules/config/devices/config/printers/printer1.nix index caec90c..e1b1c97 100755 --- a/config/devices/config/printers/printer1.nix +++ b/modules/config/devices/config/printers/printer1.nix @@ -1,9 +1,10 @@ -{devicesFunctions}: let - inherit - (devicesFunctions) +{ devicesFunctions }: +let + inherit (devicesFunctions) dummy ; -in { +in +{ name = dummy; label = "Brother-HL-2170W"; ip = { diff --git a/config/devices/config/server.nix b/modules/config/devices/config/server.nix similarity index 100% rename from config/devices/config/server.nix rename to modules/config/devices/config/server.nix diff --git a/config/devices/config/synology.nix b/modules/config/devices/config/synology.nix similarity index 100% rename from config/devices/config/synology.nix rename to modules/config/devices/config/synology.nix diff --git a/config/devices/config/tablet.nix b/modules/config/devices/config/tablet.nix similarity index 100% rename from config/devices/config/tablet.nix rename to modules/config/devices/config/tablet.nix diff --git a/modules/config/devices/default.nix b/modules/config/devices/default.nix new file mode 100755 index 0000000..532b711 --- /dev/null +++ b/modules/config/devices/default.nix @@ -0,0 +1,76 @@ +let + configPath = ./config; + printerPath = configPath + /printers; + + devicesFunctions = { + ownerWriteOthersReadMask = [ + "fmask=0022" + "dmask=0022" + ]; + ownerExclusiveReadWriteMask = [ + "fmask=0077" + "dmask=0077" + ]; + readWritePermissions = [ + "rw" + ]; + sambaPermissions = [ + "rw" + "gid=100" + "vers=3.0" + "x-systemd.automount" + "x-systemd.requires=network-online.target" + ]; + fileModeAndDirMode = [ + "file_mode=0644" + "dir_mode=0755" + ]; + userIdForUser0 = [ + "uid=1000" + ]; + userIdForUser1 = [ + "uid=1001" + ]; + dummy = [ + ]; + }; + + deviceswithFunctions = builtins.listToAttrs ( + map + (name: { + name = builtins.substring 0 (builtins.stringLength name - 4) name; + value = import (configPath + "/${name}") { + inherit + devicesFunctions + ; + }; + }) + ( + builtins.filter (name: builtins.match ".*\\.nix$" name != null) ( + builtins.attrNames (builtins.readDir configPath) + ) + ) + ); + + devicesPrinters = builtins.listToAttrs ( + map + (name: { + name = builtins.substring 0 (builtins.stringLength name - 4) name; + value = import (printerPath + "/${name}") { + inherit + devicesFunctions + ; + }; + }) + ( + builtins.filter (name: builtins.match ".*\\.nix$" name != null) ( + builtins.attrNames (builtins.readDir printerPath) + ) + ) + ); + + devices = deviceswithFunctions // devicesPrinters; +in +{ + devices = devices; +} diff --git a/config/instances/config/acme.nix b/modules/config/instances/config/acme.nix similarity index 76% rename from config/instances/config/acme.nix rename to modules/config/instances/config/acme.nix index f074898..9b4a432 100755 --- a/config/instances/config/acme.nix +++ b/modules/config/instances/config/acme.nix @@ -1,13 +1,14 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) sslPath sopsPath ; acmeLabel = "Acme"; acmeName = "acme"; -in { +in +{ label = acmeLabel; name = acmeName; paths = { diff --git a/config/instances/config/caddy.nix b/modules/config/instances/config/caddy.nix similarity index 76% rename from config/instances/config/caddy.nix rename to modules/config/instances/config/caddy.nix index 7099e3d..b8e3362 100755 --- a/config/instances/config/caddy.nix +++ b/modules/config/instances/config/caddy.nix @@ -1,12 +1,13 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) sopsPath ; caddyLabel = "Caddy"; caddyName = "caddy"; -in { +in +{ label = caddyLabel; name = caddyName; sops = { diff --git a/config/instances/config/forgejo.nix b/modules/config/instances/config/forgejo.nix similarity index 100% rename from config/instances/config/forgejo.nix rename to modules/config/instances/config/forgejo.nix diff --git a/config/instances/config/jellyfin.nix b/modules/config/instances/config/jellyfin.nix similarity index 89% rename from config/instances/config/jellyfin.nix rename to modules/config/instances/config/jellyfin.nix index daa5254..477a4a5 100755 --- a/config/instances/config/jellyfin.nix +++ b/modules/config/instances/config/jellyfin.nix @@ -1,6 +1,6 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) domain0 jellyfinLabel jellyfinName @@ -8,7 +8,8 @@ sslPath sopsPath ; -in { +in +{ label = jellyfinLabel; name = jellyfinName; sops = { diff --git a/config/instances/config/mastodon.nix b/modules/config/instances/config/mastodon.nix similarity index 100% rename from config/instances/config/mastodon.nix rename to modules/config/instances/config/mastodon.nix diff --git a/config/instances/config/matrix.nix b/modules/config/instances/config/matrix.nix similarity index 82% rename from config/instances/config/matrix.nix rename to modules/config/instances/config/matrix.nix index 8394a66..60584e1 100755 --- a/config/instances/config/matrix.nix +++ b/modules/config/instances/config/matrix.nix @@ -1,13 +1,14 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) servicePath sopsPath ; matrixLabel = "Matrix"; matrixName = "matrix"; -in { +in +{ label = matrixLabel; name = matrixName; sops = { diff --git a/config/instances/config/minecraft.nix b/modules/config/instances/config/minecraft.nix similarity index 88% rename from config/instances/config/minecraft.nix rename to modules/config/instances/config/minecraft.nix index 17a13c2..a31fda9 100755 --- a/config/instances/config/minecraft.nix +++ b/modules/config/instances/config/minecraft.nix @@ -1,6 +1,6 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) domain0 servicePath sslPath @@ -9,7 +9,8 @@ minecraftLabel = "Minecraft"; minecraftName = "minecraft"; -in { +in +{ label = minecraftLabel; name = minecraftName; sops = { diff --git a/config/instances/config/nextcloud.nix b/modules/config/instances/config/nextcloud.nix similarity index 88% rename from config/instances/config/nextcloud.nix rename to modules/config/instances/config/nextcloud.nix index bfba927..cedb045 100755 --- a/config/instances/config/nextcloud.nix +++ b/modules/config/instances/config/nextcloud.nix @@ -1,6 +1,6 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) domain1 servicePath sslPath @@ -9,7 +9,8 @@ nextcloudLabel = "Nextcloud"; nextcloudName = "nextcloud"; -in { +in +{ label = nextcloudLabel; name = nextcloudName; sops = { diff --git a/config/instances/config/ollama.nix b/modules/config/instances/config/ollama.nix similarity index 89% rename from config/instances/config/ollama.nix rename to modules/config/instances/config/ollama.nix index 7bc5312..0edf75d 100755 --- a/config/instances/config/ollama.nix +++ b/modules/config/instances/config/ollama.nix @@ -1,6 +1,6 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) domain0 servicePath sslPath @@ -9,7 +9,8 @@ ollamaLabel = "Ollama"; ollamaName = "ollama"; -in { +in +{ label = ollamaLabel; name = ollamaName; sops = { diff --git a/config/instances/config/owncast.nix b/modules/config/instances/config/owncast.nix similarity index 90% rename from config/instances/config/owncast.nix rename to modules/config/instances/config/owncast.nix index ea42d88..3c9310a 100755 --- a/config/instances/config/owncast.nix +++ b/modules/config/instances/config/owncast.nix @@ -1,6 +1,6 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) domain1 servicePath sslPath @@ -10,7 +10,8 @@ owncastLabel = "Owncast"; owncastName = "owncast"; owncastSubdomain = "stream"; -in { +in +{ label = owncastLabel; name = owncastName; sops = { diff --git a/config/instances/config/peertube.nix b/modules/config/instances/config/peertube.nix similarity index 91% rename from config/instances/config/peertube.nix rename to modules/config/instances/config/peertube.nix index 784bf01..ff2489c 100755 --- a/config/instances/config/peertube.nix +++ b/modules/config/instances/config/peertube.nix @@ -1,6 +1,6 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) domain3 servicePath sslPath @@ -10,7 +10,8 @@ peertubeLabel = "PeerTube"; peertubeName = "peertube"; peertubeSubdomain = "video"; -in { +in +{ label = peertubeLabel; name = peertubeName; email = { diff --git a/config/instances/config/postfix.nix b/modules/config/instances/config/postfix.nix similarity index 100% rename from config/instances/config/postfix.nix rename to modules/config/instances/config/postfix.nix diff --git a/config/instances/config/postgresql.nix b/modules/config/instances/config/postgresql.nix similarity index 82% rename from config/instances/config/postgresql.nix rename to modules/config/instances/config/postgresql.nix index fb765a5..b03a623 100755 --- a/config/instances/config/postgresql.nix +++ b/modules/config/instances/config/postgresql.nix @@ -1,13 +1,14 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) servicePath sopsPath ; postgresLabel = "PostgreSQL"; postgresName = "postgres"; -in { +in +{ label = postgresLabel; name = postgresName; sops = { diff --git a/config/instances/config/samba.nix b/modules/config/instances/config/samba.nix similarity index 84% rename from config/instances/config/samba.nix rename to modules/config/instances/config/samba.nix index 44d3df8..189042e 100755 --- a/config/instances/config/samba.nix +++ b/modules/config/instances/config/samba.nix @@ -1,6 +1,6 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) jellyfinLabel jellyfinName servicePath @@ -9,7 +9,8 @@ sambaLabel = "Samba"; sambaName = "samba"; -in { +in +{ label = sambaLabel; name = sambaName; sops = { diff --git a/config/instances/config/smtp.nix b/modules/config/instances/config/smtp.nix similarity index 100% rename from config/instances/config/smtp.nix rename to modules/config/instances/config/smtp.nix diff --git a/config/instances/config/syncthing.nix b/modules/config/instances/config/syncthing.nix similarity index 88% rename from config/instances/config/syncthing.nix rename to modules/config/instances/config/syncthing.nix index fee37b0..1ca9d66 100755 --- a/config/instances/config/syncthing.nix +++ b/modules/config/instances/config/syncthing.nix @@ -1,6 +1,6 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) domain0 sslPath sopsPath @@ -8,7 +8,8 @@ syncthingLabel = "Syncthing"; syncthingName = "syncthing"; -in { +in +{ label = syncthingLabel; name = syncthingName; sops = { diff --git a/config/instances/config/synology.nix b/modules/config/instances/config/synology.nix similarity index 78% rename from config/instances/config/synology.nix rename to modules/config/instances/config/synology.nix index 403a7d4..48d4c11 100755 --- a/config/instances/config/synology.nix +++ b/modules/config/instances/config/synology.nix @@ -1,12 +1,13 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) sopsPath ; synologyLabel = "Synology"; synologyName = "synology"; -in { +in +{ label = synologyLabel; name = synologyName; sops = { diff --git a/config/instances/config/upRootNutrition.nix b/modules/config/instances/config/upRootNutrition.nix similarity index 89% rename from config/instances/config/upRootNutrition.nix rename to modules/config/instances/config/upRootNutrition.nix index 1440e34..059f8f0 100755 --- a/config/instances/config/upRootNutrition.nix +++ b/modules/config/instances/config/upRootNutrition.nix @@ -1,6 +1,6 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) domain3 sslPath sopsPath @@ -8,7 +8,8 @@ upRootNutritionLabel = "upRootNutrition"; upRootNutritionName = "uprootnutrition"; -in { +in +{ label = upRootNutritionLabel; name = upRootNutritionName; email = { diff --git a/config/instances/config/vaultwarden.nix b/modules/config/instances/config/vaultwarden.nix similarity index 90% rename from config/instances/config/vaultwarden.nix rename to modules/config/instances/config/vaultwarden.nix index 8dcad5f..801f3d4 100755 --- a/config/instances/config/vaultwarden.nix +++ b/modules/config/instances/config/vaultwarden.nix @@ -1,6 +1,6 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) domain0 servicePath sslPath @@ -9,7 +9,8 @@ vaultwardenLabel = "Vaultwarden"; vaultwardenName = "vaultwarden"; -in { +in +{ label = vaultwardenLabel; name = vaultwardenName; email = { diff --git a/config/instances/config/web.nix b/modules/config/instances/config/web.nix similarity index 84% rename from config/instances/config/web.nix rename to modules/config/instances/config/web.nix index 0f04f27..369a7e1 100755 --- a/config/instances/config/web.nix +++ b/modules/config/instances/config/web.nix @@ -1,12 +1,13 @@ -{instancesFunctions}: let - inherit - (instancesFunctions) +{ instancesFunctions }: +let + inherit (instancesFunctions) domain0 domain1 domain2 domain3 ; -in { +in +{ domains = { url0 = domain0; url1 = domain1; diff --git a/config/instances/default.nix b/modules/config/instances/default.nix similarity index 100% rename from config/instances/default.nix rename to modules/config/instances/default.nix diff --git a/config/themes/default.nix b/modules/config/themes/default.nix similarity index 100% rename from config/themes/default.nix rename to modules/config/themes/default.nix diff --git a/config/themes/palettes/brogrammer/default.nix b/modules/config/themes/palettes/brogrammer/default.nix similarity index 100% rename from config/themes/palettes/brogrammer/default.nix rename to modules/config/themes/palettes/brogrammer/default.nix diff --git a/config/themes/palettes/catppuccin/frappe/default.nix b/modules/config/themes/palettes/catppuccin/frappe/default.nix similarity index 100% rename from config/themes/palettes/catppuccin/frappe/default.nix rename to modules/config/themes/palettes/catppuccin/frappe/default.nix diff --git a/config/themes/palettes/catppuccin/latte/default.nix b/modules/config/themes/palettes/catppuccin/latte/default.nix similarity index 100% rename from config/themes/palettes/catppuccin/latte/default.nix rename to modules/config/themes/palettes/catppuccin/latte/default.nix diff --git a/config/themes/palettes/catppuccin/macchiato/default.nix b/modules/config/themes/palettes/catppuccin/macchiato/default.nix similarity index 100% rename from config/themes/palettes/catppuccin/macchiato/default.nix rename to modules/config/themes/palettes/catppuccin/macchiato/default.nix diff --git a/config/themes/palettes/catppuccin/mocha/default.nix b/modules/config/themes/palettes/catppuccin/mocha/default.nix similarity index 100% rename from config/themes/palettes/catppuccin/mocha/default.nix rename to modules/config/themes/palettes/catppuccin/mocha/default.nix diff --git a/config/themes/palettes/chalk/default.nix b/modules/config/themes/palettes/chalk/default.nix similarity index 100% rename from config/themes/palettes/chalk/default.nix rename to modules/config/themes/palettes/chalk/default.nix diff --git a/config/themes/palettes/deep-oceanic-next/default.nix b/modules/config/themes/palettes/deep-oceanic-next/default.nix similarity index 100% rename from config/themes/palettes/deep-oceanic-next/default.nix rename to modules/config/themes/palettes/deep-oceanic-next/default.nix diff --git a/config/themes/palettes/dracula/default.nix b/modules/config/themes/palettes/dracula/default.nix similarity index 100% rename from config/themes/palettes/dracula/default.nix rename to modules/config/themes/palettes/dracula/default.nix diff --git a/config/themes/palettes/espresso/default.nix b/modules/config/themes/palettes/espresso/default.nix similarity index 100% rename from config/themes/palettes/espresso/default.nix rename to modules/config/themes/palettes/espresso/default.nix diff --git a/config/themes/palettes/flat/default.nix b/modules/config/themes/palettes/flat/default.nix similarity index 100% rename from config/themes/palettes/flat/default.nix rename to modules/config/themes/palettes/flat/default.nix diff --git a/config/themes/palettes/framer/default.nix b/modules/config/themes/palettes/framer/default.nix similarity index 100% rename from config/themes/palettes/framer/default.nix rename to modules/config/themes/palettes/framer/default.nix diff --git a/config/themes/palettes/github/default.nix b/modules/config/themes/palettes/github/default.nix similarity index 100% rename from config/themes/palettes/github/default.nix rename to modules/config/themes/palettes/github/default.nix diff --git a/config/themes/palettes/hardcore/default.nix b/modules/config/themes/palettes/hardcore/default.nix similarity index 100% rename from config/themes/palettes/hardcore/default.nix rename to modules/config/themes/palettes/hardcore/default.nix diff --git a/config/themes/palettes/one/black/default.nix b/modules/config/themes/palettes/one/black/default.nix similarity index 100% rename from config/themes/palettes/one/black/default.nix rename to modules/config/themes/palettes/one/black/default.nix diff --git a/config/themes/palettes/one/dark/default.nix b/modules/config/themes/palettes/one/dark/default.nix similarity index 100% rename from config/themes/palettes/one/dark/default.nix rename to modules/config/themes/palettes/one/dark/default.nix diff --git a/config/themes/palettes/one/light/default.nix b/modules/config/themes/palettes/one/light/default.nix similarity index 100% rename from config/themes/palettes/one/light/default.nix rename to modules/config/themes/palettes/one/light/default.nix diff --git a/config/themes/palettes/sparky/default.nix b/modules/config/themes/palettes/sparky/default.nix similarity index 100% rename from config/themes/palettes/sparky/default.nix rename to modules/config/themes/palettes/sparky/default.nix diff --git a/config/users/config/user0.nix b/modules/config/users/config/user0.nix similarity index 96% rename from config/users/config/user0.nix rename to modules/config/users/config/user0.nix index c3096a6..e68fd70 100755 --- a/config/users/config/user0.nix +++ b/modules/config/users/config/user0.nix @@ -1,8 +1,10 @@ -{user0}: let +{ user0 }: +let inherit user0 ; -in { +in +{ name = "Nick"; aliases = { name0 = "BRBWaffles"; diff --git a/config/users/config/user1.nix b/modules/config/users/config/user1.nix similarity index 89% rename from config/users/config/user1.nix rename to modules/config/users/config/user1.nix index 7079b14..c646b64 100755 --- a/config/users/config/user1.nix +++ b/modules/config/users/config/user1.nix @@ -1,8 +1,10 @@ -{user1}: let +{ user1 }: +let inherit user1 ; -in { +in +{ name = "Garnet"; email = { address0 = "ninaeffler@gmail.com"; diff --git a/config/users/config/user2.nix b/modules/config/users/config/user2.nix similarity index 100% rename from config/users/config/user2.nix rename to modules/config/users/config/user2.nix diff --git a/config/users/default.nix b/modules/config/users/default.nix similarity index 100% rename from config/users/default.nix rename to modules/config/users/default.nix diff --git a/home/modules/cli/android/default.nix b/modules/default.nix similarity index 100% rename from home/modules/cli/android/default.nix rename to modules/default.nix diff --git a/home/default.nix b/modules/home/default.nix similarity index 99% rename from home/default.nix rename to modules/home/default.nix index 59b976c..40f12a7 100755 --- a/home/default.nix +++ b/modules/home/default.nix @@ -50,7 +50,7 @@ in messaging sharing tools - hyprland + hypr wayland theming ; diff --git a/home/modules/cli/android/androidFileTransfer/default.nix b/modules/home/modules/cli/android/androidFileTransfer/default.nix similarity index 100% rename from home/modules/cli/android/androidFileTransfer/default.nix rename to modules/home/modules/cli/android/androidFileTransfer/default.nix diff --git a/home/modules/cli/android/androidTools/default.nix b/modules/home/modules/cli/android/androidTools/default.nix similarity index 100% rename from home/modules/cli/android/androidTools/default.nix rename to modules/home/modules/cli/android/androidTools/default.nix diff --git a/home/modules/cli/default.nix b/modules/home/modules/cli/android/default.nix similarity index 100% rename from home/modules/cli/default.nix rename to modules/home/modules/cli/android/default.nix diff --git a/home/modules/cli/android/simpleMtpfs/default.nix b/modules/home/modules/cli/android/simpleMtpfs/default.nix similarity index 100% rename from home/modules/cli/android/simpleMtpfs/default.nix rename to modules/home/modules/cli/android/simpleMtpfs/default.nix diff --git a/home/modules/cli/development/default.nix b/modules/home/modules/cli/default.nix similarity index 100% rename from home/modules/cli/development/default.nix rename to modules/home/modules/cli/default.nix diff --git a/home/modules/cli/development/editing/default.nix b/modules/home/modules/cli/development/default.nix similarity index 100% rename from home/modules/cli/development/editing/default.nix rename to modules/home/modules/cli/development/default.nix diff --git a/home/modules/cli/development/tooling/default.nix b/modules/home/modules/cli/development/editing/default.nix similarity index 100% rename from home/modules/cli/development/tooling/default.nix rename to modules/home/modules/cli/development/editing/default.nix diff --git a/home/modules/cli/development/editing/helix/config/languages.nix b/modules/home/modules/cli/development/editing/helix/config/languages.nix similarity index 100% rename from home/modules/cli/development/editing/helix/config/languages.nix rename to modules/home/modules/cli/development/editing/helix/config/languages.nix diff --git a/home/modules/cli/development/editing/helix/config/settings.nix b/modules/home/modules/cli/development/editing/helix/config/settings.nix similarity index 100% rename from home/modules/cli/development/editing/helix/config/settings.nix rename to modules/home/modules/cli/development/editing/helix/config/settings.nix diff --git a/home/modules/cli/development/editing/helix/default.nix b/modules/home/modules/cli/development/editing/helix/default.nix similarity index 100% rename from home/modules/cli/development/editing/helix/default.nix rename to modules/home/modules/cli/development/editing/helix/default.nix diff --git a/home/modules/cli/development/editing/neovim/default.nix b/modules/home/modules/cli/development/editing/neovim/default.nix similarity index 100% rename from home/modules/cli/development/editing/neovim/default.nix rename to modules/home/modules/cli/development/editing/neovim/default.nix diff --git a/home/modules/cli/development/versioning/default.nix b/modules/home/modules/cli/development/tooling/default.nix similarity index 100% rename from home/modules/cli/development/versioning/default.nix rename to modules/home/modules/cli/development/tooling/default.nix diff --git a/home/modules/cli/development/tooling/elm/default.nix b/modules/home/modules/cli/development/tooling/elm/default.nix similarity index 100% rename from home/modules/cli/development/tooling/elm/default.nix rename to modules/home/modules/cli/development/tooling/elm/default.nix diff --git a/home/modules/cli/development/tooling/javascript/default.nix b/modules/home/modules/cli/development/tooling/javascript/default.nix similarity index 100% rename from home/modules/cli/development/tooling/javascript/default.nix rename to modules/home/modules/cli/development/tooling/javascript/default.nix diff --git a/home/modules/cli/files/default.nix b/modules/home/modules/cli/development/versioning/default.nix similarity index 100% rename from home/modules/cli/files/default.nix rename to modules/home/modules/cli/development/versioning/default.nix diff --git a/home/modules/cli/development/versioning/git/default.nix b/modules/home/modules/cli/development/versioning/git/default.nix similarity index 100% rename from home/modules/cli/development/versioning/git/default.nix rename to modules/home/modules/cli/development/versioning/git/default.nix diff --git a/home/modules/cli/development/versioning/lazygit/default.nix b/modules/home/modules/cli/development/versioning/lazygit/default.nix similarity index 100% rename from home/modules/cli/development/versioning/lazygit/default.nix rename to modules/home/modules/cli/development/versioning/lazygit/default.nix diff --git a/home/modules/cli/fun/default.nix b/modules/home/modules/cli/files/default.nix similarity index 100% rename from home/modules/cli/fun/default.nix rename to modules/home/modules/cli/files/default.nix diff --git a/home/modules/cli/files/fileRoller/default.nix b/modules/home/modules/cli/files/fileRoller/default.nix similarity index 100% rename from home/modules/cli/files/fileRoller/default.nix rename to modules/home/modules/cli/files/fileRoller/default.nix diff --git a/home/modules/cli/files/ncdu/default.nix b/modules/home/modules/cli/files/ncdu/default.nix similarity index 100% rename from home/modules/cli/files/ncdu/default.nix rename to modules/home/modules/cli/files/ncdu/default.nix diff --git a/home/modules/cli/files/samba/default.nix b/modules/home/modules/cli/files/samba/default.nix similarity index 100% rename from home/modules/cli/files/samba/default.nix rename to modules/home/modules/cli/files/samba/default.nix diff --git a/home/modules/cli/files/unrar/default.nix b/modules/home/modules/cli/files/unrar/default.nix similarity index 100% rename from home/modules/cli/files/unrar/default.nix rename to modules/home/modules/cli/files/unrar/default.nix diff --git a/home/modules/cli/files/unzip/default.nix b/modules/home/modules/cli/files/unzip/default.nix similarity index 100% rename from home/modules/cli/files/unzip/default.nix rename to modules/home/modules/cli/files/unzip/default.nix diff --git a/home/modules/cli/files/yazi/config/keymap.nix b/modules/home/modules/cli/files/yazi/config/keymap.nix similarity index 100% rename from home/modules/cli/files/yazi/config/keymap.nix rename to modules/home/modules/cli/files/yazi/config/keymap.nix diff --git a/home/modules/cli/files/yazi/config/settings.nix b/modules/home/modules/cli/files/yazi/config/settings.nix similarity index 100% rename from home/modules/cli/files/yazi/config/settings.nix rename to modules/home/modules/cli/files/yazi/config/settings.nix diff --git a/home/modules/cli/files/yazi/default.nix b/modules/home/modules/cli/files/yazi/default.nix similarity index 100% rename from home/modules/cli/files/yazi/default.nix rename to modules/home/modules/cli/files/yazi/default.nix diff --git a/home/modules/cli/files/zip/default.nix b/modules/home/modules/cli/files/zip/default.nix similarity index 100% rename from home/modules/cli/files/zip/default.nix rename to modules/home/modules/cli/files/zip/default.nix diff --git a/home/modules/cli/fun/aniCli/default.nix b/modules/home/modules/cli/fun/aniCli/default.nix similarity index 100% rename from home/modules/cli/fun/aniCli/default.nix rename to modules/home/modules/cli/fun/aniCli/default.nix diff --git a/home/modules/cli/shell/default.nix b/modules/home/modules/cli/fun/default.nix similarity index 100% rename from home/modules/cli/shell/default.nix rename to modules/home/modules/cli/fun/default.nix diff --git a/home/modules/cli/fun/fastFetch/config/settings.nix b/modules/home/modules/cli/fun/fastFetch/config/settings.nix similarity index 100% rename from home/modules/cli/fun/fastFetch/config/settings.nix rename to modules/home/modules/cli/fun/fastFetch/config/settings.nix diff --git a/home/modules/cli/fun/fastFetch/default.nix b/modules/home/modules/cli/fun/fastFetch/default.nix similarity index 100% rename from home/modules/cli/fun/fastFetch/default.nix rename to modules/home/modules/cli/fun/fastFetch/default.nix diff --git a/home/modules/cli/fun/libgenCli/default.nix b/modules/home/modules/cli/fun/libgenCli/default.nix similarity index 100% rename from home/modules/cli/fun/libgenCli/default.nix rename to modules/home/modules/cli/fun/libgenCli/default.nix diff --git a/home/modules/cli/fun/nyanCat/default.nix b/modules/home/modules/cli/fun/nyanCat/default.nix similarity index 100% rename from home/modules/cli/fun/nyanCat/default.nix rename to modules/home/modules/cli/fun/nyanCat/default.nix diff --git a/home/modules/cli/fun/yaBridge/default.nix b/modules/home/modules/cli/fun/yaBridge/default.nix similarity index 100% rename from home/modules/cli/fun/yaBridge/default.nix rename to modules/home/modules/cli/fun/yaBridge/default.nix diff --git a/home/modules/cli/fun/yt-dlp/config/extraConfig.nix b/modules/home/modules/cli/fun/yt-dlp/config/extraConfig.nix similarity index 100% rename from home/modules/cli/fun/yt-dlp/config/extraConfig.nix rename to modules/home/modules/cli/fun/yt-dlp/config/extraConfig.nix diff --git a/home/modules/cli/fun/yt-dlp/config/settings.nix b/modules/home/modules/cli/fun/yt-dlp/config/settings.nix similarity index 100% rename from home/modules/cli/fun/yt-dlp/config/settings.nix rename to modules/home/modules/cli/fun/yt-dlp/config/settings.nix diff --git a/home/modules/cli/fun/yt-dlp/default.nix b/modules/home/modules/cli/fun/yt-dlp/default.nix similarity index 100% rename from home/modules/cli/fun/yt-dlp/default.nix rename to modules/home/modules/cli/fun/yt-dlp/default.nix diff --git a/home/modules/cli/utilities/default.nix b/modules/home/modules/cli/shell/default.nix similarity index 100% rename from home/modules/cli/utilities/default.nix rename to modules/home/modules/cli/shell/default.nix diff --git a/home/modules/cli/shell/nushell/default.nix b/modules/home/modules/cli/shell/nushell/default.nix similarity index 100% rename from home/modules/cli/shell/nushell/default.nix rename to modules/home/modules/cli/shell/nushell/default.nix diff --git a/home/modules/cli/shell/starship/config/settings.nix b/modules/home/modules/cli/shell/starship/config/settings.nix similarity index 100% rename from home/modules/cli/shell/starship/config/settings.nix rename to modules/home/modules/cli/shell/starship/config/settings.nix diff --git a/home/modules/cli/shell/starship/default.nix b/modules/home/modules/cli/shell/starship/default.nix similarity index 100% rename from home/modules/cli/shell/starship/default.nix rename to modules/home/modules/cli/shell/starship/default.nix diff --git a/home/modules/cli/shell/zellij/default.nix b/modules/home/modules/cli/shell/zellij/default.nix similarity index 100% rename from home/modules/cli/shell/zellij/default.nix rename to modules/home/modules/cli/shell/zellij/default.nix diff --git a/home/modules/cli/shell/zoxide/default.nix b/modules/home/modules/cli/shell/zoxide/default.nix similarity index 100% rename from home/modules/cli/shell/zoxide/default.nix rename to modules/home/modules/cli/shell/zoxide/default.nix diff --git a/home/modules/cli/utilities/alsaUtils/default.nix b/modules/home/modules/cli/utilities/alsaUtils/default.nix similarity index 100% rename from home/modules/cli/utilities/alsaUtils/default.nix rename to modules/home/modules/cli/utilities/alsaUtils/default.nix diff --git a/home/modules/cli/utilities/bottom/config/settings.nix b/modules/home/modules/cli/utilities/bottom/config/settings.nix similarity index 100% rename from home/modules/cli/utilities/bottom/config/settings.nix rename to modules/home/modules/cli/utilities/bottom/config/settings.nix diff --git a/home/modules/cli/utilities/bottom/default.nix b/modules/home/modules/cli/utilities/bottom/default.nix similarity index 100% rename from home/modules/cli/utilities/bottom/default.nix rename to modules/home/modules/cli/utilities/bottom/default.nix diff --git a/home/modules/cli/utilities/brightnessCtl/default.nix b/modules/home/modules/cli/utilities/brightnessCtl/default.nix similarity index 100% rename from home/modules/cli/utilities/brightnessCtl/default.nix rename to modules/home/modules/cli/utilities/brightnessCtl/default.nix diff --git a/home/modules/cli/utilities/cifsUtils/default.nix b/modules/home/modules/cli/utilities/cifsUtils/default.nix similarity index 100% rename from home/modules/cli/utilities/cifsUtils/default.nix rename to modules/home/modules/cli/utilities/cifsUtils/default.nix diff --git a/home/modules/default.nix b/modules/home/modules/cli/utilities/default.nix similarity index 100% rename from home/modules/default.nix rename to modules/home/modules/cli/utilities/default.nix diff --git a/home/modules/cli/utilities/direnv/default.nix b/modules/home/modules/cli/utilities/direnv/default.nix similarity index 100% rename from home/modules/cli/utilities/direnv/default.nix rename to modules/home/modules/cli/utilities/direnv/default.nix diff --git a/home/modules/cli/utilities/ffmpeg/default.nix b/modules/home/modules/cli/utilities/ffmpeg/default.nix similarity index 100% rename from home/modules/cli/utilities/ffmpeg/default.nix rename to modules/home/modules/cli/utilities/ffmpeg/default.nix diff --git a/home/modules/cli/utilities/flac/default.nix b/modules/home/modules/cli/utilities/flac/default.nix similarity index 100% rename from home/modules/cli/utilities/flac/default.nix rename to modules/home/modules/cli/utilities/flac/default.nix diff --git a/home/modules/cli/utilities/gLib/default.nix b/modules/home/modules/cli/utilities/gLib/default.nix similarity index 100% rename from home/modules/cli/utilities/gLib/default.nix rename to modules/home/modules/cli/utilities/gLib/default.nix diff --git a/home/modules/cli/utilities/hardInfo/default.nix b/modules/home/modules/cli/utilities/hardInfo/default.nix similarity index 100% rename from home/modules/cli/utilities/hardInfo/default.nix rename to modules/home/modules/cli/utilities/hardInfo/default.nix diff --git a/home/modules/cli/utilities/homeManager/default.nix b/modules/home/modules/cli/utilities/homeManager/default.nix similarity index 100% rename from home/modules/cli/utilities/homeManager/default.nix rename to modules/home/modules/cli/utilities/homeManager/default.nix diff --git a/home/modules/cli/utilities/inetUtils/default.nix b/modules/home/modules/cli/utilities/inetUtils/default.nix similarity index 100% rename from home/modules/cli/utilities/inetUtils/default.nix rename to modules/home/modules/cli/utilities/inetUtils/default.nix diff --git a/home/modules/cli/utilities/libnatpmp/default.nix b/modules/home/modules/cli/utilities/libnatpmp/default.nix similarity index 100% rename from home/modules/cli/utilities/libnatpmp/default.nix rename to modules/home/modules/cli/utilities/libnatpmp/default.nix diff --git a/home/modules/cli/utilities/paMixer/default.nix b/modules/home/modules/cli/utilities/paMixer/default.nix similarity index 100% rename from home/modules/cli/utilities/paMixer/default.nix rename to modules/home/modules/cli/utilities/paMixer/default.nix diff --git a/home/modules/cli/utilities/parted/default.nix b/modules/home/modules/cli/utilities/parted/default.nix similarity index 100% rename from home/modules/cli/utilities/parted/default.nix rename to modules/home/modules/cli/utilities/parted/default.nix diff --git a/home/modules/cli/utilities/pciUtils/default.nix b/modules/home/modules/cli/utilities/pciUtils/default.nix similarity index 100% rename from home/modules/cli/utilities/pciUtils/default.nix rename to modules/home/modules/cli/utilities/pciUtils/default.nix diff --git a/home/modules/cli/utilities/pinEntry/default.nix b/modules/home/modules/cli/utilities/pinEntry/default.nix similarity index 100% rename from home/modules/cli/utilities/pinEntry/default.nix rename to modules/home/modules/cli/utilities/pinEntry/default.nix diff --git a/home/modules/cli/utilities/playerCtl/default.nix b/modules/home/modules/cli/utilities/playerCtl/default.nix similarity index 100% rename from home/modules/cli/utilities/playerCtl/default.nix rename to modules/home/modules/cli/utilities/playerCtl/default.nix diff --git a/home/modules/cli/utilities/protonVpn/default.nix b/modules/home/modules/cli/utilities/protonVpn/default.nix similarity index 100% rename from home/modules/cli/utilities/protonVpn/default.nix rename to modules/home/modules/cli/utilities/protonVpn/default.nix diff --git a/home/modules/cli/utilities/speedTest/default.nix b/modules/home/modules/cli/utilities/speedTest/default.nix similarity index 100% rename from home/modules/cli/utilities/speedTest/default.nix rename to modules/home/modules/cli/utilities/speedTest/default.nix diff --git a/home/modules/cli/utilities/sshfs/default.nix b/modules/home/modules/cli/utilities/sshfs/default.nix similarity index 100% rename from home/modules/cli/utilities/sshfs/default.nix rename to modules/home/modules/cli/utilities/sshfs/default.nix diff --git a/home/modules/cli/utilities/tokei/default.nix b/modules/home/modules/cli/utilities/tokei/default.nix similarity index 100% rename from home/modules/cli/utilities/tokei/default.nix rename to modules/home/modules/cli/utilities/tokei/default.nix diff --git a/home/modules/cli/utilities/tomb/default.nix b/modules/home/modules/cli/utilities/tomb/default.nix similarity index 100% rename from home/modules/cli/utilities/tomb/default.nix rename to modules/home/modules/cli/utilities/tomb/default.nix diff --git a/home/modules/cli/utilities/wget/default.nix b/modules/home/modules/cli/utilities/wget/default.nix similarity index 100% rename from home/modules/cli/utilities/wget/default.nix rename to modules/home/modules/cli/utilities/wget/default.nix diff --git a/home/modules/cli/utilities/wine/default.nix b/modules/home/modules/cli/utilities/wine/default.nix similarity index 100% rename from home/modules/cli/utilities/wine/default.nix rename to modules/home/modules/cli/utilities/wine/default.nix diff --git a/home/modules/cli/utilities/xdgUtils/default.nix b/modules/home/modules/cli/utilities/xdgUtils/default.nix similarity index 100% rename from home/modules/cli/utilities/xdgUtils/default.nix rename to modules/home/modules/cli/utilities/xdgUtils/default.nix diff --git a/home/modules/cli/utilities/xdoTool/default.nix b/modules/home/modules/cli/utilities/xdoTool/default.nix similarity index 100% rename from home/modules/cli/utilities/xdoTool/default.nix rename to modules/home/modules/cli/utilities/xdoTool/default.nix diff --git a/home/modules/gui/apps/browsers/default.nix b/modules/home/modules/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/default.nix rename to modules/home/modules/default.nix diff --git a/home/modules/gui/apps/browsers/brave/config/extensions.nix b/modules/home/modules/gui/apps/browsers/brave/config/extensions.nix similarity index 100% rename from home/modules/gui/apps/browsers/brave/config/extensions.nix rename to modules/home/modules/gui/apps/browsers/brave/config/extensions.nix diff --git a/home/modules/gui/apps/browsers/brave/default.nix b/modules/home/modules/gui/apps/browsers/brave/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/brave/default.nix rename to modules/home/modules/gui/apps/browsers/brave/default.nix diff --git a/home/modules/gui/apps/browsers/braveNix/default.nix b/modules/home/modules/gui/apps/browsers/braveNix/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/braveNix/default.nix rename to modules/home/modules/gui/apps/browsers/braveNix/default.nix diff --git a/home/modules/gui/apps/browsers/chrome/default.nix b/modules/home/modules/gui/apps/browsers/chrome/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/chrome/default.nix rename to modules/home/modules/gui/apps/browsers/chrome/default.nix diff --git a/home/modules/gui/apps/code/default.nix b/modules/home/modules/gui/apps/browsers/default.nix similarity index 100% rename from home/modules/gui/apps/code/default.nix rename to modules/home/modules/gui/apps/browsers/default.nix diff --git a/home/modules/gui/apps/browsers/edge/default.nix b/modules/home/modules/gui/apps/browsers/edge/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/edge/default.nix rename to modules/home/modules/gui/apps/browsers/edge/default.nix diff --git a/home/modules/gui/apps/browsers/epiphany/default.nix b/modules/home/modules/gui/apps/browsers/epiphany/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/epiphany/default.nix rename to modules/home/modules/gui/apps/browsers/epiphany/default.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix b/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/academic.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix b/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/development.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix b/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/finances.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix b/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/flake/selfHosted.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix b/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/gaming.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix b/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/shopping.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix b/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/socialMedia.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix b/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tools.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix b/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/config/tracking.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/bookmarks/default.nix b/modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/bookmarks/default.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/bookmarks/default.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/extensions/default.nix b/modules/home/modules/gui/apps/browsers/firefox/config/extensions/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/extensions/default.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/extensions/default.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/academic.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/academic.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/academic.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/academic.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/development.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/development.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/development.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/development.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/jf.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/icons/pt.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/flake/selfHosted.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/gaming.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/gaming.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/gaming.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/gaming.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/hidden.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/hidden.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/hidden.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/hidden.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/13.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/13.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/13.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/13.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/al.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/al.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/al.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/al.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/am.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/am.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/am.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/am.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/br.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/br.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/br.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/br.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/cr.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/cr.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/cr.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/cr.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/dn.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/dn.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/dn.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/dn.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/do.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/do.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/do.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/do.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/fy.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/fy.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/fy.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/fy.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ha.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ha.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/ha.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ha.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ho.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ho.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/ho.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ho.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ka.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ka.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/ka.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ka.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ki.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ki.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/ki.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ki.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/me.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/me.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/me.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/me.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ne.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ne.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/ne.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ne.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/nx.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/nx.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/nx.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/nx.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pd.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pd.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/pd.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pd.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ph.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ph.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/ph.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ph.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pi.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pi.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/pi.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/pi.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/re.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/re.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/re.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/re.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/rz.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/rz.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/rz.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/rz.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sb.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sb.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/sb.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sb.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sc.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sc.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/sc.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sc.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sd.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sd.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/sd.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sd.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sk.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sk.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/sk.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/sk.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tl.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tl.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/tl.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tl.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tw.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tw.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/tw.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/tw.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ur.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ur.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/ur.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/ur.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/vs.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/vs.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/vs.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/vs.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/wi.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/wi.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/wi.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/wi.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xh.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xh.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/xh.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xh.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xv.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xv.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/xv.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/xv.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/icons/yo.png b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/yo.png similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/icons/yo.png rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/icons/yo.png diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/shopping.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/shopping.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/shopping.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/shopping.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/socialMedia.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/socialMedia.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/socialMedia.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/socialMedia.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/spank.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/spank.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/spank.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/spank.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/tools.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/tools.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/tools.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/tools.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/tracking.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/tracking.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/tracking.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/tracking.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/config/web.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/config/web.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/config/web.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/config/web.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/search/default.nix b/modules/home/modules/gui/apps/browsers/firefox/config/search/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/search/default.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/search/default.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/cosmetics.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/diskAvoidance.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/fingerprinting.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/formFill.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/formFill.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/formFill.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/formFill.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/geolocation.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/geolocation.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/geolocation.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/geolocation.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/hardening.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/hardening.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/hardening.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/hardening.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/https.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/https.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/https.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/https.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/misc.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/misc.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/misc.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/misc.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/noTouching.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/noTouching.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/noTouching.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/noTouching.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/opSec.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/opSec.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/opSec.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/opSec.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/outbound.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/outbound.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/outbound.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/outbound.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/passwords.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/passwords.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/passwords.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/passwords.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/privacy.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/privacy.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/privacy.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/privacy.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/proxy.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/proxy.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/proxy.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/proxy.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/startup.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/startup.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/startup.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/startup.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/config/telemetry.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/config/telemetry.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/config/telemetry.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/config/telemetry.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/settings/default.nix b/modules/home/modules/gui/apps/browsers/firefox/config/settings/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/settings/default.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/settings/default.nix diff --git a/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css b/modules/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css rename to modules/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css diff --git a/home/modules/gui/apps/browsers/firefox/config/themes/default.nix b/modules/home/modules/gui/apps/browsers/firefox/config/themes/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/config/themes/default.nix rename to modules/home/modules/gui/apps/browsers/firefox/config/themes/default.nix diff --git a/home/modules/gui/apps/browsers/firefox/default.nix b/modules/home/modules/gui/apps/browsers/firefox/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefox/default.nix rename to modules/home/modules/gui/apps/browsers/firefox/default.nix diff --git a/home/modules/gui/apps/browsers/firefoxNix/default.nix b/modules/home/modules/gui/apps/browsers/firefoxNix/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/firefoxNix/default.nix rename to modules/home/modules/gui/apps/browsers/firefoxNix/default.nix diff --git a/home/modules/gui/apps/browsers/ladybird/default.nix b/modules/home/modules/gui/apps/browsers/ladybird/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/ladybird/default.nix rename to modules/home/modules/gui/apps/browsers/ladybird/default.nix diff --git a/home/modules/gui/apps/browsers/opera/default.nix b/modules/home/modules/gui/apps/browsers/opera/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/opera/default.nix rename to modules/home/modules/gui/apps/browsers/opera/default.nix diff --git a/home/modules/gui/apps/browsers/tor/default.nix b/modules/home/modules/gui/apps/browsers/tor/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/tor/default.nix rename to modules/home/modules/gui/apps/browsers/tor/default.nix diff --git a/home/modules/gui/apps/browsers/vivaldi/default.nix b/modules/home/modules/gui/apps/browsers/vivaldi/default.nix similarity index 100% rename from home/modules/gui/apps/browsers/vivaldi/default.nix rename to modules/home/modules/gui/apps/browsers/vivaldi/default.nix diff --git a/home/modules/gui/apps/code/cursor/default.nix b/modules/home/modules/gui/apps/code/cursor/default.nix similarity index 100% rename from home/modules/gui/apps/code/cursor/default.nix rename to modules/home/modules/gui/apps/code/cursor/default.nix diff --git a/home/modules/gui/apps/default.nix b/modules/home/modules/gui/apps/code/default.nix similarity index 100% rename from home/modules/gui/apps/default.nix rename to modules/home/modules/gui/apps/code/default.nix diff --git a/home/modules/gui/apps/code/vsCode/config/extensions.nix b/modules/home/modules/gui/apps/code/vsCode/config/extensions.nix similarity index 100% rename from home/modules/gui/apps/code/vsCode/config/extensions.nix rename to modules/home/modules/gui/apps/code/vsCode/config/extensions.nix diff --git a/home/modules/gui/apps/code/vsCode/config/keybindings.nix b/modules/home/modules/gui/apps/code/vsCode/config/keybindings.nix similarity index 100% rename from home/modules/gui/apps/code/vsCode/config/keybindings.nix rename to modules/home/modules/gui/apps/code/vsCode/config/keybindings.nix diff --git a/home/modules/gui/apps/code/vsCode/config/userSettings.nix b/modules/home/modules/gui/apps/code/vsCode/config/userSettings.nix similarity index 100% rename from home/modules/gui/apps/code/vsCode/config/userSettings.nix rename to modules/home/modules/gui/apps/code/vsCode/config/userSettings.nix diff --git a/home/modules/gui/apps/code/vsCode/default.nix b/modules/home/modules/gui/apps/code/vsCode/default.nix similarity index 100% rename from home/modules/gui/apps/code/vsCode/default.nix rename to modules/home/modules/gui/apps/code/vsCode/default.nix diff --git a/home/modules/gui/apps/code/zed/config/extensions/default.nix b/modules/home/modules/gui/apps/code/zed/config/extensions/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/extensions/default.nix rename to modules/home/modules/gui/apps/code/zed/config/extensions/default.nix diff --git a/home/modules/gui/apps/code/zed/config/extraPackages/default.nix b/modules/home/modules/gui/apps/code/zed/config/extraPackages/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/extraPackages/default.nix rename to modules/home/modules/gui/apps/code/zed/config/extraPackages/default.nix diff --git a/home/modules/gui/apps/code/zed/config/userKeymaps/default.nix b/modules/home/modules/gui/apps/code/zed/config/userKeymaps/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/userKeymaps/default.nix rename to modules/home/modules/gui/apps/code/zed/config/userKeymaps/default.nix diff --git a/home/modules/gui/apps/code/zed/config/userSettings/config/assistant/default.nix b/modules/home/modules/gui/apps/code/zed/config/userSettings/config/assistant/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/userSettings/config/assistant/default.nix rename to modules/home/modules/gui/apps/code/zed/config/userSettings/config/assistant/default.nix diff --git a/home/modules/gui/apps/code/zed/config/userSettings/config/git/default.nix b/modules/home/modules/gui/apps/code/zed/config/userSettings/config/git/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/userSettings/config/git/default.nix rename to modules/home/modules/gui/apps/code/zed/config/userSettings/config/git/default.nix diff --git a/home/modules/gui/apps/code/zed/config/userSettings/config/interface/default.nix b/modules/home/modules/gui/apps/code/zed/config/userSettings/config/interface/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/userSettings/config/interface/default.nix rename to modules/home/modules/gui/apps/code/zed/config/userSettings/config/interface/default.nix diff --git a/home/modules/gui/apps/code/zed/config/userSettings/config/languages/default.nix b/modules/home/modules/gui/apps/code/zed/config/userSettings/config/languages/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/userSettings/config/languages/default.nix rename to modules/home/modules/gui/apps/code/zed/config/userSettings/config/languages/default.nix diff --git a/home/modules/gui/apps/code/zed/config/userSettings/config/lsp/default.nix b/modules/home/modules/gui/apps/code/zed/config/userSettings/config/lsp/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/userSettings/config/lsp/default.nix rename to modules/home/modules/gui/apps/code/zed/config/userSettings/config/lsp/default.nix diff --git a/home/modules/gui/apps/code/zed/config/userSettings/config/misc/default.nix b/modules/home/modules/gui/apps/code/zed/config/userSettings/config/misc/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/userSettings/config/misc/default.nix rename to modules/home/modules/gui/apps/code/zed/config/userSettings/config/misc/default.nix diff --git a/home/modules/gui/apps/code/zed/config/userSettings/config/terminal/default.nix b/modules/home/modules/gui/apps/code/zed/config/userSettings/config/terminal/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/userSettings/config/terminal/default.nix rename to modules/home/modules/gui/apps/code/zed/config/userSettings/config/terminal/default.nix diff --git a/home/modules/gui/apps/code/zed/config/userSettings/config/theme/default.nix b/modules/home/modules/gui/apps/code/zed/config/userSettings/config/theme/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/userSettings/config/theme/default.nix rename to modules/home/modules/gui/apps/code/zed/config/userSettings/config/theme/default.nix diff --git a/home/modules/gui/apps/code/zed/config/userSettings/default.nix b/modules/home/modules/gui/apps/code/zed/config/userSettings/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/config/userSettings/default.nix rename to modules/home/modules/gui/apps/code/zed/config/userSettings/default.nix diff --git a/home/modules/gui/apps/code/zed/default.nix b/modules/home/modules/gui/apps/code/zed/default.nix similarity index 100% rename from home/modules/gui/apps/code/zed/default.nix rename to modules/home/modules/gui/apps/code/zed/default.nix diff --git a/home/modules/gui/apps/emulators/default.nix b/modules/home/modules/gui/apps/default.nix similarity index 100% rename from home/modules/gui/apps/emulators/default.nix rename to modules/home/modules/gui/apps/default.nix diff --git a/home/modules/gui/apps/gaming/default.nix b/modules/home/modules/gui/apps/emulators/default.nix similarity index 100% rename from home/modules/gui/apps/gaming/default.nix rename to modules/home/modules/gui/apps/emulators/default.nix diff --git a/home/modules/gui/apps/emulators/ghostty/config/settings.nix b/modules/home/modules/gui/apps/emulators/ghostty/config/settings.nix similarity index 100% rename from home/modules/gui/apps/emulators/ghostty/config/settings.nix rename to modules/home/modules/gui/apps/emulators/ghostty/config/settings.nix diff --git a/home/modules/gui/apps/emulators/ghostty/config/themes.nix b/modules/home/modules/gui/apps/emulators/ghostty/config/themes.nix similarity index 100% rename from home/modules/gui/apps/emulators/ghostty/config/themes.nix rename to modules/home/modules/gui/apps/emulators/ghostty/config/themes.nix diff --git a/home/modules/gui/apps/emulators/ghostty/default.nix b/modules/home/modules/gui/apps/emulators/ghostty/default.nix similarity index 100% rename from home/modules/gui/apps/emulators/ghostty/default.nix rename to modules/home/modules/gui/apps/emulators/ghostty/default.nix diff --git a/home/modules/gui/apps/emulators/kitty/default.nix b/modules/home/modules/gui/apps/emulators/kitty/default.nix similarity index 100% rename from home/modules/gui/apps/emulators/kitty/default.nix rename to modules/home/modules/gui/apps/emulators/kitty/default.nix diff --git a/home/modules/gui/apps/emulators/wezterm/config/extraConfig.nix b/modules/home/modules/gui/apps/emulators/wezterm/config/extraConfig.nix similarity index 100% rename from home/modules/gui/apps/emulators/wezterm/config/extraConfig.nix rename to modules/home/modules/gui/apps/emulators/wezterm/config/extraConfig.nix diff --git a/home/modules/gui/apps/emulators/wezterm/default.nix b/modules/home/modules/gui/apps/emulators/wezterm/default.nix similarity index 100% rename from home/modules/gui/apps/emulators/wezterm/default.nix rename to modules/home/modules/gui/apps/emulators/wezterm/default.nix diff --git a/home/modules/gui/apps/media/3d/default.nix b/modules/home/modules/gui/apps/gaming/default.nix similarity index 100% rename from home/modules/gui/apps/media/3d/default.nix rename to modules/home/modules/gui/apps/gaming/default.nix diff --git a/home/modules/gui/apps/gaming/heroic/default.nix b/modules/home/modules/gui/apps/gaming/heroic/default.nix similarity index 100% rename from home/modules/gui/apps/gaming/heroic/default.nix rename to modules/home/modules/gui/apps/gaming/heroic/default.nix diff --git a/home/modules/gui/apps/gaming/lutris/default.nix b/modules/home/modules/gui/apps/gaming/lutris/default.nix similarity index 100% rename from home/modules/gui/apps/gaming/lutris/default.nix rename to modules/home/modules/gui/apps/gaming/lutris/default.nix diff --git a/home/modules/gui/apps/gaming/prismLauncher/default.nix b/modules/home/modules/gui/apps/gaming/prismLauncher/default.nix similarity index 100% rename from home/modules/gui/apps/gaming/prismLauncher/default.nix rename to modules/home/modules/gui/apps/gaming/prismLauncher/default.nix diff --git a/home/modules/gui/apps/gaming/steam/default.nix b/modules/home/modules/gui/apps/gaming/steam/default.nix similarity index 100% rename from home/modules/gui/apps/gaming/steam/default.nix rename to modules/home/modules/gui/apps/gaming/steam/default.nix diff --git a/home/modules/gui/apps/gaming/steam/steam_dev.cfg b/modules/home/modules/gui/apps/gaming/steam/steam_dev.cfg similarity index 100% rename from home/modules/gui/apps/gaming/steam/steam_dev.cfg rename to modules/home/modules/gui/apps/gaming/steam/steam_dev.cfg diff --git a/home/modules/gui/apps/media/3d/blender/default.nix b/modules/home/modules/gui/apps/media/3d/blender/default.nix similarity index 100% rename from home/modules/gui/apps/media/3d/blender/default.nix rename to modules/home/modules/gui/apps/media/3d/blender/default.nix diff --git a/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/default.nix b/modules/home/modules/gui/apps/media/3d/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/audioEditing/audioMetadata/default.nix rename to modules/home/modules/gui/apps/media/3d/default.nix diff --git a/home/modules/gui/apps/media/3d/sweetHome/default.nix b/modules/home/modules/gui/apps/media/3d/sweetHome/default.nix similarity index 100% rename from home/modules/gui/apps/media/3d/sweetHome/default.nix rename to modules/home/modules/gui/apps/media/3d/sweetHome/default.nix diff --git a/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/beets/default.nix b/modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/beets/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/audioEditing/audioMetadata/beets/default.nix rename to modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/beets/default.nix diff --git a/home/modules/gui/apps/media/audio/audioEditing/audioProduction/default.nix b/modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/audioEditing/audioProduction/default.nix rename to modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/default.nix diff --git a/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/kid3/default.nix b/modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/kid3/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/audioEditing/audioMetadata/kid3/default.nix rename to modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/kid3/default.nix diff --git a/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/mp3Gain/default.nix b/modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/mp3Gain/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/audioEditing/audioMetadata/mp3Gain/default.nix rename to modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/mp3Gain/default.nix diff --git a/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/puddleTag/default.nix b/modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/puddleTag/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/audioEditing/audioMetadata/puddleTag/default.nix rename to modules/home/modules/gui/apps/media/audio/audioEditing/audioMetadata/puddleTag/default.nix diff --git a/home/modules/gui/apps/media/audio/audioEditing/default.nix b/modules/home/modules/gui/apps/media/audio/audioEditing/audioProduction/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/audioEditing/default.nix rename to modules/home/modules/gui/apps/media/audio/audioEditing/audioProduction/default.nix diff --git a/home/modules/gui/apps/media/audio/audioEditing/audioProduction/reaper/default.nix b/modules/home/modules/gui/apps/media/audio/audioEditing/audioProduction/reaper/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/audioEditing/audioProduction/reaper/default.nix rename to modules/home/modules/gui/apps/media/audio/audioEditing/audioProduction/reaper/default.nix diff --git a/home/modules/gui/apps/media/audio/audioPlaying/default.nix b/modules/home/modules/gui/apps/media/audio/audioEditing/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/audioPlaying/default.nix rename to modules/home/modules/gui/apps/media/audio/audioEditing/default.nix diff --git a/home/modules/gui/apps/media/audio/default.nix b/modules/home/modules/gui/apps/media/audio/audioPlaying/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/default.nix rename to modules/home/modules/gui/apps/media/audio/audioPlaying/default.nix diff --git a/home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix b/modules/home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix rename to modules/home/modules/gui/apps/media/audio/audioPlaying/feishin/default.nix diff --git a/home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix b/modules/home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix similarity index 100% rename from home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix rename to modules/home/modules/gui/apps/media/audio/audioPlaying/spotify/default.nix diff --git a/home/modules/gui/apps/media/default.nix b/modules/home/modules/gui/apps/media/audio/default.nix similarity index 100% rename from home/modules/gui/apps/media/default.nix rename to modules/home/modules/gui/apps/media/audio/default.nix diff --git a/home/modules/gui/apps/media/docs/default.nix b/modules/home/modules/gui/apps/media/default.nix similarity index 100% rename from home/modules/gui/apps/media/docs/default.nix rename to modules/home/modules/gui/apps/media/default.nix diff --git a/home/modules/gui/apps/media/docs/docEditing/default.nix b/modules/home/modules/gui/apps/media/docs/default.nix similarity index 100% rename from home/modules/gui/apps/media/docs/docEditing/default.nix rename to modules/home/modules/gui/apps/media/docs/default.nix diff --git a/home/modules/gui/apps/media/docs/docViewing/default.nix b/modules/home/modules/gui/apps/media/docs/docEditing/default.nix similarity index 100% rename from home/modules/gui/apps/media/docs/docViewing/default.nix rename to modules/home/modules/gui/apps/media/docs/docEditing/default.nix diff --git a/home/modules/gui/apps/media/docs/docEditing/libreOffice/default.nix b/modules/home/modules/gui/apps/media/docs/docEditing/libreOffice/default.nix similarity index 100% rename from home/modules/gui/apps/media/docs/docEditing/libreOffice/default.nix rename to modules/home/modules/gui/apps/media/docs/docEditing/libreOffice/default.nix diff --git a/home/modules/gui/apps/media/docs/docEditing/logseq/default.nix b/modules/home/modules/gui/apps/media/docs/docEditing/logseq/default.nix similarity index 100% rename from home/modules/gui/apps/media/docs/docEditing/logseq/default.nix rename to modules/home/modules/gui/apps/media/docs/docEditing/logseq/default.nix diff --git a/home/modules/gui/apps/media/docs/docEditing/obsidian/default.nix b/modules/home/modules/gui/apps/media/docs/docEditing/obsidian/default.nix similarity index 100% rename from home/modules/gui/apps/media/docs/docEditing/obsidian/default.nix rename to modules/home/modules/gui/apps/media/docs/docEditing/obsidian/default.nix diff --git a/home/modules/gui/apps/media/docs/docEditing/wpsOffice/default.nix b/modules/home/modules/gui/apps/media/docs/docEditing/wpsOffice/default.nix similarity index 100% rename from home/modules/gui/apps/media/docs/docEditing/wpsOffice/default.nix rename to modules/home/modules/gui/apps/media/docs/docEditing/wpsOffice/default.nix diff --git a/home/modules/gui/apps/media/images/default.nix b/modules/home/modules/gui/apps/media/docs/docViewing/default.nix similarity index 100% rename from home/modules/gui/apps/media/images/default.nix rename to modules/home/modules/gui/apps/media/docs/docViewing/default.nix diff --git a/home/modules/gui/apps/media/docs/docViewing/okular/default.nix b/modules/home/modules/gui/apps/media/docs/docViewing/okular/default.nix similarity index 100% rename from home/modules/gui/apps/media/docs/docViewing/okular/default.nix rename to modules/home/modules/gui/apps/media/docs/docViewing/okular/default.nix diff --git a/home/modules/gui/apps/media/images/imageEditing/default.nix b/modules/home/modules/gui/apps/media/images/default.nix similarity index 100% rename from home/modules/gui/apps/media/images/imageEditing/default.nix rename to modules/home/modules/gui/apps/media/images/default.nix diff --git a/home/modules/gui/apps/media/images/imageEditing/blender/default.nix b/modules/home/modules/gui/apps/media/images/imageEditing/blender/default.nix similarity index 100% rename from home/modules/gui/apps/media/images/imageEditing/blender/default.nix rename to modules/home/modules/gui/apps/media/images/imageEditing/blender/default.nix diff --git a/home/modules/gui/apps/media/images/imageEditing/darktable/default.nix b/modules/home/modules/gui/apps/media/images/imageEditing/darktable/default.nix similarity index 100% rename from home/modules/gui/apps/media/images/imageEditing/darktable/default.nix rename to modules/home/modules/gui/apps/media/images/imageEditing/darktable/default.nix diff --git a/home/modules/gui/apps/media/images/imageViewing/default.nix b/modules/home/modules/gui/apps/media/images/imageEditing/default.nix similarity index 100% rename from home/modules/gui/apps/media/images/imageViewing/default.nix rename to modules/home/modules/gui/apps/media/images/imageEditing/default.nix diff --git a/home/modules/gui/apps/media/images/imageEditing/gimp/default.nix b/modules/home/modules/gui/apps/media/images/imageEditing/gimp/default.nix similarity index 100% rename from home/modules/gui/apps/media/images/imageEditing/gimp/default.nix rename to modules/home/modules/gui/apps/media/images/imageEditing/gimp/default.nix diff --git a/home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix b/modules/home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix similarity index 100% rename from home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix rename to modules/home/modules/gui/apps/media/images/imageEditing/inkscape/default.nix diff --git a/home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix b/modules/home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix similarity index 100% rename from home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix rename to modules/home/modules/gui/apps/media/images/imageEditing/kolourPaint/default.nix diff --git a/home/modules/gui/apps/media/images/imageEditing/krita/default.nix b/modules/home/modules/gui/apps/media/images/imageEditing/krita/default.nix similarity index 100% rename from home/modules/gui/apps/media/images/imageEditing/krita/default.nix rename to modules/home/modules/gui/apps/media/images/imageEditing/krita/default.nix diff --git a/home/modules/gui/apps/media/llms/default.nix b/modules/home/modules/gui/apps/media/images/imageViewing/default.nix similarity index 100% rename from home/modules/gui/apps/media/llms/default.nix rename to modules/home/modules/gui/apps/media/images/imageViewing/default.nix diff --git a/home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix b/modules/home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix similarity index 100% rename from home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix rename to modules/home/modules/gui/apps/media/images/imageViewing/gwenview/default.nix diff --git a/home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix b/modules/home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix similarity index 100% rename from home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix rename to modules/home/modules/gui/apps/media/images/imageViewing/nomacs/default.nix diff --git a/home/modules/gui/apps/media/llms/alpaca/default.nix b/modules/home/modules/gui/apps/media/llms/alpaca/default.nix similarity index 100% rename from home/modules/gui/apps/media/llms/alpaca/default.nix rename to modules/home/modules/gui/apps/media/llms/alpaca/default.nix diff --git a/home/modules/gui/apps/media/video/default.nix b/modules/home/modules/gui/apps/media/llms/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/default.nix rename to modules/home/modules/gui/apps/media/llms/default.nix diff --git a/home/modules/gui/apps/media/llms/oterm/default.nix b/modules/home/modules/gui/apps/media/llms/oterm/default.nix similarity index 100% rename from home/modules/gui/apps/media/llms/oterm/default.nix rename to modules/home/modules/gui/apps/media/llms/oterm/default.nix diff --git a/home/modules/gui/apps/media/video/videoEditing/default.nix b/modules/home/modules/gui/apps/media/video/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/default.nix rename to modules/home/modules/gui/apps/media/video/default.nix diff --git a/home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix b/modules/home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix rename to modules/home/modules/gui/apps/media/video/videoEditing/daVinci/default.nix diff --git a/home/modules/gui/apps/media/video/videoPlaying/default.nix b/modules/home/modules/gui/apps/media/video/videoEditing/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoPlaying/default.nix rename to modules/home/modules/gui/apps/media/video/videoEditing/default.nix diff --git a/home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix b/modules/home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix rename to modules/home/modules/gui/apps/media/video/videoEditing/kdenlive/default.nix diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/default.nix b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/default.nix rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/default.nix diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe (compact).qss b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe (compact).qss similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe (compact).qss rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe (compact).qss diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe.qss b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe.qss similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe.qss rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Frappe.qss diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte (compact).qss b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte (compact).qss similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte (compact).qss rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte (compact).qss diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte.qss b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte.qss similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte.qss rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Latte.qss diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato (compact).qss b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato (compact).qss similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato (compact).qss rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato (compact).qss diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato.qss b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato.qss similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato.qss rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Macchiato.qss diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha (compact).qss b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha (compact).qss similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha (compact).qss rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha (compact).qss diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha.qss b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha.qss similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha.qss rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin Mocha.qss diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/alert.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/alert.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/alert.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/alert.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_disabled.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_focus.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_focus.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_focus.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_checked_focus.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_disabled.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/checkbox_unchecked_focus.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/close.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/close.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/close.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/close.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/cogs.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/cogs.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/cogs.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/cogs.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/collapse.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/collapse.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/collapse.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/collapse.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots-vert.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots-vert.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots-vert.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots-vert.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/dots.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/down.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/down.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/down.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/down.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/entry-clear.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/entry-clear.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/entry-clear.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/entry-clear.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/expand.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/expand.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/expand.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/expand.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/filter.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/filter.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/filter.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/filter.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/interact.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/interact.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/interact.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/interact.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/left.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/left.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/left.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/left.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/locked.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/locked.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/locked.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/locked.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media-pause.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media-pause.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media-pause.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media-pause.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_next.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_next.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_next.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_next.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_pause.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_pause.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_pause.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_pause.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_play.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_play.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_play.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_play.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_previous.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_previous.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_previous.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_previous.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_restart.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_restart.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_restart.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_restart.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_stop.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_stop.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_stop.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/media/media_stop.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/minus.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/minus.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/minus.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/minus.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/mute.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/mute.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/mute.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/mute.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/no_sources.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/no_sources.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/no_sources.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/no_sources.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/plus.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/plus.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/plus.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/plus.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/popout.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/popout.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/popout.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/popout.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/refresh.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/refresh.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/refresh.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/refresh.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/revert.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/revert.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/revert.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/revert.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/right.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/right.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/right.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/right.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/save.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/save.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/save.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/save.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/accessibility.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/accessibility.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/accessibility.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/accessibility.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/advanced.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/advanced.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/advanced.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/advanced.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/audio.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/audio.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/audio.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/audio.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/general.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/general.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/general.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/general.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/hotkeys.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/hotkeys.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/hotkeys.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/hotkeys.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/output.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/output.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/output.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/output.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/stream.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/stream.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/stream.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/stream.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/video.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/video.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/video.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/settings/video.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/brush.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/brush.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/brush.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/brush.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/camera.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/camera.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/camera.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/camera.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/default.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/default.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/default.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/default.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/gamepad.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/gamepad.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/gamepad.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/gamepad.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/globe.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/globe.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/globe.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/globe.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/group.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/group.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/group.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/group.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/image.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/image.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/image.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/image.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/media.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/media.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/media.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/media.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/microphone.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/microphone.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/microphone.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/microphone.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/scene.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/scene.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/scene.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/scene.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/slideshow.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/slideshow.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/slideshow.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/slideshow.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/text.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/text.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/text.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/text.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/window.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/window.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/window.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/window.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/windowaudio.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/windowaudio.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/windowaudio.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/sources/windowaudio.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/trash.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/trash.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/trash.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/trash.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/up.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/up.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/up.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/up.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/updown.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/updown.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/updown.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/updown.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/visible.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/visible.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/visible.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Dark/visible.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/alert.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/alert.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/alert.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/alert.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_disabled.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_disabled.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_disabled.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_disabled.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_focus.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_focus.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_focus.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_checked_focus.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_disabled.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/checkbox_unchecked_focus.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/close.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/close.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/close.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/close.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/cogs.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/cogs.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/cogs.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/cogs.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/collapse.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/collapse.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/collapse.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/collapse.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots-vert.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots-vert.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots-vert.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots-vert.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/dots.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/down.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/down.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/down.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/down.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/entry-clear.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/entry-clear.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/entry-clear.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/entry-clear.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/expand.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/expand.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/expand.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/expand.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/filter.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/filter.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/filter.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/filter.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/interact.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/interact.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/interact.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/interact.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/left.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/left.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/left.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/left.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/locked.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/locked.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/locked.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/locked.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media-pause.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media-pause.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media-pause.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media-pause.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_next.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_next.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_next.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_next.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_pause.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_pause.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_pause.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_pause.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_play.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_play.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_play.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_play.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_previous.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_previous.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_previous.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_previous.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_restart.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_restart.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_restart.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_restart.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_stop.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_stop.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_stop.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/media/media_stop.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/minus.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/minus.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/minus.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/minus.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/mute.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/mute.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/mute.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/mute.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/no_sources.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/no_sources.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/no_sources.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/no_sources.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/plus.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/plus.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/plus.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/plus.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/popout.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/popout.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/popout.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/popout.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/refresh.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/refresh.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/refresh.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/refresh.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/revert.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/revert.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/revert.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/revert.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/right.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/right.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/right.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/right.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/save.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/save.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/save.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/save.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/accessibility.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/accessibility.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/accessibility.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/accessibility.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/advanced.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/advanced.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/advanced.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/advanced.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/audio.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/audio.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/audio.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/audio.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/general.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/general.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/general.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/general.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/hotkeys.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/hotkeys.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/hotkeys.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/hotkeys.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/output.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/output.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/output.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/output.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/stream.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/stream.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/stream.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/stream.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/video.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/video.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/video.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/settings/video.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/brush.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/brush.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/brush.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/brush.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/camera.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/camera.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/camera.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/camera.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/default.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/default.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/default.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/default.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/gamepad.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/gamepad.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/gamepad.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/gamepad.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/globe.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/globe.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/globe.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/globe.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/group.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/group.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/group.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/group.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/image.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/image.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/image.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/image.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/media.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/media.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/media.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/media.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/microphone.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/microphone.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/microphone.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/microphone.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/scene.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/scene.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/scene.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/scene.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/slideshow.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/slideshow.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/slideshow.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/slideshow.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/text.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/text.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/text.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/text.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/window.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/window.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/window.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/window.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/windowaudio.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/windowaudio.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/windowaudio.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/sources/windowaudio.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/trash.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/trash.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/trash.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/trash.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/up.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/up.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/up.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/up.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/updown.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/updown.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/updown.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/updown.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/visible.svg b/modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/visible.svg similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/visible.svg rename to modules/home/modules/gui/apps/media/video/videoEditing/obsStudio/themes/Catppuccin/Light/visible.svg diff --git a/home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix b/modules/home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix rename to modules/home/modules/gui/apps/media/video/videoEditing/shotcut/default.nix diff --git a/home/modules/gui/apps/messaging/default.nix b/modules/home/modules/gui/apps/media/video/videoPlaying/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/default.nix rename to modules/home/modules/gui/apps/media/video/videoPlaying/default.nix diff --git a/home/modules/gui/apps/media/video/videoPlaying/freetube/config/settings.nix b/modules/home/modules/gui/apps/media/video/videoPlaying/freetube/config/settings.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoPlaying/freetube/config/settings.nix rename to modules/home/modules/gui/apps/media/video/videoPlaying/freetube/config/settings.nix diff --git a/home/modules/gui/apps/media/video/videoPlaying/freetube/default.nix b/modules/home/modules/gui/apps/media/video/videoPlaying/freetube/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoPlaying/freetube/default.nix rename to modules/home/modules/gui/apps/media/video/videoPlaying/freetube/default.nix diff --git a/home/modules/gui/apps/media/video/videoPlaying/jellyfin/default.nix b/modules/home/modules/gui/apps/media/video/videoPlaying/jellyfin/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoPlaying/jellyfin/default.nix rename to modules/home/modules/gui/apps/media/video/videoPlaying/jellyfin/default.nix diff --git a/home/modules/gui/apps/media/video/videoPlaying/mpv/default.nix b/modules/home/modules/gui/apps/media/video/videoPlaying/mpv/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoPlaying/mpv/default.nix rename to modules/home/modules/gui/apps/media/video/videoPlaying/mpv/default.nix diff --git a/home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix b/modules/home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix rename to modules/home/modules/gui/apps/media/video/videoPlaying/stremio/default.nix diff --git a/home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix b/modules/home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix rename to modules/home/modules/gui/apps/media/video/videoPlaying/syncplay/default.nix diff --git a/home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix b/modules/home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix similarity index 100% rename from home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix rename to modules/home/modules/gui/apps/media/video/videoPlaying/vlc/default.nix diff --git a/home/modules/gui/apps/messaging/discord/default.nix b/modules/home/modules/gui/apps/messaging/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/discord/default.nix rename to modules/home/modules/gui/apps/messaging/default.nix diff --git a/home/modules/gui/apps/messaging/matrix/default.nix b/modules/home/modules/gui/apps/messaging/discord/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/matrix/default.nix rename to modules/home/modules/gui/apps/messaging/discord/default.nix diff --git a/home/modules/gui/apps/messaging/discord/discordCanary/default.nix b/modules/home/modules/gui/apps/messaging/discord/discordCanary/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/discord/discordCanary/default.nix rename to modules/home/modules/gui/apps/messaging/discord/discordCanary/default.nix diff --git a/home/modules/gui/apps/messaging/discord/discordOfficial/default.nix b/modules/home/modules/gui/apps/messaging/discord/discordOfficial/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/discord/discordOfficial/default.nix rename to modules/home/modules/gui/apps/messaging/discord/discordOfficial/default.nix diff --git a/home/modules/gui/apps/messaging/discord/vesktop/default.nix b/modules/home/modules/gui/apps/messaging/discord/vesktop/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/discord/vesktop/default.nix rename to modules/home/modules/gui/apps/messaging/discord/vesktop/default.nix diff --git a/home/modules/gui/apps/messaging/discord/webcord/default.nix b/modules/home/modules/gui/apps/messaging/discord/webcord/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/discord/webcord/default.nix rename to modules/home/modules/gui/apps/messaging/discord/webcord/default.nix diff --git a/home/modules/gui/apps/sharing/default.nix b/modules/home/modules/gui/apps/messaging/matrix/default.nix similarity index 100% rename from home/modules/gui/apps/sharing/default.nix rename to modules/home/modules/gui/apps/messaging/matrix/default.nix diff --git a/home/modules/gui/apps/messaging/matrix/element/default.nix b/modules/home/modules/gui/apps/messaging/matrix/element/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/matrix/element/default.nix rename to modules/home/modules/gui/apps/messaging/matrix/element/default.nix diff --git a/home/modules/gui/apps/messaging/matrix/nheko/default.nix b/modules/home/modules/gui/apps/messaging/matrix/nheko/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/matrix/nheko/default.nix rename to modules/home/modules/gui/apps/messaging/matrix/nheko/default.nix diff --git a/home/modules/gui/apps/messaging/signal/default.nix b/modules/home/modules/gui/apps/messaging/signal/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/signal/default.nix rename to modules/home/modules/gui/apps/messaging/signal/default.nix diff --git a/home/modules/gui/apps/messaging/slack/default.nix b/modules/home/modules/gui/apps/messaging/slack/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/slack/default.nix rename to modules/home/modules/gui/apps/messaging/slack/default.nix diff --git a/home/modules/gui/apps/messaging/tdesktop/default.nix b/modules/home/modules/gui/apps/messaging/tdesktop/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/tdesktop/default.nix rename to modules/home/modules/gui/apps/messaging/tdesktop/default.nix diff --git a/home/modules/gui/apps/messaging/teams/default.nix b/modules/home/modules/gui/apps/messaging/teams/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/teams/default.nix rename to modules/home/modules/gui/apps/messaging/teams/default.nix diff --git a/home/modules/gui/apps/messaging/whatsApp/default.nix b/modules/home/modules/gui/apps/messaging/whatsApp/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/whatsApp/default.nix rename to modules/home/modules/gui/apps/messaging/whatsApp/default.nix diff --git a/home/modules/gui/apps/messaging/zoom/default.nix b/modules/home/modules/gui/apps/messaging/zoom/default.nix similarity index 100% rename from home/modules/gui/apps/messaging/zoom/default.nix rename to modules/home/modules/gui/apps/messaging/zoom/default.nix diff --git a/home/modules/gui/apps/tools/default.nix b/modules/home/modules/gui/apps/sharing/default.nix similarity index 100% rename from home/modules/gui/apps/tools/default.nix rename to modules/home/modules/gui/apps/sharing/default.nix diff --git a/home/modules/gui/apps/sharing/nicotinePlus/default.nix b/modules/home/modules/gui/apps/sharing/nicotinePlus/default.nix similarity index 100% rename from home/modules/gui/apps/sharing/nicotinePlus/default.nix rename to modules/home/modules/gui/apps/sharing/nicotinePlus/default.nix diff --git a/home/modules/gui/apps/sharing/qBittorrent/catppuccin-macchiato.qbtheme b/modules/home/modules/gui/apps/sharing/qBittorrent/catppuccin-macchiato.qbtheme similarity index 100% rename from home/modules/gui/apps/sharing/qBittorrent/catppuccin-macchiato.qbtheme rename to modules/home/modules/gui/apps/sharing/qBittorrent/catppuccin-macchiato.qbtheme diff --git a/home/modules/gui/apps/sharing/qBittorrent/default.nix b/modules/home/modules/gui/apps/sharing/qBittorrent/default.nix similarity index 100% rename from home/modules/gui/apps/sharing/qBittorrent/default.nix rename to modules/home/modules/gui/apps/sharing/qBittorrent/default.nix diff --git a/home/modules/gui/apps/sharing/soulseekQt/default.nix b/modules/home/modules/gui/apps/sharing/soulseekQt/default.nix similarity index 100% rename from home/modules/gui/apps/sharing/soulseekQt/default.nix rename to modules/home/modules/gui/apps/sharing/soulseekQt/default.nix diff --git a/home/modules/gui/apps/tools/bitwarden/default.nix b/modules/home/modules/gui/apps/tools/bitwarden/default.nix similarity index 100% rename from home/modules/gui/apps/tools/bitwarden/default.nix rename to modules/home/modules/gui/apps/tools/bitwarden/default.nix diff --git a/home/modules/gui/apps/tools/celeste/default.nix b/modules/home/modules/gui/apps/tools/celeste/default.nix similarity index 100% rename from home/modules/gui/apps/tools/celeste/default.nix rename to modules/home/modules/gui/apps/tools/celeste/default.nix diff --git a/home/modules/gui/default.nix b/modules/home/modules/gui/apps/tools/default.nix similarity index 100% rename from home/modules/gui/default.nix rename to modules/home/modules/gui/apps/tools/default.nix diff --git a/home/modules/gui/apps/tools/deskreen/default.nix b/modules/home/modules/gui/apps/tools/deskreen/default.nix similarity index 100% rename from home/modules/gui/apps/tools/deskreen/default.nix rename to modules/home/modules/gui/apps/tools/deskreen/default.nix diff --git a/home/modules/gui/apps/tools/droidCam/default.nix b/modules/home/modules/gui/apps/tools/droidCam/default.nix similarity index 100% rename from home/modules/gui/apps/tools/droidCam/default.nix rename to modules/home/modules/gui/apps/tools/droidCam/default.nix diff --git a/home/modules/gui/apps/tools/emote/default.nix b/modules/home/modules/gui/apps/tools/emote/default.nix similarity index 100% rename from home/modules/gui/apps/tools/emote/default.nix rename to modules/home/modules/gui/apps/tools/emote/default.nix diff --git a/home/modules/gui/apps/tools/flameshot/default.nix b/modules/home/modules/gui/apps/tools/flameshot/default.nix similarity index 100% rename from home/modules/gui/apps/tools/flameshot/default.nix rename to modules/home/modules/gui/apps/tools/flameshot/default.nix diff --git a/home/modules/gui/apps/tools/gnomeCalculator/default.nix b/modules/home/modules/gui/apps/tools/gnomeCalculator/default.nix similarity index 100% rename from home/modules/gui/apps/tools/gnomeCalculator/default.nix rename to modules/home/modules/gui/apps/tools/gnomeCalculator/default.nix diff --git a/home/modules/gui/apps/tools/ledger/default.nix b/modules/home/modules/gui/apps/tools/ledger/default.nix similarity index 100% rename from home/modules/gui/apps/tools/ledger/default.nix rename to modules/home/modules/gui/apps/tools/ledger/default.nix diff --git a/home/modules/gui/apps/tools/mullvad/default.nix b/modules/home/modules/gui/apps/tools/mullvad/default.nix similarity index 100% rename from home/modules/gui/apps/tools/mullvad/default.nix rename to modules/home/modules/gui/apps/tools/mullvad/default.nix diff --git a/home/modules/gui/apps/tools/openRgb/default.nix b/modules/home/modules/gui/apps/tools/openRgb/default.nix similarity index 100% rename from home/modules/gui/apps/tools/openRgb/default.nix rename to modules/home/modules/gui/apps/tools/openRgb/default.nix diff --git a/home/modules/gui/apps/tools/openTablet/default.nix b/modules/home/modules/gui/apps/tools/openTablet/default.nix similarity index 100% rename from home/modules/gui/apps/tools/openTablet/default.nix rename to modules/home/modules/gui/apps/tools/openTablet/default.nix diff --git a/home/modules/gui/apps/tools/scrcpy/default.nix b/modules/home/modules/gui/apps/tools/scrcpy/default.nix similarity index 100% rename from home/modules/gui/apps/tools/scrcpy/default.nix rename to modules/home/modules/gui/apps/tools/scrcpy/default.nix diff --git a/home/modules/gui/apps/tools/synologyDrive/default.nix b/modules/home/modules/gui/apps/tools/synologyDrive/default.nix similarity index 100% rename from home/modules/gui/apps/tools/synologyDrive/default.nix rename to modules/home/modules/gui/apps/tools/synologyDrive/default.nix diff --git a/home/modules/gui/apps/tools/usbImager/default.nix b/modules/home/modules/gui/apps/tools/usbImager/default.nix similarity index 100% rename from home/modules/gui/apps/tools/usbImager/default.nix rename to modules/home/modules/gui/apps/tools/usbImager/default.nix diff --git a/home/modules/gui/apps/tools/virtManager/default.nix b/modules/home/modules/gui/apps/tools/virtManager/default.nix similarity index 100% rename from home/modules/gui/apps/tools/virtManager/default.nix rename to modules/home/modules/gui/apps/tools/virtManager/default.nix diff --git a/home/modules/gui/desktop/default.nix b/modules/home/modules/gui/default.nix similarity index 100% rename from home/modules/gui/desktop/default.nix rename to modules/home/modules/gui/default.nix diff --git a/home/modules/gui/desktop/hypr/default.nix b/modules/home/modules/gui/desktop/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/default.nix rename to modules/home/modules/gui/desktop/default.nix diff --git a/home/modules/gui/desktop/gnome/default.nix b/modules/home/modules/gui/desktop/gnome/default.nix similarity index 100% rename from home/modules/gui/desktop/gnome/default.nix rename to modules/home/modules/gui/desktop/gnome/default.nix diff --git a/home/modules/gui/desktop/theming/default.nix b/modules/home/modules/gui/desktop/hypr/default.nix similarity index 100% rename from home/modules/gui/desktop/theming/default.nix rename to modules/home/modules/gui/desktop/hypr/default.nix diff --git a/home/modules/gui/desktop/hypr/hypridle/config/settings.nix b/modules/home/modules/gui/desktop/hypr/idle/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hypridle/config/settings.nix rename to modules/home/modules/gui/desktop/hypr/idle/config/settings.nix diff --git a/home/modules/gui/desktop/hypr/hypridle/default.nix b/modules/home/modules/gui/desktop/hypr/idle/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hypridle/default.nix rename to modules/home/modules/gui/desktop/hypr/idle/default.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/animations.nix b/modules/home/modules/gui/desktop/hypr/land/config/animations.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/animations.nix rename to modules/home/modules/gui/desktop/hypr/land/config/animations.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/bind.nix b/modules/home/modules/gui/desktop/hypr/land/config/bind.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/bind.nix rename to modules/home/modules/gui/desktop/hypr/land/config/bind.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/bindl.nix b/modules/home/modules/gui/desktop/hypr/land/config/bindl.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/bindl.nix rename to modules/home/modules/gui/desktop/hypr/land/config/bindl.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/bindm.nix b/modules/home/modules/gui/desktop/hypr/land/config/bindm.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/bindm.nix rename to modules/home/modules/gui/desktop/hypr/land/config/bindm.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/binds.nix b/modules/home/modules/gui/desktop/hypr/land/config/binds.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/binds.nix rename to modules/home/modules/gui/desktop/hypr/land/config/binds.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/decoration.nix b/modules/home/modules/gui/desktop/hypr/land/config/decoration.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/decoration.nix rename to modules/home/modules/gui/desktop/hypr/land/config/decoration.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/dwindle.nix b/modules/home/modules/gui/desktop/hypr/land/config/dwindle.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/dwindle.nix rename to modules/home/modules/gui/desktop/hypr/land/config/dwindle.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix b/modules/home/modules/gui/desktop/hypr/land/config/exec-once.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/exec-once.nix rename to modules/home/modules/gui/desktop/hypr/land/config/exec-once.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/general.nix b/modules/home/modules/gui/desktop/hypr/land/config/general.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/general.nix rename to modules/home/modules/gui/desktop/hypr/land/config/general.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/input.nix b/modules/home/modules/gui/desktop/hypr/land/config/input.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/input.nix rename to modules/home/modules/gui/desktop/hypr/land/config/input.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/misc.nix b/modules/home/modules/gui/desktop/hypr/land/config/misc.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/misc.nix rename to modules/home/modules/gui/desktop/hypr/land/config/misc.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix b/modules/home/modules/gui/desktop/hypr/land/config/windowrulev2.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/windowrulev2.nix rename to modules/home/modules/gui/desktop/hypr/land/config/windowrulev2.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/config/xwayland.nix b/modules/home/modules/gui/desktop/hypr/land/config/xwayland.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/config/xwayland.nix rename to modules/home/modules/gui/desktop/hypr/land/config/xwayland.nix diff --git a/home/modules/gui/desktop/hypr/hyprland/default.nix b/modules/home/modules/gui/desktop/hypr/land/default.nix similarity index 100% rename from home/modules/gui/desktop/hypr/hyprland/default.nix rename to modules/home/modules/gui/desktop/hypr/land/default.nix diff --git a/home/modules/gui/desktop/river/config/map.nix b/modules/home/modules/gui/desktop/river/config/map.nix similarity index 53% rename from home/modules/gui/desktop/river/config/map.nix rename to modules/home/modules/gui/desktop/river/config/map.nix index 6443090..f3a6a8f 100755 --- a/home/modules/gui/desktop/river/config/map.nix +++ b/modules/home/modules/gui/desktop/river/config/map.nix @@ -1,20 +1,20 @@ { - # "Super Space" = "rm -r /home/$USER/.cache/tofi* ; tofi-drun"; + "Super Space" = "rm -r /home/$USER/.cache/tofi* ; tofi-drun"; "Super C" = "zed"; "Super A" = "obsidian"; - # "Super D" = "ghostty -e zellij a dotfiles"; - # "Super E" = "ghostty -e nu -e y"; + "Super D" = "ghostty -e zellij a dotfiles"; + "Super E" = "ghostty -e nu -e y"; "Super T" = "ghostty"; - # "Super G" = "firefox https://cronometer.com/#diary"; + "Super G" = "firefox https://cronometer.com/#diary"; "Super B" = "firefox"; "Super V" = "vesktop"; "Super W" = "bitwarden"; "Super H" = "feishin"; "Super Y" = "scrcpy"; - # "Super R" = "ghostty -e nu -e btm"; + "Super R" = "ghostty -e nu -e btm"; "Super N" = "signal-desktop"; "Super M" = "element-desktop"; - # "Super Home" = "sudo protonvpn c --cc CA"; + "Super Home" = "sudo protonvpn c --cc CA"; "Super End" = "exit"; "Super S" = "steam"; "Super period" = "emote"; diff --git a/home/modules/gui/desktop/river/config/spawn.nix b/modules/home/modules/gui/desktop/river/config/spawn.nix similarity index 100% rename from home/modules/gui/desktop/river/config/spawn.nix rename to modules/home/modules/gui/desktop/river/config/spawn.nix diff --git a/home/modules/gui/desktop/river/default.nix b/modules/home/modules/gui/desktop/river/default.nix similarity index 100% rename from home/modules/gui/desktop/river/default.nix rename to modules/home/modules/gui/desktop/river/default.nix diff --git a/home/modules/gui/desktop/wayland/default.nix b/modules/home/modules/gui/desktop/theming/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/default.nix rename to modules/home/modules/gui/desktop/theming/default.nix diff --git a/home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix b/modules/home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix similarity index 100% rename from home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix rename to modules/home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix diff --git a/home/modules/gui/desktop/theming/gtk/config/gtk3.nix b/modules/home/modules/gui/desktop/theming/gtk/config/gtk3.nix similarity index 100% rename from home/modules/gui/desktop/theming/gtk/config/gtk3.nix rename to modules/home/modules/gui/desktop/theming/gtk/config/gtk3.nix diff --git a/home/modules/gui/desktop/theming/gtk/config/homeCursor.nix b/modules/home/modules/gui/desktop/theming/gtk/config/homeCursor.nix similarity index 100% rename from home/modules/gui/desktop/theming/gtk/config/homeCursor.nix rename to modules/home/modules/gui/desktop/theming/gtk/config/homeCursor.nix diff --git a/home/modules/gui/desktop/theming/gtk/config/iconTheme.nix b/modules/home/modules/gui/desktop/theming/gtk/config/iconTheme.nix similarity index 100% rename from home/modules/gui/desktop/theming/gtk/config/iconTheme.nix rename to modules/home/modules/gui/desktop/theming/gtk/config/iconTheme.nix diff --git a/home/modules/gui/desktop/theming/gtk/config/theme.nix b/modules/home/modules/gui/desktop/theming/gtk/config/theme.nix similarity index 100% rename from home/modules/gui/desktop/theming/gtk/config/theme.nix rename to modules/home/modules/gui/desktop/theming/gtk/config/theme.nix diff --git a/home/modules/gui/desktop/theming/gtk/default.nix b/modules/home/modules/gui/desktop/theming/gtk/default.nix similarity index 100% rename from home/modules/gui/desktop/theming/gtk/default.nix rename to modules/home/modules/gui/desktop/theming/gtk/default.nix diff --git a/home/modules/gui/desktop/theming/qt/default.nix b/modules/home/modules/gui/desktop/theming/qt/default.nix similarity index 100% rename from home/modules/gui/desktop/theming/qt/default.nix rename to modules/home/modules/gui/desktop/theming/qt/default.nix diff --git a/nixos/modules/core/default.nix b/modules/home/modules/gui/desktop/wayland/default.nix similarity index 100% rename from nixos/modules/core/default.nix rename to modules/home/modules/gui/desktop/wayland/default.nix diff --git a/home/modules/gui/desktop/wayland/dunst/config/settings.nix b/modules/home/modules/gui/desktop/wayland/dunst/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/wayland/dunst/config/settings.nix rename to modules/home/modules/gui/desktop/wayland/dunst/config/settings.nix diff --git a/home/modules/gui/desktop/wayland/dunst/default.nix b/modules/home/modules/gui/desktop/wayland/dunst/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/dunst/default.nix rename to modules/home/modules/gui/desktop/wayland/dunst/default.nix diff --git a/home/modules/gui/desktop/wayland/easyEffects/default.nix b/modules/home/modules/gui/desktop/wayland/easyEffects/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/easyEffects/default.nix rename to modules/home/modules/gui/desktop/wayland/easyEffects/default.nix diff --git a/home/modules/gui/desktop/wayland/gammastep/default.nix b/modules/home/modules/gui/desktop/wayland/gammastep/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/gammastep/default.nix rename to modules/home/modules/gui/desktop/wayland/gammastep/default.nix diff --git a/home/modules/gui/desktop/wayland/network/default.nix b/modules/home/modules/gui/desktop/wayland/network/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/network/default.nix rename to modules/home/modules/gui/desktop/wayland/network/default.nix diff --git a/home/modules/gui/desktop/wayland/nwgLook/default.nix b/modules/home/modules/gui/desktop/wayland/nwgLook/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/nwgLook/default.nix rename to modules/home/modules/gui/desktop/wayland/nwgLook/default.nix diff --git a/home/modules/gui/desktop/wayland/plasmaNm/default.nix b/modules/home/modules/gui/desktop/wayland/plasmaNm/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/plasmaNm/default.nix rename to modules/home/modules/gui/desktop/wayland/plasmaNm/default.nix diff --git a/home/modules/gui/desktop/wayland/swaylock/config/settings.nix b/modules/home/modules/gui/desktop/wayland/swaylock/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/wayland/swaylock/config/settings.nix rename to modules/home/modules/gui/desktop/wayland/swaylock/config/settings.nix diff --git a/home/modules/gui/desktop/wayland/swaylock/default.nix b/modules/home/modules/gui/desktop/wayland/swaylock/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/swaylock/default.nix rename to modules/home/modules/gui/desktop/wayland/swaylock/default.nix diff --git a/home/modules/gui/desktop/wayland/tofi/config/settings.nix b/modules/home/modules/gui/desktop/wayland/tofi/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/wayland/tofi/config/settings.nix rename to modules/home/modules/gui/desktop/wayland/tofi/config/settings.nix diff --git a/home/modules/gui/desktop/wayland/tofi/default.nix b/modules/home/modules/gui/desktop/wayland/tofi/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/tofi/default.nix rename to modules/home/modules/gui/desktop/wayland/tofi/default.nix diff --git a/home/modules/gui/desktop/wayland/udiskie/default.nix b/modules/home/modules/gui/desktop/wayland/udiskie/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/udiskie/default.nix rename to modules/home/modules/gui/desktop/wayland/udiskie/default.nix diff --git a/home/modules/gui/desktop/wayland/wallet/default.nix b/modules/home/modules/gui/desktop/wayland/wallet/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/wallet/default.nix rename to modules/home/modules/gui/desktop/wayland/wallet/default.nix diff --git a/home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh b/modules/home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh similarity index 100% rename from home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh rename to modules/home/modules/gui/desktop/wayland/waybar/config/scripts/get_weather.sh diff --git a/home/modules/gui/desktop/wayland/waybar/config/settings.nix b/modules/home/modules/gui/desktop/wayland/waybar/config/settings.nix similarity index 100% rename from home/modules/gui/desktop/wayland/waybar/config/settings.nix rename to modules/home/modules/gui/desktop/wayland/waybar/config/settings.nix diff --git a/home/modules/gui/desktop/wayland/waybar/config/style.nix b/modules/home/modules/gui/desktop/wayland/waybar/config/style.nix similarity index 100% rename from home/modules/gui/desktop/wayland/waybar/config/style.nix rename to modules/home/modules/gui/desktop/wayland/waybar/config/style.nix diff --git a/home/modules/gui/desktop/wayland/waybar/default.nix b/modules/home/modules/gui/desktop/wayland/waybar/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/waybar/default.nix rename to modules/home/modules/gui/desktop/wayland/waybar/default.nix diff --git a/home/modules/gui/desktop/wayland/wlClipboard/default.nix b/modules/home/modules/gui/desktop/wayland/wlClipboard/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/wlClipboard/default.nix rename to modules/home/modules/gui/desktop/wayland/wlClipboard/default.nix diff --git a/home/modules/gui/desktop/wayland/wpaperd/default.nix b/modules/home/modules/gui/desktop/wayland/wpaperd/default.nix similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/default.nix rename to modules/home/modules/gui/desktop/wayland/wpaperd/default.nix diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/FTDCMyaXoAEUn5h.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/pinksky.png diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/u6ne2q214dx71.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-0wj757.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-2ege2g.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4dj2qo.png diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-4xq6vv.png diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-5dyvy3.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-735xv3.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-8xe25y.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-g8ky73.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-j8wzvp.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nekxjk.png diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-nryz87.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-r7yey1.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vge32m.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallhaven-vgxgem.jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (1).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (10).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (11).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (12).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (13).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (14).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (15).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (16).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (17).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (19).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (2).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (20).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (21).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (22).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (23).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (24).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (26).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (27).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (28).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (29).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (3).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (30).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (31).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (32).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (34).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (35).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (37).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (38).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (4).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (5).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (6).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (7).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (8).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper (9).jpg diff --git a/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg b/modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg similarity index 100% rename from home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg rename to modules/home/modules/gui/desktop/wayland/wpaperd/wallpaper/wallpaperflare.com_wallpaper.jpg diff --git a/nixos/default.nix b/modules/nixos/default.nix old mode 100644 new mode 100755 similarity index 100% rename from nixos/default.nix rename to modules/nixos/default.nix index 23c07fe..6893b14 --- a/nixos/default.nix +++ b/modules/nixos/default.nix @@ -27,11 +27,11 @@ in desktop = { imports = builtins.attrValues { inherit (modules) - hypr - wayland mullvad syncthing ollama + hypr + wayland xserver ; }; diff --git a/nixos/modules/core/accounts/default.nix b/modules/nixos/modules/core/accounts/default.nix similarity index 100% rename from nixos/modules/core/accounts/default.nix rename to modules/nixos/modules/core/accounts/default.nix diff --git a/nixos/modules/default.nix b/modules/nixos/modules/core/default.nix similarity index 100% rename from nixos/modules/default.nix rename to modules/nixos/modules/core/default.nix diff --git a/nixos/modules/core/doas/default.nix b/modules/nixos/modules/core/doas/default.nix similarity index 100% rename from nixos/modules/core/doas/default.nix rename to modules/nixos/modules/core/doas/default.nix diff --git a/nixos/modules/core/environment/default.nix b/modules/nixos/modules/core/environment/default.nix similarity index 100% rename from nixos/modules/core/environment/default.nix rename to modules/nixos/modules/core/environment/default.nix diff --git a/nixos/modules/core/flatpak/default.nix b/modules/nixos/modules/core/flatpak/default.nix similarity index 100% rename from nixos/modules/core/flatpak/default.nix rename to modules/nixos/modules/core/flatpak/default.nix diff --git a/nixos/modules/core/fonts/default.nix b/modules/nixos/modules/core/fonts/default.nix similarity index 100% rename from nixos/modules/core/fonts/default.nix rename to modules/nixos/modules/core/fonts/default.nix diff --git a/nixos/modules/core/homeManager/default.nix b/modules/nixos/modules/core/homeManager/default.nix similarity index 100% rename from nixos/modules/core/homeManager/default.nix rename to modules/nixos/modules/core/homeManager/default.nix diff --git a/nixos/modules/core/locale/default.nix b/modules/nixos/modules/core/locale/default.nix similarity index 100% rename from nixos/modules/core/locale/default.nix rename to modules/nixos/modules/core/locale/default.nix diff --git a/nixos/modules/core/nh/default.nix b/modules/nixos/modules/core/nh/default.nix similarity index 100% rename from nixos/modules/core/nh/default.nix rename to modules/nixos/modules/core/nh/default.nix diff --git a/nixos/modules/core/nix/default.nix b/modules/nixos/modules/core/nix/default.nix similarity index 100% rename from nixos/modules/core/nix/default.nix rename to modules/nixos/modules/core/nix/default.nix diff --git a/nixos/modules/core/rsync/default.nix b/modules/nixos/modules/core/rsync/default.nix similarity index 100% rename from nixos/modules/core/rsync/default.nix rename to modules/nixos/modules/core/rsync/default.nix diff --git a/nixos/modules/core/ssh/default.nix b/modules/nixos/modules/core/ssh/default.nix similarity index 100% rename from nixos/modules/core/ssh/default.nix rename to modules/nixos/modules/core/ssh/default.nix diff --git a/nixos/modules/core/sysStat/default.nix b/modules/nixos/modules/core/sysStat/default.nix similarity index 100% rename from nixos/modules/core/sysStat/default.nix rename to modules/nixos/modules/core/sysStat/default.nix diff --git a/nixos/modules/core/system/default.nix b/modules/nixos/modules/core/system/default.nix similarity index 100% rename from nixos/modules/core/system/default.nix rename to modules/nixos/modules/core/system/default.nix diff --git a/nixos/modules/desktop/default.nix b/modules/nixos/modules/default.nix similarity index 100% rename from nixos/modules/desktop/default.nix rename to modules/nixos/modules/default.nix diff --git a/modules/nixos/modules/desktop/cosmic/default.nix b/modules/nixos/modules/desktop/cosmic/default.nix new file mode 100755 index 0000000..2c4be49 --- /dev/null +++ b/modules/nixos/modules/desktop/cosmic/default.nix @@ -0,0 +1,16 @@ +{ + nix.settings = { + substituters = [ + "https://cosmic.cachix.org/" + ]; + trusted-public-keys = [ + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" + ]; + }; + + environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; + services = { + desktopManager.cosmic.enable = true; + displayManager.cosmic-greeter.enable = true; + }; +} diff --git a/nixos/modules/desktop/hypr/default.nix b/modules/nixos/modules/desktop/default.nix similarity index 100% rename from nixos/modules/desktop/hypr/default.nix rename to modules/nixos/modules/desktop/default.nix diff --git a/nixos/modules/desktop/gnome/default.nix b/modules/nixos/modules/desktop/gnome/default.nix similarity index 100% rename from nixos/modules/desktop/gnome/default.nix rename to modules/nixos/modules/desktop/gnome/default.nix diff --git a/nixos/modules/desktop/wayland/default.nix b/modules/nixos/modules/desktop/hypr/default.nix similarity index 100% rename from nixos/modules/desktop/wayland/default.nix rename to modules/nixos/modules/desktop/hypr/default.nix diff --git a/nixos/modules/desktop/hypr/idle/default.nix b/modules/nixos/modules/desktop/hypr/idle/default.nix similarity index 100% rename from nixos/modules/desktop/hypr/idle/default.nix rename to modules/nixos/modules/desktop/hypr/idle/default.nix diff --git a/nixos/modules/desktop/hypr/land/default.nix b/modules/nixos/modules/desktop/hypr/land/default.nix similarity index 100% rename from nixos/modules/desktop/hypr/land/default.nix rename to modules/nixos/modules/desktop/hypr/land/default.nix diff --git a/nixos/modules/desktop/plasma/default.nix b/modules/nixos/modules/desktop/plasma/default.nix similarity index 100% rename from nixos/modules/desktop/plasma/default.nix rename to modules/nixos/modules/desktop/plasma/default.nix diff --git a/nixos/modules/desktop/river/default.nix b/modules/nixos/modules/desktop/river/default.nix similarity index 100% rename from nixos/modules/desktop/river/default.nix rename to modules/nixos/modules/desktop/river/default.nix diff --git a/nixos/modules/desktop/sddm/default.nix b/modules/nixos/modules/desktop/sddm/default.nix similarity index 100% rename from nixos/modules/desktop/sddm/default.nix rename to modules/nixos/modules/desktop/sddm/default.nix diff --git a/nixos/modules/hardware/default.nix b/modules/nixos/modules/desktop/wayland/default.nix similarity index 100% rename from nixos/modules/hardware/default.nix rename to modules/nixos/modules/desktop/wayland/default.nix diff --git a/nixos/modules/desktop/wayland/geoclue2/default.nix b/modules/nixos/modules/desktop/wayland/geoclue2/default.nix similarity index 100% rename from nixos/modules/desktop/wayland/geoclue2/default.nix rename to modules/nixos/modules/desktop/wayland/geoclue2/default.nix diff --git a/nixos/modules/desktop/wayland/greetd/default.nix b/modules/nixos/modules/desktop/wayland/greetd/default.nix similarity index 100% rename from nixos/modules/desktop/wayland/greetd/default.nix rename to modules/nixos/modules/desktop/wayland/greetd/default.nix diff --git a/nixos/modules/desktop/wayland/network/default.nix b/modules/nixos/modules/desktop/wayland/network/default.nix similarity index 100% rename from nixos/modules/desktop/wayland/network/default.nix rename to modules/nixos/modules/desktop/wayland/network/default.nix diff --git a/nixos/modules/desktop/wayland/regreet/default.nix b/modules/nixos/modules/desktop/wayland/regreet/default.nix similarity index 100% rename from nixos/modules/desktop/wayland/regreet/default.nix rename to modules/nixos/modules/desktop/wayland/regreet/default.nix diff --git a/nixos/modules/desktop/wayland/swaylock/default.nix b/modules/nixos/modules/desktop/wayland/swaylock/default.nix similarity index 100% rename from nixos/modules/desktop/wayland/swaylock/default.nix rename to modules/nixos/modules/desktop/wayland/swaylock/default.nix diff --git a/nixos/modules/desktop/wayland/thunar/default.nix b/modules/nixos/modules/desktop/wayland/thunar/default.nix similarity index 100% rename from nixos/modules/desktop/wayland/thunar/default.nix rename to modules/nixos/modules/desktop/wayland/thunar/default.nix diff --git a/nixos/modules/desktop/wayland/wayland/default.nix b/modules/nixos/modules/desktop/wayland/wayland/default.nix similarity index 100% rename from nixos/modules/desktop/wayland/wayland/default.nix rename to modules/nixos/modules/desktop/wayland/wayland/default.nix diff --git a/nixos/modules/desktop/xserver/default.nix b/modules/nixos/modules/desktop/xserver/default.nix similarity index 100% rename from nixos/modules/desktop/xserver/default.nix rename to modules/nixos/modules/desktop/xserver/default.nix diff --git a/nixos/modules/hardware/android/default.nix b/modules/nixos/modules/hardware/android/default.nix similarity index 100% rename from nixos/modules/hardware/android/default.nix rename to modules/nixos/modules/hardware/android/default.nix diff --git a/nixos/modules/hardware/audio/default.nix b/modules/nixos/modules/hardware/audio/default.nix similarity index 100% rename from nixos/modules/hardware/audio/default.nix rename to modules/nixos/modules/hardware/audio/default.nix diff --git a/nixos/modules/hardware/bluetooth/default.nix b/modules/nixos/modules/hardware/bluetooth/default.nix similarity index 100% rename from nixos/modules/hardware/bluetooth/default.nix rename to modules/nixos/modules/hardware/bluetooth/default.nix diff --git a/nixos/modules/programs/default.nix b/modules/nixos/modules/hardware/default.nix similarity index 100% rename from nixos/modules/programs/default.nix rename to modules/nixos/modules/hardware/default.nix diff --git a/nixos/modules/hardware/printing/default.nix b/modules/nixos/modules/hardware/printing/default.nix similarity index 100% rename from nixos/modules/hardware/printing/default.nix rename to modules/nixos/modules/hardware/printing/default.nix diff --git a/nixos/modules/hardware/tablet/default.nix b/modules/nixos/modules/hardware/tablet/default.nix similarity index 100% rename from nixos/modules/hardware/tablet/default.nix rename to modules/nixos/modules/hardware/tablet/default.nix diff --git a/nixos/modules/programs/coreCtrl/default.nix b/modules/nixos/modules/programs/coreCtrl/default.nix similarity index 100% rename from nixos/modules/programs/coreCtrl/default.nix rename to modules/nixos/modules/programs/coreCtrl/default.nix diff --git a/nixos/modules/services/default.nix b/modules/nixos/modules/programs/default.nix similarity index 100% rename from nixos/modules/services/default.nix rename to modules/nixos/modules/programs/default.nix diff --git a/nixos/modules/programs/disks/default.nix b/modules/nixos/modules/programs/disks/default.nix similarity index 100% rename from nixos/modules/programs/disks/default.nix rename to modules/nixos/modules/programs/disks/default.nix diff --git a/nixos/modules/programs/firejail/default.nix b/modules/nixos/modules/programs/firejail/default.nix similarity index 100% rename from nixos/modules/programs/firejail/default.nix rename to modules/nixos/modules/programs/firejail/default.nix diff --git a/nixos/modules/programs/steam/default.nix b/modules/nixos/modules/programs/steam/default.nix similarity index 100% rename from nixos/modules/programs/steam/default.nix rename to modules/nixos/modules/programs/steam/default.nix diff --git a/nixos/modules/programs/virtManager/default.nix b/modules/nixos/modules/programs/virtManager/default.nix similarity index 100% rename from nixos/modules/programs/virtManager/default.nix rename to modules/nixos/modules/programs/virtManager/default.nix diff --git a/nixos/modules/services/acme/default.nix b/modules/nixos/modules/services/acme/default.nix similarity index 100% rename from nixos/modules/services/acme/default.nix rename to modules/nixos/modules/services/acme/default.nix diff --git a/nixos/modules/services/caddy/default.nix b/modules/nixos/modules/services/caddy/default.nix similarity index 100% rename from nixos/modules/services/caddy/default.nix rename to modules/nixos/modules/services/caddy/default.nix diff --git a/modules/nixos/modules/services/default.nix b/modules/nixos/modules/services/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/modules/nixos/modules/services/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/nixos/modules/services/forgejo/default.nix b/modules/nixos/modules/services/forgejo/default.nix similarity index 100% rename from nixos/modules/services/forgejo/default.nix rename to modules/nixos/modules/services/forgejo/default.nix diff --git a/nixos/modules/services/hLedger/default.nix b/modules/nixos/modules/services/hLedger/default.nix similarity index 100% rename from nixos/modules/services/hLedger/default.nix rename to modules/nixos/modules/services/hLedger/default.nix diff --git a/nixos/modules/services/jellyfin/default.nix b/modules/nixos/modules/services/jellyfin/default.nix similarity index 100% rename from nixos/modules/services/jellyfin/default.nix rename to modules/nixos/modules/services/jellyfin/default.nix diff --git a/nixos/modules/services/logrotate/default.nix b/modules/nixos/modules/services/logrotate/default.nix similarity index 100% rename from nixos/modules/services/logrotate/default.nix rename to modules/nixos/modules/services/logrotate/default.nix diff --git a/nixos/modules/services/mastodon/config/chars.patch b/modules/nixos/modules/services/mastodon/config/chars.patch similarity index 100% rename from nixos/modules/services/mastodon/config/chars.patch rename to modules/nixos/modules/services/mastodon/config/chars.patch diff --git a/nixos/modules/services/mastodon/config/twitter.txt b/modules/nixos/modules/services/mastodon/config/twitter.txt similarity index 100% rename from nixos/modules/services/mastodon/config/twitter.txt rename to modules/nixos/modules/services/mastodon/config/twitter.txt diff --git a/nixos/modules/services/mastodon/default.nix b/modules/nixos/modules/services/mastodon/default.nix similarity index 100% rename from nixos/modules/services/mastodon/default.nix rename to modules/nixos/modules/services/mastodon/default.nix diff --git a/nixos/modules/services/minecraft/default.nix b/modules/nixos/modules/services/minecraft/default.nix similarity index 100% rename from nixos/modules/services/minecraft/default.nix rename to modules/nixos/modules/services/minecraft/default.nix diff --git a/nixos/modules/services/mullvad/default.nix b/modules/nixos/modules/services/mullvad/default.nix similarity index 100% rename from nixos/modules/services/mullvad/default.nix rename to modules/nixos/modules/services/mullvad/default.nix diff --git a/nixos/modules/services/nextcloud/default.nix b/modules/nixos/modules/services/nextcloud/default.nix similarity index 100% rename from nixos/modules/services/nextcloud/default.nix rename to modules/nixos/modules/services/nextcloud/default.nix diff --git a/nixos/modules/services/ollama/default.nix b/modules/nixos/modules/services/ollama/default.nix similarity index 100% rename from nixos/modules/services/ollama/default.nix rename to modules/nixos/modules/services/ollama/default.nix diff --git a/nixos/modules/services/owncast/default.nix b/modules/nixos/modules/services/owncast/default.nix similarity index 100% rename from nixos/modules/services/owncast/default.nix rename to modules/nixos/modules/services/owncast/default.nix diff --git a/nixos/modules/services/peertube/default.nix b/modules/nixos/modules/services/peertube/default.nix similarity index 100% rename from nixos/modules/services/peertube/default.nix rename to modules/nixos/modules/services/peertube/default.nix diff --git a/nixos/modules/services/postgresql/default.nix b/modules/nixos/modules/services/postgresql/default.nix similarity index 100% rename from nixos/modules/services/postgresql/default.nix rename to modules/nixos/modules/services/postgresql/default.nix diff --git a/nixos/modules/services/samba/default.nix b/modules/nixos/modules/services/samba/default.nix similarity index 100% rename from nixos/modules/services/samba/default.nix rename to modules/nixos/modules/services/samba/default.nix diff --git a/nixos/modules/services/syncthing/default.nix b/modules/nixos/modules/services/syncthing/default.nix similarity index 100% rename from nixos/modules/services/syncthing/default.nix rename to modules/nixos/modules/services/syncthing/default.nix diff --git a/nixos/modules/services/vaultwarden/default.nix b/modules/nixos/modules/services/vaultwarden/default.nix similarity index 100% rename from nixos/modules/services/vaultwarden/default.nix rename to modules/nixos/modules/services/vaultwarden/default.nix diff --git a/nixos/modules/services/website/default.nix b/modules/nixos/modules/services/website/default.nix similarity index 100% rename from nixos/modules/services/website/default.nix rename to modules/nixos/modules/services/website/default.nix diff --git a/nixos/modules/sops/default.nix b/modules/nixos/modules/sops/default.nix similarity index 95% rename from nixos/modules/sops/default.nix rename to modules/nixos/modules/sops/default.nix index 7742422..ebdd0fa 100755 --- a/nixos/modules/sops/default.nix +++ b/modules/nixos/modules/sops/default.nix @@ -25,7 +25,7 @@ let in { sops = { - defaultSopsFile = ../../../secrets/secrets.yaml; + defaultSopsFile = ../../../../secrets/secrets.yaml; validateSopsFiles = false; age = { keyFile = "/var/lib/sops-nix/key.txt";