From 2e54749e77e89ff725b56e3d3627521aa4a41c26 Mon Sep 17 00:00:00 2001 From: Joshua Potter Date: Sun, 10 Dec 2023 10:23:26 -0700 Subject: [PATCH] Update directory structure once more. --- README.md | 12 +++++++----- .../23.11pre-git}/flake.lock | 0 .../23.11pre-git}/flake.nix | 0 .../23.11pre-git}/result | 0 .sops.yaml => hive/.sops.yaml | 0 flake.lock => hive/flake.lock | 0 flake.nix => hive/flake.nix | 0 {framework => hive/framework}/configuration.nix | 0 {framework => hive/framework}/flake.lock | 0 {framework => hive/framework}/flake.nix | 0 .../framework}/hardware-configuration.nix | 0 .../framework}/jrpotter/bash/default.nix | 0 .../framework}/jrpotter/bash/git-prompt.sh | 0 {framework => hive/framework}/jrpotter/default.nix | 0 {framework => hive/framework}/jrpotter/git.nix | 0 {framework => hive/framework}/jrpotter/lang/bash.nix | 0 {framework => hive/framework}/jrpotter/lang/c.nix | 0 .../framework}/jrpotter/lang/elixir.nix | 0 {framework => hive/framework}/jrpotter/lang/lean.nix | 0 {framework => hive/framework}/jrpotter/lang/lua.nix | 0 .../framework}/jrpotter/lang/markdown.nix | 0 {framework => hive/framework}/jrpotter/lang/nix.nix | 0 .../framework}/jrpotter/lang/python.nix | 0 .../framework}/jrpotter/lang/typescript.nix | 0 .../framework}/jrpotter/neovim/default.nix | 0 .../framework}/jrpotter/neovim/lua/default.nix | 0 .../framework}/jrpotter/neovim/lua/init/c.lua | 0 .../framework}/jrpotter/neovim/lua/init/cmp.lua | 0 .../framework}/jrpotter/neovim/lua/init/dap.lua | 0 .../framework}/jrpotter/neovim/lua/init/lsp.lua | 0 .../framework}/jrpotter/neovim/lua/init/lua.lua | 0 .../framework}/jrpotter/neovim/lua/init/python.lua | 0 .../jrpotter/neovim/lua/init/statusline.lua | 0 .../jrpotter/neovim/lua/init/telescope.lua | 0 .../jrpotter/neovim/lua/init/treesitter.lua | 0 .../framework}/jrpotter/neovim/utils.nix | 0 .../framework}/jrpotter/wezterm/default.nix | 0 .../framework}/jrpotter/wezterm/wezterm.lua | 0 {phobos => hive/phobos}/flake.lock | 0 {phobos => hive/phobos}/flake.nix | 0 {phobos => hive/phobos}/secrets.yaml | 0 41 files changed, 7 insertions(+), 5 deletions(-) rename {images/digital-ocean-23.11pre-git => digital-ocean/23.11pre-git}/flake.lock (100%) rename {images/digital-ocean-23.11pre-git => digital-ocean/23.11pre-git}/flake.nix (100%) rename {images/digital-ocean-23.11pre-git => digital-ocean/23.11pre-git}/result (100%) rename .sops.yaml => hive/.sops.yaml (100%) rename flake.lock => hive/flake.lock (100%) rename flake.nix => hive/flake.nix (100%) rename {framework => hive/framework}/configuration.nix (100%) rename {framework => hive/framework}/flake.lock (100%) rename {framework => hive/framework}/flake.nix (100%) rename {framework => hive/framework}/hardware-configuration.nix (100%) rename {framework => hive/framework}/jrpotter/bash/default.nix (100%) rename {framework => hive/framework}/jrpotter/bash/git-prompt.sh (100%) rename {framework => hive/framework}/jrpotter/default.nix (100%) rename {framework => hive/framework}/jrpotter/git.nix (100%) rename {framework => hive/framework}/jrpotter/lang/bash.nix (100%) rename {framework => hive/framework}/jrpotter/lang/c.nix (100%) rename {framework => hive/framework}/jrpotter/lang/elixir.nix (100%) rename {framework => hive/framework}/jrpotter/lang/lean.nix (100%) rename {framework => hive/framework}/jrpotter/lang/lua.nix (100%) rename {framework => hive/framework}/jrpotter/lang/markdown.nix (100%) rename {framework => hive/framework}/jrpotter/lang/nix.nix (100%) rename {framework => hive/framework}/jrpotter/lang/python.nix (100%) rename {framework => hive/framework}/jrpotter/lang/typescript.nix (100%) rename {framework => hive/framework}/jrpotter/neovim/default.nix (100%) rename {framework => hive/framework}/jrpotter/neovim/lua/default.nix (100%) rename {framework => hive/framework}/jrpotter/neovim/lua/init/c.lua (100%) rename {framework => hive/framework}/jrpotter/neovim/lua/init/cmp.lua (100%) rename {framework => hive/framework}/jrpotter/neovim/lua/init/dap.lua (100%) rename {framework => hive/framework}/jrpotter/neovim/lua/init/lsp.lua (100%) rename {framework => hive/framework}/jrpotter/neovim/lua/init/lua.lua (100%) rename {framework => hive/framework}/jrpotter/neovim/lua/init/python.lua (100%) rename {framework => hive/framework}/jrpotter/neovim/lua/init/statusline.lua (100%) rename {framework => hive/framework}/jrpotter/neovim/lua/init/telescope.lua (100%) rename {framework => hive/framework}/jrpotter/neovim/lua/init/treesitter.lua (100%) rename {framework => hive/framework}/jrpotter/neovim/utils.nix (100%) rename {framework => hive/framework}/jrpotter/wezterm/default.nix (100%) rename {framework => hive/framework}/jrpotter/wezterm/wezterm.lua (100%) rename {phobos => hive/phobos}/flake.lock (100%) rename {phobos => hive/phobos}/flake.nix (100%) rename {phobos => hive/phobos}/secrets.yaml (100%) diff --git a/README.md b/README.md index d1eb305..bc16e31 100644 --- a/README.md +++ b/README.md @@ -3,16 +3,17 @@ The collection of publically visible nixos-configuration files used for all of my NixOS machines. Deployment (both local and remote) is managed using [colmena](https://github.com/zhaofengli/colmena). All machines can be found in -the top-level `flake.nix` file. +the `hive/flake.nix` file. ## Local Machines -My personal laptop configuration is reflected in the top-level `framework` -directory (named after the [framework](https://frame.work/) laptop I use). This -flake defines a [home-manager](https://nix-community.github.io/home-manager/) +My personal laptop configuration is reflected in the `hive/framework` directory +(named after the [framework](https://frame.work/) laptop I use). This flake +defines a [home-manager](https://nix-community.github.io/home-manager/) configuration for a single user called `jrpotter`. We can apply a `nixos-rebuild switch` by running: ```bash +$ cd hive $ nix flake update # If any changes were made to local machines. $ colmena apply-local [--sudo] ``` @@ -21,7 +22,7 @@ $ colmena apply-local [--sudo] Remote machines are hosted on [DigitalOcean](https://www.digitalocean.com/). The custom image used by each droplet can be built using the top-level -`images/digital-ocean-23.11pre-git` flake. This image disables a root password +`digital-ocean/23.11pre-git` flake. This image disables a root password in favor of SSH. A droplet running this image will automatically pull in any enabled SSH keys from your DigitalOcean account at creation time (so make sure to include them when creating a new droplet). @@ -80,6 +81,7 @@ $ ssh-add ~/.ssh/id_ed25519 ``` Afterward you can run the following: ```bash +$ cd hive $ nix flake update # If any changes were made to remote machines. $ colmena apply ``` diff --git a/images/digital-ocean-23.11pre-git/flake.lock b/digital-ocean/23.11pre-git/flake.lock similarity index 100% rename from images/digital-ocean-23.11pre-git/flake.lock rename to digital-ocean/23.11pre-git/flake.lock diff --git a/images/digital-ocean-23.11pre-git/flake.nix b/digital-ocean/23.11pre-git/flake.nix similarity index 100% rename from images/digital-ocean-23.11pre-git/flake.nix rename to digital-ocean/23.11pre-git/flake.nix diff --git a/images/digital-ocean-23.11pre-git/result b/digital-ocean/23.11pre-git/result similarity index 100% rename from images/digital-ocean-23.11pre-git/result rename to digital-ocean/23.11pre-git/result diff --git a/.sops.yaml b/hive/.sops.yaml similarity index 100% rename from .sops.yaml rename to hive/.sops.yaml diff --git a/flake.lock b/hive/flake.lock similarity index 100% rename from flake.lock rename to hive/flake.lock diff --git a/flake.nix b/hive/flake.nix similarity index 100% rename from flake.nix rename to hive/flake.nix diff --git a/framework/configuration.nix b/hive/framework/configuration.nix similarity index 100% rename from framework/configuration.nix rename to hive/framework/configuration.nix diff --git a/framework/flake.lock b/hive/framework/flake.lock similarity index 100% rename from framework/flake.lock rename to hive/framework/flake.lock diff --git a/framework/flake.nix b/hive/framework/flake.nix similarity index 100% rename from framework/flake.nix rename to hive/framework/flake.nix diff --git a/framework/hardware-configuration.nix b/hive/framework/hardware-configuration.nix similarity index 100% rename from framework/hardware-configuration.nix rename to hive/framework/hardware-configuration.nix diff --git a/framework/jrpotter/bash/default.nix b/hive/framework/jrpotter/bash/default.nix similarity index 100% rename from framework/jrpotter/bash/default.nix rename to hive/framework/jrpotter/bash/default.nix diff --git a/framework/jrpotter/bash/git-prompt.sh b/hive/framework/jrpotter/bash/git-prompt.sh similarity index 100% rename from framework/jrpotter/bash/git-prompt.sh rename to hive/framework/jrpotter/bash/git-prompt.sh diff --git a/framework/jrpotter/default.nix b/hive/framework/jrpotter/default.nix similarity index 100% rename from framework/jrpotter/default.nix rename to hive/framework/jrpotter/default.nix diff --git a/framework/jrpotter/git.nix b/hive/framework/jrpotter/git.nix similarity index 100% rename from framework/jrpotter/git.nix rename to hive/framework/jrpotter/git.nix diff --git a/framework/jrpotter/lang/bash.nix b/hive/framework/jrpotter/lang/bash.nix similarity index 100% rename from framework/jrpotter/lang/bash.nix rename to hive/framework/jrpotter/lang/bash.nix diff --git a/framework/jrpotter/lang/c.nix b/hive/framework/jrpotter/lang/c.nix similarity index 100% rename from framework/jrpotter/lang/c.nix rename to hive/framework/jrpotter/lang/c.nix diff --git a/framework/jrpotter/lang/elixir.nix b/hive/framework/jrpotter/lang/elixir.nix similarity index 100% rename from framework/jrpotter/lang/elixir.nix rename to hive/framework/jrpotter/lang/elixir.nix diff --git a/framework/jrpotter/lang/lean.nix b/hive/framework/jrpotter/lang/lean.nix similarity index 100% rename from framework/jrpotter/lang/lean.nix rename to hive/framework/jrpotter/lang/lean.nix diff --git a/framework/jrpotter/lang/lua.nix b/hive/framework/jrpotter/lang/lua.nix similarity index 100% rename from framework/jrpotter/lang/lua.nix rename to hive/framework/jrpotter/lang/lua.nix diff --git a/framework/jrpotter/lang/markdown.nix b/hive/framework/jrpotter/lang/markdown.nix similarity index 100% rename from framework/jrpotter/lang/markdown.nix rename to hive/framework/jrpotter/lang/markdown.nix diff --git a/framework/jrpotter/lang/nix.nix b/hive/framework/jrpotter/lang/nix.nix similarity index 100% rename from framework/jrpotter/lang/nix.nix rename to hive/framework/jrpotter/lang/nix.nix diff --git a/framework/jrpotter/lang/python.nix b/hive/framework/jrpotter/lang/python.nix similarity index 100% rename from framework/jrpotter/lang/python.nix rename to hive/framework/jrpotter/lang/python.nix diff --git a/framework/jrpotter/lang/typescript.nix b/hive/framework/jrpotter/lang/typescript.nix similarity index 100% rename from framework/jrpotter/lang/typescript.nix rename to hive/framework/jrpotter/lang/typescript.nix diff --git a/framework/jrpotter/neovim/default.nix b/hive/framework/jrpotter/neovim/default.nix similarity index 100% rename from framework/jrpotter/neovim/default.nix rename to hive/framework/jrpotter/neovim/default.nix diff --git a/framework/jrpotter/neovim/lua/default.nix b/hive/framework/jrpotter/neovim/lua/default.nix similarity index 100% rename from framework/jrpotter/neovim/lua/default.nix rename to hive/framework/jrpotter/neovim/lua/default.nix diff --git a/framework/jrpotter/neovim/lua/init/c.lua b/hive/framework/jrpotter/neovim/lua/init/c.lua similarity index 100% rename from framework/jrpotter/neovim/lua/init/c.lua rename to hive/framework/jrpotter/neovim/lua/init/c.lua diff --git a/framework/jrpotter/neovim/lua/init/cmp.lua b/hive/framework/jrpotter/neovim/lua/init/cmp.lua similarity index 100% rename from framework/jrpotter/neovim/lua/init/cmp.lua rename to hive/framework/jrpotter/neovim/lua/init/cmp.lua diff --git a/framework/jrpotter/neovim/lua/init/dap.lua b/hive/framework/jrpotter/neovim/lua/init/dap.lua similarity index 100% rename from framework/jrpotter/neovim/lua/init/dap.lua rename to hive/framework/jrpotter/neovim/lua/init/dap.lua diff --git a/framework/jrpotter/neovim/lua/init/lsp.lua b/hive/framework/jrpotter/neovim/lua/init/lsp.lua similarity index 100% rename from framework/jrpotter/neovim/lua/init/lsp.lua rename to hive/framework/jrpotter/neovim/lua/init/lsp.lua diff --git a/framework/jrpotter/neovim/lua/init/lua.lua b/hive/framework/jrpotter/neovim/lua/init/lua.lua similarity index 100% rename from framework/jrpotter/neovim/lua/init/lua.lua rename to hive/framework/jrpotter/neovim/lua/init/lua.lua diff --git a/framework/jrpotter/neovim/lua/init/python.lua b/hive/framework/jrpotter/neovim/lua/init/python.lua similarity index 100% rename from framework/jrpotter/neovim/lua/init/python.lua rename to hive/framework/jrpotter/neovim/lua/init/python.lua diff --git a/framework/jrpotter/neovim/lua/init/statusline.lua b/hive/framework/jrpotter/neovim/lua/init/statusline.lua similarity index 100% rename from framework/jrpotter/neovim/lua/init/statusline.lua rename to hive/framework/jrpotter/neovim/lua/init/statusline.lua diff --git a/framework/jrpotter/neovim/lua/init/telescope.lua b/hive/framework/jrpotter/neovim/lua/init/telescope.lua similarity index 100% rename from framework/jrpotter/neovim/lua/init/telescope.lua rename to hive/framework/jrpotter/neovim/lua/init/telescope.lua diff --git a/framework/jrpotter/neovim/lua/init/treesitter.lua b/hive/framework/jrpotter/neovim/lua/init/treesitter.lua similarity index 100% rename from framework/jrpotter/neovim/lua/init/treesitter.lua rename to hive/framework/jrpotter/neovim/lua/init/treesitter.lua diff --git a/framework/jrpotter/neovim/utils.nix b/hive/framework/jrpotter/neovim/utils.nix similarity index 100% rename from framework/jrpotter/neovim/utils.nix rename to hive/framework/jrpotter/neovim/utils.nix diff --git a/framework/jrpotter/wezterm/default.nix b/hive/framework/jrpotter/wezterm/default.nix similarity index 100% rename from framework/jrpotter/wezterm/default.nix rename to hive/framework/jrpotter/wezterm/default.nix diff --git a/framework/jrpotter/wezterm/wezterm.lua b/hive/framework/jrpotter/wezterm/wezterm.lua similarity index 100% rename from framework/jrpotter/wezterm/wezterm.lua rename to hive/framework/jrpotter/wezterm/wezterm.lua diff --git a/phobos/flake.lock b/hive/phobos/flake.lock similarity index 100% rename from phobos/flake.lock rename to hive/phobos/flake.lock diff --git a/phobos/flake.nix b/hive/phobos/flake.nix similarity index 100% rename from phobos/flake.nix rename to hive/phobos/flake.nix diff --git a/phobos/secrets.yaml b/hive/phobos/secrets.yaml similarity index 100% rename from phobos/secrets.yaml rename to hive/phobos/secrets.yaml