From ae87f64c98db642b9422faba3b76b6632afaa894 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Sat, 17 Aug 2024 11:50:52 +0200
Subject: [PATCH] cleanup

---
 hosts/vali/hermit/configuration.nix     | 26 -------------------------
 hosts/vali/hermit/programs.nix          |  1 -
 hosts/vali/temperance/configuration.nix | 26 -------------------------
 modules/options/style/module.nix        |  1 -
 modules/programs/gui/foot.nix           |  2 ++
 modules/system/keyboard.nix             |  8 +++++---
 6 files changed, 7 insertions(+), 57 deletions(-)

diff --git a/hosts/vali/hermit/configuration.nix b/hosts/vali/hermit/configuration.nix
index 3274829..eebe143 100644
--- a/hosts/vali/hermit/configuration.nix
+++ b/hosts/vali/hermit/configuration.nix
@@ -1,5 +1,4 @@
 {
-  self,
   pkgs,
   config,
   ...
@@ -9,16 +8,6 @@
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
   console.keyMap = "de";
-  nix = {
-    settings = {
-      substituters = ["https://hyprland.cachix.org"];
-      trusted-public-keys = [
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      ];
-      # enable flakes
-      # reduce file size used & automatic garbage collector
-    };
-  };
   security.sudo.package = pkgs.sudo.override {withInsults = true;};
   security.polkit.enable = true;
   programs.kdeconnect.enable = true;
@@ -74,21 +63,6 @@
       style = {
         gtk.enable = true;
         qt.enable = true;
-        stylix = {
-          enable = false;
-          scheme = "${pkgs.base16-schemes}/share/themes/bright.yaml";
-          cursor = {
-            size = 28;
-            package = pkgs.bibata-cursors;
-            name = "Bibata-Modern-Classic";
-          };
-          fontsizes = {
-            terminal = 18;
-            popups = 14;
-            applications = 14;
-          };
-          image = self + "assets/wallpapers/wholefoods.jpg";
-        };
       };
     };
     other = {
diff --git a/hosts/vali/hermit/programs.nix b/hosts/vali/hermit/programs.nix
index 29f04db..260c7a7 100644
--- a/hosts/vali/hermit/programs.nix
+++ b/hosts/vali/hermit/programs.nix
@@ -81,7 +81,6 @@ in {
     signal-desktop-beta
     smartmontools
     telegram-desktop
-    temurin-jre-bin-17
     tldr
     thunderbird
     trash-cli
diff --git a/hosts/vali/temperance/configuration.nix b/hosts/vali/temperance/configuration.nix
index 0ce2d70..a916eb6 100644
--- a/hosts/vali/temperance/configuration.nix
+++ b/hosts/vali/temperance/configuration.nix
@@ -1,5 +1,4 @@
 {
-  self,
   pkgs,
   config,
   ...
@@ -9,16 +8,6 @@
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
   console.keyMap = "de";
-  nix = {
-    settings = {
-      substituters = ["https://hyprland.cachix.org"];
-      trusted-public-keys = [
-        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
-      ];
-      # enable flakes
-      # reduce file size used & automatic garbage collector
-    };
-  };
   security.sudo.package = pkgs.sudo.override {withInsults = true;};
   security.polkit.enable = true;
   programs.kdeconnect.enable = true;
@@ -67,21 +56,6 @@
       };
       style = {
         gtk.enable = true;
-        stylix = {
-          enable = true;
-          scheme = "${pkgs.base16-schemes}/share/themes/bright.yaml";
-          cursor = {
-            size = 28;
-            package = pkgs.bibata-cursors;
-            name = "Bibata-Modern-Classic";
-          };
-          fontsizes = {
-            terminal = 18;
-            popups = 14;
-            applications = 14;
-          };
-          image = self + "assets/wallpapers/wholefoods.jpg";
-        };
       };
     };
     other = {
diff --git a/modules/options/style/module.nix b/modules/options/style/module.nix
index 5ac7f44..21b67ec 100644
--- a/modules/options/style/module.nix
+++ b/modules/options/style/module.nix
@@ -7,7 +7,6 @@
   inherit (lib.types) package str int;
 in {
   imports = [
-    ./stylix.nix
     ./qt.nix
     ./gtk.nix
   ];
diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix
index e5c4c84..699a35b 100644
--- a/modules/programs/gui/foot.nix
+++ b/modules/programs/gui/foot.nix
@@ -23,6 +23,8 @@ in {
             title = "foot";
             locked-title = "no";
 
+            font = "ComicShannsMono Nerd Font:size=14";
+
             # line-height = 20;
             letter-spacing = 0;
             horizontal-letter-offset = 0;
diff --git a/modules/system/keyboard.nix b/modules/system/keyboard.nix
index 4139d1f..8c37969 100644
--- a/modules/system/keyboard.nix
+++ b/modules/system/keyboard.nix
@@ -1,7 +1,9 @@
 {
   services.xserver = {
-    xkb.layout = "de,us";
-    xkbVariant = ",colemak_dh_wide";
-    xkbOptions = "grp:rctrl_rshift_toggle";
+    xkb = {
+      layout = "de, us";
+      variant = "colemak_dh_wide";
+      options = "grp:rctrl_rshift_toggle";
+    };
   };
 }