Modules/Impermanence: Persist vscode + zed state

derivations/tiddl/default.nix

@@ -34,12 +34,12 @@
 in
   pythonPkgs.buildPythonApplication rec {
     pname = "tiddl";
-    version = "3.2.0";
+    version = "3.4.3";
     format = "pyproject";
 
     src = pythonPkgs.fetchPypi {
       inherit pname version;
-      sha256 = "sha256-uLkGyIScYPqFgQdPAOYJDJG0jp+nDAwIl2kFkaJZFco=";
+      sha256 = "sha256-45KHNS1IP59DsH8i2uQ7sua6T21vW/Yw1PQg55jzLGs=";
     };
 
     dontCheckRuntimeDeps = true;

home/christoph/nixinator/default.nix

@@ -18,6 +18,8 @@
       fcitx.enable = true;
 
       waybar.monitors = ["DP-1" "DP-2"];
+      vscode.enable = true;
+      zed.enable = true;
     };
 
     home = let
@@ -75,9 +77,9 @@
         # jetbrains.idea-ultimate
         # jetbrains.webstorm
         # jetbrains.rider
-        zed-editor
-        vscode
         # ghidra # launch with _JAVA_AWT_WM_NONREPARENTING=1 (use programs.ghidra)
+        # zed-editor # Using module
+        # vscode # Using module
 
         # Unity Stuff
         # unityhub

home/homemodules/1_deprecated/vscode/default.nix

@@ -1,156 +0,0 @@
-# TODO: Expose some settings
-{
-  config,
-  nixosConfig,
-  lib,
-  mylib,
-  pkgs,
-  ...
-}:
-with lib;
-with mylib.modules; let
-  cfg = config.homemodules.vscode;
-in {
-  options.homemodules.vscode = import ./options.nix {inherit lib mylib;};
-
-  config = mkIf cfg.enable {
-    programs.vscode = {
-      enable = true;
-      enableExtensionUpdateCheck = false;
-      enableUpdateCheck = false;
-      extensions = with pkgs.vscode-extensions; [
-        # alefragnani.bookmarks # TODO: Use inline bookmarks instead
-        # alefragnani.project-manager # NOTE: Not much sense with flake dev environments
-        catppuccin.catppuccin-vsc
-        catppuccin.catppuccin-vsc-icons
-        christian-kohler.path-intellisense
-        # codezombiech.gitignore # NOTE: Superfluous
-        # coolbear.systemd-unit-file # NOTE: Unnecessary on NixOS
-        eamodio.gitlens
-        # formulahendry.auto-rename-tag
-        # formulahendry.auto-close-tag
-        # gitlab.gitlab-workflow
-        # irongeek.vscode-env
-        # jnoortheen.nix-ide
-        # kamadorueda.alejandra
-        # kamikillerto.vscode-colorize
-        # llvm-vs-code-extensions.vscode-clangd
-        # matklad.rust-analyzer
-        mechatroner.rainbow-csv
-        # mikestead.dotenv
-        # mkhl.direnv
-        # ms-azuretools.vscode-docker
-        # ms-kubernetes-tools.vscode-kubernetes-tools
-        ms-python.python
-        ms-toolsai.jupyter
-        ms-vscode.cmake-tools
-        ms-vscode.cpptools
-        # ms-vscode.hexeditor
-        # ms-vscode.makefile-tools
-        ms-python.black-formatter
-        ms-python.vscode-pylance
-        ms-vscode-remote.remote-ssh
-        # naumovs.color-highlight
-        njpwerner.autodocstring
-        # james-yu.latex-workshop
-        # redhat.java
-        # redhat.vscode-xml
-        # redhat.vscode-yaml
-        ritwickdey.liveserver
-        # rubymaniac.vscode-paste-and-indent
-        ryu1kn.partial-diff
-        # serayuzgur.crates
-        shd101wyy.markdown-preview-enhanced
-        # skyapps.fish-vscode
-        # tamasfe.even-better-toml
-        # timonwong.shellcheck
-        # tomoki1207.pdf # Incompatible with latex workshop
-        # valentjn.vscode-ltex
-        vscodevim.vim
-        vscode-icons-team.vscode-icons
-        # yzhang.markdown-all-in-one
-      ];
-      # haskell = {};
-      # keybindings = {};
-
-      userSettings = {
-        # VSCode Internals
-        "editor.fontFamily" = "JetBrainsMono Nerd Font Mono";
-        "editor.fontSize" = 16;
-        "editor.renderWhitespace" = "selection";
-        "editor.cursorStyle" = "line"; # Use line for vim plugin
-        "editor.lineNumbers" = "relative";
-        "editor.linkedEditing" = true;
-        "editor.smoothScrolling" = true;
-        "editor.stickyScroll.enabled" = true;
-        "editor.tabCompletion" = "on";
-        "editor.cursorSmoothCaretAnimation" = "on";
-        "editor.cursorSurroundingLines" = 10;
-        "editor.minimap.renderCharacters" = false;
-        "editor.bracketPairColorization.enabled" = true;
-        "editor.guides.bracketPairs" = "active";
-        "editor.guides.bracketPairsHorizontal" = "active";
-        "editor.guides.highlightActiveIndentation" = false;
-
-        "files.autoSave" = "onFocusChange";
-        "files.trimFinalNewlines" = true;
-        "files.trimTrailingWhitespace" = true; # NOTE: If this is enabled with frequent autosave, the current lines whitespace will always be removed, which is obnoxious
-
-        "window.restoreWindows" = "none";
-
-        "window.titleBarStyle" = "custom"; # NOTE: Should help with crashing on wayland
-        # "window.titleBarStyle" = "native";
-        # "window.menuBarVisibility" = "toggle";
-
-        "workbench.enableExperiments" = false;
-        "workbench.list.smoothScrolling" = true;
-        # "workbench.colorTheme" = "Default Light Modern";
-        # "workbench.iconTheme" = "vscode-icons";
-        "workbench.colorTheme" = "Catppuccin Latte";
-        "workbench.iconTheme" = "catppuccin-latte";
-
-        "remote.SSH.configFile" = "~/.ssh/custom-config";
-
-        "security.workspace.trust.enabled" = false;
-
-        # Language Tool
-        "ltex.checkFrequency" = "manual";
-
-        # LaTeX
-        "latex-workshop.latex.tools" = [
-          {
-            "name" = "latexmk";
-            "command" = "latexmk";
-            "args" = [
-              "-synctex=1"
-              "-shell-escape"
-              "-interaction=nonstopmode"
-              "-file-line-error"
-              "-pdf"
-              "-outdir=%OUTDIR%"
-              "%DOC%"
-            ];
-            "env" = {};
-          }
-        ];
-        "latex-workshop.latexindent.args" = [
-          "-c"
-          "%DIR%/"
-          "%TMPFILE%"
-          "-m"
-          "-y=defaultIndent: '%INDENT%'"
-        ];
-
-        # Nix
-        "[nix]"."editor.tabSize" = 2;
-        "nix.enableLanguageServer" = true;
-        "nix.serverPath" = "nil";
-        "nix.formatterPath" = "alejandra";
-
-        # C++
-        # "C_Cpp.intelliSenseEngine" = "disabled"; # IntelliSense conflics with Clangd
-      };
-      # TODO: Snippets
-    };
-  };
-}

