From b429d8e6da02cf1600cbde2f84640c5bbdbbf745 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Fri, 27 Sep 2024 01:03:05 -0400 Subject: [PATCH] move some stuff around --- .gitattributes | 6 +++--- {nix/etcnixos => etcnixos}/common.nix | 0 {nix/etcnixos => etcnixos}/declarative-nm.nix | 0 {nix/etcnixos => etcnixos}/flake.lock | 0 {nix/etcnixos => etcnixos}/flake.nix | 0 {nix/etcnixos => etcnixos}/hardware_desktop.nix | 0 {nix/etcnixos => etcnixos}/hardware_laptop.nix | 0 {nix/etcnixos => etcnixos}/networking.nix | 0 .../secrets/primary-password.age | Bin {nix/etcnixos => etcnixos}/secrets/secrets.nix | 0 {nix/etcnixos => etcnixos}/secrets/secureboot.tar | Bin .../secrets/wifi-passwords.nix | Bin {nix/etcnixos => etcnixos}/system-mreow.nix | 0 {nix/etcnixos => etcnixos}/system-nixos.nix | 0 {nix/home-manager => home-manager}/flake.lock | 0 {nix/home-manager => home-manager}/flake.nix | 0 {nix/home-manager => home-manager}/gui.nix | 0 {nix/home-manager => home-manager}/no-gui.nix | 0 .../progs/alacritty.nix | 0 {nix/home-manager => home-manager}/progs/borg.nix | 0 {nix/home-manager => home-manager}/progs/fish.nix | 0 .../progs/gpt4all-HEAD-disable-settings-err.patch | 0 .../gpt4all/gpt4all-HEAD-disable-settings-err.patch | 0 .../gpt4all/gpt4all-HEAD-embeddings-model.patch | 0 .../progs/gpt4all/gpt4all.nix | 0 {nix/home-manager => home-manager}/progs/helix.nix | 0 .../progs/librewolf.nix | 0 {nix/home-manager => home-manager}/progs/niri.nix | 0 {nix/home-manager => home-manager}/progs/rss.nix | 0 .../progs/swaylock.nix | 0 {nix/home-manager => home-manager}/progs/waybar.nix | 0 .../secrets/borg-laptop-password.age | 0 .../secrets/factorio.nix | Bin .../secrets/my-gpg.age | Bin .../secrets/secrets.nix | 0 .../secrets/server-password.age | 0 {nix/home-manager => home-manager}/system-mreow.nix | 0 {nix/home-manager => home-manager}/system-nixos.nix | 0 justfile | 6 +++--- 39 files changed, 6 insertions(+), 6 deletions(-) rename {nix/etcnixos => etcnixos}/common.nix (100%) rename {nix/etcnixos => etcnixos}/declarative-nm.nix (100%) rename {nix/etcnixos => etcnixos}/flake.lock (100%) rename {nix/etcnixos => etcnixos}/flake.nix (100%) rename {nix/etcnixos => etcnixos}/hardware_desktop.nix (100%) rename {nix/etcnixos => etcnixos}/hardware_laptop.nix (100%) rename {nix/etcnixos => etcnixos}/networking.nix (100%) rename {nix/etcnixos => etcnixos}/secrets/primary-password.age (100%) rename {nix/etcnixos => etcnixos}/secrets/secrets.nix (100%) rename {nix/etcnixos => etcnixos}/secrets/secureboot.tar (100%) rename {nix/etcnixos => etcnixos}/secrets/wifi-passwords.nix (100%) rename {nix/etcnixos => etcnixos}/system-mreow.nix (100%) rename {nix/etcnixos => etcnixos}/system-nixos.nix (100%) rename {nix/home-manager => home-manager}/flake.lock (100%) rename {nix/home-manager => home-manager}/flake.nix (100%) rename {nix/home-manager => home-manager}/gui.nix (100%) rename {nix/home-manager => home-manager}/no-gui.nix (100%) rename {nix/home-manager => home-manager}/progs/alacritty.nix (100%) rename {nix/home-manager => home-manager}/progs/borg.nix (100%) rename {nix/home-manager => home-manager}/progs/fish.nix (100%) rename {nix/home-manager => home-manager}/progs/gpt4all-HEAD-disable-settings-err.patch (100%) rename {nix/home-manager => home-manager}/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch (100%) rename {nix/home-manager => home-manager}/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch (100%) rename {nix/home-manager => home-manager}/progs/gpt4all/gpt4all.nix (100%) rename {nix/home-manager => home-manager}/progs/helix.nix (100%) rename {nix/home-manager => home-manager}/progs/librewolf.nix (100%) rename {nix/home-manager => home-manager}/progs/niri.nix (100%) rename {nix/home-manager => home-manager}/progs/rss.nix (100%) rename {nix/home-manager => home-manager}/progs/swaylock.nix (100%) rename {nix/home-manager => home-manager}/progs/waybar.nix (100%) rename {nix/home-manager => home-manager}/secrets/borg-laptop-password.age (100%) rename {nix/home-manager => home-manager}/secrets/factorio.nix (100%) rename {nix/home-manager => home-manager}/secrets/my-gpg.age (100%) rename {nix/home-manager => home-manager}/secrets/secrets.nix (100%) rename {nix/home-manager => home-manager}/secrets/server-password.age (100%) rename {nix/home-manager => home-manager}/system-mreow.nix (100%) rename {nix/home-manager => home-manager}/system-nixos.nix (100%) diff --git a/.gitattributes b/.gitattributes index 486a9c3..77298d2 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,3 @@ -nix/home-manager/secrets/factorio.nix filter=git-crypt diff=git-crypt -nix/etcnixos/secrets/secureboot.tar filter=git-crypt diff=git-crypt -nix/etcnixos/secrets/wifi-passwords.nix filter=git-crypt diff=git-crypt +home-manager/secrets/factorio.nix filter=git-crypt diff=git-crypt +etcnixos/secrets/secureboot.tar filter=git-crypt diff=git-crypt +etcnixos/secrets/wifi-passwords.nix filter=git-crypt diff=git-crypt diff --git a/nix/etcnixos/common.nix b/etcnixos/common.nix similarity index 100% rename from nix/etcnixos/common.nix rename to etcnixos/common.nix diff --git a/nix/etcnixos/declarative-nm.nix b/etcnixos/declarative-nm.nix similarity index 100% rename from nix/etcnixos/declarative-nm.nix rename to etcnixos/declarative-nm.nix diff --git a/nix/etcnixos/flake.lock b/etcnixos/flake.lock similarity index 100% rename from nix/etcnixos/flake.lock rename to etcnixos/flake.lock diff --git a/nix/etcnixos/flake.nix b/etcnixos/flake.nix similarity index 100% rename from nix/etcnixos/flake.nix rename to etcnixos/flake.nix diff --git a/nix/etcnixos/hardware_desktop.nix b/etcnixos/hardware_desktop.nix similarity index 100% rename from nix/etcnixos/hardware_desktop.nix rename to etcnixos/hardware_desktop.nix diff --git a/nix/etcnixos/hardware_laptop.nix b/etcnixos/hardware_laptop.nix similarity index 100% rename from nix/etcnixos/hardware_laptop.nix rename to etcnixos/hardware_laptop.nix diff --git a/nix/etcnixos/networking.nix b/etcnixos/networking.nix similarity index 100% rename from nix/etcnixos/networking.nix rename to etcnixos/networking.nix diff --git a/nix/etcnixos/secrets/primary-password.age b/etcnixos/secrets/primary-password.age similarity index 100% rename from nix/etcnixos/secrets/primary-password.age rename to etcnixos/secrets/primary-password.age diff --git a/nix/etcnixos/secrets/secrets.nix b/etcnixos/secrets/secrets.nix similarity index 100% rename from nix/etcnixos/secrets/secrets.nix rename to etcnixos/secrets/secrets.nix diff --git a/nix/etcnixos/secrets/secureboot.tar b/etcnixos/secrets/secureboot.tar similarity index 100% rename from nix/etcnixos/secrets/secureboot.tar rename to etcnixos/secrets/secureboot.tar diff --git a/nix/etcnixos/secrets/wifi-passwords.nix b/etcnixos/secrets/wifi-passwords.nix similarity index 100% rename from nix/etcnixos/secrets/wifi-passwords.nix rename to etcnixos/secrets/wifi-passwords.nix diff --git a/nix/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix similarity index 100% rename from nix/etcnixos/system-mreow.nix rename to etcnixos/system-mreow.nix diff --git a/nix/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix similarity index 100% rename from nix/etcnixos/system-nixos.nix rename to etcnixos/system-nixos.nix diff --git a/nix/home-manager/flake.lock b/home-manager/flake.lock similarity index 100% rename from nix/home-manager/flake.lock rename to home-manager/flake.lock diff --git a/nix/home-manager/flake.nix b/home-manager/flake.nix similarity index 100% rename from nix/home-manager/flake.nix rename to home-manager/flake.nix diff --git a/nix/home-manager/gui.nix b/home-manager/gui.nix similarity index 100% rename from nix/home-manager/gui.nix rename to home-manager/gui.nix diff --git a/nix/home-manager/no-gui.nix b/home-manager/no-gui.nix similarity index 100% rename from nix/home-manager/no-gui.nix rename to home-manager/no-gui.nix diff --git a/nix/home-manager/progs/alacritty.nix b/home-manager/progs/alacritty.nix similarity index 100% rename from nix/home-manager/progs/alacritty.nix rename to home-manager/progs/alacritty.nix diff --git a/nix/home-manager/progs/borg.nix b/home-manager/progs/borg.nix similarity index 100% rename from nix/home-manager/progs/borg.nix rename to home-manager/progs/borg.nix diff --git a/nix/home-manager/progs/fish.nix b/home-manager/progs/fish.nix similarity index 100% rename from nix/home-manager/progs/fish.nix rename to home-manager/progs/fish.nix diff --git a/nix/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch b/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch similarity index 100% rename from nix/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch rename to home-manager/progs/gpt4all-HEAD-disable-settings-err.patch diff --git a/nix/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch b/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch similarity index 100% rename from nix/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch rename to home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch diff --git a/nix/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch b/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch similarity index 100% rename from nix/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch rename to home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch diff --git a/nix/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix similarity index 100% rename from nix/home-manager/progs/gpt4all/gpt4all.nix rename to home-manager/progs/gpt4all/gpt4all.nix diff --git a/nix/home-manager/progs/helix.nix b/home-manager/progs/helix.nix similarity index 100% rename from nix/home-manager/progs/helix.nix rename to home-manager/progs/helix.nix diff --git a/nix/home-manager/progs/librewolf.nix b/home-manager/progs/librewolf.nix similarity index 100% rename from nix/home-manager/progs/librewolf.nix rename to home-manager/progs/librewolf.nix diff --git a/nix/home-manager/progs/niri.nix b/home-manager/progs/niri.nix similarity index 100% rename from nix/home-manager/progs/niri.nix rename to home-manager/progs/niri.nix diff --git a/nix/home-manager/progs/rss.nix b/home-manager/progs/rss.nix similarity index 100% rename from nix/home-manager/progs/rss.nix rename to home-manager/progs/rss.nix diff --git a/nix/home-manager/progs/swaylock.nix b/home-manager/progs/swaylock.nix similarity index 100% rename from nix/home-manager/progs/swaylock.nix rename to home-manager/progs/swaylock.nix diff --git a/nix/home-manager/progs/waybar.nix b/home-manager/progs/waybar.nix similarity index 100% rename from nix/home-manager/progs/waybar.nix rename to home-manager/progs/waybar.nix diff --git a/nix/home-manager/secrets/borg-laptop-password.age b/home-manager/secrets/borg-laptop-password.age similarity index 100% rename from nix/home-manager/secrets/borg-laptop-password.age rename to home-manager/secrets/borg-laptop-password.age diff --git a/nix/home-manager/secrets/factorio.nix b/home-manager/secrets/factorio.nix similarity index 100% rename from nix/home-manager/secrets/factorio.nix rename to home-manager/secrets/factorio.nix diff --git a/nix/home-manager/secrets/my-gpg.age b/home-manager/secrets/my-gpg.age similarity index 100% rename from nix/home-manager/secrets/my-gpg.age rename to home-manager/secrets/my-gpg.age diff --git a/nix/home-manager/secrets/secrets.nix b/home-manager/secrets/secrets.nix similarity index 100% rename from nix/home-manager/secrets/secrets.nix rename to home-manager/secrets/secrets.nix diff --git a/nix/home-manager/secrets/server-password.age b/home-manager/secrets/server-password.age similarity index 100% rename from nix/home-manager/secrets/server-password.age rename to home-manager/secrets/server-password.age diff --git a/nix/home-manager/system-mreow.nix b/home-manager/system-mreow.nix similarity index 100% rename from nix/home-manager/system-mreow.nix rename to home-manager/system-mreow.nix diff --git a/nix/home-manager/system-nixos.nix b/home-manager/system-nixos.nix similarity index 100% rename from nix/home-manager/system-nixos.nix rename to home-manager/system-nixos.nix diff --git a/justfile b/justfile index d15b366..8db2e74 100644 --- a/justfile +++ b/justfile @@ -16,6 +16,6 @@ home_update: home-manager switch --impure sync_configs: format_home format_system - rsync -a --delete /etc/nixos/ ~/dotfiles/nix/etcnixos/ - rsync -a --delete ~/.config/home-manager/ ~/dotfiles/nix/home-manager/ - cp ~/justfile ~/dotfiles/ + rsync -a --delete /etc/nixos/ ~/projects/configs/dotfiles/nix/etcnixos/ + rsync -a --delete ~/.config/home-manager/ ~/projects/configs/dotfiles/nix/home-manager/ +