From b7ffa5e305e70fd55a6fe94ec69c63b5440c53c0 Mon Sep 17 00:00:00 2001
From: Leon Vatthauer <leon.vatthauer@fau.de>
Date: Tue, 10 Dec 2024 15:28:34 +0100
Subject: [PATCH] change packages of gunther

---
 gunther/configuration.nix | 29 ++------------
 gunther/hypr/hyprland.nix |  1 +
 gunther/leonv.nix         | 81 ++++++++++++++++-----------------------
 3 files changed, 38 insertions(+), 73 deletions(-)

diff --git a/gunther/configuration.nix b/gunther/configuration.nix
index be78f12..bfb30a4 100755
--- a/gunther/configuration.nix
+++ b/gunther/configuration.nix
@@ -19,11 +19,6 @@
     };
   };
 
-  # TODO remove once logseq is fixed
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-27.3.11"
-  ];
-
   services.emacs.package = pkgs.emacs29-pgtk;
   services.emacs.enable = true;
 
@@ -133,14 +128,6 @@
   # List packages installed in system profile.
     environment.systemPackages = 
       with pkgs;
-      # let
-      #   catp-gtk = pkgs.catppuccin-gtk.override {
-      #     accents = [ "flamingo" ]; # You can specify multiple accents here to output multiple themes
-      #     size = "compact";
-      #     tweaks = [ "rimless" "black" ]; # You can also specify multiple tweaks here
-      #     variant = "macchiato";
-      #   };
-      # in 
       [
         # for connecting to nas
         nfs-utils
@@ -154,7 +141,6 @@
 
         # greeter
         greetd.gtkgreet
-        # catp-gtk
 
         # deps for hyprland / eww
         socat
@@ -168,28 +154,23 @@
   programs.zsh.enable = true;
   users.defaultUserShell = pkgs.zsh;
 
-  # # Binary Cache for Haskell.nix
-  # nix.settings.trusted-public-keys = [
-  #   "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
-  # ];
   nix.settings.substituters = [
     "https://aseipp-nix-cache.freetls.fastly.net" 
-    # "https://aseipp-nix-cache.global.ssl.fastly.net" 
-    # "https://cache.iog.io"
   ];
 
   # environment variables
   environment.sessionVariables = {
     ## disable logging when direnv changes
     DIRENV_LOG_FORMAT = [];
-    # GTK theme (set here for greetd)
-    # GTK_THEME = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
   };
 
   # fonts
   fonts = {
     packages = with pkgs; [
-      ((nerdfonts.override { fonts = [ "Hack" "DejaVuSansMono" "DroidSansMono" "Noto" ]; }))
+      nerd-fonts.hack
+      nerd-fonts.dejavu-sans-mono
+      nerd-fonts.droid-sans-mono
+      nerd-fonts.noto
       mononoki
       # noto-fonts
       noto-fonts-cjk-sans
@@ -222,8 +203,6 @@
       User hy84coky
     '';
 
-  programs.steam.enable = true;
-
   # thunar
   programs.thunar = {
     enable = true;
diff --git a/gunther/hypr/hyprland.nix b/gunther/hypr/hyprland.nix
index a96327b..e3125c4 100755
--- a/gunther/hypr/hyprland.nix
+++ b/gunther/hypr/hyprland.nix
@@ -118,6 +118,7 @@
       ];
       exec-once = [
         "bash ~/Git/nixos/gunther/hypr/start.sh"
+        "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
       ];
     };
   };
diff --git a/gunther/leonv.nix b/gunther/leonv.nix
index ef74351..04b4e01 100755
--- a/gunther/leonv.nix
+++ b/gunther/leonv.nix
@@ -20,13 +20,6 @@
             variant = "macchiato";
           })
 
-    #nextcloud-client
-    #ausweisapp
-    #godot_4
-    #dotnet-runtime
-    #blender
-    #aseprite
-
     # smt solver for liquid haskell
     z3
 
@@ -40,13 +33,14 @@
     cpplint
 
     # stuff
+    swi-prolog
     jq
     vlc
     openvpn
     signal-desktop
-    webcord
+    discord-canary
     firefox-wayland
-    ungoogled-chromium
+    google-chrome
     thunderbird
     gimp
     qpdfview
@@ -71,14 +65,10 @@
     haskell-language-server
     python3
     python3Packages.pygments
-    nodejs_20
     unifont
     anki
     pandoc
 
-    # games
-    prismlauncher
-
     # hyprland
     kitty
     networkmanagerapplet
@@ -141,29 +131,29 @@
     oh-my-zsh.enable = true;
   };
 
-  # gtk = {
-  #   enable = true;
-  #   theme = {
-  #     name = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
-  #     package = pkgs.catppuccin-gtk.override {
-  #       accents = [ "flamingo" ];
-  #       size = "compact";
-  #       tweaks = [ "rimless" "black" ];
-  #       variant = "macchiato";
-  #     };
-  #   };
-  #   iconTheme = {
-  #     name = "Dracula";
-  #     package = pkgs.dracula-icon-theme;
-  #   };
-  #   font = {
-  #     name = "NotoSans Nerd Font";
-  #   };
-  #   gtk3 = {
-  #     extraConfig.gtk-application-prefer-dark-theme = true;
-  #   };
-  # };
-  # home.sessionVariables.GTK_THEME = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
+  gtk = {
+    enable = true;
+    theme = {
+      name = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
+      package = pkgs.catppuccin-gtk.override {
+        accents = [ "flamingo" ];
+        size = "compact";
+        tweaks = [ "rimless" "black" ];
+        variant = "macchiato";
+      };
+    };
+    iconTheme = {
+      name = "Dracula";
+      package = pkgs.dracula-icon-theme;
+    };
+    font = {
+      name = "NotoSans Nerd Font";
+    };
+    gtk3 = {
+      extraConfig.gtk-application-prefer-dark-theme = true;
+    };
+  };
+  home.sessionVariables.GTK_THEME = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
   home.sessionPath = [ "$HOME/.config/emacs/bin" ];
 
   home.pointerCursor = {
@@ -173,10 +163,6 @@
     size = 24;
   };
 
-  services.syncthing = {
-    enable = true;
-  };
-
   programs.tofi = {
     enable = true;
     settings = {
@@ -193,14 +179,13 @@
     };
   };
 
-
-  # dconf.settings = {
-  #   # GTK4 Setup
-  #   "org/gnome/desktop/interface" = {
-  #     gtk-theme = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
-  #     color-scheme = "prefer-dark";
-  #   };
-  # };
+  dconf.settings = {
+    # GTK4 Setup
+    "org/gnome/desktop/interface" = {
+      gtk-theme = "Catppuccin-Macchiato-Compact-Flamingo-Dark";
+      color-scheme = "prefer-dark";
+    };
+  };
 
   services.mpris-proxy.enable = true;
 }