From 40814540cd0b98292e60392a21152cb2b78536ac Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Sun, 7 Jan 2024 17:45:50 +0900
Subject: [PATCH] Update hyprland and vscodium

---
 .../desktops/hyprland/components/hyprland.nix |  4 +-
 home-manager/common/software/gui/vscodium.nix | 48 ++++++++++++++++++-
 .../services}/ollama.nix                      |  0
 nixos/hosts/nixos-desktop/default.nix         |  1 -
 4 files changed, 49 insertions(+), 4 deletions(-)
 rename nixos/{hosts/nixos-desktop => common/services}/ollama.nix (100%)

diff --git a/home-manager/common/desktops/hyprland/components/hyprland.nix b/home-manager/common/desktops/hyprland/components/hyprland.nix
index 91318053..db81be60 100644
--- a/home-manager/common/desktops/hyprland/components/hyprland.nix
+++ b/home-manager/common/desktops/hyprland/components/hyprland.nix
@@ -168,8 +168,8 @@
       ];
       bindm = [
         # Move/resize windows with mainMod + LMB/RMB and dragging
-        ''SHIFT, mouse:272, movewindow''
-        ''SHIFT, mouse:273, resizewindow''
+        ''LCTRL SHIFT, mouse:272, movewindow''
+        ''LCTRL SHIFT, mouse:273, resizewindow''
       ];
 
       exec-once = ''bash ~/.config/hypr/start.sh'';
diff --git a/home-manager/common/software/gui/vscodium.nix b/home-manager/common/software/gui/vscodium.nix
index f4e52fd9..c6584992 100644
--- a/home-manager/common/software/gui/vscodium.nix
+++ b/home-manager/common/software/gui/vscodium.nix
@@ -1,8 +1,54 @@
-{ config, pkgs, ... }: {
+{ config; pkgs; ... }: {
   programs.vscode = {
     enable = true;
     package = pkgs.vscodium;
     enableUpdateCheck = false;
     enableExtensionUpdateCheck = false;
+    extensions = with pkgs.vscode-extensions; [
+        waderyan.gitblame       # See Git Blame info in status bar
+        vscodevim.vim           # Vim keybinds
+        oderwat.indent-rainbow  # Colorise indents
+        naumovs.color-highlight # Highlight HTML color codes
+
+        # Theme
+        enkia.tokyo-night
+    ];
+    userSettings = {
+      # Theming:
+      "window.autoDetectColorScheme" = false;
+      "workbench.preferredLightColorTheme" = "Tokyo Night Light";
+      "workbench.preferredDarkColorTheme" = "Tokyo Night";
+      "workbench.colorTheme" = "Tokyo Night";
+      "workbench.iconTheme" = "";
+
+      # Workbench
+      "workbench.startupEditor" = "none";
+      "diffEditor.ignoreTrimWhitespace" = false;
+      "workbench.editor.autoLockGroups" = {
+          "mainThreadWebview-markdown.preview" = true
+      };
+      "editor.fontFamily" = "JetBrainsMono Regular";
+      "editor.fontLigatures" = true;
+
+      # Telemetry =
+      "redhat.telemetry.enabled" = false;
+      "telemetry.telemetryLevel" = "off";
+
+      # Git =
+      "git.enableSmartCommit" = true;
+      "git.confirmSync" = false;
+      "git.autofetch" = true;
+
+      # Language Specific
+      # Python =
+      "python.diagnostics.sourceMapsEnabled" = true;
+      "python.linting.pylintEnabled" = true;
+      "python.linting.pylintArgs" = [
+          "--rcfile=~/.config/pylintrc"
+      ];
+
+      # Rust
+      "rust-analyzer.cargo.buildScripts.overrideCommand" = null;
+    };
   };
 }
\ No newline at end of file
diff --git a/nixos/hosts/nixos-desktop/ollama.nix b/nixos/common/services/ollama.nix
similarity index 100%
rename from nixos/hosts/nixos-desktop/ollama.nix
rename to nixos/common/services/ollama.nix
diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix
index 9ce4d233..817e2585 100644
--- a/nixos/hosts/nixos-desktop/default.nix
+++ b/nixos/hosts/nixos-desktop/default.nix
@@ -1,7 +1,6 @@
 { inputs, config, lib, pkgs, modulesPath, desktop, username, platform, ... }: {
   imports = [ 
     ./disks.nix
-    ./ollama.nix
     ../../common/modules/secureboot.nix
     ../../common/modules/ssh-luks.nix
     ../../common/services/openrazer.nix