From 753771d3d7393794cc27777f56916e418073a3c4 Mon Sep 17 00:00:00 2001
From: joy <mail@joygnu.org>
Date: Tue, 8 Oct 2024 15:59:17 +0200
Subject: [PATCH] fix code

---
 hosts/laptop/default.nix                     |  3 +-
 modules/apps/home/default.nix                |  1 -
 modules/apps/{home => norm}/code/default.nix |  2 +-
 modules/apps/norm/default.nix                |  1 +
 modules/wm/gnome/default.nix                 | 76 ++++++++++----------
 5 files changed, 41 insertions(+), 42 deletions(-)
 rename modules/apps/{home => norm}/code/default.nix (87%)

diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix
index d7ed69a..37e9336 100644
--- a/hosts/laptop/default.nix
+++ b/hosts/laptop/default.nix
@@ -3,8 +3,9 @@
 
   hypridle.enable = true;
   led.enable = true;
-  code.enable = true;
   gnome.enable = true;
+  code.enable = true;
+  # code.enable = true;
 
   imports = [
     ./hardware.nix
diff --git a/modules/apps/home/default.nix b/modules/apps/home/default.nix
index ea1bf90..7976dc7 100644
--- a/modules/apps/home/default.nix
+++ b/modules/apps/home/default.nix
@@ -3,7 +3,6 @@
     ./alacritty
     ./mpv
     ./firefox
-    ./code
     ./git
     ./helix
     ./newsboat
diff --git a/modules/apps/home/code/default.nix b/modules/apps/norm/code/default.nix
similarity index 87%
rename from modules/apps/home/code/default.nix
rename to modules/apps/norm/code/default.nix
index f8e16f3..d81a048 100644
--- a/modules/apps/home/code/default.nix
+++ b/modules/apps/norm/code/default.nix
@@ -8,7 +8,7 @@
     code.enable = lib.mkEnableOption "";
   };
   config = lib.mkIf config.code.enable {
-    programs.vscode = {
+    home-manager.users.joy.programs.vscode = {
       enable = true;
       package = pkgs.vscodium;
       extensions = with pkgs.vscode-extensions; [
diff --git a/modules/apps/norm/default.nix b/modules/apps/norm/default.nix
index f24a38e..aa32bbe 100644
--- a/modules/apps/norm/default.nix
+++ b/modules/apps/norm/default.nix
@@ -5,5 +5,6 @@
     ./nemo
     ./misc
     ./mutt
+    ./code
   ];
 }
diff --git a/modules/wm/gnome/default.nix b/modules/wm/gnome/default.nix
index 3e63b92..b7b3773 100644
--- a/modules/wm/gnome/default.nix
+++ b/modules/wm/gnome/default.nix
@@ -11,44 +11,42 @@
   config = lib.mkIf config.gnome.enable {
     services.xserver.desktopManager.gnome.enable = true;
 
-    environment.gnome.excludePackages = with pkgs; [
-      adwaita-icon-theme
-      # nixos-background-info This can't be excluded since it's defined locally. So even if we removed all GNOME backgrounds it seems we have to keep the NixOS one.
-      gnome-backgrounds
-      gnome-bluetooth
-      gnome-color-manager
-      gnome-control-center
-      gnome-shell-extensions
-      gnome-themes-extra
-      pkgs.gnome-tour # GNOME Shell detects the .desktop file on first log-in.
-      pkgs.gnome-user-docs
-      pkgs.orca
-      pkgs.glib # for gsettings program
-      pkgs.gnome-menus
-      pkgs.gtk3.out # for gtk-launch program
-      pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
-      baobab
-      epiphany
-      pkgs.gnome-text-editor
-      gnome-calculator
-      gnome-calendar
-      gnome-characters
-      gnome-clocks
-      pkgs.gnome-console
-      gnome-contacts
-      gnome-font-viewer
-      gnome-logs
-      gnome-maps
-      gnome-music
-      gnome-system-monitor
-      gnome-weather
-      pkgs.loupe
-      nautilus
-      pkgs.gnome-connections
-      simple-scan
-      pkgs.snapshot
-      totem
-      yelp
-    ];
+    # environment.gnome.excludePackages = with pkgs; [
+    # gnome-backgrounds
+    # gnome-bluetooth
+    # gnome-color-manager
+    # gnome-control-center
+    # gnome-shell-extensions
+    # gnome-themes-extra
+    # gnome-tour
+    # gnome-user-docs
+    # orca
+    # glib
+    # gnome-menus
+    # gtk3.out
+    # xdg-user-dirs
+    # baobab
+    # epiphany
+    # gnome-text-editor
+    # gnome-calculator
+    # gnome-calendar
+    # gnome-characters
+    # gnome-clocks
+    # gnome-console
+    # gnome-contacts
+    # gnome-font-viewer
+    # gnome-logs
+    # gnome-maps
+    # gnome-music
+    # gnome-system-monitor
+    # gnome-weather
+    # loupe
+    # nautilus
+    # gnome-connections
+    # simple-scan
+    # snapshot
+    # totem
+    # yelp
+    # ];
   };
 }