From 173f6e446b3b9bbacfcc61c737c5a370e0bbaa79 Mon Sep 17 00:00:00 2001
From: Leon Vatthauer <leon.vatthauer@fau.de>
Date: Sun, 25 Feb 2024 21:03:35 +0100
Subject: [PATCH] switch to vscodium

---
 common/vscode.nix         | 162 ++++++++++++++++++--------------------
 gunther/configuration.nix |   2 +-
 gunther/leonv.nix         |   3 +-
 shinx/leonvatthauer.nix   |   3 +
 4 files changed, 81 insertions(+), 89 deletions(-)

diff --git a/common/vscode.nix b/common/vscode.nix
index 93df8a0..6aaaeec 100755
--- a/common/vscode.nix
+++ b/common/vscode.nix
@@ -2,103 +2,91 @@
 {
   programs.vscode = {
     enable = true;
+    package = pkgs.vscodium;
     extensions = with pkgs.vscode-extensions; [
-      jdinhlife.gruvbox
-      vscodevim.vim
+      bbenoist.nix
       yzhang.markdown-all-in-one
       haskell.haskell
       justusadam.language-haskell
       maximedenes.vscoq
       james-yu.latex-workshop
-      bbenoist.nix
       mkhl.direnv
       catppuccin.catppuccin-vsc
       valentjn.vscode-ltex
     ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
-      {
-        name = "theme-panda";
-        publisher = "tinkertrain";
-        version = "1.3.0";
-        sha256 = "sha256-ijOXoby3FHgDhF2sibXnGpkldKNPCoEXCY0Iw0ndUtw=";
-      }
-      {
-        name = "agda-mode";
-        publisher = "banacorn";
-        version = "0.4.7";
-        sha256 = "sha256-gNa3n16lP3ooBRvGaugTua4IXcIzpMk7jBYMJDQsY00=";
-      }
-      {
-        name = "yuck";
-        publisher = "eww-yuck";
-        version = "0.0.3";
-        sha256 = "sha256-DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM=";
-      }
-    ];
-    userSettings = {
-      "agdaMode.connection.agdaLanguageServer" = false;
-      "agdaMode.highlighting.getHighlightWithThemeColors" = false;
-      "editor.unicodeHighlight.ambiguousCharacters" = false;
-      "editor.semanticHighlighting.enabled" = true;
-      "workbench.colorTheme" = "Catppuccin Mocha";
-      # "workbench.iconTheme" = "catppuccin-mocha";
-      "haskell.manageHLS" = "PATH";
-      "editor.fontFamily" = "Berkeley Mono, DejaVu Sans Mono, monospace, Unifont";
-      "terminal.integrated.minimumContrastRatio" = 1;
-      "terminal.integrated.shellIntegration.enabled" = false;
-      "terminal.integrated.profiles.linux" = {
-        bash = null;
-        zsh = {
-          path = "/run/current-system/sw/bin/zsh";
-          icon = "terminal-linux";
-        };
-      };
-      "terminal.integrated.defaultProfile.linux" = "zsh";
-      "vim.handleKeys" = {
-        "<C-c>" = false;
-        "<C-x>" = false;
-        "<C-s>" = false;
-        "<C-v>" = false;
-        "<C-a>" = false;
-        "<C-d>" = false;
-      };
-      "vim.overrideCopy" = false;
-      "window.titleBarStyle" = "custom";
-      "window.customMenuBarAltFocus" = false;
-      "window.enableMenuBarMnemonics" = false;
-      #"ltex.additionalRules.motherTongue" = "de-DE";
-      #"ltex.language" = "de-DE";
-      #"ltex.ltex-ls.path" = "/etc/profiles/per-user/leonv/";
-      "ltex.java.path" = "/etc/profiles/per-user/leonv/";
-      #"ltex.sentenceCacheSize" = 50000;
-      #"ltex.java.maximumHeapSize" = 8192;
-      "editor.tabSize" = 2;
-      "explorer.excludeGitIgnore" = true;
-      "files.exclude" = {
-        "**/*.agdai" = true;
-      };
-      # try to fix agda suggestions:
-      "editor.acceptSuggestionOnCommitCharacter" = false;
-      "editor.minimap.enabled" = false;
-      "editor.autoClosingOvertype" = "never";
-      "editor.autoClosingBrackets" = "never";
-      "editor.accessibilitySupport" = "off";
-    };
-    keybindings = [
-      {
-        key = "ctrl+shift+v";
-        command = "extension.vim_ctrl+v";
-        when = "editorTextFocus && vim.active && !inDebugRepl";
-      }
-      {
-        key = "ctrl+shift+=";
-        command = "editor.action.fontZoomIn";
-        when = "";
-      }
-      {
-        key = "ctrl+shift+-";
-        command = "editor.action.fontZoomOut";
-        when = "";
-      }
+     {
+       name = "agda-mode";
+       publisher = "banacorn";
+       version = "0.4.7";
+       sha256 = "sha256-gNa3n16lP3ooBRvGaugTua4IXcIzpMk7jBYMJDQsY00=";
+     }
+     {
+       name = "yuck";
+       publisher = "eww-yuck";
+       version = "0.0.3";
+       sha256 = "sha256-DITgLedaO0Ifrttu+ZXkiaVA7Ua5RXc4jXQHPYLqrcM=";
+     }
     ];
+   userSettings = {
+     "agdaMode.connection.agdaLanguageServer" = false;
+     "agdaMode.highlighting.getHighlightWithThemeColors" = false;
+     "editor.unicodeHighlight.ambiguousCharacters" = false;
+     "editor.semanticHighlighting.enabled" = true;
+     "workbench.colorTheme" = "Catppuccin Mocha";
+     "haskell.manageHLS" = "PATH";
+     "editor.fontFamily" = "Berkeley Mono, DejaVu Sans Mono, monospace, Unifont";
+     "terminal.integrated.minimumContrastRatio" = 1;
+     "terminal.integrated.shellIntegration.enabled" = false;
+     "terminal.integrated.profiles.linux" = {
+       bash = null;
+       zsh = {
+         path = "/run/current-system/sw/bin/zsh";
+         icon = "terminal-linux";
+       };
+     };
+     "terminal.integrated.defaultProfile.linux" = "zsh";
+     "vim.handleKeys" = {
+       "<C-c>" = false;
+       "<C-x>" = false;
+       "<C-s>" = false;
+       "<C-v>" = false;
+       "<C-a>" = false;
+       "<C-d>" = false;
+     };
+     "vim.overrideCopy" = false;
+     "window.titleBarStyle" = "custom";
+     "window.customMenuBarAltFocus" = false;
+     "window.enableMenuBarMnemonics" = false;
+     "ltex.sentenceCacheSize" = 50000;
+     "ltex.java.maximumHeapSize" = 8192;
+     "editor.tabSize" = 2;
+     "explorer.excludeGitIgnore" = true;
+     "files.exclude" = {
+       "**/*.agdai" = true;
+     };
+     # try to fix agda suggestions:
+     "editor.acceptSuggestionOnCommitCharacter" = false;
+     "editor.minimap.enabled" = false;
+     "editor.autoClosingOvertype" = "never";
+     "editor.autoClosingBrackets" = "never";
+     "editor.accessibilitySupport" = "off";
+   };
+   keybindings = [
+     {
+       key = "ctrl+shift+v";
+       command = "extension.vim_ctrl+v";
+       when = "editorTextFocus && vim.active && !inDebugRepl";
+     }
+     {
+       key = "ctrl+shift+=";
+       command = "editor.action.fontZoomIn";
+       when = "";
+     }
+     {
+       key = "ctrl+shift+-";
+       command = "editor.action.fontZoomOut";
+       when = "";
+     }
+   ];
   };
 }
