From aae6777f037a50f0b23fd54a5c529a3e47b6c5a0 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Wed, 6 Nov 2024 10:50:08 +0100
Subject: [PATCH] schizo mode

---
 flake.nix                                 |  2 +-
 hosts/hermit/configuration.nix            |  9 ------
 hosts/hermit/programs.nix                 |  6 ++++
 modules/style/quickshell/module.nix       | 34 +++++++++++------------
 modules/wms/wayland/hyprland/exec.nix     |  8 +-----
 modules/wms/wayland/hyprland/settings.nix |  4 +--
 6 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7f47ebc..d3c28e6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,7 +14,7 @@
     apps.x86_64-linux = {
       default = {
         type = "app";
-        program = "${user.packages.fish}/bin/fish";
+        program = pkgs.getExe user.packages.fish;
       };
       helix = {
         type = "app";
diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix
index 47a3fc6..c0b5510 100644
--- a/hosts/hermit/configuration.nix
+++ b/hosts/hermit/configuration.nix
@@ -80,22 +80,13 @@
     other = {
       system.username = "cr";
 
-      home-manager = {
-        enable = true;
-      };
     };
     programs = {
       ssh.enable = true;
       btop.enable = true;
-      newsboat.enable = true;
-      fish.enable = true;
       nh.enable = true;
-      waybar.enable = true;
     };
 
-    services = {
-      dunst.enable = true;
-    };
   };
   system.stateVersion = "23.11";
 }
diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix
index 2765367..aba15e9 100644
--- a/hosts/hermit/programs.nix
+++ b/hosts/hermit/programs.nix
@@ -12,6 +12,7 @@
     element-desktop
     evince
     eza
+    firefox
     fftw
     grc
     gparted
@@ -30,6 +31,7 @@
     keepassxc
     lazygit
     libtool
+    librewolf
     links2
     mapscii
     moc
@@ -56,11 +58,15 @@
     signal-desktop-beta
     smartmontools
     telegram-desktop
+    texliveFull
     tldr
     thunderbird
+    tor-browser
     trash-cli
+    typst
     util-linux
     v4l-utils
+    vesktop
     vlc
     weechat
     wireguard-tools
diff --git a/modules/style/quickshell/module.nix b/modules/style/quickshell/module.nix
index 569d0b0..80b7e3f 100644
--- a/modules/style/quickshell/module.nix
+++ b/modules/style/quickshell/module.nix
@@ -5,22 +5,22 @@
   pkgs,
   ...
 }: let
-  inherit (inputs) quickshell;
-  inherit (lib.generators) toKeyValue;
+#   inherit (inputs) quickshell;
+#   inherit (lib.generators) toKeyValue;
 in {
-  environment.systemPackages = with pkgs; [
-    qt6.qtimageformats # amog
-    qt6.qt5compat # shader fx
-    (quickshell.packages.x86_64-linux.default.override {
-      withJemalloc = true;
-      withQtSvg = true;
-      withX11 = true;
-      withPipewire = true;
-      withPam = true;
-      withHyprland = true;
-    })
-    pamtester # lockscreen
-    grim
-    imagemagick # screenshot
-  ];
+#   environment.systemPackages = with pkgs; [
+#     qt6.qtimageformats # amog
+#     qt6.qt5compat # shader fx
+#     (quickshell.packages.x86_64-linux.default.override {
+#       withJemalloc = true;
+#       withQtSvg = true;
+#       withX11 = true;
+#       withPipewire = true;
+#       withPam = true;
+#       withHyprland = true;
+#     })
+#     pamtester # lockscreen
+#     grim
+#     imagemagick # screenshot
+#   ];
 }
diff --git a/modules/wms/wayland/hyprland/exec.nix b/modules/wms/wayland/hyprland/exec.nix
index a49283b..f427a93 100644
--- a/modules/wms/wayland/hyprland/exec.nix
+++ b/modules/wms/wayland/hyprland/exec.nix
@@ -11,12 +11,6 @@ in {
     # Programs which get executed at Hyprland start.
     exec-once = [
       "hyprctl setcursor ${cursor.name} ${toString cursor.size}"
-      #start waybar
-      "${pkgs.waybar}/bin/waybar"
-      # "${pkgs.ianny}/bin/ianny"
-
-      # run persistent special workspace windows
-      # "[workspace special:nixos; silent;tile] ${pkgs.foot}/bin/foot -D ~/projects/nichts"
 
       "[workspace special:keepassxc; silent;tile] ${pkgs.keepassxc}/bin/keepassxc"
       "[workspace special:audio; silent;tile] ${pkgs.pwvucontrol}/bin/pwvucontrol"
@@ -25,7 +19,7 @@ in {
 
       "${pkgs.wlsunset}/bin/wlsunset -S 06:00 -s 20:00"
       "${pkgs.lxqt.lxqt-policykit}/bin/lxqt-policykit-agent"
-      "hyprctl dispatch split:workspace 1"
+      "hyprctl dispatch split-workspace 1"
     ];
   };
 }
diff --git a/modules/wms/wayland/hyprland/settings.nix b/modules/wms/wayland/hyprland/settings.nix
index 86dec3c..d37c172 100644
--- a/modules/wms/wayland/hyprland/settings.nix
+++ b/modules/wms/wayland/hyprland/settings.nix
@@ -33,8 +33,8 @@ in {
 
         # Input settings
         input = {
-          kb_layout = "de,ru, us";
-          kb_variant = ",phonetic_winkeys,dvorak";
+          kb_layout = "gb,ru,de";
+          kb_variant = ",phonetic_winkeys,";
           kb_options = "grp:rctrl_rshift_toggle, caps:escape";
 
           follow_mouse = true;