moving around reencrypt secrets

apps/loadkey.nix

@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-{
-
-  # TODO: just replace with packages instead of apps
-
-  type = "app";
-
-  program = "${pkgs.nmasur.loadkey}/bin/loadkey";
-}

apps/reencrypt-secrets.nix

@@ -1,27 +0,0 @@
-{ pkgs, ... }:
-{
-
-  # nix run github:nmasur/dotfiles#reencrypt-secrets ./private
-
-  type = "app";
-
-  program = builtins.toString (
-    pkgs.writeShellScript "reencrypt-secrets" ''
-      if [ $# -eq 0 ]; then
-        echo "Must provide directory to reencrypt."
-        exit 1
-      fi
-      encrypted=$1
-      for encryptedfile in ''${1}/*; do
-        tmpfile=$(mktemp)
-        echo "Decrypting ''${encryptedfile}..."
-        ${pkgs.age}/bin/age --decrypt \
-          --identity ~/.ssh/id_ed25519 $encryptedfile > $tmpfile
-        echo "Encrypting ''${encryptedfile}..."
-        ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${builtins.toString ../misc/public-keys} $tmpfile > $encryptedfile
-        rm $tmpfile
-      done
-      echo "Finished."
-    ''
-  );
-}

flake.nix

@@ -447,14 +447,14 @@
 
       packages = mypackages;
 
-      # Programs that can be run by calling this flake
-      apps = forAllSystems (
-        system:
-        let
-          pkgs = import nixpkgs { inherit system overlays; };
-        in
-        import ./apps { inherit pkgs; }
-      );
+      # # Programs that can be run by calling this flake
+      # apps = forAllSystems (
+      #   system:
+      #   let
+      #     pkgs = import nixpkgs { inherit system overlays; };
+      #   in
+      #   import ./apps { inherit pkgs; }
+      # );
 
       # Development environments
       devShells = forAllSystems (

hosts-by-platform/aarch64-linux/flame/default.nix

@@ -27,6 +27,7 @@ rec {
     nmasur.profiles = {
       common.enable = true;
       linux-base.enable = true;
+      power-user.enable = true;
     };
     home.stateVersion = "23.05";
   };

pkgs/tools/misc/reencrypt-secrets/package.nix

@@ -0,0 +1,21 @@
+{ pkgs, ... }:
+
+# nix run github:nmasur/dotfiles#reencrypt-secrets ./private
+
+pkgs.writeShellScriptBin "reencrypt-secrets" ''
+  if [ $# -eq 0 ]; then
+    echo "Must provide directory to reencrypt."
+    exit 1
+  fi
+  encrypted=$1
+  find "''${1}" -type f -name "*.age" | while IFS= read -r encryptedfile; do
+    tmpfile=$(mktemp)
+    echo "Decrypting ''${encryptedfile}..."
+    ${pkgs.age}/bin/age --decrypt \
+      --identity ~/.ssh/id_ed25519 $encryptedfile > $tmpfile
+    echo "Encrypting ''${encryptedfile}..."
+    ${pkgs.age}/bin/age --encrypt --armor --recipients-file ${builtins.toString ../../../../misc/public-keys} $tmpfile > $encryptedfile
+    rm $tmpfile
+  done
+  echo "Finished."
+''

platforms/home-manager/modules/nmasur/presets/programs/fish.nix

@@ -40,6 +40,9 @@ in
           description = "Evaluate a bash-like environment variables file";
           body = ''set -gx (cat $argv | tr "=" " " | string split ' ')'';
         };
+        fish_user_key_bindings = {
+          body = cfg.fish_user_key_bindings;
+        };
         ip = {
           body = lib.getExe pkgs.nmasur.ip-check;
         };

platforms/home-manager/modules/nmasur/presets/services/nix.nix

@@ -40,6 +40,12 @@ in
 
       settings = {
 
+        # Trust users for messing with Nix stuff
+        trusted-users = [
+          "root"
+          "@wheel"
+        ];
+
         # Add community Cachix to binary cache
         # Don't use at work because blocked by corporate firewall
         builders-use-substitutes = true;

platforms/nixos/modules/nmasur/profiles/base.nix

@@ -28,13 +28,16 @@ in
       };
     };
 
+programs.fish.enable = lib.mkDefault config.home-manager.users.${username}.programs.fish.enable;
+
+
     # Allows us to declaritively set password
     users.mutableUsers = lib.mkDefault false;
 
     # Define a user account. Don't forget to set a password with ‘passwd’.
     users.users.${username} = {
       # Use fish by default if enabled in home-manager
-      shell = lib.mkIf (config.home-manager.users.${username}.programs.fish.enable) pkgs.fish;
+      shell = lib.mkIf (config.programs.fish.enable) pkgs.fish;
 
       # Create a home directory for human user
       isNormalUser = lib.mkDefault true;