From 572e82a24962ccbe7ed454f982037a400c5055d0 Mon Sep 17 00:00:00 2001 From: Joshua Yuen Date: Sat, 12 Sep 2026 00:10:36 -0400 Subject: [PATCH] Rename directory structure --- flake.nix | 2 +- hosts/installation-iso/default.nix | 2 +- hosts/laptop/default.nix | 2 +- hosts/vm/default.nix | 2 +- modules/{homes => home}/default.nix | 0 modules/{homes => home}/direnv.nix | 0 modules/{homes => home}/discord.nix | 2 +- modules/home/firefox.nix | 101 +++++++++++++++++ modules/{homes => home}/fzf.nix | 0 modules/{homes => home}/gpg.nix | 0 modules/{homes => home}/hyprland/binds.nix | 0 modules/{homes => home}/hyprland/default.nix | 0 modules/{homes => home}/hyprland/hyprland.nix | 0 modules/{homes => home}/kitty.nix | 0 modules/{homes => home}/stylix.nix | 0 modules/{homes => home}/vscodium.nix | 0 modules/{homes => home}/walker.nix | 5 +- modules/{homes => home}/xdg.nix | 0 modules/{homes => home}/zsh/completion.nix | 0 modules/{homes => home}/zsh/completion.zsh | 0 modules/home/zsh/default.nix | 107 ++++++++++++++++++ modules/{homes => home}/zsh/p10k.nix | 0 modules/{homes => home}/zsh/p10k.zsh | 0 modules/homes/firefox.nix | 99 ---------------- modules/homes/zsh/default.nix | 103 ----------------- modules/{core => nixos}/boot.nix | 0 modules/{core => nixos}/default.nix | 0 modules/{core => nixos}/fonts.nix | 0 modules/{core => nixos}/gdm.nix | 0 modules/{core => nixos}/gnomeBoxes.nix | 0 modules/{core => nixos}/home-manager.nix | 0 modules/{core => nixos}/hyprland.nix | 0 modules/{core => nixos}/localsend.nix | 2 +- modules/{core => nixos}/network.nix | 0 modules/{core => nixos}/packages.nix | 0 modules/{core => nixos}/pipewire.nix | 0 modules/{core => nixos}/plasma.nix | 0 modules/{core => nixos}/sddm.nix | 0 modules/{core => nixos}/services.nix | 0 modules/{core => nixos}/stylix.nix | 2 +- modules/{core => nixos}/system.nix | 0 modules/{core => nixos}/tailscale.nix | 0 modules/{core => nixos}/user.nix | 0 modules/{core => nixos}/zsh.nix | 2 +- {homes => users}/josh/home.nix | 2 +- 45 files changed, 220 insertions(+), 213 deletions(-) rename modules/{homes => home}/default.nix (100%) rename modules/{homes => home}/direnv.nix (100%) rename modules/{homes => home}/discord.nix (99%) create mode 100644 modules/home/firefox.nix rename modules/{homes => home}/fzf.nix (100%) rename modules/{homes => home}/gpg.nix (100%) rename modules/{homes => home}/hyprland/binds.nix (100%) rename modules/{homes => home}/hyprland/default.nix (100%) rename modules/{homes => home}/hyprland/hyprland.nix (100%) rename modules/{homes => home}/kitty.nix (100%) rename modules/{homes => home}/stylix.nix (100%) rename modules/{homes => home}/vscodium.nix (100%) rename modules/{homes => home}/walker.nix (82%) rename modules/{homes => home}/xdg.nix (100%) rename modules/{homes => home}/zsh/completion.nix (100%) rename modules/{homes => home}/zsh/completion.zsh (100%) create mode 100644 modules/home/zsh/default.nix rename modules/{homes => home}/zsh/p10k.nix (100%) rename modules/{homes => home}/zsh/p10k.zsh (100%) delete mode 100644 modules/homes/firefox.nix delete mode 100644 modules/homes/zsh/default.nix rename modules/{core => nixos}/boot.nix (100%) rename modules/{core => nixos}/default.nix (100%) rename modules/{core => nixos}/fonts.nix (100%) rename modules/{core => nixos}/gdm.nix (100%) rename modules/{core => nixos}/gnomeBoxes.nix (100%) rename modules/{core => nixos}/home-manager.nix (100%) rename modules/{core => nixos}/hyprland.nix (100%) rename modules/{core => nixos}/localsend.nix (98%) rename modules/{core => nixos}/network.nix (100%) rename modules/{core => nixos}/packages.nix (100%) rename modules/{core => nixos}/pipewire.nix (100%) rename modules/{core => nixos}/plasma.nix (100%) rename modules/{core => nixos}/sddm.nix (100%) rename modules/{core => nixos}/services.nix (100%) rename modules/{core => nixos}/stylix.nix (99%) rename modules/{core => nixos}/system.nix (100%) rename modules/{core => nixos}/tailscale.nix (100%) rename modules/{core => nixos}/user.nix (100%) rename modules/{core => nixos}/zsh.nix (98%) rename {homes => users}/josh/home.nix (97%) diff --git a/flake.nix b/flake.nix index 314df8b..cf035bb 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ system = "x86_64-linux"; username = "josh"; profile = "desktop"; - homePath = ./. + "/homes/${username}/home.nix"; + homePath = ./. + "/users/${username}/home.nix"; pkgs = import nixpkgs { inherit system; diff --git a/hosts/installation-iso/default.nix b/hosts/installation-iso/default.nix index c82a518..f5c4fd4 100644 --- a/hosts/installation-iso/default.nix +++ b/hosts/installation-iso/default.nix @@ -5,7 +5,7 @@ imports = [ ../../profiles/desktop - ../../modules/core + ../../modules/nixos ../../modules/drivers ../../modules/options diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 555cbcd..f8c9633 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -5,7 +5,7 @@ imports = [ ../../profiles/desktop - ../../modules/core + ../../modules/nixos ../../modules/drivers ../../modules/options diff --git a/hosts/vm/default.nix b/hosts/vm/default.nix index a04732e..3d17445 100644 --- a/hosts/vm/default.nix +++ b/hosts/vm/default.nix @@ -5,7 +5,7 @@ imports = [ ../../profiles/desktop - ../../modules/core + ../../modules/nixos ../../modules/drivers ../../modules/options diff --git a/modules/homes/default.nix b/modules/home/default.nix similarity index 100% rename from modules/homes/default.nix rename to modules/home/default.nix diff --git a/modules/homes/direnv.nix b/modules/home/direnv.nix similarity index 100% rename from modules/homes/direnv.nix rename to modules/home/direnv.nix diff --git a/modules/homes/discord.nix b/modules/home/discord.nix similarity index 99% rename from modules/homes/discord.nix rename to modules/home/discord.nix index 34c7633..3fa2b01 100644 --- a/modules/homes/discord.nix +++ b/modules/home/discord.nix @@ -15,4 +15,4 @@ in package = pkgs.discord; }; }; -} \ No newline at end of file +} diff --git a/modules/home/firefox.nix b/modules/home/firefox.nix new file mode 100644 index 0000000..6909302 --- /dev/null +++ b/modules/home/firefox.nix @@ -0,0 +1,101 @@ +{ + config, + pkgs, + username, + ... +}: +{ + programs.firefox = { + enable = true; + package = pkgs.firefox; + configPath = "${config.xdg.configHome}/mozilla/firefox"; + + policies = { + # Updates & Background Services + AppAutoUpdate = false; + BackgroundAppUpdate = false; + + # Quality of Life + OfferToSaveLogins = false; + + # Extensions + ExtensionSettings = + let + moz = short: "https://addons.mozilla.org/firefox/downloads/latest/${short}/latest.xpi"; + in + { + "*".installation_mode = "blocked"; + + # uBlock Origin + "uBlock0@raymondhill.net" = { + install_url = moz "ublock-origin"; + installation_mode = "force_installed"; + updates_disabled = true; + private_browsing = true; + default_area = "navbar"; + }; + + # Bitwarden + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { + install_url = moz "bitwarden-password-manager"; + installation_mode = "force_installed"; + updates_disabled = true; + private_browsing = true; + default_area = "navbar"; + }; + + # Dark Reader + "addon@darkreader.org" = { + install_url = moz "darkreader"; + installation_mode = "force_installed"; + updates_disabled = true; + private_browsing = true; + default_area = "navbar"; + }; + + # SponsorBlock + "sponsorBlocker@ajay.app" = { + install_url = moz "sponsorblock"; + installation_mode = "force_installed"; + updates_disabled = true; + private_browsing = true; + default_area = "menupanel"; + }; + + # Return YouTube Dislike + "{762f9885-5a13-4abd-9c77-433dcd38b8fd}" = { + install_url = moz "return-youtube-dislikes"; + installation_mode = "force_installed"; + updates_disabled = true; + private_browsing = true; + default_area = "menupanel"; + }; + + # RES + "jid1-xUfzOsOFlzSOXg@jetpack" = { + install_url = moz "reddit-enhancement-suite"; + installation_mode = "force_installed"; + updates_disabled = true; + private_browsing = true; + default_area = "menupanel"; + }; + }; + + "3rdparty".Extensions = { + "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { + environment = { + base = "https://bitwarden.joshuayuen.me"; + }; + }; + }; + + profiles = { + ${username} = { + id = 0; + isDefault = true; + name = "${username}"; + }; + }; + }; + }; +} diff --git a/modules/homes/fzf.nix b/modules/home/fzf.nix similarity index 100% rename from modules/homes/fzf.nix rename to modules/home/fzf.nix diff --git a/modules/homes/gpg.nix b/modules/home/gpg.nix similarity index 100% rename from modules/homes/gpg.nix rename to modules/home/gpg.nix diff --git a/modules/homes/hyprland/binds.nix b/modules/home/hyprland/binds.nix similarity index 100% rename from modules/homes/hyprland/binds.nix rename to modules/home/hyprland/binds.nix diff --git a/modules/homes/hyprland/default.nix b/modules/home/hyprland/default.nix similarity index 100% rename from modules/homes/hyprland/default.nix rename to modules/home/hyprland/default.nix diff --git a/modules/homes/hyprland/hyprland.nix b/modules/home/hyprland/hyprland.nix similarity index 100% rename from modules/homes/hyprland/hyprland.nix rename to modules/home/hyprland/hyprland.nix diff --git a/modules/homes/kitty.nix b/modules/home/kitty.nix similarity index 100% rename from modules/homes/kitty.nix rename to modules/home/kitty.nix diff --git a/modules/homes/stylix.nix b/modules/home/stylix.nix similarity index 100% rename from modules/homes/stylix.nix rename to modules/home/stylix.nix diff --git a/modules/homes/vscodium.nix b/modules/home/vscodium.nix similarity index 100% rename from modules/homes/vscodium.nix rename to modules/home/vscodium.nix diff --git a/modules/homes/walker.nix b/modules/home/walker.nix similarity index 82% rename from modules/homes/walker.nix rename to modules/home/walker.nix index 61260ac..308082f 100644 --- a/modules/homes/walker.nix +++ b/modules/home/walker.nix @@ -5,7 +5,8 @@ ... }: with lib; -let hyprlandCfg = config.modules.hyprland; +let + hyprlandCfg = config.modules.hyprland; in { imports = [ inputs.walker.homeManagerModules.default ]; @@ -14,4 +15,4 @@ in enable = true; runAsService = true; }; -} \ No newline at end of file +} diff --git a/modules/homes/xdg.nix b/modules/home/xdg.nix similarity index 100% rename from modules/homes/xdg.nix rename to modules/home/xdg.nix diff --git a/modules/homes/zsh/completion.nix b/modules/home/zsh/completion.nix similarity index 100% rename from modules/homes/zsh/completion.nix rename to modules/home/zsh/completion.nix diff --git a/modules/homes/zsh/completion.zsh b/modules/home/zsh/completion.zsh similarity index 100% rename from modules/homes/zsh/completion.zsh rename to modules/home/zsh/completion.zsh diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix new file mode 100644 index 0000000..cd7fecb --- /dev/null +++ b/modules/home/zsh/default.nix @@ -0,0 +1,107 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; +let + cfg = config.modules.zsh; + xdgCfg = config.xdg; +in +{ + imports = [ + ./completion.nix + ./p10k.nix + ]; + + programs.zsh = { + enable = cfg.enable; + dotDir = "${xdgCfg.configHome}/zsh"; + autosuggestion.enable = false; + enableCompletion = false; + syntaxHighlighting = { + enable = true; + highlighters = [ + "main" + "brackets" + "pattern" + "root" + ]; + }; + historySubstringSearch.enable = true; + history = { + append = true; + ignoreDups = false; + ignoreSpace = true; + save = 100000; + share = true; + size = 100000; + extended = true; + }; + + initContent = + let + zshConfigInitEarly = mkOrder 500 '' + # p10k + # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. + # Initialization code that may require console input (password prompts, [y/n] + # confirmations, etc.) must go above this block; everything else may go below. + if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then + source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" + fi + source "${xdgCfg.configHome}/zsh/p10k.zsh"; + ''; + zshConfig = mkOrder 1000 '' + # Autocompletion and menu styling + zmodload zsh/complist + autoload -Uz compinit && compinit + source "${xdgCfg.configHome}/zsh/completion.zsh"; + + # vi keybindings for menu select + bindkey -M menuselect 'h' vi-backward-char + bindkey -M menuselect 'k' vi-up-line-or-history + bindkey -M menuselect 'j' vi-down-line-or-history + bindkey -M menuselect 'l' vi-forward-char + + # Tab to accept current selection + bindkey -M menuselect '^I' accept-and-infer-next-history + + # Control arrow keys + bindkey '^[[1;5C' forward-word + bindkey '^[[1;5D' backward-word + + # Control backspace + bindkey '^H' backward-kill-word + ''; + in + mkMerge [ + zshConfigInitEarly + zshConfig + ]; + + shellAliases = { + ".." = "cd .."; + "..." = "cd ../.."; + ls = "ls --color=auto"; + ll = "ls -al"; + grep = "grep --color=auto"; + back = "cd $OLDPWD"; + gs = "git status"; + ssha = "eval $(ssh-agent) && ssh-add"; + }; + + plugins = [ + { + name = "powerlevel10k"; + src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/"; + file = "powerlevel10k.zsh-theme"; + } + { + name = "zsh-autocomplete"; + src = "${pkgs.zsh-autocomplete}/share/zsh-autocomplete/"; + file = "zsh-autocomplete.zsh"; + } + ]; + }; +} diff --git a/modules/homes/zsh/p10k.nix b/modules/home/zsh/p10k.nix similarity index 100% rename from modules/homes/zsh/p10k.nix rename to modules/home/zsh/p10k.nix diff --git a/modules/homes/zsh/p10k.zsh b/modules/home/zsh/p10k.zsh similarity index 100% rename from modules/homes/zsh/p10k.zsh rename to modules/home/zsh/p10k.zsh diff --git a/modules/homes/firefox.nix b/modules/homes/firefox.nix deleted file mode 100644 index a7cf82a..0000000 --- a/modules/homes/firefox.nix +++ /dev/null @@ -1,99 +0,0 @@ -{ - config, - pkgs, - username, - ... -}: -{ - programs.firefox = { - enable = true; - package = pkgs.firefox; - configPath = "${config.xdg.configHome}/mozilla/firefox"; - - policies = { - # Updates & Background Services - AppAutoUpdate = false; - BackgroundAppUpdate = false; - - # Quality of Life - OfferToSaveLogins = false; - - # Extensions - ExtensionSettings = let - moz = short: "https://addons.mozilla.org/firefox/downloads/latest/${short}/latest.xpi"; - in { - "*".installation_mode = "blocked"; - - # uBlock Origin - "uBlock0@raymondhill.net" = { - install_url = moz "ublock-origin"; - installation_mode = "force_installed"; - updates_disabled = true; - private_browsing = true; - default_area = "navbar"; - }; - - # Bitwarden - "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { - install_url = moz "bitwarden-password-manager"; - installation_mode = "force_installed"; - updates_disabled = true; - private_browsing = true; - default_area = "navbar"; - }; - - # Dark Reader - "addon@darkreader.org" = { - install_url = moz "darkreader"; - installation_mode = "force_installed"; - updates_disabled = true; - private_browsing = true; - default_area = "navbar"; - }; - - # SponsorBlock - "sponsorBlocker@ajay.app" = { - install_url = moz "sponsorblock"; - installation_mode = "force_installed"; - updates_disabled = true; - private_browsing = true; - default_area = "menupanel"; - }; - - # Return YouTube Dislike - "{762f9885-5a13-4abd-9c77-433dcd38b8fd}" = { - install_url = moz "return-youtube-dislikes"; - installation_mode = "force_installed"; - updates_disabled = true; - private_browsing = true; - default_area = "menupanel"; - }; - - # RES - "jid1-xUfzOsOFlzSOXg@jetpack" = { - install_url = moz "reddit-enhancement-suite"; - installation_mode = "force_installed"; - updates_disabled = true; - private_browsing = true; - default_area = "menupanel"; - }; - }; - - "3rdparty".Extensions = { - "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { - environment = { - base = "https://bitwarden.joshuayuen.me"; - }; - }; - }; - - profiles = { - ${username} = { - id = 0; - isDefault = true; - name = "${username}"; - }; - }; - }; - }; -} \ No newline at end of file diff --git a/modules/homes/zsh/default.nix b/modules/homes/zsh/default.nix deleted file mode 100644 index 8d581a9..0000000 --- a/modules/homes/zsh/default.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; -let - cfg = config.modules.zsh; - xdgCfg = config.xdg; -in -{ - imports = [ - ./completion.nix - ./p10k.nix - ]; - - programs.zsh = { - enable = cfg.enable; - dotDir = "${xdgCfg.configHome}/zsh"; - autosuggestion.enable = false; - enableCompletion = false; - syntaxHighlighting = { - enable = true; - highlighters = [ - "main" - "brackets" - "pattern" - "root" - ]; - }; - historySubstringSearch.enable = true; - history = { - append = true; - ignoreDups = false; - ignoreSpace = true; - save = 100000; - share = true; - size = 100000; - extended = true; - }; - - initContent = - let - zshConfigInitEarly = mkOrder 500 '' - # p10k - # Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc. - # Initialization code that may require console input (password prompts, [y/n] - # confirmations, etc.) must go above this block; everything else may go below. - if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then - source "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" - fi - source "${xdgCfg.configHome}/zsh/p10k.zsh"; - ''; - zshConfig = mkOrder 1000 '' - # Autocompletion and menu styling - zmodload zsh/complist - autoload -Uz compinit && compinit - source "${xdgCfg.configHome}/zsh/completion.zsh"; - - # vi keybindings for menu select - bindkey -M menuselect 'h' vi-backward-char - bindkey -M menuselect 'k' vi-up-line-or-history - bindkey -M menuselect 'j' vi-down-line-or-history - bindkey -M menuselect 'l' vi-forward-char - - # Tab to accept current selection - bindkey -M menuselect '^I' accept-and-infer-next-history - - # Control arrow keys - bindkey '^[[1;5C' forward-word - bindkey '^[[1;5D' backward-word - - # Control backspace - bindkey '^H' backward-kill-word - ''; - in mkMerge [ zshConfigInitEarly zshConfig ]; - - shellAliases = { - ".." = "cd .."; - "..." = "cd ../.."; - ls = "ls --color=auto"; - ll = "ls -al"; - grep = "grep --color=auto"; - back = "cd $OLDPWD"; - gs = "git status"; - ssha = "eval $(ssh-agent) && ssh-add"; - }; - - plugins = [ - { - name = "powerlevel10k"; - src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/"; - file = "powerlevel10k.zsh-theme"; - } - { - name = "zsh-autocomplete"; - src = "${pkgs.zsh-autocomplete}/share/zsh-autocomplete/"; - file = "zsh-autocomplete.zsh"; - } - ]; - }; -} diff --git a/modules/core/boot.nix b/modules/nixos/boot.nix similarity index 100% rename from modules/core/boot.nix rename to modules/nixos/boot.nix diff --git a/modules/core/default.nix b/modules/nixos/default.nix similarity index 100% rename from modules/core/default.nix rename to modules/nixos/default.nix diff --git a/modules/core/fonts.nix b/modules/nixos/fonts.nix similarity index 100% rename from modules/core/fonts.nix rename to modules/nixos/fonts.nix diff --git a/modules/core/gdm.nix b/modules/nixos/gdm.nix similarity index 100% rename from modules/core/gdm.nix rename to modules/nixos/gdm.nix diff --git a/modules/core/gnomeBoxes.nix b/modules/nixos/gnomeBoxes.nix similarity index 100% rename from modules/core/gnomeBoxes.nix rename to modules/nixos/gnomeBoxes.nix diff --git a/modules/core/home-manager.nix b/modules/nixos/home-manager.nix similarity index 100% rename from modules/core/home-manager.nix rename to modules/nixos/home-manager.nix diff --git a/modules/core/hyprland.nix b/modules/nixos/hyprland.nix similarity index 100% rename from modules/core/hyprland.nix rename to modules/nixos/hyprland.nix diff --git a/modules/core/localsend.nix b/modules/nixos/localsend.nix similarity index 98% rename from modules/core/localsend.nix rename to modules/nixos/localsend.nix index cb3d89f..5f8c925 100644 --- a/modules/core/localsend.nix +++ b/modules/nixos/localsend.nix @@ -13,4 +13,4 @@ in enable = true; }; }; -} \ No newline at end of file +} diff --git a/modules/core/network.nix b/modules/nixos/network.nix similarity index 100% rename from modules/core/network.nix rename to modules/nixos/network.nix diff --git a/modules/core/packages.nix b/modules/nixos/packages.nix similarity index 100% rename from modules/core/packages.nix rename to modules/nixos/packages.nix diff --git a/modules/core/pipewire.nix b/modules/nixos/pipewire.nix similarity index 100% rename from modules/core/pipewire.nix rename to modules/nixos/pipewire.nix diff --git a/modules/core/plasma.nix b/modules/nixos/plasma.nix similarity index 100% rename from modules/core/plasma.nix rename to modules/nixos/plasma.nix diff --git a/modules/core/sddm.nix b/modules/nixos/sddm.nix similarity index 100% rename from modules/core/sddm.nix rename to modules/nixos/sddm.nix diff --git a/modules/core/services.nix b/modules/nixos/services.nix similarity index 100% rename from modules/core/services.nix rename to modules/nixos/services.nix diff --git a/modules/core/stylix.nix b/modules/nixos/stylix.nix similarity index 99% rename from modules/core/stylix.nix rename to modules/nixos/stylix.nix index 9ec018f..3a5c2db 100644 --- a/modules/core/stylix.nix +++ b/modules/nixos/stylix.nix @@ -12,4 +12,4 @@ polarity = "dark"; }; -} \ No newline at end of file +} diff --git a/modules/core/system.nix b/modules/nixos/system.nix similarity index 100% rename from modules/core/system.nix rename to modules/nixos/system.nix diff --git a/modules/core/tailscale.nix b/modules/nixos/tailscale.nix similarity index 100% rename from modules/core/tailscale.nix rename to modules/nixos/tailscale.nix diff --git a/modules/core/user.nix b/modules/nixos/user.nix similarity index 100% rename from modules/core/user.nix rename to modules/nixos/user.nix diff --git a/modules/core/zsh.nix b/modules/nixos/zsh.nix similarity index 98% rename from modules/core/zsh.nix rename to modules/nixos/zsh.nix index a9322fc..25d1bb4 100644 --- a/modules/core/zsh.nix +++ b/modules/nixos/zsh.nix @@ -11,4 +11,4 @@ in config = mkIf zshCfg.enable { programs.zsh.enable = true; }; -} \ No newline at end of file +} diff --git a/homes/josh/home.nix b/users/josh/home.nix similarity index 97% rename from homes/josh/home.nix rename to users/josh/home.nix index f4097df..237a63e 100644 --- a/homes/josh/home.nix +++ b/users/josh/home.nix @@ -12,7 +12,7 @@ let in { imports = [ - ../../modules/homes + ../../modules/home ../../modules/options ../../profiles/${profile} ];