diff --git a/Makefile b/Makefile index 40cd748..3e88b82 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ endif # update by default, install first all: update update: install $(UPDATE_TARGET) - cp $(DSTDIR)/.flake/flake.lock $(SRCDIR)/.flake + cp $(DSTDIR)/.flake/flake.lock $(SRCDIR)/flake git add -A git commit -m "update lock file" || true diff --git a/macos.local/.flake/flake.lock b/macos.local/flake/flake.lock similarity index 100% rename from macos.local/.flake/flake.lock rename to macos.local/flake/flake.lock diff --git a/macos.local/.flake/flake.nix.org b/macos.local/flake/flake.nix.org similarity index 100% rename from macos.local/.flake/flake.nix.org rename to macos.local/flake/flake.nix.org diff --git a/macos.local/.flake/home/.wallpaper b/macos.local/flake/home/.wallpaper similarity index 100% rename from macos.local/.flake/home/.wallpaper rename to macos.local/flake/home/.wallpaper diff --git a/macos.local/.flake/home/clang-format.nix.org b/macos.local/flake/home/clang-format.nix.org similarity index 100% rename from macos.local/.flake/home/clang-format.nix.org rename to macos.local/flake/home/clang-format.nix.org diff --git a/macos.local/.flake/home/core.nix.org b/macos.local/flake/home/core.nix.org similarity index 100% rename from macos.local/.flake/home/core.nix.org rename to macos.local/flake/home/core.nix.org diff --git a/macos.local/.flake/home/fonts.nix.org b/macos.local/flake/home/fonts.nix.org similarity index 100% rename from macos.local/.flake/home/fonts.nix.org rename to macos.local/flake/home/fonts.nix.org diff --git a/macos.local/.flake/home/programs/.DS_Store b/macos.local/flake/home/programs/.DS_Store similarity index 100% rename from macos.local/.flake/home/programs/.DS_Store rename to macos.local/flake/home/programs/.DS_Store diff --git a/macos.local/.flake/home/programs/core.nix.org b/macos.local/flake/home/programs/core.nix.org similarity index 100% rename from macos.local/.flake/home/programs/core.nix.org rename to macos.local/flake/home/programs/core.nix.org diff --git a/macos.local/.flake/home/programs/emacs/core.nix.org b/macos.local/flake/home/programs/emacs/core.nix.org similarity index 100% rename from macos.local/.flake/home/programs/emacs/core.nix.org rename to macos.local/flake/home/programs/emacs/core.nix.org diff --git a/macos.local/.flake/home/programs/emacs/early-init.el.org b/macos.local/flake/home/programs/emacs/early-init.el.org similarity index 100% rename from macos.local/.flake/home/programs/emacs/early-init.el.org rename to macos.local/flake/home/programs/emacs/early-init.el.org diff --git a/macos.local/.flake/home/programs/emacs/feed.org.org b/macos.local/flake/home/programs/emacs/feed.org.org similarity index 100% rename from macos.local/.flake/home/programs/emacs/feed.org.org rename to macos.local/flake/home/programs/emacs/feed.org.org diff --git a/macos.local/.flake/home/programs/emacs/init.el.org b/macos.local/flake/home/programs/emacs/init.el.org similarity index 100% rename from macos.local/.flake/home/programs/emacs/init.el.org rename to macos.local/flake/home/programs/emacs/init.el.org diff --git a/macos.local/.flake/home/programs/fastfetch.nix.org b/macos.local/flake/home/programs/fastfetch.nix.org similarity index 100% rename from macos.local/.flake/home/programs/fastfetch.nix.org rename to macos.local/flake/home/programs/fastfetch.nix.org diff --git a/macos.local/.flake/home/programs/ghostty.nix.org b/macos.local/flake/home/programs/ghostty.nix.org similarity index 100% rename from macos.local/.flake/home/programs/ghostty.nix.org rename to macos.local/flake/home/programs/ghostty.nix.org diff --git a/macos.local/.flake/home/programs/git.nix.org b/macos.local/flake/home/programs/git.nix.org similarity index 100% rename from macos.local/.flake/home/programs/git.nix.org rename to macos.local/flake/home/programs/git.nix.org diff --git a/macos.local/.flake/home/programs/ncmpcpp.nix.org b/macos.local/flake/home/programs/ncmpcpp.nix.org similarity index 100% rename from macos.local/.flake/home/programs/ncmpcpp.nix.org rename to macos.local/flake/home/programs/ncmpcpp.nix.org diff --git a/macos.local/.flake/home/programs/neovim.nix.org b/macos.local/flake/home/programs/neovim.nix.org similarity index 100% rename from macos.local/.flake/home/programs/neovim.nix.org rename to macos.local/flake/home/programs/neovim.nix.org diff --git a/macos.local/.flake/home/programs/ssh.nix.org b/macos.local/flake/home/programs/ssh.nix.org similarity index 100% rename from macos.local/.flake/home/programs/ssh.nix.org rename to macos.local/flake/home/programs/ssh.nix.org diff --git a/macos.local/.flake/home/programs/zsh/core.nix.org b/macos.local/flake/home/programs/zsh/core.nix.org similarity index 100% rename from macos.local/.flake/home/programs/zsh/core.nix.org rename to macos.local/flake/home/programs/zsh/core.nix.org diff --git a/macos.local/.flake/home/programs/zsh/init-extra.sh.org b/macos.local/flake/home/programs/zsh/init-extra.sh.org similarity index 100% rename from macos.local/.flake/home/programs/zsh/init-extra.sh.org rename to macos.local/flake/home/programs/zsh/init-extra.sh.org diff --git a/macos.local/.flake/home/programs/zsh/profile-extra.sh.org b/macos.local/flake/home/programs/zsh/profile-extra.sh.org similarity index 100% rename from macos.local/.flake/home/programs/zsh/profile-extra.sh.org rename to macos.local/flake/home/programs/zsh/profile-extra.sh.org diff --git a/macos.local/.flake/home/scripts/core.nix.org b/macos.local/flake/home/scripts/core.nix.org similarity index 100% rename from macos.local/.flake/home/scripts/core.nix.org rename to macos.local/flake/home/scripts/core.nix.org diff --git a/macos.local/.flake/home/scripts/deploy-website.org b/macos.local/flake/home/scripts/deploy-website.org similarity index 100% rename from macos.local/.flake/home/scripts/deploy-website.org rename to macos.local/flake/home/scripts/deploy-website.org diff --git a/macos.local/.flake/home/scripts/launcher.org b/macos.local/flake/home/scripts/launcher.org similarity index 100% rename from macos.local/.flake/home/scripts/launcher.org rename to macos.local/flake/home/scripts/launcher.org diff --git a/macos.local/.flake/home/scripts/manage-system.org b/macos.local/flake/home/scripts/manage-system.org similarity index 100% rename from macos.local/.flake/home/scripts/manage-system.org rename to macos.local/flake/home/scripts/manage-system.org diff --git a/macos.local/.flake/home/scripts/remove-quarantine.org b/macos.local/flake/home/scripts/remove-quarantine.org similarity index 100% rename from macos.local/.flake/home/scripts/remove-quarantine.org rename to macos.local/flake/home/scripts/remove-quarantine.org diff --git a/macos.local/.flake/home/services/core.nix.org b/macos.local/flake/home/services/core.nix.org similarity index 100% rename from macos.local/.flake/home/services/core.nix.org rename to macos.local/flake/home/services/core.nix.org diff --git a/macos.local/.flake/home/services/mpd.nix.org b/macos.local/flake/home/services/mpd.nix.org similarity index 100% rename from macos.local/.flake/home/services/mpd.nix.org rename to macos.local/flake/home/services/mpd.nix.org diff --git a/macos.local/.flake/system/aerospace.nix.org b/macos.local/flake/system/aerospace.nix.org similarity index 100% rename from macos.local/.flake/system/aerospace.nix.org rename to macos.local/flake/system/aerospace.nix.org diff --git a/macos.local/.flake/system/core.nix.org b/macos.local/flake/system/core.nix.org similarity index 100% rename from macos.local/.flake/system/core.nix.org rename to macos.local/flake/system/core.nix.org diff --git a/macos.local/.flake/system/homebrew.nix.org b/macos.local/flake/system/homebrew.nix.org similarity index 100% rename from macos.local/.flake/system/homebrew.nix.org rename to macos.local/flake/system/homebrew.nix.org diff --git a/nixos/.flake/flake.lock b/nixos/flake/flake.lock similarity index 100% rename from nixos/.flake/flake.lock rename to nixos/flake/flake.lock diff --git a/nixos/.flake/flake.nix.org b/nixos/flake/flake.nix.org similarity index 100% rename from nixos/.flake/flake.nix.org rename to nixos/flake/flake.nix.org diff --git a/nixos/.flake/home/.wallpaper b/nixos/flake/home/.wallpaper similarity index 100% rename from nixos/.flake/home/.wallpaper rename to nixos/flake/home/.wallpaper diff --git a/nixos/.flake/home/clang-format.nix.org b/nixos/flake/home/clang-format.nix.org similarity index 100% rename from nixos/.flake/home/clang-format.nix.org rename to nixos/flake/home/clang-format.nix.org diff --git a/nixos/.flake/home/core.nix.org b/nixos/flake/home/core.nix.org similarity index 100% rename from nixos/.flake/home/core.nix.org rename to nixos/flake/home/core.nix.org diff --git a/nixos/.flake/home/cursor.nix.org b/nixos/flake/home/cursor.nix.org similarity index 100% rename from nixos/.flake/home/cursor.nix.org rename to nixos/flake/home/cursor.nix.org diff --git a/nixos/.flake/home/fonts.nix.org b/nixos/flake/home/fonts.nix.org similarity index 100% rename from nixos/.flake/home/fonts.nix.org rename to nixos/flake/home/fonts.nix.org diff --git a/nixos/.flake/home/hyprland.nix.org b/nixos/flake/home/hyprland.nix.org similarity index 100% rename from nixos/.flake/home/hyprland.nix.org rename to nixos/flake/home/hyprland.nix.org diff --git a/nixos/.flake/home/programs/core.nix.org b/nixos/flake/home/programs/core.nix.org similarity index 100% rename from nixos/.flake/home/programs/core.nix.org rename to nixos/flake/home/programs/core.nix.org diff --git a/nixos/.flake/home/programs/emacs b/nixos/flake/home/programs/emacs similarity index 100% rename from nixos/.flake/home/programs/emacs rename to nixos/flake/home/programs/emacs diff --git a/nixos/.flake/home/programs/fastfetch.nix.org b/nixos/flake/home/programs/fastfetch.nix.org similarity index 100% rename from nixos/.flake/home/programs/fastfetch.nix.org rename to nixos/flake/home/programs/fastfetch.nix.org diff --git a/nixos/.flake/home/programs/foot.nix.org b/nixos/flake/home/programs/foot.nix.org similarity index 100% rename from nixos/.flake/home/programs/foot.nix.org rename to nixos/flake/home/programs/foot.nix.org diff --git a/nixos/.flake/home/programs/git.nix.org b/nixos/flake/home/programs/git.nix.org similarity index 100% rename from nixos/.flake/home/programs/git.nix.org rename to nixos/flake/home/programs/git.nix.org diff --git a/nixos/.flake/home/programs/hyprlock.nix.org b/nixos/flake/home/programs/hyprlock.nix.org similarity index 100% rename from nixos/.flake/home/programs/hyprlock.nix.org rename to nixos/flake/home/programs/hyprlock.nix.org diff --git a/nixos/.flake/home/programs/ncmpcpp.nix.org b/nixos/flake/home/programs/ncmpcpp.nix.org similarity index 100% rename from nixos/.flake/home/programs/ncmpcpp.nix.org rename to nixos/flake/home/programs/ncmpcpp.nix.org diff --git a/nixos/.flake/home/programs/neovim.nix.org b/nixos/flake/home/programs/neovim.nix.org similarity index 100% rename from nixos/.flake/home/programs/neovim.nix.org rename to nixos/flake/home/programs/neovim.nix.org diff --git a/nixos/.flake/home/programs/ssh.nix.org b/nixos/flake/home/programs/ssh.nix.org similarity index 100% rename from nixos/.flake/home/programs/ssh.nix.org rename to nixos/flake/home/programs/ssh.nix.org diff --git a/nixos/.flake/home/programs/waybar.nix.org b/nixos/flake/home/programs/waybar.nix.org similarity index 100% rename from nixos/.flake/home/programs/waybar.nix.org rename to nixos/flake/home/programs/waybar.nix.org diff --git a/nixos/.flake/home/programs/zsh.nix.org b/nixos/flake/home/programs/zsh.nix.org similarity index 100% rename from nixos/.flake/home/programs/zsh.nix.org rename to nixos/flake/home/programs/zsh.nix.org diff --git a/nixos/.flake/home/scripts.nix.org b/nixos/flake/home/scripts.nix.org similarity index 100% rename from nixos/.flake/home/scripts.nix.org rename to nixos/flake/home/scripts.nix.org diff --git a/nixos/.flake/home/services/core.nix.org b/nixos/flake/home/services/core.nix.org similarity index 100% rename from nixos/.flake/home/services/core.nix.org rename to nixos/flake/home/services/core.nix.org diff --git a/nixos/.flake/home/services/emacs.nix.org b/nixos/flake/home/services/emacs.nix.org similarity index 100% rename from nixos/.flake/home/services/emacs.nix.org rename to nixos/flake/home/services/emacs.nix.org diff --git a/nixos/.flake/home/services/mako.nix.org b/nixos/flake/home/services/mako.nix.org similarity index 100% rename from nixos/.flake/home/services/mako.nix.org rename to nixos/flake/home/services/mako.nix.org diff --git a/nixos/.flake/home/services/mpd.nix.org b/nixos/flake/home/services/mpd.nix.org similarity index 100% rename from nixos/.flake/home/services/mpd.nix.org rename to nixos/flake/home/services/mpd.nix.org diff --git a/nixos/.flake/home/services/syncthing.nix.org b/nixos/flake/home/services/syncthing.nix.org similarity index 100% rename from nixos/.flake/home/services/syncthing.nix.org rename to nixos/flake/home/services/syncthing.nix.org diff --git a/nixos/.flake/system/boot.nix.org b/nixos/flake/system/boot.nix.org similarity index 100% rename from nixos/.flake/system/boot.nix.org rename to nixos/flake/system/boot.nix.org diff --git a/nixos/.flake/system/core.nix.org b/nixos/flake/system/core.nix.org similarity index 100% rename from nixos/.flake/system/core.nix.org rename to nixos/flake/system/core.nix.org diff --git a/nixos/.flake/system/desktop.nix.org b/nixos/flake/system/desktop.nix.org similarity index 100% rename from nixos/.flake/system/desktop.nix.org rename to nixos/flake/system/desktop.nix.org diff --git a/nixos/.flake/system/hardware-configuration.nix b/nixos/flake/system/hardware-configuration.nix similarity index 100% rename from nixos/.flake/system/hardware-configuration.nix rename to nixos/flake/system/hardware-configuration.nix diff --git a/nixos/.flake/system/locale.nix.org b/nixos/flake/system/locale.nix.org similarity index 100% rename from nixos/.flake/system/locale.nix.org rename to nixos/flake/system/locale.nix.org diff --git a/nixos/.flake/system/network.nix.org b/nixos/flake/system/network.nix.org similarity index 100% rename from nixos/.flake/system/network.nix.org rename to nixos/flake/system/network.nix.org diff --git a/nixos/.flake/system/update-resolv-conf.sh b/nixos/flake/system/update-resolv-conf.sh similarity index 100% rename from nixos/.flake/system/update-resolv-conf.sh rename to nixos/flake/system/update-resolv-conf.sh diff --git a/nixos/.flake/system/users.nix.org b/nixos/flake/system/users.nix.org similarity index 100% rename from nixos/.flake/system/users.nix.org rename to nixos/flake/system/users.nix.org