From 477c10e7ee8e291dc50f79aa644f89b88fd39c28 Mon Sep 17 00:00:00 2001
From: Alex Ottr <alex@otter.foo>
Date: Tue, 27 Aug 2024 02:36:41 +0200
Subject: [PATCH] adjust gnome and vscode

---
 home/common/gnome.nix          | 73 ++++++++++++++++++++++++++++++++++
 home/common/gnome.nix.save     | 66 ++++++++++++++++++++++++++++++
 home/common/vscode.nix         | 22 ++++++++++
 home/otter/default.nix         |  4 +-
 nixos/common/desktop/gnome.nix | 13 +++---
 5 files changed, 172 insertions(+), 6 deletions(-)
 create mode 100644 home/common/gnome.nix
 create mode 100644 home/common/gnome.nix.save
 create mode 100644 home/common/vscode.nix

diff --git a/home/common/gnome.nix b/home/common/gnome.nix
new file mode 100644
index 0000000..f892c4b
--- /dev/null
+++ b/home/common/gnome.nix
@@ -0,0 +1,73 @@
+{ config, lib, pkgs, ... }: 
+{
+    gtk = {
+      enable = true;
+
+      iconTheme = {
+        name = "Papirus-Dark";
+        package = pkgs.papirus-icon-theme;
+      };
+
+      theme = {
+        name = "catppuccin-macchiato-blue-standard";
+        package = pkgs.catppuccin-gtk.override {
+          variant = "macchiato";
+        };
+      };
+
+      cursorTheme = {
+        name = "Numix-Cursor";
+        package = pkgs.numix-cursor-theme;
+      };
+
+      gtk3.extraConfig = {
+        Settings = ''
+          gtk-application-prefer-dark-theme=1
+        '';
+      };
+
+      gtk4.extraConfig = {
+        Settings = ''
+          gtk-application-prefer-dark-theme=1
+        '';
+      };
+  };
+  xdg.configFile = {
+    "gtk-4.0/assets".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/assets";
+    "gtk-4.0/gtk.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk.css";
+    "gtk-4.0/gtk-dark.css".source = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}/gtk-4.0/gtk-dark.css";
+  };
+
+  home.sessionVariables.GTK_THEME = "catppuccin";
+  
+  dconf.settings = {
+    "org/gnome/desktop/interface" = {
+      color-scheme = "prefer-dark";
+      enable-hot-corners = false;
+    };
+    "org/gnome/shell" = {
+      disable-user-extensions = false;
+
+      
+      enabled-extensions = with pkgs.gnomeExtensions; [
+        user-themes.extensionUuid
+        sound-output-device-chooser.extensionUuid
+        space-bar.extensionUuid
+        blur-my-shell.extensionUuid
+        tiling-shell.extensionUuid
+      ];
+    };
+    "org/gnome/shell/extensions/user-theme" = {
+      name = "catppuccin-macchiato-blue-standard";
+    };
+  };
+
+  home.packages = with pkgs.gnomeExtensions; [
+    tiling-shell
+    blur-my-shell
+    user-themes
+    space-bar
+    sound-output-device-chooser
+  ];
+
+}
diff --git a/home/common/gnome.nix.save b/home/common/gnome.nix.save
new file mode 100644
index 0000000..799a00b
--- /dev/null
+++ b/home/common/gnome.nix.save
@@ -0,0 +1,66 @@
+{ config, lib, pkgs, ... }: 
+{
+    gtk = {
+      enable = true;
+
+      iconTheme = {
+        name = "Papirus-Dark";
+        package = pkgs.papirus-icon-theme;
+      };
+
+      theme = {
+        name = "catppuccin";
+        package = pkgs.catppuccin-gtk;
+      };
+
+      cursorTheme = {
+        name = "Numix-Cursor";
+        package = pkgs.numix-cursor-theme;
+      };
+
+      gtk3.extraConfig = {
+        Settings = ''
+          gtk-application-prefer-dark-theme=1
+        '';
+      };
+
+      gtk4.extraConfig = {
+        Settings = ''
+          gtk-application-prefer-dark-theme=1
+        '';
+      };
+   };
+
+  home.sessionVariables.GTK_THEME = "catppuccin";
+  
+  dconf.settings = {
+    "org/gnome/desktop/interface" = {
+      color-scheme = "prefer-dark";
+      enable-hot-corners = false;
+    };
+    "org/gnome/shell" = {
+      disable-user-extensions = false;
+
+      
+      enabled-extensions = with pkgs.gnomeExtensions; [
+        user-themes.extensionUuid
+        sound-output-device-chooser.extensionUuid
+        space-bar.extensionUuid
+        blur-my-shell.extensionUuid
+        tiling-shell.extensionUuid
+      ];
+    };
+    "org/gnome/shell/extensions/user-theme" = {
+      name = "catppuccin-frappe-blue-standard";
+    };
+  };
+
+  home.packages = with pkgs.gnomeExtensions; [
+    tiling-shell
+    blur-my-shell
+    user-themes
+    space-bar
+    sound-output-device-chooser
+  ];
+
+}
diff --git a/home/common/vscode.nix b/home/common/vscode.nix
new file mode 100644
index 0000000..dd75f30
--- /dev/null
+++ b/home/common/vscode.nix
@@ -0,0 +1,22 @@
+{ pkgs, config, ... }:
+{
+  programs.vscode = {
+    enable = true;
+    extensions = with pkgs.vscode-extensions; [
+      catppuccin.catppuccin-vsc
+      catppuccin.catppuccin-vsc-icons
+      bradlc.vscode-tailwindcss
+      jnoortheen.nix-ide
+      prisma.prisma
+      batisteo.vscode-django
+      oderwat.indent-rainbow
+    ];
+
+    userSettings = {
+      "files.autoSave" = "off";
+      "[nix]"."editor.tabSize" = 2;
+      "workbench.colorTheme" = "Catppuccin Macchiato";
+      "workbench.iconTheme" = "catppuccin-macchiato";
+    };
+  };
+}
diff --git a/home/otter/default.nix b/home/otter/default.nix
index 9ca51c2..d548746 100644
--- a/home/otter/default.nix
+++ b/home/otter/default.nix
@@ -8,7 +8,9 @@
       ../common/gpg.nix
       ../common/music.nix
       #../common/sway.nix
-
+      ../common/gnome.nix
+      ../common/vscode.nix    
+ 
       ../common/dev
       ../common/dev/blog.nix
     ];
diff --git a/nixos/common/desktop/gnome.nix b/nixos/common/desktop/gnome.nix
index c46e29e..0d51cfc 100644
--- a/nixos/common/desktop/gnome.nix
+++ b/nixos/common/desktop/gnome.nix
@@ -13,13 +13,16 @@
     epiphany
     geary
     evince
+    yelp
+    cheese
   ]) ++ (with pkgs.gnome; [
-    # for packages that are pkgs.gnome.*
+    gnome-music
+    gnome-contacts
   ]);
 
-  environment.systemPackages = with pkgs.gnomeExtensions; [
-    blur-my-shell
-    pop-shell
-    # ...
+  environment.systemPackages = with pkgs; [
+    gnome-tweaks
   ];
+  
+  programs.dconf.enable = true;
 }
-- 
2.51.2