chore: update & various tweaks/docs

nekowinston · Jul 12, 2024 · 7be2b5d · 7be2b5d
1 parent 56915de
commit 7be2b5d
Show file tree

Hide file tree

Showing 9 changed files with 93 additions and 75 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -140,10 +140,6 @@
     };
 
     nur.url = "github:nix-community/nur";
-    caarlos0-nur = {
-      url = "github:caarlos0/nur";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nekowinston-nur.url = "github:nekowinston/nur";
 
     agenix = {

diff --git a/home/apps/mail.nix b/home/apps/mail.nix
@@ -3,7 +3,8 @@
   age.secrets."aerc-personal.conf".path = "${config.xdg.configHome}/aerc/accounts.conf";
   programs = {
     aerc = {
-      enable = true;
+      # FIXME: https://github.com/NixOS/nixpkgs/issues/326307
+      enable = false;
       extraConfig = {
         general = {
           default-save-path = "~/Downloads";

diff --git a/home/apps/nu.nix b/home/apps/nu.nix
@@ -7,9 +7,6 @@
 let
   nu_scripts = "${pkgs.nu_scripts}/share/nu_scripts";
 
-  # milspec = (pkgs.callPackage ../../_sources/generated.nix { }).milspec;
-  milspec.src = /Users/winston/Code/neovim/milspec;
-
   shellAliases = lib.concatStringsSep "\n" (
     lib.mapAttrsToList (k: v: "alias ${k} = ${v}") config.home.shellAliases
   );

diff --git a/home/apps/nu/config.nu b/home/apps/nu/config.nu
@@ -100,7 +100,35 @@ $env.config = {
   # emacs, vi
   edit_mode: vi
   # enables terminal shell integration. Off by default, as some terminals have issues with this.
-  shell_integration: $in_supported_termprogram,
+  shell_integration: {
+    # osc2 abbreviates the path if in the home_dir, sets the tab/window title, shows the running command in the tab/window title
+    osc2: $in_supported_termprogram
+    # osc7 is a way to communicate the path to the terminal, this is helpful for spawning new tabs in the same directory
+    osc7: $in_supported_termprogram
+    # osc8 is also implemented as the deprecated setting ls.show_clickable_links, it shows clickable links in ls output if your terminal supports it. show_clickable_links is deprecated in favor of osc8
+    osc8: $in_supported_termprogram
+    # osc9_9 is from ConEmu and is starting to get wider support. It's similar to osc7 in that it communicates the path to the terminal
+    osc9_9: false
+    # osc133 is several escapes invented by Final Term which include the supported ones below.
+    # 133;A - Mark prompt start
+    # 133;B - Mark prompt end
+    # 133;C - Mark pre-execution
+    # 133;D;exit - Mark execution finished with exit code
+    # This is used to enable terminals to know where the prompt is, the command is, where the command finishes, and where the output of the command is
+    osc133: $in_supported_termprogram
+    # osc633 is closely related to osc133 but only exists in visual studio code (vscode) and supports their shell integration features
+    # 633;A - Mark prompt start
+    # 633;B - Mark prompt end
+    # 633;C - Mark pre-execution
+    # 633;D;exit - Mark execution finished with exit code
+    # 633;E - NOT IMPLEMENTED - Explicitly set the command line with an optional nonce
+    # 633;P;Cwd=<path> - Mark the current working directory and communicate it to the terminal
+    # and also helps with the run recent menu in vscode
+    osc633: ($env.TERM_PROGRAM? == "vscode")
+    # reset_application_mode is escape \x1b[?1l and was added to help ssh work better
+    reset_application_mode: true
+  }
+
   # true or false to enable or disable right prompt to be rendered on last line of the prompt.
   render_right_prompt_on_last_line: false
   # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this.

diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix
@@ -16,6 +16,16 @@ in
 {
   programs.vscode = {
     enable = config.isGraphical;
+
+    # pulling from different package sets:
+    # - pkgs.vscode-extensions:
+    #   pinned releases from inputs.nixpkgs.
+    #
+    # - pkgs.vscode-marketplace-release:
+    #   pinned releases from inputs.nix-vscode-extensions
+    #
+    # - pkgs.vscode-marketplace:
+    #   rolling/nightly releases from inputs.nix-vscode-extensions
     extensions =
       (with pkgs.vscode-extensions; [
         # patches

diff --git a/home/default.nix b/home/default.nix
@@ -38,6 +38,7 @@ in
           nvd
           ranger
           ripgrep
+          sd
           watchexec
         ]
         ++ lib.optionals (config.isGraphical && isLinux) [
@@ -50,9 +51,16 @@ in
       SSH_AUTH_SOCK = "${config.programs.gpg.homedir}/S.gpg-agent.ssh";
     };
     stateVersion = "23.05";
+
+    # respected by `fd` & `rg`, makes it so that iCloud files are ignored by those utils
+    # this speeds up the search processes and files aren't downloaded while searching $HOME
+    file."Library/.ignore".text = lib.optionalString isDarwin ''
+      Mobile Documents/
+    '';
+
+    mac-wallpaper = ./wallpapers/dhm_1610.png;
   };
 
-  home.mac-wallpaper = ./wallpapers/dhm_1610.png;
   xdg.configFile.sketchybar.source = lib.mkIf isDarwin ./apps/sketchybar;
 
   programs = {

diff --git a/home/lib.nix b/home/lib.nix
@@ -30,7 +30,6 @@ rec {
   modules =
     (with inputs; [
       agenix.homeManagerModules.age
-      caarlos0-nur.homeManagerModules.default
       nekowinston-nur.homeManagerModules.default
       nix-index-database.hmModules.nix-index
       vscode-server.homeModules.default

diff --git a/machines/sashimi/brew.nix b/machines/sashimi/brew.nix
@@ -23,7 +23,6 @@ in
       (skipSha "affinity-photo")
       (skipSha "affinity-publisher")
       "alfred"
-      "azure-data-studio"
       "blender"
       (noQuarantine "easy-move-plus-resize")
       (skipSha "element")
@@ -37,6 +36,7 @@ in
       "macfuse"
       "mullvad-browser"
       "mullvadvpn"
+      "orion"
       "rustdesk"
       "signal"
       (skipSha "sizzy")