diff --git a/gunther/configuration.nix b/gunther/configuration.nix
index 10a5d4f..33e1752 100755
--- a/gunther/configuration.nix
+++ b/gunther/configuration.nix
@@ -158,7 +158,7 @@
         socat
       ];
 
-  system.stateVersion = "23.11";
+  system.stateVersion = "24.05";
 
   # NFS setup
   services.rpcbind.enable = true; # needed for NFS
diff --git a/gunther/leonv.nix b/gunther/leonv.nix
index b9f9f2f..41841b2 100755
--- a/gunther/leonv.nix
+++ b/gunther/leonv.nix
@@ -6,7 +6,7 @@
     ./../common/eww
   ];
   /* The home.stateVersion option does not have a default and must be set */
-  home.stateVersion = "23.11";
+  home.stateVersion = "24.05";
   home.username = "leonv";
   home.homeDirectory = "/home/leonv";
 
@@ -97,6 +97,7 @@
       ls = "eza";
       ll = "eza -l";
       l = "eza -lah";
+      code = "codium";
     };
     initExtra = ''
       function rebuild () {
diff --git a/shinx/leonvatthauer.nix b/shinx/leonvatthauer.nix
index 8c38fde..98485c4 100755
--- a/shinx/leonvatthauer.nix
+++ b/shinx/leonvatthauer.nix
@@ -58,6 +58,9 @@
   };
   programs.zsh = {
     enable = true;
+    shellAliases = {
+      code = "codium";
+    };
     oh-my-zsh = {
       enable = true;
       plugins = [ "git" ];