Merge pull request #345 from genebean/shell-hacking

Updates found to be helpful while working today

modules/home-manager/common/all-cli.nix

@@ -78,10 +78,16 @@ in {
     bottom.enable = true;
     broot.enable = true;
     eza.enable = true;
+    fzf.enable = true;
     gh.enable = true;
     git = {
       enable = true;
       diff-so-fancy.enable = true;
+      ignores = [
+        "*~"
+        "*.swp"
+        ".DS_Store"
+      ];
       includes = [ { path = "~/.gitconfig-local"; }];
       lfs.enable = true;
       package = pkgs.gitAndTools.gitFull;
@@ -243,6 +249,16 @@ in {
         fi
 
         export GPG_TTY=$(tty)
+        nv() {
+          # Assumes all configs exist in directories named ~/.config/nvim-*
+          local config=$(fd --max-depth 1 --glob 'nvim*' ~/.config | fzf --prompt="Neovim Configs > " --height=~50% --layout=reverse --border --exit-0)
+
+          # If I exit fzf without selecting a config, don't open Neovim
+          [[ -z $config ]] && echo "No config selected" && return
+
+          # Open Neovim with the selected config
+          NVIM_APPNAME=$(basename $config) nvim $*
+        }
       '';
       oh-my-zsh = {
         enable = true;
@@ -273,6 +289,7 @@ in {
         gitextract = "git log --pretty=email --patch-with-stat --reverse --full-index --binary --";
         gpge = "gpg2 --encrypt --sign --armor -r ";
         hubpr = "hub pull-request --push --browse";
+        nvd = "NVIM_APPNAME=nvim-dots nvim";
         pssh = "ssh -o 'UserKnownHostsFile /dev/null' -o 'StrictHostKeyChecking no' -o PubkeyAcceptedKeyTypes=+ssh-rsa -o HostKeyAlgorithms=+ssh-rsa -o KexAlgorithms=+diffie-hellman-group1-sha1 -i ~/.ssh/id_rsa-acceptance";
         sal = "ssh-add -L";
         st = "open -a SourceTree";

modules/home-manager/files/nvim/lua/plugins/lsp-config.lua

@@ -50,7 +50,7 @@ return {
       lspconfig.puppet.setup({
         capabilities = capabilities,
         on_attach = on_attach,
-        cmd = { puppet_languageserver },
+        cmd = { puppet_languageserver, "--feature-flags=puppetstrings", },
       })
       lspconfig.ruff_lsp.setup({ on_attach = on_attach })
     end,

modules/home-manager/hosts/Blue-Rock/secrets.yaml

@@ -1,6 +1,6 @@
 tailscale_key: ENC[AES256_GCM,data:7XXDKJ/x/8F5HabD7dYE4OE8kLMUjkxCp5eBnVayErPpobo+/4P2DC6ZAUlnaxllHpFMPMQE82S4,iv:aRUvoHuwNa3kOnH38foY/dfZl3JH8LyQsZb2qDGACsM=,tag:YL3Dm66WuDIv8KwvYLfjUw==,type:str]
 local_git_config: ENC[AES256_GCM,data:DC8DzFYGT0H/5t2QhtvSc65WMil+nhj6BUdYujnNqyQJVlRe5DgIgCu280/y,iv:cCWJ9PmqIB8udCVQJfb8w5rPYIq9CWB0smtv+jiLm/o=,tag:5eeaHfPr6Y6B30CB7Yidqw==,type:str]
-local_private_env: ENC[AES256_GCM,data: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,iv:/ljcG+rx0JjgXIfGpZ+rnuss0i+ZXi3vSCtly2XRxRo=,tag:+0+yPNQuTnCj4zF8cQEeeg==,type:str]
+local_private_env: ENC[AES256_GCM,data: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,iv:xGQHVt+gBIECVpTNrii2bWdL0dN2ZXlI7oaZ1CgVf5U=,tag:aSB41Q0ToHqJNXi45aJqxQ==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -16,8 +16,8 @@ sops:
             b3U5ZWtYNXgzQXljYU5DSlJkUitjUGMKMtV3Q3X9Hn/ILCm5Wf9rt5YezT76Nnrn
             XYbIIVIglNfgaS4iVgQhMOPh+yLJ5P+swFSt6/vrDH72LUFA9YNxSw==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-12-18T19:39:41Z"
+    lastmodified: "2024-01-03T15:48:03Z"
-    mac: ENC[AES256_GCM,data:LwQGcpDFrsuc0yYEv0ElJa50AdnzWk/xs78UJz4VjRPOEZbw3ibo3MmLcrYSsatU4cLqtBbVO60/lWjeeKiqmzAKdbxA/sui3JLYB4aS6wEnJvrNa4+cNr9cryaAMBF2zz9eXifBGa5Hk1VuXPCwLzAftBSTqdhIWfOHA/jej2w=,iv:eUk2TJ4fVk8y4FPYW9mgoT4UHRH6SP5GEWYsf68K714=,tag:TPn9xY+IiWHFEuD4jVvvkA==,type:str]
+    mac: ENC[AES256_GCM,data:6TePwTz4x/CEm9rBxC9T9yKhN4A8LtarZvoEkoAbWaDw37a0fEQLfOPiYpgoeYLfyMvcFMBm9CeKTWq2kSQJ8BLOo5+7me6/qIVa3lYmEzstwlyRG/aPH3eYQCXvPpjeBkdwgnwJzGWRbFIzChPmb/4q9vTP1LC3+Uk9KGh1aIA=,iv:s+TjSD/ZFo4sNd8l/JafvRaD2M7zYWik4u+nc4DlsMc=,tag:gOrhYObXNf6mwjLLqRYriw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1