From dfaaca9026190ef489e692e8feae29aef3e251d6 Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sun, 18 Feb 2024 23:04:50 +0100
Subject: [PATCH] several tweaks

---
 home-manager/modules/machine.nix    |  1 +
 home-manager/modules/packages.nix   | 15 +++++---------
 home-manager/programs/alacritty.nix |  4 ++--
 home-manager/programs/chromium.nix  | 32 ++++++++++++++++++-----------
 home-manager/programs/hstr.nix      |  5 +++++
 5 files changed, 33 insertions(+), 24 deletions(-)
 create mode 100644 home-manager/programs/hstr.nix

diff --git a/home-manager/modules/machine.nix b/home-manager/modules/machine.nix
index 7c3b418..430e196 100644
--- a/home-manager/modules/machine.nix
+++ b/home-manager/modules/machine.nix
@@ -21,6 +21,7 @@ with lib;
     ./../programs/chromium.nix
     ./../programs/mpv.nix
     ./../programs/syncthing.nix
+    ./../programs/hstr.nix
     ./../../nix.nix
     ./packages.nix
   ];
diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 61e610b..3347a7c 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -1,7 +1,9 @@
 { config, pkgs, lib, inputs, ... }:
 
 with lib;
-{
+let
+    electronFlags = "--enable-features=UseOzonePlatform --ozone-platform=wayland --enable-wayland-ime --disable-gpu-shader-disk-cache -n";
+in {
   config = {
     nixpkgs.overlays = [
       (final: prev: {
@@ -15,8 +17,6 @@ with lib;
 
     home.packages = with pkgs; [
       up
-      rbenv
-      # cargo-update
       htop
       rustc
       cargo
@@ -34,7 +34,6 @@ with lib;
       nix-init
       nodePackages.nodemon
       pocketbase
-      # surrealdb
       thefuck
       hub
       httpie
@@ -51,9 +50,6 @@ with lib;
       (pkgs.writeShellScriptBin "nix-build-default" ''
         nix-build -E 'with import <nixpkgs> { }; callPackage ./default.nix { }'
       '')
-      (callPackage ./../pkgs/docker-craft-cms-dev-env.nix {
-        inherit lib;
-      })
       (callPackage ./../pkgs/toggl-time-grouper/package.nix {
         inherit lib;
       })
@@ -74,11 +70,11 @@ with lib;
       gh
       nil
       nixd
+      unrar
     ] ++ (if config.machine.isGraphical then [
       (pkgs.nerdfonts.override {
         fonts = [ "JetBrainsMono" "FiraCode" "FiraMono" ];
       })
-      # anki
       corefonts
       vistafonts
       jetbrains.webstorm
@@ -103,12 +99,11 @@ with lib;
       bottles
       protontricks
       heroic
-      (vscode.fhsWithPackages (ps: with ps; [ sqlite ]))
+      (vscode.override { commandLineArgs = electronFlags; })
       quickemu
       quickgui
       trilium-desktop
       anki
-      inputs.nix-software-center.packages.x86_64-linux.nix-software-center
       inputs.muse-sounds-manager.packages.x86_64-linux.muse-sounds-manager
       jetbrains-toolbox
       mumble
diff --git a/home-manager/programs/alacritty.nix b/home-manager/programs/alacritty.nix
index 57fb3e7..2f8a30f 100644
--- a/home-manager/programs/alacritty.nix
+++ b/home-manager/programs/alacritty.nix
@@ -8,7 +8,7 @@
         decorations = "full";
         dynamic_title = true;
       };
-      window.opacity = 1;
+      window.opacity = 0.9;
       font = {
         normal = {
           family = "JetbrainsMono NFM";
@@ -18,7 +18,7 @@
           family = "JetbrainsMono NFM";
           style = "Bold";
         };
-        size = 14;
+        size = 12;
       };
       cursor.style.shape = "Beam";
       colors = {
diff --git a/home-manager/programs/chromium.nix b/home-manager/programs/chromium.nix
index 731811c..65d8a66 100644
--- a/home-manager/programs/chromium.nix
+++ b/home-manager/programs/chromium.nix
@@ -19,12 +19,9 @@ let
     "bmnlcjabgnpnenekpadlanbbkooimhnj" # Honey
     "kbfnbcaeplbcioakkpcpgfkobkghlhen" # Grammarly
   ];
-in
-{
-  programs.vivaldi = {
-    enable = if config.machine.isGraphical then true else false;
-    dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
-    commandLineArgs = [
+  isEnabled = if config.machine.isGraphical then true else false;
+  dictionaries = with pkgs.hunspellDictsChromium; [ en_US de_DE ];
+  commandLineArgs = [
       "--ignore-gpu-blocklist"
       "--enable-gpu-rasterization"
       "--enable-zero-copy"
@@ -33,11 +30,22 @@ in
       "--use-vulkan"
       "--ozone-platform-hint=auto"
       "--enable-hardware-overlays"
-    ];
-    extensions = map
-      (eid: {
-        id = eid;
-      })
-      chromium_extension;
+  ];
+  extensions = map
+    (eid: {
+      id = eid;
+    })
+    chromium_extension;
+in
+{
+  programs.vivaldi = {
+    enable = isEnabled;
+    dictionaries = dictionaries;
+    commandLineArgs = commandLineArgs;
+    extensions = extensions;
+  };
+  programs.google-chrome = {
+    enable = isEnabled;
+    commandLineArgs = commandLineArgs;
   };
 }
diff --git a/home-manager/programs/hstr.nix b/home-manager/programs/hstr.nix
new file mode 100644
index 0000000..c5e521d
--- /dev/null
+++ b/home-manager/programs/hstr.nix
@@ -0,0 +1,5 @@
+{ config, pkgs, lib, ... }:
+
+{
+  programs.hstr = { enable = true; };
+}