fix some font stuff, switch to kermit as terminal, fix some titlebar stuff in de2

flake.nix

@@ -10,6 +10,10 @@
       url = "github:kdrag0n/base16-kitty";
       flake = false;
     };
+    base16-kermit = {
+      url = "github:orhun/base16-kermit";
+      flake = false;
+    };
     base16-vscode = {
       url = "github:golf1052/base16-vscode";
       flake = false;
@@ -79,6 +83,7 @@
       gaming = import ./home-manager/modules/gaming.nix inputs;
       gamerenv = import ./home-manager/modules/gamerenv.nix;
       mopidy = import ./home-manager/modules/mopidy.nix;
+      kermit = import ./home-manager/modules/kermit.nix;
       de2u = import ./home-manager/modules/de2u.nix inputs;
       all = import ./home-manager/modules/default.nix inputs;
     };

home-manager/modules/colors.nix

@@ -264,6 +264,9 @@ in
         include ${genTheme inputs.base16-kitty}
       '';
 
+      # Kermit
+      programs.kermit.extraConfig = builtins.readFile (genTheme inputs.base16-kermit);
+
       # neovim
       xdg.configFile."nvim/colors/base16.vim".source = "${genTheme inputs.base16-vim}";
       programs.neovim.extraConfig = ''

home-manager/modules/de2u.nix

@@ -106,6 +106,14 @@ in
         };
     };
 
+    programs.kermit = {
+      enable = lib.mkDefault true;
+      settings = {
+        key = lib.mkDefault "shift";
+        opacity = lib.mkDefault "1";
+      };
+    };
+
     programs.kitty = {
       enable = lib.mkDefault true;
       settings = {
@@ -125,10 +133,10 @@ in
       gnomeExtensions.improved-workspace-indicator
       gnomeExtensions.vitals
       gnomeExtensions.clipboard-indicator
-      gnomeExtensions.gtk-title-bar
       gnomeExtensions.just-perfection
       gnomeExtensions.appindicator
       gnomeExtensions.compiz-windows-effect
+      gnomeExtensions.unite-shell
     ];
 
     systemd.user.sessionVariables = {
@@ -136,6 +144,25 @@ in
       QT_WAYLAND_DISABLE_WINDOWDECORATION = lib.mkIf cfg.tiling "1";
     };
 
+    xdg.configFile."gtk-4.0/gtk.css".text = ''
+      /* UNITE windowDecorations */
+      @import url('${config.home.homeDirectory}/.nix-profile/share/gnome-shell/extensions/unite@hardpixel.eu/styles/gtk4/buttons-right/${if cfg.tiling then "always" else "both"}.css');
+      /* windowDecorations UNITE */
+    '';
+    gtk.gtk3.extraCss = ''
+      /* UNITE windowDecorations */
+      @import url('${config.home.homeDirectory}/.nix-profile/share/gnome-shell/extensions/unite@hardpixel.eu/styles/gtk3/buttons-right/${if cfg.tiling then "always" else "both"}.css');
+      /* windowDecorations UNITE */
+    '';
+    home.activation.gtk3css-over-unite = {
+      data = ''
+        $DRY_RUN_CMD rm -f ~/.config/gtk-3.0/gtk.css
+        $DRY_RUN_CMD rm -f ~/.config/gtk-4.0/gtk.css
+      '';
+      before = [ "checkLinkTargets" ];
+      after = [ ];
+    };
+
     xdg.mimeApps = {
       enable = true;
       defaultApplications =
@@ -199,7 +226,7 @@ in
         name = if config.colors.enable then "Generated" else "Default";
       };
       "org/gnome/shell/extensions/just-perfection" = {
-        activities-button = !cfg.tiling;
+        # activities-button = !cfg.tiling; # conflicts with unite?
         startup-status = 0;
         workspace-popup = false;
         window-picker-icon = false;
@@ -221,7 +248,7 @@ in
           "just-perfection-desktop@just-perfection"
           "appindicatorsupport@rgcjonas.gmail.com"
           "launch-new-instance@gnome-shell-extensions.gcampax.github.com"
-          "gtktitlebar@velitasali.github.io"
+          "unite@hardpixel.eu"
         ];
       };
       "org/gnome/desktop/peripherals/touchpad" = {
@@ -232,8 +259,18 @@ in
         dynamic-workspaces = !cfg.tiling;
         only-on-primary = cfg.tiling;
       };
