From 46f9a593ffe355ed1da067cf701e6069e4efb7c4 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sun, 23 Apr 2023 14:53:55 +0100 Subject: [PATCH] Fix structure levels --- home/Legion-xenia.nix | 2 +- home/Monarch-tux.nix | 15 +-------------- home/Northstar-xenia.nix | 2 +- home/Vanguard-xenia.nix | 2 +- home/env/{common => }/config/ssh | 0 home/env/{common => }/config/starship.toml | 0 home/env/{common => }/default.nix | 0 home/env/{common => }/direnv.nix | 0 home/env/{common => }/fonts/default.nix | 0 home/env/{common => }/fonts/firacode.nix | 0 home/env/{common => }/fonts/iosevka.nix | 0 home/env/{common => }/git.nix | 0 home/env/{common => }/keychain.nix | 0 home/env/{common => }/nixpkgs.nix | 0 home/env/{common => }/qemu.nix | 0 home/env/{common => }/shell/bash.nix | 0 home/env/{common => }/shell/default.nix | 0 home/env/{common => }/shell/fish.nix | 0 home/env/{common => }/shell/zsh.nix | 0 home/env/{common => }/ssh.nix | 0 home/env/{common => }/starship.nix | 0 home/env/{work.nix => user/elitherl.nix} | 2 +- home/env/user/tux.nix | 16 ++++++++++++++++ home/env/{personal.nix => user/xenia.nix} | 2 +- home/ukaea-elitherl.nix | 2 +- 25 files changed, 23 insertions(+), 20 deletions(-) rename home/env/{common => }/config/ssh (100%) rename home/env/{common => }/config/starship.toml (100%) rename home/env/{common => }/default.nix (100%) rename home/env/{common => }/direnv.nix (100%) rename home/env/{common => }/fonts/default.nix (100%) rename home/env/{common => }/fonts/firacode.nix (100%) rename home/env/{common => }/fonts/iosevka.nix (100%) rename home/env/{common => }/git.nix (100%) rename home/env/{common => }/keychain.nix (100%) rename home/env/{common => }/nixpkgs.nix (100%) rename home/env/{common => }/qemu.nix (100%) rename home/env/{common => }/shell/bash.nix (100%) rename home/env/{common => }/shell/default.nix (100%) rename home/env/{common => }/shell/fish.nix (100%) rename home/env/{common => }/shell/zsh.nix (100%) rename home/env/{common => }/ssh.nix (100%) rename home/env/{common => }/starship.nix (100%) rename home/env/{work.nix => user/elitherl.nix} (88%) create mode 100644 home/env/user/tux.nix rename home/env/{personal.nix => user/xenia.nix} (87%) diff --git a/home/Legion-xenia.nix b/home/Legion-xenia.nix index 866bdd58..78a51838 100644 --- a/home/Legion-xenia.nix +++ b/home/Legion-xenia.nix @@ -1,6 +1,6 @@ { ... }: { imports = [ - ./env/personal.nix + ./env/xenia.nix ./tui ]; home.stateVersion = "22.11"; diff --git a/home/Monarch-tux.nix b/home/Monarch-tux.nix index 8883866a..3db2ee99 100644 --- a/home/Monarch-tux.nix +++ b/home/Monarch-tux.nix @@ -1,21 +1,8 @@ { ... }: { imports = [ - ./env/personal.nix + ./env/tux.nix ./tui ]; - # Home Manager needs a bit of information about you and the - # paths it should manage. - home.username = "tux"; - home.homeDirectory = "/Users/tux"; - - programs.git = { - userEmail = "evie@xenia.me.uk"; - }; - - programs.zsh.envExtra = '' - eval "$(/opt/homebrew/bin/brew shellenv)" - ''; - home.stateVersion = "22.11"; } diff --git a/home/Northstar-xenia.nix b/home/Northstar-xenia.nix index 866bdd58..95fff4e5 100644 --- a/home/Northstar-xenia.nix +++ b/home/Northstar-xenia.nix @@ -1,6 +1,6 @@ { ... }: { imports = [ - ./env/personal.nix + ./env/user/xenia.nix ./tui ]; home.stateVersion = "22.11"; diff --git a/home/Vanguard-xenia.nix b/home/Vanguard-xenia.nix index 2d38b261..d85f59b2 100644 --- a/home/Vanguard-xenia.nix +++ b/home/Vanguard-xenia.nix @@ -1,6 +1,6 @@ { ... }: { imports = [ - ./env/personal.nix + ./env/xenia.nix ./desktop/gtk.nix ./desktop/wayland.nix ./tui diff --git a/home/env/common/config/ssh b/home/env/config/ssh similarity index 100% rename from home/env/common/config/ssh rename to home/env/config/ssh diff --git a/home/env/common/config/starship.toml b/home/env/config/starship.toml similarity index 100% rename from home/env/common/config/starship.toml rename to home/env/config/starship.toml diff --git a/home/env/common/default.nix b/home/env/default.nix similarity index 100% rename from home/env/common/default.nix rename to home/env/default.nix diff --git a/home/env/common/direnv.nix b/home/env/direnv.nix similarity index 100% rename from home/env/common/direnv.nix rename to home/env/direnv.nix diff --git a/home/env/common/fonts/default.nix b/home/env/fonts/default.nix similarity index 100% rename from home/env/common/fonts/default.nix rename to home/env/fonts/default.nix diff --git a/home/env/common/fonts/firacode.nix b/home/env/fonts/firacode.nix similarity index 100% rename from home/env/common/fonts/firacode.nix rename to home/env/fonts/firacode.nix diff --git a/home/env/common/fonts/iosevka.nix b/home/env/fonts/iosevka.nix similarity index 100% rename from home/env/common/fonts/iosevka.nix rename to home/env/fonts/iosevka.nix diff --git a/home/env/common/git.nix b/home/env/git.nix similarity index 100% rename from home/env/common/git.nix rename to home/env/git.nix diff --git a/home/env/common/keychain.nix b/home/env/keychain.nix similarity index 100% rename from home/env/common/keychain.nix rename to home/env/keychain.nix diff --git a/home/env/common/nixpkgs.nix b/home/env/nixpkgs.nix similarity index 100% rename from home/env/common/nixpkgs.nix rename to home/env/nixpkgs.nix diff --git a/home/env/common/qemu.nix b/home/env/qemu.nix similarity index 100% rename from home/env/common/qemu.nix rename to home/env/qemu.nix diff --git a/home/env/common/shell/bash.nix b/home/env/shell/bash.nix similarity index 100% rename from home/env/common/shell/bash.nix rename to home/env/shell/bash.nix diff --git a/home/env/common/shell/default.nix b/home/env/shell/default.nix similarity index 100% rename from home/env/common/shell/default.nix rename to home/env/shell/default.nix diff --git a/home/env/common/shell/fish.nix b/home/env/shell/fish.nix similarity index 100% rename from home/env/common/shell/fish.nix rename to home/env/shell/fish.nix diff --git a/home/env/common/shell/zsh.nix b/home/env/shell/zsh.nix similarity index 100% rename from home/env/common/shell/zsh.nix rename to home/env/shell/zsh.nix diff --git a/home/env/common/ssh.nix b/home/env/ssh.nix similarity index 100% rename from home/env/common/ssh.nix rename to home/env/ssh.nix diff --git a/home/env/common/starship.nix b/home/env/starship.nix similarity index 100% rename from home/env/common/starship.nix rename to home/env/starship.nix diff --git a/home/env/work.nix b/home/env/user/elitherl.nix similarity index 88% rename from home/env/work.nix rename to home/env/user/elitherl.nix index 54f3a6ca..d8e9f93f 100644 --- a/home/env/work.nix +++ b/home/env/user/elitherl.nix @@ -1,6 +1,6 @@ { ... }: { - imports = [ ./common ]; + imports = [ ../default.nix ]; # Home Manager needs a bit of information about you and the # paths it should manage. home.username = "elitherl"; diff --git a/home/env/user/tux.nix b/home/env/user/tux.nix new file mode 100644 index 00000000..0ec524c6 --- /dev/null +++ b/home/env/user/tux.nix @@ -0,0 +1,16 @@ +{ ... }: +{ + imports = [ ../default.nix ]; + # Home Manager needs a bit of information about you and the + # paths it should manage. + home.username = "tux"; + home.homeDirectory = "/Users/tux"; + + programs.git = { + userEmail = "evie@xenia.me.uk"; + }; + + programs.zsh.envExtra = '' + eval "$(/opt/homebrew/bin/brew shellenv)" + ''; +} diff --git a/home/env/personal.nix b/home/env/user/xenia.nix similarity index 87% rename from home/env/personal.nix rename to home/env/user/xenia.nix index 1bc8f0ce..2ffe2262 100644 --- a/home/env/personal.nix +++ b/home/env/user/xenia.nix @@ -1,6 +1,6 @@ { ... }: { - imports = [ ./common ]; + imports = [ ../default.nix ]; # Home Manager needs a bit of information about you and the # paths it should manage. home.username = "xenia"; diff --git a/home/ukaea-elitherl.nix b/home/ukaea-elitherl.nix index e24a0017..78074f14 100644 --- a/home/ukaea-elitherl.nix +++ b/home/ukaea-elitherl.nix @@ -2,7 +2,7 @@ imports = [ ./desktop/gtk.nix ./desktop/wayland.nix - ./env/work.nix + ./env/elitherl.nix ./tui ./gui/chromium-wayland.nix ./gui/neovide.nix