home/homemodules/beets/default.nix

@@ -57,7 +57,7 @@ in {
 
         fetchart = {
           auto = "yes";
-          sources = "filesystem coverart itunes amazon albumart"; # sources are queried in this order
+          sources = "*"; # sources are queried in this order
         };
 
         # lyrics = {

home/homemodules/default.nix

@@ -31,8 +31,10 @@
     ./ssh
     ./terminal
     ./tmux
+    ./vscode
     ./yazi
     ./zathura
+    ./zed
 
     # HM modules imported from the flake inputs
     inputs.nix-flatpak.homeManagerModules.nix-flatpak

home/homemodules/vscode/default.nix

@@ -0,0 +1,88 @@
+# TODO: Expose some settings
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}:
+with lib;
+with mylib.modules; let
+  cfg = config.homemodules.vscode;
+in {
+  options.homemodules.vscode = import ./options.nix {inherit lib mylib;};
+
+  config = mkIf cfg.enable {
+    programs.vscode = {
+      enable = true;
+      package = pkgs.vscode;
+      mutableExtensionsDir = false;
+
+      profiles.default = {
+        enableUpdateCheck = false;
+        enableExtensionUpdateCheck = false;
+        enableMcpIntegration = false;
+
+        extensions = with pkgs.vscode-extensions; [
+          # Theme
+          catppuccin.catppuccin-vsc
+          catppuccin.catppuccin-vsc-icons
+          vscode-icons-team.vscode-icons
+
+          # General
+          vscodevim.vim
+          christian-kohler.path-intellisense
+          ryu1kn.partial-diff
+          redhat.vscode-yaml
+          ms-vscode-remote.remote-ssh
+          ms-vscode-remote.remote-ssh-edit
+          ms-vscode.remote-explorer
+
+          # Python
+          ms-python.python
+          ms-python.vscode-pylance
+          ms-python.black-formatter
+
+          # C/C++
+          ms-vscode.cpptools
+          # llvm-vs-code-extensions.vscode-clangd
+          ms-vscode.cmake-tools
+          ms-vscode.makefile-tools
+          # llvm-org.lldb-vscode
+          vadimcn.vscode-lldb
+          # "13xforever".language-x86-64-assembly
+
+          # Latex
+          # james-yu.latex-workshop
+          # valentjn.vscode-ltex
+        ];
+
+        keybindings = [];
+        globalSnippets = {};
+        languageSnippets = {};
+        userMcp = {};
+
+        userSettings = {
+          "editor.fontFamily" = config.homemodules.color.font;
+          "editor.fontSize" = 14;
+          "editor.smoothScrolling" = true;
+          "editor.cursorSmoothCaretAnimation" = "on";
+          "workbench.enableExperiments" = false;
+          "workbench.list.smoothScrolling" = true;
+          "workbench.colorTheme" = "Catppuccin Mocha";
+          "workbench.iconTheme" = "catppuccin-mocha";
+          "remote.SSH.configFile" = "~/.ssh/custom-config";
+          "workbench.welcomePage.walkthroughs.openOnInstall" = false;
+          "security.workspace.trust.enabled" = false;
+          "chat.disableAIFeatures" = true;
+
+          # C++
+          # "C_Cpp.intelliSenseEngine" = "disabled"; # IntelliSense conflics with Clangd
+        };
+
+        userTasks = {};
+      };
+    };
+  };
+}

