diff --git a/configurations/home/toph@aepplet/default.nix b/configurations/home/toph@aepplet/default.nix new file mode 100644 index 0000000..793d234 --- /dev/null +++ b/configurations/home/toph@aepplet/default.nix @@ -0,0 +1,7 @@ +{pkgs, ...}: { + bosun.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBUKDCjB0VpQubi8BfnYKbh4MIE1tcvKQesdoPE4NXAf"; + + home.packages = with pkgs; [ + helix + ]; +} diff --git a/configurations/home/toph@endurance/config/appearance.nix b/configurations/home/toph@endurance/config/appearance.nix index 2d9e73b..b141f13 100644 --- a/configurations/home/toph@endurance/config/appearance.nix +++ b/configurations/home/toph@endurance/config/appearance.nix @@ -3,10 +3,6 @@ pkgs, ... }: { - home.packages = with pkgs; [ - lxappearance - ]; - gtk = { enable = true; @@ -16,18 +12,6 @@ # package = pkgs.rose-pine-cursor; # size = 32; # }; - - gtk2.extraConfig = lib._elements.selfReferencedString {sep = "#";} '' - gtk-enable-animations = 1 - gtk-primary-button-warps-slider = 1 - gtk-toolbar-style = 3 - gtk-menu-images = 1 - gtk-button-images = 1 - gtk-sound-theme-name = "freedesktop" - ''; - - gtk3.extraConfig.gtk-application-prefer-dark-theme = 1; - gtk4.extraConfig.gtk-application-prefer-dark-theme = 1; }; home.sessionVariables = { diff --git a/configurations/home/toph@endurance/config/dev.nix b/configurations/home/toph@endurance/config/dev.nix index 89c1bf4..e1ed607 100644 --- a/configurations/home/toph@endurance/config/dev.nix +++ b/configurations/home/toph@endurance/config/dev.nix @@ -30,12 +30,12 @@ tokei # Like cloc gource zeal # Offline documentation browser - _elements.dedoc # Terminal-based documentation viewer + harbor.dedoc # Terminal-based documentation viewer just # Just a command runner claude-monitor devenv gitui - _elements.oryx # TUI for sniffing network traffic using eBPF + harbor.oryx # TUI for sniffing network traffic using eBPF # Build tools cargo diff --git a/configurations/home/toph@endurance/config/git.nix b/configurations/home/toph@endurance/config/git.nix index fa8f171..f47c58b 100644 --- a/configurations/home/toph@endurance/config/git.nix +++ b/configurations/home/toph@endurance/config/git.nix @@ -15,7 +15,7 @@ delta # Diffing tool onefetch # neofetch for git repos - pkgs._elements.git-delete-stale + harbor.git-delete-stale ]; programs.git-global-log.enable = true; diff --git a/configurations/home/toph@endurance/default-applications.nix b/configurations/home/toph@endurance/default-applications.nix index 668391a..ee1f3c9 100644 --- a/configurations/home/toph@endurance/default-applications.nix +++ b/configurations/home/toph@endurance/default-applications.nix @@ -2,7 +2,7 @@ home.packages = with pkgs; [ # Simple browsers for HTML qutebrowser - pkgs._elements.firefox-with-context # Open URLs in different browser profiles based on context + harbor.firefox-with-context # Open URLs in different browser profiles based on context ]; xdg.mimeApps = { diff --git a/configurations/home/toph@endurance/default.nix b/configurations/home/toph@endurance/default.nix index 275531e..9af18cd 100644 --- a/configurations/home/toph@endurance/default.nix +++ b/configurations/home/toph@endurance/default.nix @@ -149,9 +149,9 @@ home = { extraOutputsToInstall = ["doc" "devdoc"]; - packages = with pkgs._elements; [ - quick-zeal - spawn-term + packages = with pkgs; [ + harbor.quick-zeal + harbor.spawn-term ]; }; diff --git a/configurations/home/toph@endurance/misc/creativity.nix b/configurations/home/toph@endurance/misc/creativity.nix index 9ad5393..da89809 100644 --- a/configurations/home/toph@endurance/misc/creativity.nix +++ b/configurations/home/toph@endurance/misc/creativity.nix @@ -1,11 +1,10 @@ { pkgs, - system, inputs, ... }: { home.packages = with pkgs; [ - inputs.affinity-nix.packages.${system}.v3 # adobe suite replacement + inputs.affinity-nix.packages.${pkgs.stdenv.hostPlatform.system}.v3 # adobe suite replacement gmic # greyc's magic krita diff --git a/configurations/home/toph@endurance/niri/default.nix b/configurations/home/toph@endurance/niri/default.nix index 7627ff6..0a65e14 100644 --- a/configurations/home/toph@endurance/niri/default.nix +++ b/configurations/home/toph@endurance/niri/default.nix @@ -4,6 +4,8 @@ ... }: { imports = [ + inputs.niri.homeModules.niri + ./settings.nix ./window-rules.nix ./keybinds.nix diff --git a/configurations/home/toph@endurance/niri/keybinds.nix b/configurations/home/toph@endurance/niri/keybinds.nix index 7c3918b..6b2c62d 100644 --- a/configurations/home/toph@endurance/niri/keybinds.nix +++ b/configurations/home/toph@endurance/niri/keybinds.nix @@ -1,6 +1,8 @@ { config, pkgs, + lib, + inputs, ... }: { programs.niri.settings = { @@ -8,8 +10,8 @@ "Mod+space".action = spawn "fuzzel"; "Mod+e".action = spawn "dolphin"; "Mod+d".action = spawn "zeal"; # Documentation viewer - "Mod+c".action = spawn "${pkgs._elements.spawn-term}/bin/spawn-term"; - "Mod+g".action = spawn "${pkgs._elements.hg-picker}/bin/hg-picker"; + "Mod+c".action = spawn "${"spawn-term"}/bin/spawn-term"; + "Mod+g".action = spawn "${pkgs.harbor.hg-picker}/bin/hg-picker"; "Mod+q".action = close-window; "Mod+f".action = fullscreen-window; diff --git a/configurations/home/toph@endurance/niri/settings.nix b/configurations/home/toph@endurance/niri/settings.nix index da78313..6d75226 100644 --- a/configurations/home/toph@endurance/niri/settings.nix +++ b/configurations/home/toph@endurance/niri/settings.nix @@ -6,7 +6,7 @@ programs.niri.settings = { prefer-no-csd = true; - debug.honor-xdg-activation-with-invalid-serial = true; + # debug.honor-xdg-activation-with-invalid-serial = true; layout = { always-center-single-column = true; diff --git a/configurations/home/toph@vasa/default.nix b/configurations/home/toph@vasa/default.nix index 111281f..d8e9fff 100644 --- a/configurations/home/toph@vasa/default.nix +++ b/configurations/home/toph@vasa/default.nix @@ -1,17 +1,8 @@ -{ - pkgs, - config, - ... -} @ all: { - elements.secrets = { - rekeyPath = "christopher_molybdenum"; - key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHl33DPxxzxrNNjM8rL4ktAj4ExzCyGiU8rKog0csxNA"; - }; - - elements.kitty.enable = true; +{pkgs, ...}: { + bosun.key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHl33DPxxzxrNNjM8rL4ktAj4ExzCyGiU8rKog0csxNA"; home.packages = with pkgs; [ - _elements.to-s3 - _elements.connect-to-mercury + harbor.to-s3 + harbor.connect-to-mercury ]; } diff --git a/configurations/nixos/endurance/default.nix b/configurations/nixos/endurance/default.nix index 66e5fb8..799ca5a 100644 --- a/configurations/nixos/endurance/default.nix +++ b/configurations/nixos/endurance/default.nix @@ -1,6 +1,3 @@ -# ++ 27_Co: Cobalt -# -# Main tower workstation environment { pkgs, lib, @@ -31,7 +28,7 @@ }; networking = { - hostName = "cobalt"; + hostName = "endurance"; firewall.enable = false; interfaces.eno1.wakeOnLan.enable = true; }; diff --git a/flake.nix b/flake.nix index f5150d1..93adee6 100644 --- a/flake.nix +++ b/flake.nix @@ -86,53 +86,17 @@ ./modules/flake ]; }); - # (inputs.snowfall.mkFlake { - # inherit inputs; - # src = ./.; - - # # Exposes all internal libs and packages as `lib._elements` or `pkgs._elements` respectively - # snowfall.namespace = "_elements"; - - # # Global system modules to be included for all systems - # systems.modules = with inputs; { - # nixos = [ - # disko.nixosModules.default - # ./modules/common - # ]; - # darwin = [ - # stylix.darwinModules.stylix - # ./modules/common - # ]; - # }; # # Add modules only to specific hosts # systems.hosts = with inputs; { # cobalt.modules = [ - # niri.nixosModules.niri # stylix.nixosModules.stylix - # musnix.nixosModules.default # ovos.nixosModules.default # waka-victoriametrics.nixosModules.default # ]; # }; - # homes.users = { - # # TODO: For some reason this needs to be toggled for agenix to work? - # # "christopher@cobalt".modules = with inputs; [ - # # niri.homeModules.niri - # # ]; - # }; - - # # Configure nixpkgs when instantiating the package set - # # TODO: This is already specified elsewhere. Still needed here? - # channels-config = { - # allowUnfree = true; - # permittedInsecurePackages = []; - # }; - # overlays = with inputs; [ - # niri.overlays.niri - # nur.overlays.default # ovos.overlays.default # (final: prev: { # waka-victoriametrics = waka-victoriametrics.packages.${final.system}.default; diff --git a/modules/flake/args.nix b/modules/flake/args.nix index 77f6d9c..056c353 100644 --- a/modules/flake/args.nix +++ b/modules/flake/args.nix @@ -1,18 +1,31 @@ -{inputs, ...}: { +{ + inputs, + lib, + ... +}: { systems = [ "x86_64-linux" "x86_64-darwin" ]; - perSystem = {system, ...}: { + perSystem = { + system, + self', + ... + }: { + # these settings only apply to flake-local packages being built, not to the + # nixpkgs instance within host and home configurations _module.args.pkgs = import inputs.nixpkgs { inherit system; - config = { - allowUnfree = true; - allowUnsupportedSystem = true; - }; - overlays = []; + overlays = [ + (final: prev: { + writeNushellApplication = import ./lib/writeNushellApplication.nix { + inherit lib; + pkgs = prev; + }; + }) + ]; }; }; } diff --git a/modules/flake/default.nix b/modules/flake/default.nix index 28f143f..3d0ba8d 100644 --- a/modules/flake/default.nix +++ b/modules/flake/default.nix @@ -4,6 +4,7 @@ ./homes.nix ./args.nix ./formatter.nix + ./packages.nix ./lib ]; } diff --git a/modules/flake/hosts.nix b/modules/flake/hosts.nix index d235385..98d79c3 100644 --- a/modules/flake/hosts.nix +++ b/modules/flake/hosts.nix @@ -1,19 +1,11 @@ -{ - inputs, - inputs', - ... -}: let +{inputs, ...}: let inherit (inputs) self; - mkHost = host: config: + mkHost = hostname: config: { - path = ../../configurations/nixos/${host}; + path = ../../configurations/nixos/${hostname}; deployable = true; - - specialArgs = { - inherit inputs inputs'; - hostname = host; - }; + specialArgs = {inherit inputs hostname;}; } // config; in { diff --git a/modules/flake/lib/default.nix b/modules/flake/lib/default.nix index c9caaa6..4b236d0 100644 --- a/modules/flake/lib/default.nix +++ b/modules/flake/lib/default.nix @@ -4,8 +4,7 @@ ... }: { flake.lib = lib.fixedPoints.makeExtensible (final: { - secrets = import ./secrets.nix {inherit inputs lib;}; - - inherit (final.secrets) mkSecret; + # secrets = import ./secrets.nix {inherit inputs lib;}; + # inherit (final.secrets) mkSecret; }); } diff --git a/lib/writeNushellApplication.nix b/modules/flake/lib/writeNushellApplication.nix similarity index 98% rename from lib/writeNushellApplication.nix rename to modules/flake/lib/writeNushellApplication.nix index c87f8d9..d9adaac 100644 --- a/lib/writeNushellApplication.nix +++ b/modules/flake/lib/writeNushellApplication.nix @@ -1,4 +1,8 @@ -{lib, ...}: pkgs: { +{ + lib, + pkgs, + ... +}: { /* The name of the script to write. diff --git a/modules/flake/nix.nix b/modules/flake/nix.nix deleted file mode 100644 index 30db3f5..0000000 --- a/modules/flake/nix.nix +++ /dev/null @@ -1,24 +0,0 @@ -{inputs, ...}: { - systems = [ - "x86_64-linux" - "x86_64-darwin" - ]; - - perSystem = {system, ...}: { - _module.args.pkgs = import inputs.nixpkgs { - inherit system; - - config = { - allowUnfree = true; - permittedInsecurePackages = [ - "nixos-config" - "electron-36.9.5" - "dotnet-sdk-6.0.428" - "olm-3.2.16" - ]; - }; - - overlays = []; - }; - }; -} diff --git a/modules/flake/packages.nix b/modules/flake/packages.nix new file mode 100644 index 0000000..04637a1 --- /dev/null +++ b/modules/flake/packages.nix @@ -0,0 +1,13 @@ +{lib, ...}: { + perSystem = { + config, + pkgs, + inputs', + ... + }: { + packages = lib.filesystem.packagesFromDirectoryRecursive { + callPackage = pkgs.callPackage; + directory = ../../packages; + }; + }; +} diff --git a/modules/generic/nix.nix b/modules/generic/nix.nix index 87405a1..331ec96 100644 --- a/modules/generic/nix.nix +++ b/modules/generic/nix.nix @@ -1,4 +1,9 @@ -{pkgs, ...}: { +{ + pkgs, + lib, + inputs, + ... +}: { nix = { package = pkgs.lixPackageSets.stable.lix; @@ -23,12 +28,21 @@ }; nixpkgs = { - config.allowUnfree = true; - config.permittedInsecurePackages = [ - "nixos-config" - "electron-36.9.5" - "dotnet-sdk-6.0.428" - "olm-3.2.16" - ]; + config = { + allowUnfree = true; + allowUnfreePredicate = pkg: + builtins.elem (lib.getName pkg) [ + "cider-2" + ]; + + permittedInsecurePackages = [ + # "nixos-config" + # "electron-36.9.5" + # "dotnet-sdk-6.0.428" + "olm-3.2.16" + ]; + }; + + overlays = import ../../overlays {inherit inputs lib;}; }; } diff --git a/modules/home/common/terminal/programs/tmux.nix b/modules/home/common/terminal/programs/tmux.nix index 2a68ade..42219bb 100644 --- a/modules/home/common/terminal/programs/tmux.nix +++ b/modules/home/common/terminal/programs/tmux.nix @@ -9,7 +9,7 @@ in { home.shellAliases.inspect = "tmux -f ~/${tmuxConfigFile} new-session ssh inspect"; - home.file.${tmuxConfigFile}.text = lib._elements.selfReferencedString {sep = "#";} '' + home.file.${tmuxConfigFile}.text = '' set -g status-position top set-option -g status-bg default set -g 'status-format[0]' '#[fill=colour202 bg=colour202 fg=colour231 bold]Danger! HAUSGOLD Inspector ' diff --git a/modules/home/common/terminal/shell/fish.nix b/modules/home/common/terminal/shell/fish.nix index 1507473..031a5c0 100644 --- a/modules/home/common/terminal/shell/fish.nix +++ b/modules/home/common/terminal/shell/fish.nix @@ -14,7 +14,7 @@ in { enable = true; shellAliases = config.home.shellAliases; - shellInit = lib._elements.selfReferencedString {sep = "#";} '' + shellInit = '' # Set global environment variables. ${env} ''; diff --git a/modules/home/common/terminal/shell/nu.nix b/modules/home/common/terminal/shell/nu.nix index cdd1df8..3b46d99 100644 --- a/modules/home/common/terminal/shell/nu.nix +++ b/modules/home/common/terminal/shell/nu.nix @@ -16,7 +16,7 @@ nushellPlugins.skim ]; - extraConfig = lib._elements.selfReferencedString {sep = "#";} '' + extraConfig = '' let carapace_completer = { |spans| carapace $spans.0 nushell ...$spans | from json @@ -72,7 +72,7 @@ } ''; - envFile.text = lib._elements.selfReferencedString {sep = "#";} '' + envFile.text = '' $env.PATH = ( $env.PATH | split row (char esep) diff --git a/modules/home/secrets.nix b/modules/home/secrets.nix index 82a8d47..7e57d6e 100644 --- a/modules/home/secrets.nix +++ b/modules/home/secrets.nix @@ -18,7 +18,8 @@ in { options.bosun = { rekeyPath = mkOption { type = types.str; - default = hostname; + # TODO: Make username configurable + default = "toph.${hostname}"; }; key = mkOption { diff --git a/modules/nixos/profiles/graphical/wm.nix b/modules/nixos/profiles/graphical/wm.nix index e781213..de6a761 100644 --- a/modules/nixos/profiles/graphical/wm.nix +++ b/modules/nixos/profiles/graphical/wm.nix @@ -8,7 +8,7 @@ inherit (lib) mkIf; in { imports = [ - inputs.niri.nixosModules.niri + #inputs.niri.nixosModules.niri ]; config = mkIf config.bosun.profiles.graphical.enable { diff --git a/modules/nixos/users.nix b/modules/nixos/users.nix index ec8f396..ad2b09d 100644 --- a/modules/nixos/users.nix +++ b/modules/nixos/users.nix @@ -1,6 +1,5 @@ { inputs, - inputs', pkgs, hostname, ... @@ -15,10 +14,13 @@ programs.fish.enable = true; home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.toph = inputs.self.homeConfigurations."toph@${hostname}"; extraSpecialArgs = { - inherit inputs inputs' hostname; + inherit inputs hostname; }; }; diff --git a/overlays/.gitkeep b/overlays/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..bb4e800 --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,34 @@ +{ + lib, + inputs, + ... +}: let + inherit (lib.attrsets) mapAttrs; + + # wrapper that provides channels arg to each overlay + withChannels = overlayFn: final: prev: let + # Import channels with the same config as the main nixpkgs + importChannel = input: import input { + system = final.stdenv.hostPlatform.system; + config = final.config; + }; + in + overlayFn { + inherit inputs; + channels = + { + nixpkgs = final; + } + // mapAttrs ( + _: input: + importChannel input + ) + inputs; + } + final + prev; +in [ + (withChannels (import ./lix.nix)) + (withChannels (import ./packages.nix)) + (withChannels (import ./unstable.nix)) +] diff --git a/overlays/lix/default.nix b/overlays/lix.nix similarity index 78% rename from overlays/lix/default.nix rename to overlays/lix.nix index 4239ca6..6b0e31d 100644 --- a/overlays/lix/default.nix +++ b/overlays/lix.nix @@ -1,4 +1,4 @@ -{channels, ...}: final: prev: { +{...}: final: prev: { inherit (prev.lixPackageSets.stable) nixpkgs-review diff --git a/overlays/packages.nix b/overlays/packages.nix new file mode 100644 index 0000000..b96e78e --- /dev/null +++ b/overlays/packages.nix @@ -0,0 +1,3 @@ +{inputs, ...}: final: prev: { + harbor = inputs.self.packages.${final.stdenv.hostPlatform.system} or {}; +} diff --git a/overlays/unstable/default.nix b/overlays/unstable.nix similarity index 100% rename from overlays/unstable/default.nix rename to overlays/unstable.nix diff --git a/packages/connect-to-mercury/package.nix b/packages/connect-to-mercury/package.nix new file mode 100644 index 0000000..51e54ce --- /dev/null +++ b/packages/connect-to-mercury/package.nix @@ -0,0 +1,18 @@ +{pkgs, ...}: +pkgs.writeShellApplication { + name = "connect-to-mercury"; + text = '' + hostname="mercury.local" + ip=$(dscacheutil -q host -a name $hostname | tail -n2 | head -n1 | cut -d' ' -f 2) + + if [ -z "$ip" ]; then + echo "Host $${hostname} seems to be down. Are you sure the VM is running?" + exit 1 + fi + + echo "$hostname: $ip" + + sudo route -n delete 172.17.0.0/16 &>/dev/null + sudo route -n add 172.17.0.0/16 "$ip" &>/dev/null + ''; +} diff --git a/packages/dedoc/default.nix b/packages/dedoc/package.nix similarity index 100% rename from packages/dedoc/default.nix rename to packages/dedoc/package.nix diff --git a/packages/scripts/firefox-with-context/firefox-with-context b/packages/firefox-with-context/firefox-with-context similarity index 100% rename from packages/scripts/firefox-with-context/firefox-with-context rename to packages/firefox-with-context/firefox-with-context diff --git a/packages/scripts/firefox-with-context/default.nix b/packages/firefox-with-context/package.nix similarity index 100% rename from packages/scripts/firefox-with-context/default.nix rename to packages/firefox-with-context/package.nix diff --git a/packages/scripts/generate-wallpaper/default.nix b/packages/generate-wallpaper/package.nix similarity index 100% rename from packages/scripts/generate-wallpaper/default.nix rename to packages/generate-wallpaper/package.nix diff --git a/packages/scripts/git-delete-stale/default.nix b/packages/git-delete-stale/package.nix similarity index 92% rename from packages/scripts/git-delete-stale/default.nix rename to packages/git-delete-stale/package.nix index 4a6ed6e..830806d 100644 --- a/packages/scripts/git-delete-stale/default.nix +++ b/packages/git-delete-stale/package.nix @@ -1,9 +1,5 @@ -{ - lib, - pkgs, - ... -}: -lib._elements.writeNushellApplication pkgs { +{pkgs, ...}: +pkgs.writeNushellApplication { name = "git-delete-stale"; runtimeInputs = with pkgs; [git]; diff --git a/packages/scripts/hg-picker/default.nix b/packages/hg-picker/package.nix similarity index 100% rename from packages/scripts/hg-picker/default.nix rename to packages/hg-picker/package.nix diff --git a/packages/oryx/default.nix b/packages/oryx/package.nix similarity index 100% rename from packages/oryx/default.nix rename to packages/oryx/package.nix diff --git a/packages/oxigraph/default.nix b/packages/oxigraph/package.nix similarity index 100% rename from packages/oxigraph/default.nix rename to packages/oxigraph/package.nix diff --git a/packages/scripts/quick-zeal/default.nix b/packages/quick-zeal/package.nix similarity index 100% rename from packages/scripts/quick-zeal/default.nix rename to packages/quick-zeal/package.nix diff --git a/packages/scripts/quick-zeal/quick-zeal b/packages/quick-zeal/quick-zeal similarity index 100% rename from packages/scripts/quick-zeal/quick-zeal rename to packages/quick-zeal/quick-zeal diff --git a/packages/scripts/connect-to-mercury/connect-to-mercury b/packages/scripts/connect-to-mercury/connect-to-mercury deleted file mode 100755 index cd9f112..0000000 --- a/packages/scripts/connect-to-mercury/connect-to-mercury +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash - -hostname="mercury.local" -ip=$(dscacheutil -q host -a name ${hostname} | tail -n2 | head -n1 | cut -d' ' -f 2) - -if [ -z "${ip}" ]; then - echo "Host ${hostname} seems to be down. Are you sure the VM is running?" - exit 1 -fi - -echo "${hostname}: ${ip}" - -sudo route -n delete 172.17.0.0/16 &>/dev/null -sudo route -n add 172.17.0.0/16 "${ip}" &>/dev/null diff --git a/packages/solidtime-desktop/default.nix b/packages/solidtime-desktop/default.nix deleted file mode 100644 index 1fc8da2..0000000 --- a/packages/solidtime-desktop/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{pkgs, ...}: -pkgs.writeShellApplication { - name = "connect-to-mercury"; - text = builtins.readFile ./connect-to-mercury; -} diff --git a/packages/scripts/connect-to-mercury/default.nix b/packages/solidtime-desktop/package.nix similarity index 100% rename from packages/scripts/connect-to-mercury/default.nix rename to packages/solidtime-desktop/package.nix diff --git a/packages/scripts/spawn-term/default.nix b/packages/spawn-term/package.nix similarity index 94% rename from packages/scripts/spawn-term/default.nix rename to packages/spawn-term/package.nix index f838f49..49ee537 100644 --- a/packages/scripts/spawn-term/default.nix +++ b/packages/spawn-term/package.nix @@ -1,9 +1,5 @@ -{ - lib, - pkgs, - ... -}: -lib._elements.writeNushellApplication pkgs { +{pkgs, ...}: +pkgs.writeNushellApplication { name = "spawn-term"; runtimeInputs = with pkgs; [kdotool]; diff --git a/packages/scripts/to-s3/default.nix b/packages/to-s3/package.nix similarity index 100% rename from packages/scripts/to-s3/default.nix rename to packages/to-s3/package.nix diff --git a/packages/scripts/to-s3/to-s3 b/packages/to-s3/to-s3 similarity index 100% rename from packages/scripts/to-s3/to-s3 rename to packages/to-s3/to-s3 diff --git a/secrets/rekeyed/aepplet/a833fa567d54391802a4b064f0911c99-tophPassword.age b/secrets/rekeyed/aepplet/a833fa567d54391802a4b064f0911c99-tophPassword.age index 393fc32..af7cc26 100644 Binary files a/secrets/rekeyed/aepplet/a833fa567d54391802a4b064f0911c99-tophPassword.age and b/secrets/rekeyed/aepplet/a833fa567d54391802a4b064f0911c99-tophPassword.age differ diff --git a/secrets/rekeyed/alvin/4d69517f795180e7624327785e4dc2e0-radiclePrivateKey.age b/secrets/rekeyed/alvin/4d69517f795180e7624327785e4dc2e0-radiclePrivateKey.age deleted file mode 100644 index aa703e9..0000000 Binary files a/secrets/rekeyed/alvin/4d69517f795180e7624327785e4dc2e0-radiclePrivateKey.age and /dev/null differ diff --git a/secrets/rekeyed/alvin/7e5c19aa43c8da31e2b8a805c08871d4-victoriametricsPasswordFile.age b/secrets/rekeyed/alvin/7e5c19aa43c8da31e2b8a805c08871d4-victoriametricsPasswordFile.age deleted file mode 100644 index 1c1a4dd..0000000 Binary files a/secrets/rekeyed/alvin/7e5c19aa43c8da31e2b8a805c08871d4-victoriametricsPasswordFile.age and /dev/null differ diff --git a/secrets/rekeyed/alvin/88cd17db4123b6ee80589c9f0b475256-radiclePublicKey.age b/secrets/rekeyed/alvin/88cd17db4123b6ee80589c9f0b475256-radiclePublicKey.age deleted file mode 100644 index 3ff559a..0000000 Binary files a/secrets/rekeyed/alvin/88cd17db4123b6ee80589c9f0b475256-radiclePublicKey.age and /dev/null differ diff --git a/secrets/rekeyed/beryllium/f5fac061d23fe6d1347e4e94aabe277f-smbSecrets.age b/secrets/rekeyed/beryllium/f5fac061d23fe6d1347e4e94aabe277f-smbSecrets.age deleted file mode 100644 index 74bb7a8..0000000 --- a/secrets/rekeyed/beryllium/f5fac061d23fe6d1347e4e94aabe277f-smbSecrets.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 pySEWw kigbWfXfeb8YlBMpSWM+jDPtjYeAltdTORqPQ7kqnFg -P8j10qrMzjWZ91FVnn4sLugS/AcS2XrMr9TRal5gRVc --> m0^G"4-grease p]TT RuLz -9HFjCiuy7w ---- j57VRBCbLMVDI2s7DnpBwTvVzzvqwMdXL6Ec/9Tg6MA -cD_FT,h }/;A8P%/:E)pՀ -mq{J Ukn\8L}j'yaJ \ No newline at end of file diff --git a/secrets/rekeyed/christopher_beryllium/8118cd92c3025c1f5bd7a4f4aabbf554-traefik-env.age b/secrets/rekeyed/christopher_beryllium/8118cd92c3025c1f5bd7a4f4aabbf554-traefik-env.age deleted file mode 100644 index 84cc35b..0000000 --- a/secrets/rekeyed/christopher_beryllium/8118cd92c3025c1f5bd7a4f4aabbf554-traefik-env.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 pySEWw yyra9wL+n2gFPpbmnkvbsxBverCR/r7yPSw3aCD0slk -65Vc/tQKzfsFC5smIqHmXA7NlSJLW8oXAYPYiX3bGcw --> MV*6+^H-grease uV!LS]1* B5lCK], yjN7. -O1RM77BbFx0SsKlEXUVAJCswHGS1oKfX1ZvBNcF47W0o//6iiBHOWTvpaW15xVMZ -00g ---- XNgzqoXEkkzK8TE/A81FFduXsiDouJFXV/9o/m/bnss -Q10#͚i~d~ElgG^O,P:֣[if>,@i|DJm)P8h2Vk)7>u@q #͈םf偨䐙ۥ+O,a,%tR[7N \ No newline at end of file diff --git a/secrets/rekeyed/cobalt/744ad1a7e324b40d0805e2ef82d8fc5a-victoriametricsEnvFile.age b/secrets/rekeyed/cobalt/744ad1a7e324b40d0805e2ef82d8fc5a-victoriametricsEnvFile.age deleted file mode 100644 index 6d48cbf..0000000 Binary files a/secrets/rekeyed/cobalt/744ad1a7e324b40d0805e2ef82d8fc5a-victoriametricsEnvFile.age and /dev/null differ diff --git a/secrets/rekeyed/cobalt/a833fa567d54391802a4b064f0911c99-tophPassword.age b/secrets/rekeyed/cobalt/a833fa567d54391802a4b064f0911c99-tophPassword.age deleted file mode 100644 index 5401e82..0000000 --- a/secrets/rekeyed/cobalt/a833fa567d54391802a4b064f0911c99-tophPassword.age +++ /dev/null @@ -1,8 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 /u/eYA a2YtLIFiK8lETFr+I/Yixme90wgJX/X+kW2KpCFWGiM -xm/9eER61LCPTiRUi24Qh3gQq1OV8s9BQjgxRJfLvKs --> vEX:@rY-grease #.ah Wz?~ Gr|K[7W -.UYxQ# -CTEhaEVZInKKSMg6Vzb54cghIPT7PbUy57qgdWwXx6lvbnnIxsqnRUwBhLK8sT3w -Sx+t1v8/cuDK ---- nzehXvl4h/fS4/3W2Rsn0Uu1E9NUsEIR6ni5qOA/U1I -i8KأeքL+KVɌnC(?C \ No newline at end of file diff --git a/secrets/rekeyed/endurance/744ad1a7e324b40d0805e2ef82d8fc5a-victoriametricsEnvFile.age b/secrets/rekeyed/endurance/744ad1a7e324b40d0805e2ef82d8fc5a-victoriametricsEnvFile.age index 250c6de..f682732 100644 --- a/secrets/rekeyed/endurance/744ad1a7e324b40d0805e2ef82d8fc5a-victoriametricsEnvFile.age +++ b/secrets/rekeyed/endurance/744ad1a7e324b40d0805e2ef82d8fc5a-victoriametricsEnvFile.age @@ -1,10 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 /u/eYA uWoNFabVJzmA1L8l124lyvnvAFgsQ9rh/Okags2UrxU -vGenkj0xh5FbxTnS91XEz2qAoILYZS5skYHaadaNIBo --> F"k"3;+O-grease (5t/PH -zBRuwDmTbpClRyVeC77vgGo4aDE2/KxWdcJK1gXvu60DxzUfyjlF3SjKLGBx4qIp - ---- VxGN6ddpUyGJNbtKpOIoo7dZ3Xy1vxX1GA5f3EXef7g -&`jZ=s ޯ8ozҏr%*}pMu` oK~ -l23v˰ -9qxg|c:2.N bi8cdJ*z#Y[7ƶǑ=}{ g Y`gw,*\r/B[ & \ No newline at end of file +-> ssh-ed25519 /u/eYA BvO3LN0SaFuuw7V5V+qRkAKFtW+ASCtMEo+HBOnccRk +2tdN2DqV/NKLX00LBp012xqimkBCdbZBFPXoQOWDqKc +-> ig7-grease 0X s +I8yjO2SGIHc0WeWWDQ51XA +--- ADjzRKqqYst1LvYy8n4DsZnHLiBFv+r+H+NdiHJ8V64 +?~ ssh-ed25519 /u/eYA nwX0pWBepC/ZFbMVxlJDrhizIHaH7ocQDM+RlzBpCGo +m1El2cCN5hLmBxjjh1hUqIrfbH/rZeubfnbs4q9tAsU +-> BB'U;P-grease +m5VAyZ9GwzzC/k3YD/A36REpYNLssYQ08N9Wy6ybjE1aW2PPn0yVNW79LVln +--- G1iRECIT8kxcUDFr5qaBKt/DW2VU0OhGjMYCadwqz8U +-sވ玥~.: +sjUMzD  \ No newline at end of file diff --git a/secrets/rekeyed/europium/7557b7278f290608722bc80adb2f95e0-compose.age b/secrets/rekeyed/europium/7557b7278f290608722bc80adb2f95e0-compose.age deleted file mode 100644 index 9fb701a..0000000 Binary files a/secrets/rekeyed/europium/7557b7278f290608722bc80adb2f95e0-compose.age and /dev/null differ diff --git a/secrets/rekeyed/europium/b2fbc3dc3ca489784f16a14cf23ab4a0-stalwart.age b/secrets/rekeyed/europium/b2fbc3dc3ca489784f16a14cf23ab4a0-stalwart.age deleted file mode 100644 index 5475333..0000000 Binary files a/secrets/rekeyed/europium/b2fbc3dc3ca489784f16a14cf23ab4a0-stalwart.age and /dev/null differ diff --git a/secrets/rekeyed/europium/bb4dfa5cb8bf5e4914b260b95cac4078-traefik.age b/secrets/rekeyed/europium/bb4dfa5cb8bf5e4914b260b95cac4078-traefik.age deleted file mode 100644 index a732461..0000000 Binary files a/secrets/rekeyed/europium/bb4dfa5cb8bf5e4914b260b95cac4078-traefik.age and /dev/null differ diff --git a/secrets/rekeyed/stalwart_europium/751166ccf5cc477824fe69b47284912e-traefik.age b/secrets/rekeyed/stalwart_europium/751166ccf5cc477824fe69b47284912e-traefik.age deleted file mode 100644 index 28251f7..0000000 Binary files a/secrets/rekeyed/stalwart_europium/751166ccf5cc477824fe69b47284912e-traefik.age and /dev/null differ diff --git a/secrets/rekeyed/stalwart_europium/7f766c9e563fa35b6b5dacdade067a5c-compose.age b/secrets/rekeyed/stalwart_europium/7f766c9e563fa35b6b5dacdade067a5c-compose.age deleted file mode 100644 index ee826b3..0000000 Binary files a/secrets/rekeyed/stalwart_europium/7f766c9e563fa35b6b5dacdade067a5c-compose.age and /dev/null differ diff --git a/secrets/rekeyed/stalwart_europium/fb2a5161551e0237b02acd721942aad9-stalwart.age b/secrets/rekeyed/stalwart_europium/fb2a5161551e0237b02acd721942aad9-stalwart.age deleted file mode 100644 index 21af6a7..0000000 Binary files a/secrets/rekeyed/stalwart_europium/fb2a5161551e0237b02acd721942aad9-stalwart.age and /dev/null differ diff --git a/secrets/rekeyed/toph.endurance/0abeaf0474074a50285a177aacd7ec0f-id_ethnuc.age b/secrets/rekeyed/toph.endurance/0abeaf0474074a50285a177aacd7ec0f-id_ethnuc.age new file mode 100644 index 0000000..8fff3bc Binary files /dev/null and b/secrets/rekeyed/toph.endurance/0abeaf0474074a50285a177aacd7ec0f-id_ethnuc.age differ diff --git a/secrets/rekeyed/toph.endurance/0f948eedfa8d6e97a197d3e5df42c92e-id_hausgold.age b/secrets/rekeyed/toph.endurance/0f948eedfa8d6e97a197d3e5df42c92e-id_hausgold.age new file mode 100644 index 0000000..b5e2530 Binary files /dev/null and b/secrets/rekeyed/toph.endurance/0f948eedfa8d6e97a197d3e5df42c92e-id_hausgold.age differ diff --git a/secrets/rekeyed/toph.endurance/241c114c18645057167f14101ddcdbcb-id_homeassistant.age b/secrets/rekeyed/toph.endurance/241c114c18645057167f14101ddcdbcb-id_homeassistant.age new file mode 100644 index 0000000..ae30bc5 Binary files /dev/null and b/secrets/rekeyed/toph.endurance/241c114c18645057167f14101ddcdbcb-id_homeassistant.age differ diff --git a/secrets/rekeyed/toph.endurance/68a44c5680f7a6e57f6cc276f6fae690-repoUpdatePAT.age b/secrets/rekeyed/toph.endurance/68a44c5680f7a6e57f6cc276f6fae690-repoUpdatePAT.age new file mode 100644 index 0000000..9819c73 --- /dev/null +++ b/secrets/rekeyed/toph.endurance/68a44c5680f7a6e57f6cc276f6fae690-repoUpdatePAT.age @@ -0,0 +1,9 @@ +age-encryption.org/v1 +-> ssh-ed25519 Sih9FA u6Zxh2e1bvUdQ9I4YJTmZu31x2wE1N/UeVfjU3neXGI +0RTNgBke72G7TVXmGXQIBEz0l3KGPMcKHx5F78IvzcY +-> J-grease :r=#zF# :( |;a'5va A1~[+ +TaZYrXCoYw +--- u1b7+IBBNy6gr7x72Q7I6WJQ+PSXhiEYZXrRT3e+nMs +䕺f A.3jub, +aͳRMy5&K侅i7࿜~6J2ߧJ$OsSLN- +L=|!<7 gNߖ3SWI; \ No newline at end of file diff --git a/secrets/rekeyed/toph.endurance/6e09e324e621f167ae6a8b9dc2ca0529-id_alvin.age b/secrets/rekeyed/toph.endurance/6e09e324e621f167ae6a8b9dc2ca0529-id_alvin.age new file mode 100644 index 0000000..b82f4dc Binary files /dev/null and b/secrets/rekeyed/toph.endurance/6e09e324e621f167ae6a8b9dc2ca0529-id_alvin.age differ diff --git a/secrets/rekeyed/toph.endurance/a3984008ff2b9a3226656619c81e4c47-emailPassword.age b/secrets/rekeyed/toph.endurance/a3984008ff2b9a3226656619c81e4c47-emailPassword.age new file mode 100644 index 0000000..19eaac2 --- /dev/null +++ b/secrets/rekeyed/toph.endurance/a3984008ff2b9a3226656619c81e4c47-emailPassword.age @@ -0,0 +1,7 @@ +age-encryption.org/v1 +-> ssh-ed25519 Sih9FA 4cwpEkfOvie2lcVVWipZdcjX+4uWvWUqqqM1Lxzqi2g +KQ+Wu6cfAb5VcdBiynUYCIFOS80Z9hzTFkJmvMyk8l0 +-> =[-grease Efc=i9 +6zuCx3Ja7X6IePeOMCNlo2E6wlUVnJdNRe5uPAfZqWEGuare +--- eEOYwAsqsa8DJnHuvXIbwjdPD4HnrkXdnIzvE/SsNhw +zL P8fݍՊ0_&lSV%<.l<6"JLV{~ \ No newline at end of file diff --git a/secrets/rekeyed/toph.endurance/bf37e236fcc3c1ce07d32b54d70f80ef-id_europium.age b/secrets/rekeyed/toph.endurance/bf37e236fcc3c1ce07d32b54d70f80ef-id_europium.age new file mode 100644 index 0000000..c0c1ac0 Binary files /dev/null and b/secrets/rekeyed/toph.endurance/bf37e236fcc3c1ce07d32b54d70f80ef-id_europium.age differ diff --git a/secrets/rekeyed/toph.endurance/d5d9325b86283f0a1572f2817924fea4-id_github.age b/secrets/rekeyed/toph.endurance/d5d9325b86283f0a1572f2817924fea4-id_github.age new file mode 100644 index 0000000..66b4048 Binary files /dev/null and b/secrets/rekeyed/toph.endurance/d5d9325b86283f0a1572f2817924fea4-id_github.age differ diff --git a/secrets/rekeyed/toph.endurance/dcb82593014313ac12faa7a33834a1aa-config.age b/secrets/rekeyed/toph.endurance/dcb82593014313ac12faa7a33834a1aa-config.age new file mode 100644 index 0000000..6bf81d9 Binary files /dev/null and b/secrets/rekeyed/toph.endurance/dcb82593014313ac12faa7a33834a1aa-config.age differ diff --git a/secrets/rekeyed/toph.endurance/f163a86f52bfaee9d516fee4b00a5111-npmrc.age b/secrets/rekeyed/toph.endurance/f163a86f52bfaee9d516fee4b00a5111-npmrc.age new file mode 100644 index 0000000..cfaaa49 --- /dev/null +++ b/secrets/rekeyed/toph.endurance/f163a86f52bfaee9d516fee4b00a5111-npmrc.age @@ -0,0 +1,8 @@ +age-encryption.org/v1 +-> ssh-ed25519 Sih9FA 3CxztQ43ysoI6lY8+urnVpPuOZ7novdVKhYbLRvCBns +m8AsmoNiOtfyizPOO8y+Duq+eF71XFa6YzLiD1q+llc +-> bn-grease 1 S{vI3DUq " +zBxmjcl0M7P1yd5ukMsV2Pu+HB+HwO+PcwRGKLmXJGbQt3v2jDe7Bi/pIXf9mhM9 +KYvNzopzJ8Ny3vYdIRMdL44 +--- EkumKng8pk1fU06yb+e47Fey3LIgpvATmzPwGhEpNB4 +ISD\6vJ 0|aGnMH*TZ_"~h>0,^[WWؽ Z,MfU@=$&輧N|ّU& \ No newline at end of file diff --git a/secrets/rekeyed/toph_endurance/0abeaf0474074a50285a177aacd7ec0f-id_ethnuc.age b/secrets/rekeyed/toph_endurance/0abeaf0474074a50285a177aacd7ec0f-id_ethnuc.age deleted file mode 100644 index efa3662..0000000 Binary files a/secrets/rekeyed/toph_endurance/0abeaf0474074a50285a177aacd7ec0f-id_ethnuc.age and /dev/null differ diff --git a/secrets/rekeyed/toph_endurance/0f948eedfa8d6e97a197d3e5df42c92e-id_hausgold.age b/secrets/rekeyed/toph_endurance/0f948eedfa8d6e97a197d3e5df42c92e-id_hausgold.age deleted file mode 100644 index 0d38eaa..0000000 Binary files a/secrets/rekeyed/toph_endurance/0f948eedfa8d6e97a197d3e5df42c92e-id_hausgold.age and /dev/null differ diff --git a/secrets/rekeyed/toph_endurance/1944c0824166a3a9a50bd2dbd4cef01b-id_rhenium.age b/secrets/rekeyed/toph_endurance/1944c0824166a3a9a50bd2dbd4cef01b-id_rhenium.age deleted file mode 100644 index 35055eb..0000000 Binary files a/secrets/rekeyed/toph_endurance/1944c0824166a3a9a50bd2dbd4cef01b-id_rhenium.age and /dev/null differ diff --git a/secrets/rekeyed/toph_endurance/241c114c18645057167f14101ddcdbcb-id_homeassistant.age b/secrets/rekeyed/toph_endurance/241c114c18645057167f14101ddcdbcb-id_homeassistant.age deleted file mode 100644 index e15f881..0000000 Binary files a/secrets/rekeyed/toph_endurance/241c114c18645057167f14101ddcdbcb-id_homeassistant.age and /dev/null differ diff --git a/secrets/rekeyed/toph_endurance/68a44c5680f7a6e57f6cc276f6fae690-repoUpdatePAT.age b/secrets/rekeyed/toph_endurance/68a44c5680f7a6e57f6cc276f6fae690-repoUpdatePAT.age deleted file mode 100644 index 8c7e59f..0000000 --- a/secrets/rekeyed/toph_endurance/68a44c5680f7a6e57f6cc276f6fae690-repoUpdatePAT.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 Sih9FA Qz6PMloD3pbf8CCRjy6R2txKzesS7/d5Rgn/MDo6jhs -0VhYjOHKvVEMCTD1KSUMEWKfYo7aJucexN9lEY29K7U --> ?*-grease [f:|T| " $QWv2+ -opETvNeqcgLuOw ---- QAnqaENfXZIfh/XR2kTZRBWDLby1SULHRjMhTr8A8xQ -4 {h%R]Nk?#SϢ*I}-baHەTɒlҜEbj I!Pƌ 4HO&{% JNA]F~e ZRM"4l広 \ No newline at end of file diff --git a/secrets/rekeyed/toph_endurance/a3984008ff2b9a3226656619c81e4c47-emailPassword.age b/secrets/rekeyed/toph_endurance/a3984008ff2b9a3226656619c81e4c47-emailPassword.age deleted file mode 100644 index 4dd93b0..0000000 --- a/secrets/rekeyed/toph_endurance/a3984008ff2b9a3226656619c81e4c47-emailPassword.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 Sih9FA 6cECI8dFrJxfryE9CMqvln5gtlLeiaperg5rptHx0GI -AsCg77lOWyeKsY5Rjd2OwHq8P5K1LBw3pX6rWqcP3oo --> P-grease =j@@ @ -QP4YAHktdAGUTj1arv43 ---- rxF03h8ttUmPO2vx1u/Xuxys4kkGpZINwlsdVHJ1ESg -=0j Y\-7Q K(uz@:pq#'t+g6 \ No newline at end of file diff --git a/secrets/rekeyed/toph_endurance/bf37e236fcc3c1ce07d32b54d70f80ef-id_europium.age b/secrets/rekeyed/toph_endurance/bf37e236fcc3c1ce07d32b54d70f80ef-id_europium.age deleted file mode 100644 index beaafda..0000000 Binary files a/secrets/rekeyed/toph_endurance/bf37e236fcc3c1ce07d32b54d70f80ef-id_europium.age and /dev/null differ diff --git a/secrets/rekeyed/toph_endurance/d5d9325b86283f0a1572f2817924fea4-id_github.age b/secrets/rekeyed/toph_endurance/d5d9325b86283f0a1572f2817924fea4-id_github.age deleted file mode 100644 index 7953c6b..0000000 Binary files a/secrets/rekeyed/toph_endurance/d5d9325b86283f0a1572f2817924fea4-id_github.age and /dev/null differ diff --git a/secrets/rekeyed/toph_endurance/dcb82593014313ac12faa7a33834a1aa-config.age b/secrets/rekeyed/toph_endurance/dcb82593014313ac12faa7a33834a1aa-config.age deleted file mode 100644 index 5dc9754..0000000 Binary files a/secrets/rekeyed/toph_endurance/dcb82593014313ac12faa7a33834a1aa-config.age and /dev/null differ diff --git a/secrets/rekeyed/toph_endurance/f163a86f52bfaee9d516fee4b00a5111-npmrc.age b/secrets/rekeyed/toph_endurance/f163a86f52bfaee9d516fee4b00a5111-npmrc.age deleted file mode 100644 index 1186aae..0000000 --- a/secrets/rekeyed/toph_endurance/f163a86f52bfaee9d516fee4b00a5111-npmrc.age +++ /dev/null @@ -1,7 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 Sih9FA sATnV8c7sc9vhDJOVGH54On7NyNpDWh4ZT4x8XwTb3w -aUhPDWpg9xmRzWM7OqyCyW/G4l5RoYxFxFHgfZIZaug --> y-grease g u^${ }! -sRY89bfP5Zny9MCjpRKLDtdcsiz9hZHkP+s ---- R/3RXSMTVS0l5AFZmPasseP1Ub+WISO5VspK7AQreXI -V̺7~؂#JbtuJSC[h_;PUI,Yèx9fJڀmAdE1E9Qo`抶MZ+ݯM)][Zc7 \ No newline at end of file diff --git a/secrets/ssh/id_alvin.age b/secrets/ssh/id_alvin.age new file mode 100644 index 0000000..9dc6292 Binary files /dev/null and b/secrets/ssh/id_alvin.age differ