From d5ac7f4799d285b25eeb687cab623036fb5f9e54 Mon Sep 17 00:00:00 2001
From: Greg Burd <greg@burd.me>
Date: Fri, 29 Sep 2023 11:54:02 -0400
Subject: [PATCH] refinements

---
 NOTES                                                      | 3 ++-
 home-manager/_mixins/desktop/jetbrains-clion.nix           | 4 ++++
 home-manager/_mixins/desktop/jetbrains-idea-ultimate.nix   | 4 ++++
 .../_mixins/desktop}/protonmail-bridge.nix                 | 0
 home-manager/_mixins/users/gburd/default.nix               | 7 ++++++-
 nixos/_mixins/desktop/chromium-extensions.nix              | 1 +
 nixos/_mixins/desktop/ungoogled-chromium.nix               | 1 +
 nixos/floki/default.nix                                    | 3 +--
 8 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 home-manager/_mixins/desktop/jetbrains-clion.nix
 create mode 100644 home-manager/_mixins/desktop/jetbrains-idea-ultimate.nix
 rename {_/home-manager/_mixins/common => home-manager/_mixins/desktop}/protonmail-bridge.nix (100%)

diff --git a/NOTES b/NOTES
index cbf6e19..53c341f 100644
--- a/NOTES
+++ b/NOTES
@@ -94,7 +94,8 @@ EDITOR=vi sops --config .sops.yaml nixos/common/secrets.yaml
 sudo nixos-install --flake .#hostname
 reboot
 home-manager switch --flake .#username@hostname
-
+gsettings reset org.gnome.desktop.input-sources xkb-options
+gsettings reset org.gnome.desktop.input-sources sources
 
 sudo nixos-rebuild switch --flake .#my-hostname
 clear; sudo nixos-rebuild dry-activate --flake .#${hostname}
diff --git a/home-manager/_mixins/desktop/jetbrains-clion.nix b/home-manager/_mixins/desktop/jetbrains-clion.nix
new file mode 100644
index 0000000..3f8a634
--- /dev/null
+++ b/home-manager/_mixins/desktop/jetbrains-clion.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = [ pkgs.jetbrains.clion ];
+}
diff --git a/home-manager/_mixins/desktop/jetbrains-idea-ultimate.nix b/home-manager/_mixins/desktop/jetbrains-idea-ultimate.nix
new file mode 100644
index 0000000..26df9a6
--- /dev/null
+++ b/home-manager/_mixins/desktop/jetbrains-idea-ultimate.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  home.packages = [ pkgs.jetbrains.idea-ultimate ];
+}
diff --git a/_/home-manager/_mixins/common/protonmail-bridge.nix b/home-manager/_mixins/desktop/protonmail-bridge.nix
similarity index 100%
rename from _/home-manager/_mixins/common/protonmail-bridge.nix
rename to home-manager/_mixins/desktop/protonmail-bridge.nix
diff --git a/home-manager/_mixins/users/gburd/default.nix b/home-manager/_mixins/users/gburd/default.nix
index 9975539..6f26973 100644
--- a/home-manager/_mixins/users/gburd/default.nix
+++ b/home-manager/_mixins/users/gburd/default.nix
@@ -2,6 +2,9 @@
   imports = [
     inputs.impermanence.nixosModules.home-manager.impermanence
     ../../services/keybase.nix
+    ../../desktop/protonmail-bridge.nix
+    ../../desktop/jetbrains.idea-ultimate.nix
+    ../../desktop/jetbrains.clion.nix
     ../../pass
     ../../cli
     ../../nvim
@@ -123,9 +126,11 @@
       vdpauinfo # Terminal VDPAU info
       wavemon # Terminal WiFi monitor
       yq-go # Terminal `jq` for YAML
+
+      emacs
     ];
     sessionVariables = {
-      PAGER = "moar";
+#      PAGER = "moar";
     };
   };
   programs = {
diff --git a/nixos/_mixins/desktop/chromium-extensions.nix b/nixos/_mixins/desktop/chromium-extensions.nix
index 10a3f66..5e7dffe 100644
--- a/nixos/_mixins/desktop/chromium-extensions.nix
+++ b/nixos/_mixins/desktop/chromium-extensions.nix
@@ -8,6 +8,7 @@ _: {
         "mnjggcdmjocbbbhaepdhchncahnbgone" # SponsorBlock for YouTube
         "gebbhagfogifgggkldgodflihgfeippi" # Return YouTube Dislike
         "edlifbnjlicfpckhgjhflgkeeibhhcii" # Screenshot Tool
+        "chphlpgkkbolifaimnlloiipkdnihall" # OneTab
       ];
     };
   };
diff --git a/nixos/_mixins/desktop/ungoogled-chromium.nix b/nixos/_mixins/desktop/ungoogled-chromium.nix
index 3d69dcc..a4dba86 100644
--- a/nixos/_mixins/desktop/ungoogled-chromium.nix
+++ b/nixos/_mixins/desktop/ungoogled-chromium.nix
@@ -9,6 +9,7 @@
       extensions = [
         "cdglnehniifkbagbbombnjghhcihifij" # kagi-search-for-chrome
         "ghmbeldphafepmbegfdlkpapadhbakde" # proton-pass-free-password
+        "chphlpgkkbolifaimnlloiipkdnihall" # OneTab
       ];
       extraOpts = {
         "AutofillAddressEnabled" = false;
diff --git a/nixos/floki/default.nix b/nixos/floki/default.nix
index 90ccbda..a31f37e 100644
--- a/nixos/floki/default.nix
+++ b/nixos/floki/default.nix
@@ -35,10 +35,9 @@
     kernelPackages = pkgs.linuxPackages_latest;
   };
 
-  # My GPD MicroPC has a US keyboard layout
   console.keyMap = lib.mkForce "us";
   services.kmscon.extraConfig = lib.mkForce ''
-    font-size=14
+    font-size=12
     xkb-layout=us
   '';
   services.xserver.layout = lib.mkForce "us";