-      "org/gnome/shell/extensions/gtktitlebar" = {
+      "org/gnome/shell/extensions/unite" = {
-        hide-window-titlebars = "always";
+        hide-window-titlebars = if cfg.tiling then "always" else "both";
+        hide-activities-button = if cfg.tiling then "never" else "always";
+        show-window-buttons = if cfg.tiling then "never" else "both";
+        notifications-position = "center";
+        restrict-to-primary-screen = false;
+        show-legacy-tray = false;
+        show-desktop-name = false;
+        extend-left-box = false;
+        hide-app-menu-icon = false;
+        reduce-panel-spacing = false;
+        hide-dropdown-arrows = true;
       };
       "org/gnome/shell/extensions/blur-me" = {
         toggle-app-blur = false;
@@ -331,6 +368,11 @@ in
         window-screenshot = [ "<Primary><Alt>Print" ];
         window-screenshot-clip = [ "<Alt>Print" ];
       };
+      "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0" = {
+        binding = "<Super>t";
+        command = "kermit";
+        name = "Kermit terminal";
+      };
     };
   };
 }

home-manager/modules/default.nix

@@ -12,6 +12,7 @@ inputs:
     ./gamerenv.nix
     ./fonts.nix
     ./mopidy.nix
+    ./kermit.nix
     (import ./de2u.nix inputs)
   ];
 }

home-manager/modules/fonts.nix

@@ -34,6 +34,7 @@ in
 
   config =
     mkIf cfg.enable {
+      fonts.fontconfig.enable = lib.mkDefault true;
       home.packages = [ cfg.favFont.package ];
 
       programs.vscode.userSettings = {
@@ -50,6 +51,10 @@ in
         font_size = cfg.favFont.size;
       };
 
+      programs.kermit.settings = {
+        font = "${cfg.favFont.name}, normal ${toString cfg.favFont.size}";
+      };
+
       programs.rofi.font = "${cfg.favFont.name} ${toString cfg.favFont.size}";
 
       programs.mako.font = "${cfg.favFont.name} ${toString cfg.favFont.size}";

home-manager/modules/kermit.nix

@@ -0,0 +1,34 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.programs.kermit;
+in
+{
+  options.programs.kermit = {
+    enable = lib.mkEnableOption "A VTE-based, simple and froggy terminal emulator 🐸";
+
+    settings = lib.mkOption {
+      default = { };
+      type = with lib.types; attrsOf str;
+      description = ''
+        The settings that Kermit should use.
+      '';
+    };
+
+    extraConfig = lib.mkOption {
+      default = "";
+      type = lib.types.lines;
+      description = ''
+        Extra config lines for the Kermit config file
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    xdg.configFile."kermit.conf".text = (lib.generators.toKeyValue {
+      mkKeyValue = lib.generators.mkKeyValueDefault {} " ";
+    } cfg.settings) + cfg.extraConfig;
+
+    home.packages = [ pkgs.kermit-terminal ];
+  };
+}

home-manager/users/notgne2.nix

@@ -377,7 +377,7 @@ in
   '';
 
   programs.git = {
-    signing.key = "DAB666DB54866F92";
+    signing.key = "70420458F2C01295";
     signing.signByDefault = true;
     enable = true;
     lfs.enable = true;

modules/workstation.nix

@@ -95,6 +95,7 @@ in
         vaapiVdpau
         libvdpau-va-gl
         libGL
+        mesa
       ];
       setLdLibraryPath = lib.mkDefault true;
     };