From cdc335e842fa8c0f17a5f5b9d85bb88ea5a5b671 Mon Sep 17 00:00:00 2001
From: Daniel Olsen <daniel.olsen99@gmail.com>
Date: Mon, 20 Jan 2025 00:58:51 +0100
Subject: [PATCH] replace vscode, clean up packages

---
 home/profiles/base/default.nix     | 51 +++++++++++++++++++++---------
 home/profiles/games/default.nix    |  5 +--
 home/profiles/xsession/default.nix |  2 +-
 3 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix
index 8982e9d..4975f19 100644
--- a/home/profiles/base/default.nix
+++ b/home/profiles/base/default.nix
@@ -38,11 +38,12 @@ in
 
 
     home.packages = with pkgs; [
-      unstable.nix-output-monitor
+      nix-output-monitor
       nix-top
       nix-index
       nix-tree
-      unstable.comma
+      # unstable.comma
+      nixd
 
       openvpn
 
@@ -95,7 +96,6 @@ in
       plasma5Packages.kdegraphics-thumbnailers
       plasma5Packages.kio
       plasma5Packages.kio-extras
-      krename
       konsole # https://bugs.kde.org/show_bug.cgi?id=407990 reeee
 
       gedit
@@ -112,7 +112,7 @@ in
       kdenlive
       frei0r
       audacity
-      inkscape
+      # inkscape
       blender
 
       mkvtoolnix
@@ -199,23 +199,44 @@ in
       };
     };
 
-    programs.vscode = {
+    programs.zed-editor = {
       enable = config.profiles.gui.enable;
-      package = pkgs.vscodium;
-      extensions = with pkgs.vscode-extensions; [
-        bbenoist.nix
-        
-        rust-lang.rust-analyzer
-        vadimcn.vscode-lldb
-      ] ++ lib.optionals config.nixpkgs.config.allowUnfree [
-        ms-vsliveshare.vsliveshare
+      package = pkgs.unstable.zed-editor;
+      extensions = [
+        "nix"
       ];
       userSettings = {
-        "editor.insertSpaces" = false;
-        "terminal.integrated.fontFamily" = "MesloLGS NF";
+        telemetry.metrics = false;
+        telemetry.diagnostics = false;
+        features = {
+          copilot = false;
+        };
+        buffer_font_family = "MesloLGS NF";
+        base_keymap = "VSCode";
+        language_overrides = {
+          Rust = {
+            inlay_hints.enabled = true;
+          };
+        };
       };
     };
 
+    # programs.vscode = {
+    #   enable = config.profiles.gui.enable;
+    #   package = pkgs.vscodium;
+    #   extensions = with pkgs.vscode-extensions; [
+    #     bbenoist.nix        
+    #     rust-lang.rust-analyzer
+    #     vadimcn.vscode-lldb
+    #   ] ++ lib.optionals config.nixpkgs.config.allowUnfree [
+    #     ms-vsliveshare.vsliveshare
+    #   ];
+    #   userSettings = {
+    #     "editor.insertSpaces" = false;
+    #     "terminal.integrated.fontFamily" = "MesloLGS NF";
+    #   };
+    # };
+
     programs.git = {
       enable = true;
       userEmail = "daniel.olsen99@gmail.com";
diff --git a/home/profiles/games/default.nix b/home/profiles/games/default.nix
index 5dbccc3..30ad017 100644
--- a/home/profiles/games/default.nix
+++ b/home/profiles/games/default.nix
@@ -12,13 +12,10 @@ in {
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
       fortune
-      lolcat
-      neofetch
-      pipes
     ] ++ lib.optionals config.profiles.gui.enable [
       steam
 
-      unstable.prismlauncher
+      prismlauncher
 #     minetest
 #     dwarf-fortress-packages.dwarf-fortress-full
 #     superTuxKart
diff --git a/home/profiles/xsession/default.nix b/home/profiles/xsession/default.nix
index 788e923..92da418 100644
--- a/home/profiles/xsession/default.nix
+++ b/home/profiles/xsession/default.nix
@@ -173,7 +173,7 @@ in
       pkgs.dmenu
 
       pkgs.scrot
-      pkgs.neofetch
+      # pkgs.neofetch
       #pkgs.dan.colors
       pkgs.xclip