diff --git a/flake.nix b/flake.nix index fb62b86..44ab66e 100644 --- a/flake.nix +++ b/flake.nix @@ -25,23 +25,35 @@ in { - nixosConfigurations.desktop = nixpkgs.lib.nixosSystem { - inherit system pkgs; - modules = [ - ./src/systems/desktop - home-manager.nixosModules.home-manager - (import ./src/systems/desktop/home.nix) - ]; - }; - nixosConfigurations.windows = nixpkgs.lib.nixosSystem { - inherit system pkgs; - modules = [ - ./src/systems/wsl - nixos-wsl.nixosModules.wsl - (import ./src/systems/wsl/wsl.nix) - home-manager.nixosModules.home-manager - (import ./src/systems/wsl/home.nix) - ]; + nixosConfigurations = { + desktop = nixpkgs.lib.nixosSystem { + inherit system pkgs; + modules = [ + ./src/system/machines/desktop + home-manager.nixosModules.home-manager + (import ./src/system/machines/desktop/home.nix) + ]; + }; + + windows = nixpkgs.lib.nixosSystem { + inherit system pkgs; + modules = [ + ./src/system/machines/wsl + nixos-wsl.nixosModules.wsl + (import ./src/system/machines/wsl/wsl.nix) + home-manager.nixosModules.home-manager + (import ./src/system/machines/wsl/home.nix) + ]; + }; + + server = nixpkgs.lib.nixosSystem { + inherit system pkgs; + modules = [ + ./src/system/machines/server + home-manager.nixosModules.home-manager + (import ./src/system/machines/server/home.nix) + ]; + }; }; }; } diff --git a/src/modules/system/corn/modules/core-lightning/default.nix b/src/modules/system/corn/modules/core-lightning/default.nix deleted file mode 100644 index 30c65c6..0000000 --- a/src/modules/system/corn/modules/core-lightning/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, pkgs, config, ... }: - -with lib; - let cfg = config.modules.corn.core-lightning; - -in -{ options.modules.corn.core-lightning = { enable = mkEnableOption "corn.core-lightning"; }; - config = mkIf cfg.enable { - home.packages = with pkgs; [ - clightning - ]; - - systemd.services.clightning = { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - script = '' - ${pkgs.clightning}/bin/lightningd --conf=... - ''; - serviceConfig = { - User = "core-lighting"; - Group = "bitcoin"; - }; - }; - }; -} diff --git a/src/modules/system/corn/modules/electrs/default.nix b/src/modules/system/corn/modules/electrs/default.nix deleted file mode 100644 index e69de29..0000000 diff --git a/src/systems/desktop/default.nix b/src/system/machines/desktop/default.nix similarity index 100% rename from src/systems/desktop/default.nix rename to src/system/machines/desktop/default.nix diff --git a/src/systems/desktop/disks.nix b/src/system/machines/desktop/disks.nix similarity index 100% rename from src/systems/desktop/disks.nix rename to src/system/machines/desktop/disks.nix diff --git a/src/systems/desktop/hardware.nix b/src/system/machines/desktop/hardware.nix similarity index 100% rename from src/systems/desktop/hardware.nix rename to src/system/machines/desktop/hardware.nix diff --git a/src/systems/desktop/home.nix b/src/system/machines/desktop/home.nix similarity index 95% rename from src/systems/desktop/home.nix rename to src/system/machines/desktop/home.nix index 757781f..b85e05e 100644 --- a/src/systems/desktop/home.nix +++ b/src/system/machines/desktop/home.nix @@ -5,8 +5,8 @@ home-manager.useUserPackages = true; home-manager.users.${config.user.name} = { imports = [ - ../../user - ../../modules/user + ../../../user + ../../../user/modules ]; programs.home-manager.enable = true; diff --git a/src/systems/desktop/system.nix b/src/system/machines/desktop/system.nix similarity index 100% rename from src/systems/desktop/system.nix rename to src/system/machines/desktop/system.nix diff --git a/src/systems/laptop/default.nix b/src/system/machines/laptop/default.nix similarity index 100% rename from src/systems/laptop/default.nix rename to src/system/machines/laptop/default.nix diff --git a/src/systems/server/default.nix b/src/system/machines/server/default.nix similarity index 79% rename from src/systems/server/default.nix rename to src/system/machines/server/default.nix index 5d6cab9..58605a4 100644 --- a/src/systems/server/default.nix +++ b/src/system/machines/server/default.nix @@ -2,7 +2,7 @@ { imports = [ - ../../user + ../../../user ./hardware.nix ./system.nix ]; diff --git a/src/system/machines/server/home.nix b/src/system/machines/server/home.nix new file mode 100644 index 0000000..3fa0be1 --- /dev/null +++ b/src/system/machines/server/home.nix @@ -0,0 +1,35 @@ +{ config, ... }: + +{ + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.${config.user.name} = { + imports = [ + ../../../user + ../../../user/modules + ]; + + programs.home-manager.enable = true; + programs.bash.shellAliases = { + nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#server"; + }; + + home.stateVersion = "23.11"; + + home.username = "${config.user.name}"; + home.homeDirectory = "/home/${config.user.name}"; + + modules = { + bash.enable = true; + git.enable = true; + gpg.enable = true; + + utils = { + enable = true; + vim.enable = true; + }; + + gui.enable = false; + }; + }; +} diff --git a/src/systems/server/system.nix b/src/system/machines/server/system.nix similarity index 92% rename from src/systems/server/system.nix rename to src/system/machines/server/system.nix index f73eabc..0c9a916 100644 --- a/src/systems/server/system.nix +++ b/src/system/machines/server/system.nix @@ -3,9 +3,18 @@ { system.stateVersion = "23.11"; imports = [ - ../../modules/system + ../modules ]; + modules = { + bitcoin = { + enable = true; + clightning = true; + electrs = true; + sparrow-server = true; + }; + }; + # Users users.users = { ${config.user.name} = { diff --git a/src/systems/wsl/default.nix b/src/system/machines/wsl/default.nix similarity index 100% rename from src/systems/wsl/default.nix rename to src/system/machines/wsl/default.nix diff --git a/src/systems/wsl/home.nix b/src/system/machines/wsl/home.nix similarity index 94% rename from src/systems/wsl/home.nix rename to src/system/machines/wsl/home.nix index 679c4a6..b7a657e 100644 --- a/src/systems/wsl/home.nix +++ b/src/system/machines/wsl/home.nix @@ -5,8 +5,8 @@ home-manager.useUserPackages = true; home-manager.users.${config.user.name} = { imports = [ - ../../user - ../../modules/user + ../../../user + ../../../user/modules ]; programs.home-manager.enable = true; diff --git a/src/systems/wsl/system.nix b/src/system/machines/wsl/system.nix similarity index 100% rename from src/systems/wsl/system.nix rename to src/system/machines/wsl/system.nix diff --git a/src/systems/wsl/wsl.nix b/src/system/machines/wsl/wsl.nix similarity index 100% rename from src/systems/wsl/wsl.nix rename to src/system/machines/wsl/wsl.nix diff --git a/src/modules/system/corn/default.nix b/src/system/modules/bitcoin/default.nix similarity index 63% rename from src/modules/system/corn/default.nix rename to src/system/modules/bitcoin/default.nix index eff2c15..fda6a50 100644 --- a/src/modules/system/corn/default.nix +++ b/src/system/modules/bitcoin/default.nix @@ -2,10 +2,10 @@ with lib; let - cfg = config.modules.corn; + cfg = config.modules.bitcoin; in -{ options.modules.corn = { enable = mkEnableOption "corn"; }; +{ options.modules.bitcoin = { enable = mkEnableOption "bitcoin"; }; imports = [ ./core-lightning @@ -13,6 +13,10 @@ in ]; config = mkIf cfg.enable { + programs.bash.shellAliases = { + btc = "bitcoin-cli"; + }; + users = { users = { "bitcoind" = { @@ -23,15 +27,18 @@ in }; groups = { "bitcoin" = { - members = [ "core-lightning" "electrs" ]; + members = [ "clightning" "electrs" ]; }; }; }; + services.bitcoind = { - "main-net" = { + "bitcoind" = { enable = true; + testnet = false; user = "bitcoind"; group = "bitcoin"; + #extraConfig = TODO; }; }; }; diff --git a/src/system/modules/bitcoin/modules/core-lightning/default.nix b/src/system/modules/bitcoin/modules/core-lightning/default.nix new file mode 100644 index 0000000..2629928 --- /dev/null +++ b/src/system/modules/bitcoin/modules/core-lightning/default.nix @@ -0,0 +1,40 @@ +{ lib, pkgs, config, ... }: + +with lib; + let cfg = config.modules.bitcoin.core-lightning; + +in +{ options.modules.bitcoin.core-lightning = { enable = mkEnableOption "bitcoin.core-lightning"; }; + config = mkIf cfg.enable { + programs.bash.shellAliases = { + cln = "lightningd"; + }; + + home.packages = with pkgs; [ + clightning + ]; + + users = { + users = { + "clightning" = { + description = "clightning system user"; + isSystemUser = true; + group = "bitcoin"; + }; + }; + }; + + systemd.services.clightning = { + Unit = { + after = [ "network.target" "bitcoind.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + Service = { + ExecStart = "${pkgs.clightning}/bin/lightningd --conf=..."; + Restart = "always"; + User = "clightning"; + Group = "bitcoin"; + }; + }; + }; +} diff --git a/src/modules/system/corn/modules/default.nix b/src/system/modules/bitcoin/modules/default.nix similarity index 81% rename from src/modules/system/corn/modules/default.nix rename to src/system/modules/bitcoin/modules/default.nix index 7d57eba..e7f0860 100644 --- a/src/modules/system/corn/modules/default.nix +++ b/src/system/modules/bitcoin/modules/default.nix @@ -1,6 +1,7 @@ { imports = [ ./core-lightning + ./electrs ./sparrow-cli ]; } diff --git a/src/system/modules/bitcoin/modules/electrs/default.nix b/src/system/modules/bitcoin/modules/electrs/default.nix new file mode 100644 index 0000000..a082b48 --- /dev/null +++ b/src/system/modules/bitcoin/modules/electrs/default.nix @@ -0,0 +1,35 @@ +{ lib, pkgs, config, ... }: + +with lib; + let cfg = config.modules.bitcoin.electrs; +in +{ options.modules.bitcoin.electrs = { enable = mkEnableOption "bitcoin.electrs"; }; + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + electrs + ]; + + users = { + users = { + "electrs" = { + description = "electrs system user"; + isSystemUser = true; + group = "bitcoin"; + }; + }; + }; + + systemd.services.electrs = { + Unit = { + after = [ "network.target" "bitcoind.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + Service = { + ExecStart = "${pkgs.electrs}/bin/electrs --conf=..."; + Restart = "always"; + User = "electrs"; + Group = "bitcoin"; + }; + }; + }; +} diff --git a/src/modules/system/corn/modules/sparrow-cli/default.nix b/src/system/modules/bitcoin/modules/sparrow-server/default.nix similarity index 58% rename from src/modules/system/corn/modules/sparrow-cli/default.nix rename to src/system/modules/bitcoin/modules/sparrow-server/default.nix index 589df5c..4a7450f 100644 --- a/src/modules/system/corn/modules/sparrow-cli/default.nix +++ b/src/system/modules/bitcoin/modules/sparrow-server/default.nix @@ -2,10 +2,10 @@ with lib; let - cfg = config.modules.corn.sparrow-server; + cfg = config.modules.bitcoin.sparrow-server; sparrow-server = import ./derivation.nix { inherit pkgs; }; in -{ options.modules.corn.sparrow-server = { enable = mkEnableOption "corn.sparrow-server"; }; +{ options.modules.bitcoin.sparrow-server = { enable = mkEnableOption "bitcoin.sparrow-server"; }; config = mkIf cfg.enable { home.packages = with pkgs; [ sparrow-server diff --git a/src/modules/system/corn/modules/sparrow-cli/derivation.nix b/src/system/modules/bitcoin/modules/sparrow-server/derivation.nix similarity index 100% rename from src/modules/system/corn/modules/sparrow-cli/derivation.nix rename to src/system/modules/bitcoin/modules/sparrow-server/derivation.nix diff --git a/src/modules/system/default.nix b/src/system/modules/default.nix similarity index 69% rename from src/modules/system/default.nix rename to src/system/modules/default.nix index 1b5d773..79cd10e 100644 --- a/src/modules/system/default.nix +++ b/src/system/modules/default.nix @@ -1,5 +1,6 @@ { imports = [ ./corn + ./security ]; } diff --git a/src/user/default.nix b/src/user/configs/default.nix similarity index 100% rename from src/user/default.nix rename to src/user/configs/default.nix diff --git a/src/user/pgpKey.nix b/src/user/configs/pgpKey.nix similarity index 100% rename from src/user/pgpKey.nix rename to src/user/configs/pgpKey.nix diff --git a/src/modules/user/bash/config/alias.nix b/src/user/modules/bash/config/alias.nix similarity index 100% rename from src/modules/user/bash/config/alias.nix rename to src/user/modules/bash/config/alias.nix diff --git a/src/modules/user/bash/config/bashprofile.nix b/src/user/modules/bash/config/bashprofile.nix similarity index 100% rename from src/modules/user/bash/config/bashprofile.nix rename to src/user/modules/bash/config/bashprofile.nix diff --git a/src/modules/user/bash/config/bashrc.nix b/src/user/modules/bash/config/bashrc.nix similarity index 100% rename from src/modules/user/bash/config/bashrc.nix rename to src/user/modules/bash/config/bashrc.nix diff --git a/src/modules/user/bash/config/prompt.nix b/src/user/modules/bash/config/prompt.nix similarity index 100% rename from src/modules/user/bash/config/prompt.nix rename to src/user/modules/bash/config/prompt.nix diff --git a/src/modules/user/bash/default.nix b/src/user/modules/bash/default.nix similarity index 100% rename from src/modules/user/bash/default.nix rename to src/user/modules/bash/default.nix diff --git a/src/modules/user/default.nix b/src/user/modules/default.nix similarity index 100% rename from src/modules/user/default.nix rename to src/user/modules/default.nix diff --git a/src/modules/user/git/default.nix b/src/user/modules/git/default.nix similarity index 100% rename from src/modules/user/git/default.nix rename to src/user/modules/git/default.nix diff --git a/src/modules/user/gpg/default.nix b/src/user/modules/gpg/default.nix similarity index 100% rename from src/modules/user/gpg/default.nix rename to src/user/modules/gpg/default.nix diff --git a/src/modules/user/gui/default.nix b/src/user/modules/gui/default.nix similarity index 100% rename from src/modules/user/gui/default.nix rename to src/user/modules/gui/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/default.nix b/src/user/modules/gui/desktopEnvironments/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/default.nix rename to src/user/modules/gui/desktopEnvironments/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix b/src/user/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix rename to src/user/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/alacritty/default.nix b/src/user/modules/gui/desktopEnvironments/modules/alacritty/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/alacritty/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/alacritty/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/browsers/default.nix b/src/user/modules/gui/desktopEnvironments/modules/browsers/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/browsers/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/browsers/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/corn/default.nix b/src/user/modules/gui/desktopEnvironments/modules/corn/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/corn/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/corn/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/default.nix b/src/user/modules/gui/desktopEnvironments/modules/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/fun/default.nix b/src/user/modules/gui/desktopEnvironments/modules/fun/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/fun/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/fun/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/servers.nix b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/servers.nix rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/default.nix b/src/user/modules/gui/desktopEnvironments/modules/neovim/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/neovim/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/utils/default.nix b/src/user/modules/gui/desktopEnvironments/modules/utils/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/utils/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/utils/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/writing/default.nix b/src/user/modules/gui/desktopEnvironments/modules/writing/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/writing/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/writing/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/sway/config/rofi.nix b/src/user/modules/gui/desktopEnvironments/sway/config/rofi.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/sway/config/rofi.nix rename to src/user/modules/gui/desktopEnvironments/sway/config/rofi.nix diff --git a/src/modules/user/gui/desktopEnvironments/sway/config/shellHook.nix b/src/user/modules/gui/desktopEnvironments/sway/config/shellHook.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/sway/config/shellHook.nix rename to src/user/modules/gui/desktopEnvironments/sway/config/shellHook.nix diff --git a/src/modules/user/gui/desktopEnvironments/sway/config/sway.nix b/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/sway/config/sway.nix rename to src/user/modules/gui/desktopEnvironments/sway/config/sway.nix diff --git a/src/modules/user/gui/desktopEnvironments/sway/default.nix b/src/user/modules/gui/desktopEnvironments/sway/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/sway/default.nix rename to src/user/modules/gui/desktopEnvironments/sway/default.nix diff --git a/src/modules/user/gui/wallpapers/mountains.jpg b/src/user/modules/gui/wallpapers/mountains.jpg similarity index 100% rename from src/modules/user/gui/wallpapers/mountains.jpg rename to src/user/modules/gui/wallpapers/mountains.jpg diff --git a/src/modules/security/default.nix b/src/user/modules/security/default.nix similarity index 100% rename from src/modules/security/default.nix rename to src/user/modules/security/default.nix diff --git a/src/modules/user/utils/default.nix b/src/user/modules/utils/default.nix similarity index 100% rename from src/modules/user/utils/default.nix rename to src/user/modules/utils/default.nix diff --git a/src/modules/user/utils/modules/default.nix b/src/user/modules/utils/modules/default.nix similarity index 100% rename from src/modules/user/utils/modules/default.nix rename to src/user/modules/utils/modules/default.nix diff --git a/src/modules/user/utils/modules/dev/default.nix b/src/user/modules/utils/modules/dev/default.nix similarity index 100% rename from src/modules/user/utils/modules/dev/default.nix rename to src/user/modules/utils/modules/dev/default.nix diff --git a/src/modules/user/utils/modules/email/config/aerc.conf b/src/user/modules/utils/modules/email/config/aerc.conf similarity index 100% rename from src/modules/user/utils/modules/email/config/aerc.conf rename to src/user/modules/utils/modules/email/config/aerc.conf diff --git a/src/modules/user/utils/modules/email/config/binds.conf b/src/user/modules/utils/modules/email/config/binds.conf similarity index 100% rename from src/modules/user/utils/modules/email/config/binds.conf rename to src/user/modules/utils/modules/email/config/binds.conf diff --git a/src/modules/user/utils/modules/email/default.nix b/src/user/modules/utils/modules/email/default.nix similarity index 100% rename from src/modules/user/utils/modules/email/default.nix rename to src/user/modules/utils/modules/email/default.nix diff --git a/src/modules/user/utils/modules/irc/default.nix b/src/user/modules/utils/modules/irc/default.nix similarity index 100% rename from src/modules/user/utils/modules/irc/default.nix rename to src/user/modules/utils/modules/irc/default.nix diff --git a/src/modules/user/utils/modules/vim/config/vimrc b/src/user/modules/utils/modules/vim/config/vimrc similarity index 100% rename from src/modules/user/utils/modules/vim/config/vimrc rename to src/user/modules/utils/modules/vim/config/vimrc diff --git a/src/modules/user/utils/modules/vim/default.nix b/src/user/modules/utils/modules/vim/default.nix similarity index 100% rename from src/modules/user/utils/modules/vim/default.nix rename to src/user/modules/utils/modules/vim/default.nix