home/homemodules/zed/default.nix

@@ -0,0 +1,81 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}: let
+  inherit (config.homemodules) zed color;
+in {
+  options.homemodules.zed = import ./options.nix {inherit lib mylib;};
+
+  config = lib.mkIf zed.enable {
+    programs.zed-editor = {
+      enable = true;
+      package = pkgs.zed-editor;
+      mutableUserKeymaps = false;
+      mutableUserSettings = false;
+      mutableUserTasks = false;
+      mutableUserDebug = false;
+
+      extensions = [
+        "catppuccin"
+        "catppuccin-icons"
+        "dockerfile"
+        "docker-compose"
+
+        # "html"
+        # "make"
+        # "nix"
+        "just"
+        "perl"
+        "assembly"
+        "wat"
+      ];
+
+      themes = {};
+      userDebug = [];
+
+      userKeymaps = [
+        {
+          context = "Workspace";
+          bindings = {
+            ctrl-shift-t = "workspace::NewTerminal";
+          };
+        }
+      ];
+
+      userSettings = {
+        buffer_font_family = config.homemodules.color.font;
+        terminal.font_family = config.homemodules.color.font;
+        theme = "Catppuccin Mocha";
+        icon_theme = "Catppuccin Mocha";
+        ui_font_size = 16;
+        buffer_font_size = 14;
+
+        project_panel.dock = "left";
+        outline_panel.dock = "left";
+        collaboration_panel.dock = "left";
+        git_panel.dock = "left";
+        agent.dock = "right";
+
+        disable_ai = true;
+        auto_signature_help = true;
+
+        telemetry = {
+          diagnostics = false;
+          metrics = false;
+        };
+
+        vim_mode = true;
+        whick_key = {
+          enabled = true;
+          delay_ms = 10;
+        };
+      };
+
+      userTasks = [];
+    };
+  };
+}

home/homemodules/zed/options.nix

@@ -0,0 +1,7 @@
+{
+  lib,
+  mylib,
+  ...
+}: {
+  enable = lib.mkEnableOption "Enable zed editor";
+}

system/systemmodules/impermanence/default.nix

@@ -136,6 +136,7 @@ in {
             (mkUDir ".tiddl" m755)
             (mkUDir ".var/app" m755)
             (mkUDir ".vim/undo" m755)
+            (mkUDir ".vscode" m755)
             (mkUDir ".zotero" m755)
 
             # Cache that's actually useful
@@ -151,6 +152,7 @@ in {
             (mkUDir ".config/beets" m755)
             (mkUDir ".config/blender" m755)
             (mkUDir ".config/chromium" m755) # TODO: Remove this someday
+            (mkUDir ".config/Code" m755)
             (mkUDir ".config/Ferdium" m755)
             (mkUDir ".config/feishin" m755)
             (mkUDir ".config/fish/completions" m755)