From f7a592c094d7f3775dc1e2c180b6fc943f9fe278 Mon Sep 17 00:00:00 2001 From: Joshua Potter Date: Sun, 10 Dec 2023 11:58:13 -0700 Subject: [PATCH] Move jrpotter to top-level. --- hive/.sops.yaml => .sops.yaml | 0 hive/flake.lock => flake.lock | 10 ++--- hive/flake.nix => flake.nix | 9 +++- hive/framework/configuration.nix | 39 +---------------- hive/framework/flake.nix | 43 +++++++++++++------ .../jrpotter/bash/default.nix | 0 .../jrpotter/bash/git-prompt.sh | 0 .../framework => users}/jrpotter/default.nix | 4 +- {hive/framework => users}/jrpotter/git.nix | 0 .../jrpotter/lang/bash.nix | 0 {hive/framework => users}/jrpotter/lang/c.nix | 0 .../jrpotter/lang/elixir.nix | 0 .../jrpotter/lang/lean.nix | 0 .../framework => users}/jrpotter/lang/lua.nix | 0 .../jrpotter/lang/markdown.nix | 0 .../framework => users}/jrpotter/lang/nix.nix | 0 .../jrpotter/lang/python.nix | 0 .../jrpotter/lang/typescript.nix | 0 .../jrpotter/neovim/default.nix | 0 .../jrpotter/neovim/lua/default.nix | 0 .../jrpotter/neovim/lua/init/c.lua | 0 .../jrpotter/neovim/lua/init/cmp.lua | 0 .../jrpotter/neovim/lua/init/dap.lua | 0 .../jrpotter/neovim/lua/init/lsp.lua | 0 .../jrpotter/neovim/lua/init/lua.lua | 0 .../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 .../jrpotter/neovim/utils.nix | 0 .../jrpotter/wezterm/default.nix | 0 .../jrpotter/wezterm/wezterm.lua | 0 32 files changed, 45 insertions(+), 60 deletions(-) rename hive/.sops.yaml => .sops.yaml (100%) rename hive/flake.lock => flake.lock (98%) rename hive/flake.nix => flake.nix (78%) rename {hive/framework => users}/jrpotter/bash/default.nix (100%) rename {hive/framework => users}/jrpotter/bash/git-prompt.sh (100%) rename {hive/framework => users}/jrpotter/default.nix (93%) rename {hive/framework => users}/jrpotter/git.nix (100%) rename {hive/framework => users}/jrpotter/lang/bash.nix (100%) rename {hive/framework => users}/jrpotter/lang/c.nix (100%) rename {hive/framework => users}/jrpotter/lang/elixir.nix (100%) rename {hive/framework => users}/jrpotter/lang/lean.nix (100%) rename {hive/framework => users}/jrpotter/lang/lua.nix (100%) rename {hive/framework => users}/jrpotter/lang/markdown.nix (100%) rename {hive/framework => users}/jrpotter/lang/nix.nix (100%) rename {hive/framework => users}/jrpotter/lang/python.nix (100%) rename {hive/framework => users}/jrpotter/lang/typescript.nix (100%) rename {hive/framework => users}/jrpotter/neovim/default.nix (100%) rename {hive/framework => users}/jrpotter/neovim/lua/default.nix (100%) rename {hive/framework => users}/jrpotter/neovim/lua/init/c.lua (100%) rename {hive/framework => users}/jrpotter/neovim/lua/init/cmp.lua (100%) rename {hive/framework => users}/jrpotter/neovim/lua/init/dap.lua (100%) rename {hive/framework => users}/jrpotter/neovim/lua/init/lsp.lua (100%) rename {hive/framework => users}/jrpotter/neovim/lua/init/lua.lua (100%) rename {hive/framework => users}/jrpotter/neovim/lua/init/python.lua (100%) rename {hive/framework => users}/jrpotter/neovim/lua/init/statusline.lua (100%) rename {hive/framework => users}/jrpotter/neovim/lua/init/telescope.lua (100%) rename {hive/framework => users}/jrpotter/neovim/lua/init/treesitter.lua (100%) rename {hive/framework => users}/jrpotter/neovim/utils.nix (100%) rename {hive/framework => users}/jrpotter/wezterm/default.nix (100%) rename {hive/framework => users}/jrpotter/wezterm/wezterm.lua (100%) diff --git a/hive/.sops.yaml b/.sops.yaml similarity index 100% rename from hive/.sops.yaml rename to .sops.yaml diff --git a/hive/flake.lock b/flake.lock similarity index 98% rename from hive/flake.lock rename to flake.lock index 45bbce7..9c5f952 100644 --- a/hive/flake.lock +++ b/flake.lock @@ -189,12 +189,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-w34b9SS0gjjLG3TGyHlSym5j2KeAgRnjFAeAnSIiF7s=", - "path": "./framework", + "narHash": "sha256-Vhq9jZLDEPDZPxrL8yiMsEAz7AWySO0a5WDCMXRRorU=", + "path": "./hive/framework", "type": "path" }, "original": { - "path": "./framework", + "path": "./hive/framework", "type": "path" } }, @@ -349,11 +349,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-uviT1vNgSZnpddGqgHZUwKDPl/VYRz92X7hnw72yiTY=", - "path": "./phobos", + "path": "./hive/phobos", "type": "path" }, "original": { - "path": "./phobos", + "path": "./hive/phobos", "type": "path" } }, diff --git a/hive/flake.nix b/flake.nix similarity index 78% rename from hive/flake.nix rename to flake.nix index 197d6a1..a039768 100644 --- a/hive/flake.nix +++ b/flake.nix @@ -3,8 +3,8 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05"; - framework.url = "path:./framework"; - phobos.url = "path:./phobos"; + framework.url = "path:./hive/framework"; + phobos.url = "path:./hive/phobos"; }; outputs = { nixpkgs, framework, phobos, ... }: @@ -16,6 +16,11 @@ meta = { nixpkgs = import nixpkgs { inherit system; }; specialArgs = { inherit system; }; + nodeSpecialArgs = { + framework = { + jrpotter = import ./users/jrpotter; + }; + }; }; # Local machines. Deploy using `colmena apply-local [--sudo]` diff --git a/hive/framework/configuration.nix b/hive/framework/configuration.nix index c8c1976..1ce554a 100644 --- a/hive/framework/configuration.nix +++ b/hive/framework/configuration.nix @@ -1,15 +1,5 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running `nixos-help`). - { pkgs, ... }: - { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - boot.loader = { efi.canTouchEfiVariables = true; systemd-boot.enable = true; @@ -52,10 +42,7 @@ }; }; - # After 23.05, this option is called `fonts.packages`. - fonts.fonts = with pkgs; [ - iosevka - ]; + fonts.fonts = with pkgs; [ iosevka ]; hardware.bluetooth.enable = true; @@ -88,34 +75,10 @@ time.timeZone = "America/Denver"; - # Don't forget to set a password with `passwd`. - users.users.jrpotter = { - isNormalUser = true; - extraGroups = [ - "docker" - "networkmanager" - "wheel" # Enable `sudo` for the user. - ]; - }; - virtualisation.docker.rootless = { enable = true; # Sets the `DOCKER_HOST` variable to the rootless Docker instance for normal # users by default. setSocketVariable = true; }; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It's perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.05"; } - diff --git a/hive/framework/flake.nix b/hive/framework/flake.nix index 2c0e2c8..3e29137 100644 --- a/hive/framework/flake.nix +++ b/hive/framework/flake.nix @@ -14,26 +14,43 @@ }; outputs = { bootstrap, home-manager, ... }: { - nixosModules.default = { pkgs, system, ... }: + nixosModules.default = { pkgs, system, jrpotter, ... }: let - jrpotter-home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.jrpotter = import ./jrpotter; - - # Used to pass non-default parameters to submodules. - extraSpecialArgs = { - inherit system; - bootstrap = bootstrap.packages.${system}.default; - }; - }; + # This value determines the NixOS and home-manager release from which + # the default settings for stateful data, like file locations and + # database versions on your system were taken. This should probably + # never change. + stateVersion = "23.05"; in { imports = [ + ./hardware-configuration.nix ./configuration.nix home-manager.nixosModules.home-manager - { home-manager = jrpotter-home-manager; } ]; + + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.jrpotter = jrpotter; + + # Used to pass non-default parameters to submodules. + extraSpecialArgs = { + inherit system stateVersion; + bootstrap = bootstrap.packages.${system}.default; + }; + }; + + users.users.jrpotter = { + isNormalUser = true; + extraGroups = [ + "docker" + "networkmanager" + "wheel" + ]; + }; + + system.stateVersion = stateVersion; }; }; } diff --git a/hive/framework/jrpotter/bash/default.nix b/users/jrpotter/bash/default.nix similarity index 100% rename from hive/framework/jrpotter/bash/default.nix rename to users/jrpotter/bash/default.nix diff --git a/hive/framework/jrpotter/bash/git-prompt.sh b/users/jrpotter/bash/git-prompt.sh similarity index 100% rename from hive/framework/jrpotter/bash/git-prompt.sh rename to users/jrpotter/bash/git-prompt.sh diff --git a/hive/framework/jrpotter/default.nix b/users/jrpotter/default.nix similarity index 93% rename from hive/framework/jrpotter/default.nix rename to users/jrpotter/default.nix index dcde495..b255f3e 100644 --- a/hive/framework/jrpotter/default.nix +++ b/users/jrpotter/default.nix @@ -1,4 +1,4 @@ -{ pkgs, bootstrap, ... }: +{ pkgs, bootstrap, stateVersion, ... }: { imports = [ ./bash @@ -52,5 +52,5 @@ # You can update Home Manager without changing this value. # See the Home Manager release notes for a list of state # version changes in each release. - home.stateVersion = "23.05"; + home.stateVersion = stateVersion; } diff --git a/hive/framework/jrpotter/git.nix b/users/jrpotter/git.nix similarity index 100% rename from hive/framework/jrpotter/git.nix rename to users/jrpotter/git.nix diff --git a/hive/framework/jrpotter/lang/bash.nix b/users/jrpotter/lang/bash.nix similarity index 100% rename from hive/framework/jrpotter/lang/bash.nix rename to users/jrpotter/lang/bash.nix diff --git a/hive/framework/jrpotter/lang/c.nix b/users/jrpotter/lang/c.nix similarity index 100% rename from hive/framework/jrpotter/lang/c.nix rename to users/jrpotter/lang/c.nix diff --git a/hive/framework/jrpotter/lang/elixir.nix b/users/jrpotter/lang/elixir.nix similarity index 100% rename from hive/framework/jrpotter/lang/elixir.nix rename to users/jrpotter/lang/elixir.nix diff --git a/hive/framework/jrpotter/lang/lean.nix b/users/jrpotter/lang/lean.nix similarity index 100% rename from hive/framework/jrpotter/lang/lean.nix rename to users/jrpotter/lang/lean.nix diff --git a/hive/framework/jrpotter/lang/lua.nix b/users/jrpotter/lang/lua.nix similarity index 100% rename from hive/framework/jrpotter/lang/lua.nix rename to users/jrpotter/lang/lua.nix diff --git a/hive/framework/jrpotter/lang/markdown.nix b/users/jrpotter/lang/markdown.nix similarity index 100% rename from hive/framework/jrpotter/lang/markdown.nix rename to users/jrpotter/lang/markdown.nix diff --git a/hive/framework/jrpotter/lang/nix.nix b/users/jrpotter/lang/nix.nix similarity index 100% rename from hive/framework/jrpotter/lang/nix.nix rename to users/jrpotter/lang/nix.nix diff --git a/hive/framework/jrpotter/lang/python.nix b/users/jrpotter/lang/python.nix similarity index 100% rename from hive/framework/jrpotter/lang/python.nix rename to users/jrpotter/lang/python.nix diff --git a/hive/framework/jrpotter/lang/typescript.nix b/users/jrpotter/lang/typescript.nix similarity index 100% rename from hive/framework/jrpotter/lang/typescript.nix rename to users/jrpotter/lang/typescript.nix diff --git a/hive/framework/jrpotter/neovim/default.nix b/users/jrpotter/neovim/default.nix similarity index 100% rename from hive/framework/jrpotter/neovim/default.nix rename to users/jrpotter/neovim/default.nix diff --git a/hive/framework/jrpotter/neovim/lua/default.nix b/users/jrpotter/neovim/lua/default.nix similarity index 100% rename from hive/framework/jrpotter/neovim/lua/default.nix rename to users/jrpotter/neovim/lua/default.nix diff --git a/hive/framework/jrpotter/neovim/lua/init/c.lua b/users/jrpotter/neovim/lua/init/c.lua similarity index 100% rename from hive/framework/jrpotter/neovim/lua/init/c.lua rename to users/jrpotter/neovim/lua/init/c.lua diff --git a/hive/framework/jrpotter/neovim/lua/init/cmp.lua b/users/jrpotter/neovim/lua/init/cmp.lua similarity index 100% rename from hive/framework/jrpotter/neovim/lua/init/cmp.lua rename to users/jrpotter/neovim/lua/init/cmp.lua diff --git a/hive/framework/jrpotter/neovim/lua/init/dap.lua b/users/jrpotter/neovim/lua/init/dap.lua similarity index 100% rename from hive/framework/jrpotter/neovim/lua/init/dap.lua rename to users/jrpotter/neovim/lua/init/dap.lua diff --git a/hive/framework/jrpotter/neovim/lua/init/lsp.lua b/users/jrpotter/neovim/lua/init/lsp.lua similarity index 100% rename from hive/framework/jrpotter/neovim/lua/init/lsp.lua rename to users/jrpotter/neovim/lua/init/lsp.lua diff --git a/hive/framework/jrpotter/neovim/lua/init/lua.lua b/users/jrpotter/neovim/lua/init/lua.lua similarity index 100% rename from hive/framework/jrpotter/neovim/lua/init/lua.lua rename to users/jrpotter/neovim/lua/init/lua.lua diff --git a/hive/framework/jrpotter/neovim/lua/init/python.lua b/users/jrpotter/neovim/lua/init/python.lua similarity index 100% rename from hive/framework/jrpotter/neovim/lua/init/python.lua rename to users/jrpotter/neovim/lua/init/python.lua diff --git a/hive/framework/jrpotter/neovim/lua/init/statusline.lua b/users/jrpotter/neovim/lua/init/statusline.lua similarity index 100% rename from hive/framework/jrpotter/neovim/lua/init/statusline.lua rename to users/jrpotter/neovim/lua/init/statusline.lua diff --git a/hive/framework/jrpotter/neovim/lua/init/telescope.lua b/users/jrpotter/neovim/lua/init/telescope.lua similarity index 100% rename from hive/framework/jrpotter/neovim/lua/init/telescope.lua rename to users/jrpotter/neovim/lua/init/telescope.lua diff --git a/hive/framework/jrpotter/neovim/lua/init/treesitter.lua b/users/jrpotter/neovim/lua/init/treesitter.lua similarity index 100% rename from hive/framework/jrpotter/neovim/lua/init/treesitter.lua rename to users/jrpotter/neovim/lua/init/treesitter.lua diff --git a/hive/framework/jrpotter/neovim/utils.nix b/users/jrpotter/neovim/utils.nix similarity index 100% rename from hive/framework/jrpotter/neovim/utils.nix rename to users/jrpotter/neovim/utils.nix diff --git a/hive/framework/jrpotter/wezterm/default.nix b/users/jrpotter/wezterm/default.nix similarity index 100% rename from hive/framework/jrpotter/wezterm/default.nix rename to users/jrpotter/wezterm/default.nix diff --git a/hive/framework/jrpotter/wezterm/wezterm.lua b/users/jrpotter/wezterm/wezterm.lua similarity index 100% rename from hive/framework/jrpotter/wezterm/wezterm.lua rename to users/jrpotter/wezterm/wezterm.lua