From 39e1806e7e3de2c71984412bc283f913a989e4b9 Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Wed, 19 Jun 2024 21:58:59 +0200
Subject: [PATCH 1/4] north 19

---
 git-crypt/secrets.nix          | Bin 2886 -> 2699 bytes
 home-modules/bitwarden.nix     |  44 ++++++-------
 home-modules/email.nix         | 113 ++++++++++++++++++++++-----------
 home-modules/fish.nix          |   3 +-
 home-modules/helix.nix         |  16 ++---
 home-modules/hyprland.nix      |   1 +
 home-modules/mako.nix          |  18 ++++--
 home-modules/programming/c.nix |  14 ++++
 home-modules/sent.nix          |  35 ++++++++++
 home-modules/sent.patch        |  71 +++++++++++++++++++++
 home.nix                       |   2 +
 11 files changed, 243 insertions(+), 74 deletions(-)
 create mode 100644 home-modules/programming/c.nix
 create mode 100644 home-modules/sent.nix
 create mode 100644 home-modules/sent.patch

diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix
index 40f3c1e6102576640e7c8821a30120a8fa8c16c8..d936b1a2f73a55364d22c88f1afbeb20c11c7362 100755
GIT binary patch
literal 2699
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

literal 2886
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

diff --git a/home-modules/bitwarden.nix b/home-modules/bitwarden.nix
index 59f6242..b5414d8 100755
--- a/home-modules/bitwarden.nix
+++ b/home-modules/bitwarden.nix
@@ -6,28 +6,28 @@ lib.mkIf (host != "NxACE")
     bitwarden-cli
   ];
 
-  home.file.".config/Bitwarden CLI/data.json".text = ''
-    {
-      "stateVersion": 9,
-      "global": {
-        "theme": "system",
-        "window": {},
-        "environmentUrls": {
-          "base": "https://pw.nx2.site",
-          "api": null,
-          "identity": null,
-          "webVault": null,
-          "icons": null,
-          "notifications": null,
-          "events": null,
-          "keyConnector": null
-        },
-        "region": "Self-hosted",
-        "installedVersion": "2023.12.0"
-      }
-    }
-  '';
+  # home.file.".config/Bitwarden CLI/data.json".text = ''
+  #   {
+  #     "stateVersion": 9,
+  #     "global": {
+  #       "theme": "system",
+  #       "window": {},
+  #       "environmentUrls": {
+  #         "base": "https://pw.nx2.site",
+  #         "api": null,
+  #         "identity": null,
+  #         "webVault": null,
+  #         "icons": null,
+  #         "notifications": null,
+  #         "events": null,
+  #         "keyConnector": null
+  #       },
+  #       "region": "Self-hosted",
+  #       "installedVersion": "2023.12.0"
+  #     }
+  #   }
+  # '';
 
-  home.sessionVariables.BW_SESSION = secrets.bitwarden.env.bw-session;
+  # home.sessionVariables.BW_SESSION = secrets.bitwarden.env.bw-session;
 
 }
diff --git a/home-modules/email.nix b/home-modules/email.nix
index 8de4c9e..ee8e666 100755
--- a/home-modules/email.nix
+++ b/home-modules/email.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, host, secrets, ... }: 
+{ pkgs, lib, host, rice, secrets, ... }: 
 lib.mkIf (host != "NxACE")
 {
   home.packages = with pkgs; [
@@ -6,30 +6,68 @@ lib.mkIf (host != "NxACE")
   ];
 
 
-  programs.thunderbird = {
+  programs.thunderbird = 
+  let
+    inherit (lib.generators) toJSON;
+    extensions = toJSON {} {
+      "default-theme@mozilla.org" = "5787f490-29b8-436e-a111-640da8590790";
+      "google@search.mozilla.org" = "cc340383-7068-4b32-a10f-9f19334bfebc";
+      "ddg@search.mozilla.org" = "0c340210-f7ab-48e8-9778-600ed5d00160";
+      "amazondotcom@search.mozilla.org" = "881d8fdf-5772-4e33-81ff-faac2d1fa92c";
+      "wikipedia@search.mozilla.org" = "7ea3d39d-3eea-430f-9bd7-f902d8124d45";
+      "bing@search.mozilla.org" = "f480cce8-68af-4082-908e-f8996153352b";
+      "addon@darkreader.org" = "71d6c69d-55f9-4c56-888c-abdcf6efd73d";
+      "lightningcalendartabs@jlx.84" = "12d48e41-412e-4d09-835a-fa6fb8c180eb";
+    };
+  in {
     enable = true;
     profiles = {
       default = {
         isDefault = true;
-        settings = {
+        settings = with rice.color; {
           "calendar.alarms.showmissed" = false;
           "calendar.alarms.playsound" = false;
           "calendar.alarms.show" = false;
+          "extensions.webextensions.uuids" = extensions;
+          "mail.startup.enabledMailCheckOnce" = true;
+          "mailnews.mark_message_read.delay" = true;
+          "mailnews.mark_message_read.delay.interval" = 3;
+          "mailnews.tags.$label1.color" = red.base;
+          "mailnews.tags.$label1.tag" = "Important";
+          "mailnews.tags.$label2.color" = yellow.base;
+          "mailnews.tags.$label2.tag" = "Work";
+          "mailnews.tags.$label3.color" = green.base;
+          "mailnews.tags.$label3.tag" = "Personal";
+          "mailnews.tags.$label4.color" = cyan.base;
+          "mailnews.tags.$label4.tag" = "To Do";
+          "mailnews.tags.$label5.color" = blue.base;
+          "mailnews.tags.$label5.tag" = "Later";
+          "mailnews.headers.showMessageId" = true;
+          "mailnews.headers.showOrganization" = true;
+          "mailnews.headers.showReferences" = true;
+          "mailnews.headers.showSender" = true;
+          "mailnews.headers.showUserAgent" = true;
         };
       }; 
     }; 
   };
 
 
-  accounts.email.accounts = {
-    "gamil-online" = {
+  accounts.email.accounts = 
+  let
+    OAuth2Settings = id: {
+      "mail.smtpserver.smtp_${id}.authMethod" = 10;
+      "mail.server.server_${id}.authMethod" = 10;
+    };
+  in {
+    gmail-online = {
       address = secrets.email.gmail-online.mail;
       realName = "Lennart J. Kurzweg";
       flavor = "gmail.com";
       primary = true;
+      smtp.tls.useStartTls = true;
       signature = {
         text = ''
-          --
           About Me: https://nx2.site/about-me
           Contact: https://nx2.site/contact
           GPG: https://nx2.site/gpg
@@ -39,16 +77,47 @@ lib.mkIf (host != "NxACE")
       thunderbird = {
         enable = true;
         profiles = [ "default" ];
+        # The id given as argument is an automatically generated account identifier.
+        settings = OAuth2Settings; 
       };
     };
 
-    "gamil-business" = {
+    gmail-business = {
       address = secrets.email.gmail-business.mail;
       realName = "Lennart J. Kurzweg";
       flavor = "gmail.com";
       signature = {
         text = ''
-          --
+          About Me: https://nx2.site/about-me
+          Contact: https://nx2.site/contact
+          GPG: https://nx2.site/gpg
+        '';
+        showSignature = "append";
+      };
+      thunderbird = {
+        enable = true;
+        profiles = [ "default" ];
+        # The id given as argument is an automatically generated account identifier.
+        settings = OAuth2Settings; 
+      };
+    };
+
+    hsmw = {
+      address = secrets.email.hsmw.mail;
+      userName = secrets.email.hsmw.mail;
+      realName = "Lennart J. Kurzweg";
+      imap = {
+        port = 993;
+        host = "xc.hs-mittweida.de";
+      };
+      smtp = {
+        port = 465;
+        host = "xc.hs-mittweida.de";
+      };
+      signature = {
+        text = ''
+          MatNr: ${secrets.email.hsmw.mnr}
+          SemGr: ${secrets.email.hsmw.semgr}
           About Me: https://nx2.site/about-me
           Contact: https://nx2.site/contact
           GPG: https://nx2.site/gpg
@@ -60,34 +129,6 @@ lib.mkIf (host != "NxACE")
         profiles = [ "default" ];
       };
     };
-
-    # "hsmw" = {
-    #   address = secrets.email.hsmw.mail;
-    #   realName = "Lennart J. Kurzweg";
-    #   imap = {
-    #     port = 993;
-    #     host = "mail.hs-mittweida.de";
-    #   };
-    #   smtp = {
-    #     port = 465;
-    #     host = "mail.hs-mittweida.de";
-    #   };
-    #   signature = {
-    #     text = ''
-    #       --
-    #       MatNr: ${secrets.email.hsmw.mnr}
-    #       SemGr: ${secrets.email.hsmw.semgr}
-    #       About Me: https://nx2.site/about-me
-    #       Contact: https://nx2.site/contact
-    #       GPG: https://nx2.site/gpg
-    #     '';
-    #     showSignature = "append";
-    #   };
-    #   thunderbird = {
-    #     enable = true;
-    #     profiles = [ "default" ];
-    #   };
-    # };
   };
 }
 
diff --git a/home-modules/fish.nix b/home-modules/fish.nix
index e59611d..9cf9d44 100755
--- a/home-modules/fish.nix
+++ b/home-modules/fish.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, system, user, allowed, secrets, ... }: 
+{ config, pkgs, lib, rice, user, allowed, secrets, ... }: 
 lib.mkIf (user != "tv")
 {
   home.packages = with pkgs; [
@@ -79,6 +79,7 @@ lib.mkIf (user != "tv")
       lzd = "lazydocker";
       d = "docker";
       dcmp = "docker compose";
+      nxsent = ''sent -c \${rice.color.foreground} -b \${rice.color.background}'';
 
       code = "codium"; 
       # ya = "yazi"; # function
diff --git a/home-modules/helix.nix b/home-modules/helix.nix
index 654f4ed..e350537 100644
--- a/home-modules/helix.nix
+++ b/home-modules/helix.nix
@@ -91,23 +91,23 @@
         "variableother.member" = foreground; 
         "warning" = red.base; 
 
+        "markup.heading" = accent.base; 
         "markup.bold" = {
-          "fg" = foreground; 
+          "fg" = tertiary.bright; 
           "modifiers" = [ "bold" ];
         };
-        "markup.heading" = foreground; 
         "italic" = {
-          "fg" = foreground;
+          "fg" = secondary.bright;
           "modifiers" = [ "italic" ];
         };
-        "markup.linktext" = foreground; 
+        "markup.linktext" = accent.base; 
         "markup.linkurl" = {
-          "fg" = foreground; 
+          "fg" = tertiary.dark; 
           "modifiers" = [ "underlined" ];
         };
-        "markup.list" = foreground; 
-        "markup.quote" = foreground; 
-        "markup.raw" = foreground; 
+        "markup.list" = accent.bright; 
+        "markup.quote" = weird.bright; 
+        "markup.raw" = special.bright; 
         "markup.strikethrough" = {
           "modifiers" = [ "crossed_out" ];
         };
diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix
index d35ded3..a069fee 100755
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -261,6 +261,7 @@ lib.mkIf (user != "tv")
         "opacity ${transparency}, code-oss"
         "opacity ${transparency}, VSCodium"
         "opacity ${transparency}, Code"
+        "opacity ${transparency}, sent"
         "opacity ${transparency}, neovide"
         "opacity ${transparency}, obsidian"
         "opacity ${transparency}, zathura"
diff --git a/home-modules/mako.nix b/home-modules/mako.nix
index f44ebfd..6249999 100755
--- a/home-modules/mako.nix
+++ b/home-modules/mako.nix
@@ -1,16 +1,20 @@
-{ config, pkgs, rice, lib, user, ... }:
+{ pkgs, rice, lib, user, ... }:
 lib.mkIf (user != "tv")
 {
   home.packages = [
     pkgs.mako
     pkgs.libnotify
   ];
-  services.mako = {
+  services.mako = with rice; {
     enable = true;
-    defaultTimeout = 10000; # in ms
-    backgroundColor = "#${rice.color.background}";
-    textColor = "#${rice.color.foreground}";
-    borderColor = "#${rice.color.border}";
-    font = rice.font.code.name2;
+    defaultTimeout = 5000; # in ms
+    backgroundColor = color.background;
+    textColor = color.foreground;
+    borderColor = color.border;
+    borderSize = border-width;
+    font = font.code.name2;
+    borderRadius = rounding;
+    anchor = "bottom-right";
+    margin = builtins.toString (gap-size * 2) ;
   };
 }
diff --git a/home-modules/programming/c.nix b/home-modules/programming/c.nix
new file mode 100644
index 0000000..b14243b
--- /dev/null
+++ b/home-modules/programming/c.nix
@@ -0,0 +1,14 @@
+{ pkgs, ... }:
+{
+  home = {
+    packages = with pkgs; [
+      libclang
+      glibc
+      # clang-tools
+    ];
+    sessionVariables = {
+      LIBCLANG_PATH = "${pkgs.llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include";
+      C_INCLUDE_PATH = "${pkgs.llvmPackages.libclang.lib}/lib:${pkgs.glibc.dev}/include";
+    };
+  };
+}
diff --git a/home-modules/sent.nix b/home-modules/sent.nix
new file mode 100644
index 0000000..6281105
--- /dev/null
+++ b/home-modules/sent.nix
@@ -0,0 +1,35 @@
+{ pkgs, rice, user, ... }:
+let 
+  my-sent = pkgs.sent.override {
+    patches = [
+      ./sent.patch
+      # /home/${user}/.local/share/sent.patch
+      # (builtins.toFile "/home/${user}/   
+    ];
+  };
+in
+{
+  home = {
+    packages = [ 
+      # pkgs.sent
+      my-sent
+    ];
+    file.".local/share/sent.patch".text = ''
+      diff --git a/config.def.h b/config.def.h
+      index 60eb376..64e7f05 100644
+      --- a/config.def.h
+      +++ b/config.def.h
+      @@ -9,8 +9,8 @@ static char *fontfallbacks[] = {
+       #define FONTSZ(x) ((int)(10.0 * powf(1.1288, (x)))) /* x in [0, NUMFONTSCALES-1] */
+
+       static const char *colors[] = {
+      -	"#000000", /* foreground color */
+      -	"#FFFFFF", /* background color */
+      +	"${rice.color.foreground}", /* foreground color */
+      +	"${rice.color.background}", /* background color */
+       };
+
+       static const float linespacing = 1.4;
+    '';  
+  };
+}
diff --git a/home-modules/sent.patch b/home-modules/sent.patch
new file mode 100644
index 0000000..daf6939
--- /dev/null
+++ b/home-modules/sent.patch
@@ -0,0 +1,71 @@
+From 3a348cc15a97df8e8784b129800293dcfba28f3f Mon Sep 17 00:00:00 2001
+From: Sunur Efe Vural <efe@efe.kim>
+Date: Wed, 13 Feb 2019 14:28:17 -0500
+Subject: [PATCH] Commandline Options
+
+A simple patch that adds extra commandline options to sent.
+---
+ sent.1 | 11 +++++++++++
+ sent.c | 11 ++++++++++-
+ 2 files changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/sent.1 b/sent.1
+index fabc614..5d55bf4 100644
+--- a/sent.1
++++ b/sent.1
+@@ -5,6 +5,9 @@
+ .Nd simple plaintext presentation tool
+ .Sh SYNOPSIS
+ .Nm
++.Op Fl f Ar font
++.Op Fl c Ar fgcolor
++.Op Fl b Ar bgcolor
+ .Op Fl v
+ .Op Ar file
+ .Sh DESCRIPTION
+@@ -21,6 +24,14 @@ few minutes.
+ .Bl -tag -width Ds
+ .It Fl v
+ Print version information to stdout and exit.
++.It Fl f Ar font
++Defines the
++.Ar font
++when sent is run.
++.It Fl c Ar fgcolor
++Defines the foreground color when sent is run.
++.It Fl b Ar bgcolor
++Defines the background color when sent is run.
+ .El
+ .Sh USAGE
+ .Bl -tag -width Ds
+diff --git a/sent.c b/sent.c
+index c50a572..0b36e32 100644
+--- a/sent.c
++++ b/sent.c
+@@ -675,7 +675,7 @@ configure(XEvent *e)
+ void
+ usage()
+ {
+-	die("usage: %s [file]", argv0);
++	die("usage: %s [-c fgcolor] [-b bgcolor] [-f font] [file]", argv0);
+ }
+ 
+ int
+@@ -687,6 +687,15 @@ main(int argc, char *argv[])
+ 	case 'v':
+ 		fprintf(stderr, "sent-"VERSION"\n");
+ 		return 0;
++	case 'f':
++		fontfallbacks[0] = EARGF(usage());
++		break;
++	case 'c':
++		colors[0] = EARGF(usage());
++		break;
++	case 'b':
++		colors[1] = EARGF(usage());
++		break;
+ 	default:
+ 		usage();
+ 	} ARGEND
+-- 
+2.20.1
diff --git a/home.nix b/home.nix
index ca66919..b177aec 100755
--- a/home.nix
+++ b/home.nix
@@ -10,6 +10,7 @@
     ./home-modules/virt-manager.nix
     ./home-modules/office.nix
     ./home-modules/obs.nix
+    ./home-modules/sent.nix
 
     ./home-modules/gestures.nix
     
@@ -48,6 +49,7 @@
     ./home-modules/pandoc.nix
 
     ./home-modules/programming/python.nix
+    ./home-modules/programming/c.nix
     ./home-modules/programming/node.nix
 
     ./home-modules/color-pallete.nix

From 85ec6f4c7cd4a643766cd0d3c8998b249a1bb4b7 Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Wed, 19 Jun 2024 22:02:53 +0200
Subject: [PATCH 2/4] xps 19

---
 flake.lock                         | 91 +++++++++++++++++++++---------
 home-modules/firefox.nix           |  5 +-
 home-modules/hyprland.nix          | 19 ++++---
 home-modules/programming/gleam.nix |  6 ++
 home.nix                           |  5 +-
 5 files changed, 86 insertions(+), 40 deletions(-)
 create mode 100644 home-modules/programming/gleam.nix

diff --git a/flake.lock b/flake.lock
index 0c76f4d..d0ca59f 100755
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1717931498,
-        "narHash": "sha256-8j6h9gZmAngPXLFRRtd8ySRb0I43f0rRW0puU8IBwKA=",
+        "lastModified": 1718337800,
+        "narHash": "sha256-Azz2lg6WsfT4SDMTA3DtJ6hS7kox3e0buSrV4J+zMAQ=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "3b7b7d83b3561269c2d8f20b5d4d4496bb36b2e6",
+        "rev": "aaf15fa3ed60109af8aad4cbb19c1fe28b4476ad",
         "type": "gitlab"
       },
       "original": {
@@ -202,17 +202,18 @@
       "inputs": {
         "hyprcursor": "hyprcursor",
         "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
         "hyprwayland-scanner": "hyprwayland-scanner",
         "nixpkgs": "nixpkgs",
         "systems": "systems",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1717960589,
-        "narHash": "sha256-0fPh9sFwzWbvDTTY6omTrYk2r9nBz7e4AzGH6HlRLCo=",
+        "lastModified": 1718365532,
+        "narHash": "sha256-2wd1ytcpvnBlhTxP1O/G4PJSY3fKuTxQLDxp+kFP4Sg=",
         "ref": "refs/heads/main",
-        "rev": "121c6ac3eae1601a1498e52a9be7030ebfed242c",
-        "revCount": 4788,
+        "rev": "a9d53a2252f7ec084e2487d18777e2df01c8c351",
+        "revCount": 4825,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -228,6 +229,11 @@
         "hyprland": [
           "hyprland"
         ],
+        "nixpkgs": [
+          "hyprland-plugins",
+          "hyprland",
+          "nixpkgs"
+        ],
         "systems": [
           "hyprland-plugins",
           "hyprland",
@@ -235,11 +241,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1717837954,
-        "narHash": "sha256-chdXRv+JoiLQ9xwwq4q14X14em94VQaxk+tzkxRnQ5c=",
+        "lastModified": 1718111105,
+        "narHash": "sha256-sLGohaz+8pCce4+wehXSlwOu7c7+We4Zc1ToXGCJYfs=",
         "owner": "hyprwm",
         "repo": "hyprland-plugins",
-        "rev": "8571aa9badf7db9c4911018a5611c038cc776256",
+        "rev": "151102b7d7c4f61ff42f275e72008d28318dac96",
         "type": "github"
       },
       "original": {
@@ -277,6 +283,10 @@
     },
     "hyprlang": {
       "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -287,11 +297,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716473782,
-        "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
+        "lastModified": 1717881852,
+        "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "87d5d984109c839482b88b4795db073eb9ed446f",
+        "rev": "ec6938c66253429192274d612912649a0cfe4d28",
         "type": "github"
       },
       "original": {
@@ -300,6 +310,31 @@
         "type": "github"
       }
     },
+    "hyprutils": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1717881334,
+        "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
     "hyprwayland-scanner": {
       "inputs": {
         "nixpkgs": [
@@ -352,11 +387,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717602782,
-        "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
+        "lastModified": 1717974879,
+        "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6",
+        "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3",
         "type": "github"
       },
       "original": {
@@ -400,11 +435,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1717786204,
-        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
+        "lastModified": 1718160348,
+        "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
+        "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
         "type": "github"
       },
       "original": {
@@ -431,11 +466,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1717696253,
-        "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
+        "lastModified": 1718208800,
+        "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b",
+        "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
         "type": "github"
       },
       "original": {
@@ -520,11 +555,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1717902109,
-        "narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=",
+        "lastModified": 1718137936,
+        "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f0922ad001829b400f0160ba85b47d252fa3d925",
+        "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6",
         "type": "github"
       },
       "original": {
@@ -580,11 +615,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716290197,
-        "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
+        "lastModified": 1717918856,
+        "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
+        "rev": "72907822c19afc0983c69d59d299204381623725",
         "type": "github"
       },
       "original": {
diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix
index 4749372..5947149 100644
--- a/home-modules/firefox.nix
+++ b/home-modules/firefox.nix
@@ -1,7 +1,8 @@
-{pkgs, secrets, user, inputs, ...}: {
+{pkgs, pkgs-unstable, secrets, user, inputs, ...}: {
   programs.firefox = {
     enable = true;
-    package = pkgs.firefox;
+    package = pkgs-unstable.firefox;
+    # package = pkgs.firefox;
     profiles.${user} = {
       # extensions = with inputs.firefox-addons; [
       #   ublock-origin
diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix
index d35ded3..a443832 100755
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -49,22 +49,25 @@ let
 in
 lib.mkIf (user != "tv")
 {
-  home.packages = [
+  home.packages = with pkgs; [
     # hyprland itself is a system package
-    pkgs.hyprland-protocols
+    hyprland-protocols
 
-    pkgs-unstable.hyprlock
-    pkgs-unstable.hypridle
+    hyprlock
+    hypridle
 
-    pkgs.grim
-    pkgs.slurp
+    grim
+    slurp
 
-  ];
+  ] ++ (with pkgs-unstable; [
+    
+  ]);
 
   wayland.windowManager.hyprland = {
     enable = true;
     # package = pkgs-unstable.hyprland;
-    package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+    package = pkgs.hyprland;
+    # package = inputs.hyprland.packages.${pkgs.system}.hyprland;
     xwayland.enable = true;
     systemd.enable = true;
     plugins = [
diff --git a/home-modules/programming/gleam.nix b/home-modules/programming/gleam.nix
new file mode 100644
index 0000000..841a4b6
--- /dev/null
+++ b/home-modules/programming/gleam.nix
@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    gleam
+  ];
+}
diff --git a/home.nix b/home.nix
index ca66919..38f24eb 100755
--- a/home.nix
+++ b/home.nix
@@ -49,6 +49,7 @@
 
     ./home-modules/programming/python.nix
     ./home-modules/programming/node.nix
+    ./home-modules/programming/gleam.nix
 
     ./home-modules/color-pallete.nix
   ];
@@ -60,7 +61,6 @@
     permittedInsecurePackages = allowed.inecure-packages;
   };
   home.packages = with pkgs; [
-    firefox
     chromium 
     
     zathura 
@@ -88,8 +88,9 @@
     gsettings-desktop-schemas
     wl-clipboard
     xclip
+    xournal
   ] ++ (with pkgs-unstable; [
-    # firefox
+    firefox
   ]) ++ (if host != "NxACE" then (with pkgs; [
     signal-desktop
     obsidian

From b8c1c7f302bbb8ba661b9ce30b467f1ddf88cae4 Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Thu, 20 Jun 2024 20:38:45 +0200
Subject: [PATCH 3/4] North 20

---
 configuration.nix                  |   21 +-
 flake.nix                          |    2 +
 git-crypt/secrets.nix              |  Bin 2699 -> 2881 bytes
 home-modules/chatterino.nix        | 2015 ++++++++++++++++++----------
 home-modules/fish.nix              |    8 +-
 home-modules/hyprland.nix          |   21 +-
 home-modules/programming/gleam.nix |    1 +
 system-modules/fonts.nix           |   15 +
 system-modules/gpg.nix             |    1 +
 9 files changed, 1378 insertions(+), 706 deletions(-)
 create mode 100644 system-modules/fonts.nix

diff --git a/configuration.nix b/configuration.nix
index efd05dd..99866bf 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -1,6 +1,4 @@
-{  pkgs, pkgs-unstable, rice, inputs, ... }:
-let
-in
+{  pkgs, pkgs-unstable, inputs, ... }:
 {
   imports = [
     inputs.sops-nix.nixosModules.sops
@@ -9,6 +7,7 @@ in
     ./system-modules/nvidia.nix 
     ./system-modules/users.nix
     ./system-modules/sound.nix
+    ./system-modules/fonts.nix
     ./system-modules/boot.nix
     ./system-modules/dm.nix
     ./system-modules/networking.nix
@@ -91,22 +90,6 @@ in
     VISUAL = "hx";  
   };
 
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-  ] ++ (with rice.font; [
-    base.package
-    code.package
-  ]) ++ (with pkgs-unstable; [
-    newcomputermodern
-  ]);
-
-  programs.gnupg.agent = {
-    enable = true;
-    enableSSHSupport = true;
-  };
-
 
   programs.hyprland = {
     # config is done with home-manager
diff --git a/flake.nix b/flake.nix
index 2943e0a..91e674d 100755
--- a/flake.nix
+++ b/flake.nix
@@ -153,6 +153,8 @@
             # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; });
           };
           base = {
+            # name = "NewComputerModern08";
+            # package = pkgs.newcomputermodern;
             name = "Atkinson Hyperlegible";
             package = pkgs.atkinson-hyperlegible;
           };
diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix
index d936b1a2f73a55364d22c88f1afbeb20c11c7362..4fc966f14ca7ea58d485238478cea02a86896828 100755
GIT binary patch
literal 2881
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

literal 2699
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

diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix
index 620a6eb..7231d31 100755
--- a/home-modules/chatterino.nix
+++ b/home-modules/chatterino.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, user, secrets, ... }:
+{ config, pkgs, lib, rice, user, secrets, ... }:
 let
   channels = [
     "agurin"
@@ -62,683 +62,1354 @@ lib.mkIf (user != "tv")
     chatterino2
   ];
 
-  home.file.".local/share/chatterino/Settings/settings.json".text = builtins.toJSON {
-    "hotkeys" = {
-      "addedDefaults" = [
-        "change channel"
-        "close popup window"
-        "create clip"
-        "delete"
-        "emote picker"
-        "focus down"
-        "focus left"
-        "focus right"
-        "focus up"
-        "go to end of input"
-        "go to end of input with selection"
-        "go to start of input"
-        "go to start of input with selection"
-        "new popup window"
-        "new popup window from tab"
-        "new split"
-        "new tab"
-        "next message"
-        "open debug popup"
-        "open quick switcher"
-        "open settings"
-        "popup accept"
-        "popup focus search box"
-        "popup reject"
-        "popup scroll down"
-        "popup scroll up"
-        "popup select last tab"
-        "popup select next tab"
-        "popup select previous tab"
-        "popup select tab #1"
-        "popup select tab #2"
-        "popup select tab #3"
-        "popup select tab #4"
-        "popup select tab #5"
-        "popup select tab #6"
-        "popup select tab #7"
-        "popup select tab #8"
-        "previous message"
-        "reconnect"
-        "reload emotes"
-        "remove tab"
-        "reopen split"
-        "scroll page down"
-        "scroll page up"
-        "scroll to bottom"
-        "scroll to top"
-        "select last tab"
-        "select next tab"
-        "select previous tab"
-        "select tab #1"
-        "select tab #2"
-        "select tab #3"
-        "select tab #4"
-        "select tab #5"
-        "select tab #6"
-        "select tab #7"
-        "select tab #8"
-        "send message"
-        "send message and keep text"
-        "show global search"
-        "show search"
-        "toggle live tabs only"
-        "toggle local r9k"
-        "toggle tab visibility"
-        "zoom in"
-        "zoom out"
-        "zoom reset"
-      ];
-      "close popup window" = {
-        "action" = "delete";
-        "keySequence" = "Esc";
-        "category" = "popupWindow";
-        "arguments" = [ ];
-      };
-      "popup accept" = {
-        "action" = "accept";
-        "keySequence" = "Return";
-        "category" = "popupWindow";
-        "arguments" = [ ];
-      };
-      "popup focus search box" = {
-        "action" = "search";
-        "keySequence" = "Ctrl+F";
-        "category" = "popupWindow";
-        "arguments" = [ ];
-      };
-      "popup reject" = {
-        "action" = "reject";
-        "keySequence" = "Esc";
-        "category" = "popupWindow";
-        "arguments" = [ ];
-      };
-      "popup scroll down" = {
-        "action" = "scrollPage";
-        "keySequence" = "PgDown";
-        "category" = "popupWindow";
-        "arguments" = [
-          "down"
-        ];
-      };
-      "popup scroll up" = {
-        "action" = "scrollPage";
-        "keySequence" = "PgUp";
-        "category" = "popupWindow";
-        "arguments" = [
-          "up"
-        ];
-      };
-      "popup select last tab" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+9";
-        "category" = "popupWindow";
-        "arguments" = [
-          "last"
-        ];
-      };
-      "popup select next tab" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+Tab";
-        "category" = "popupWindow";
-        "arguments" = [
-          "next"
-        ];
-      };
-      "popup select previous tab" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+Shift+Tab";
-        "category" = "popupWindow";
-        "arguments" = [
-          "previous"
-        ];
-      };
-      "popup select tab #1" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+1";
-        "category" = "popupWindow";
-        "arguments" = [
-          "0"
-        ];
-      };
-      "popup select tab #2" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+2";
-        "category" = "popupWindow";
-        "arguments" = [
-          "1"
-        ];
-      };
-      "popup select tab #3" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+3";
-        "category" = "popupWindow";
-        "arguments" = [
-          "2"
-        ];
-      };
-      "popup select tab #4" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+4";
-        "category" = "popupWindow";
-        "arguments" = [
-          "3"
-        ];
-      };
-      "popup select tab #5" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+5";
-        "category" = "popupWindow";
-        "arguments" = [
-          "4"
-        ];
-      };
-      "popup select tab #6" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+6";
-        "category" = "popupWindow";
-        "arguments" = [
-          "5"
-        ];
-      };
-      "popup select tab #7" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+7";
-        "category" = "popupWindow";
-        "arguments" = [
-          "6"
-        ];
-      };
-      "popup select tab #8" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+8";
-        "category" = "popupWindow";
-        "arguments" = [
-          "7"
-        ];
-      };
-      "change channel" = {
-        "action" = "changeChannel";
-        "keySequence" = "Ctrl+R";
-        "category" = "split";
-        "arguments" = [ ];
-      };
-      "create clip" = {
-        "action" = "createClip";
-        "keySequence" = "Alt+X";
-        "category" = "split";
-        "arguments" = [ ];
-      };
-      "delete" = {
-        "action" = "delete";
-        "keySequence" = "Ctrl+W";
-        "category" = "split";
-        "arguments" = [ ];
-      };
-      "focus down" = {
-        "action" = "focus";
-        "keySequence" = "Alt+Down";
-        "category" = "split";
-        "arguments" = [
-          "down"
-        ];
-      };
-      "focus left" = {
-        "action" = "focus";
-        "keySequence" = "Alt+Left";
-        "category" = "split";
-        "arguments" = [
-          "left"
-        ];
-      };
-      "focus right" = {
-        "action" = "focus";
-        "keySequence" = "Alt+Right";
-        "category" = "split";
-        "arguments" = [
-          "right"
-        ];
-      };
-      "focus up" = {
-        "action" = "focus";
-        "keySequence" = "Alt+Up";
-        "category" = "split";
-        "arguments" = [
-          "up"
-        ];
-      };
-      "open debug popup" = {
-        "action" = "debug";
-        "keySequence" = "F10";
-        "category" = "split";
-        "arguments" = [ ];
-      };
-      "reconnect" = {
-        "action" = "reconnect";
-        "keySequence" = "Ctrl+F5";
-        "category" = "split";
-        "arguments" = [ ];
-      };
-      "reload emotes" = {
-        "action" = "reloadEmotes";
-        "keySequence" = "F5";
-        "category" = "split";
-        "arguments" = [ ];
-      };
-      "scroll page down" = {
-        "action" = "scrollPage";
-        "keySequence" = "PgDown";
-        "category" = "split";
-        "arguments" = [
-          "down"
-        ];
-      };
-      "scroll page up" = {
-        "action" = "scrollPage";
-        "keySequence" = "PgUp";
-        "category" = "split";
-        "arguments" = [
-          "up"
-        ];
-      };
-      "scroll to bottom" = {
-        "action" = "scrollToBottom";
-        "keySequence" = "Ctrl+End";
-        "category" = "split";
-        "arguments" = [ ];
-      };
-      "scroll to top" = {
-        "action" = "scrollToTop";
-        "keySequence" = "Ctrl+Home";
-        "category" = "split";
-        "arguments" = [ ];
-      };
-      "show global search" = {
-        "action" = "showGlobalSearch";
-        "keySequence" = "Ctrl+Shift+F";
-        "category" = "split";
-        "arguments" = [ ];
-      };
-      "show search" = {
-        "action" = "showSearch";
-        "keySequence" = "Ctrl+F";
-        "category" = "split";
-        "arguments" = [ ];
-      };
-      "emote picker" = {
-        "action" = "openEmotesPopup";
-        "keySequence" = "Ctrl+E";
-        "category" = "splitInput";
-        "arguments" = [ ];
-      };
-      "go to end of input" = {
-        "action" = "cursorToEnd";
-        "keySequence" = "End";
-        "category" = "splitInput";
-        "arguments" = [
-          "withoutSelection"
-        ];
-      };
-      "go to end of input with selection" = {
-        "action" = "cursorToEnd";
-        "keySequence" = "Shift+End";
-        "category" = "splitInput";
-        "arguments" = [
-          "withSelection"
-        ];
-      };
-      "go to start of input" = {
-        "action" = "cursorToStart";
-        "keySequence" = "Home";
-        "category" = "splitInput";
-        "arguments" = [
-          "withoutSelection"
-        ];
-      };
-      "go to start of input with selection" = {
-        "action" = "cursorToStart";
-        "keySequence" = "Shift+Home";
-        "category" = "splitInput";
-        "arguments" = [
-          "withSelection"
-        ];
-      };
-      "next message" = {
-        "action" = "nextMessage";
-        "keySequence" = "Down";
-        "category" = "splitInput";
-        "arguments" = [ ];
-      };
-      "previous message" = {
-        "action" = "previousMessage";
-        "keySequence" = "Up";
-        "category" = "splitInput";
-        "arguments" = [ ];
-      };
-      "send message" = {
-        "action" = "sendMessage";
-        "keySequence" = "Return";
-        "category" = "splitInput";
-        "arguments" = [ ];
-      };
-      "send message and keep text" = {
-        "action" = "sendMessage";
-        "keySequence" = "Ctrl+Return";
-        "category" = "splitInput";
-        "arguments" = [
-          "keepInput"
-        ];
-      };
-      "new popup window" = {
-        "action" = "popup";
-        "keySequence" = "Ctrl+N";
-        "category" = "window";
-        "arguments" = [
-          "split"
-        ];
-      };
-      "new popup window from tab" = {
-        "action" = "popup";
-        "keySequence" = "Ctrl+Shift+N";
-        "category" = "window";
-        "arguments" = [
-          "window"
-        ];
-      };
-      "new split" = {
-        "action" = "newSplit";
-        "keySequence" = "Ctrl+T";
-        "category" = "window";
-        "arguments" = [ ];
-      };
-      "new tab" = {
-        "action" = "newTab";
-        "keySequence" = "Ctrl+Shift+T";
-        "category" = "window";
-        "arguments" = [ ];
-      };
-      "open quick switcher" = {
-        "action" = "openQuickSwitcher";
-        "keySequence" = "Ctrl+K";
-        "category" = "window";
-        "arguments" = [ ];
-      };
-      "open settings" = {
-        "action" = "openSettings";
-        "keySequence" = "Ctrl+P";
-        "category" = "window";
-        "arguments" = [ ];
-      };
-      "remove tab" = {
-        "action" = "removeTab";
-        "keySequence" = "Ctrl+Shift+W";
-        "category" = "window";
-        "arguments" = [ ];
-      };
-      "reopen split" = {
-        "action" = "reopenSplit";
-        "keySequence" = "Ctrl+G";
-        "category" = "window";
-        "arguments" = [ ];
-      };
-      "select last tab" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+9";
-        "category" = "window";
-        "arguments" = [
-          "last"
-        ];
-      };
-      "select next tab" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+Tab";
-        "category" = "window";
-        "arguments" = [
-          "next"
-        ];
-      };
-      "select previous tab" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+Shift+Tab";
-        "category" = "window";
-        "arguments" = [
-          "previous"
-        ];
-      };
-      "select tab #1" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+1";
-        "category" = "window";
-        "arguments" = [
-          "0"
-        ];
-      };
-      "select tab #2" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+2";
-        "category" = "window";
-        "arguments" = [
-          "1"
-        ];
-      };
-      "select tab #3" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+3";
-        "category" = "window";
-        "arguments" = [
-          "2"
-        ];
-      };
-      "select tab #4" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+4";
-        "category" = "window";
-        "arguments" = [
-          "3"
-        ];
-      };
-      "select tab #5" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+5";
-        "category" = "window";
-        "arguments" = [
-          "4"
-        ];
-      };
-      "select tab #6" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+6";
-        "category" = "window";
-        "arguments" = [
-          "5"
-        ];
-      };
-      "select tab #7" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+7";
-        "category" = "window";
-        "arguments" = [
-          "6"
-        ];
-      };
-      "select tab #8" = {
-        "action" = "openTab";
-        "keySequence" = "Ctrl+8";
-        "category" = "window";
-        "arguments" = [
-          "7"
-        ];
-      };
-      "toggle live tabs only" = {
-        "action" = "setTabVisibility";
-        "keySequence" = "Ctrl+Shift+L";
-        "category" = "window";
-        "arguments" = [
-          "toggleLiveOnly"
-        ];
-      };
-      "toggle local r9k" = {
-        "action" = "toggleLocalR9K";
-        "keySequence" = "Ctrl+H";
-        "category" = "window";
-        "arguments" = [ ];
-      };
-      "toggle tab visibility" = {
-        "action" = "setTabVisibility";
-        "keySequence" = "Ctrl+U";
-        "category" = "window";
-        "arguments" = [
-          "toggle"
-        ];
-      };
-      "zoom in" = {
-        "action" = "zoom";
-        "keySequence" = "Ctrl++";
-        "category" = "window";
-        "arguments" = [
-          "in"
-        ];
-      };
-      "zoom out" = {
-        "action" = "zoom";
-        "keySequence" = "Ctrl+-";
-        "category" = "window";
-        "arguments" = [
-          "out"
-        ];
-      };
-      "zoom reset" = {
-        "action" = "zoom";
-        "keySequence" = "Ctrl+0";
-        "category" = "window";
-        "arguments" = [
-          "reset"
-        ];
-      };
-    };
-    "misc" = {
-      "currentVersion" = "2.4.6";
-      "lockNotebookLayout" = false;
-    };
-    "ui" = {
-      "lastSelectChannelTab" = 0;
-      "lastSelectIrcConn" = -1;
-    };
-    "appearance" = {
-      "theme" = {
-        "name" = "Black";
-      };
-      "tabVisibility" = 1;
-      "currentFontFamily" = "Atkinson Hyperlegible";
-      "messages" = {
-        "alternateMessageBackground" = true;
-        "showTimestamps" = false;
-        "timestampFormat" = "h =mm";
-        "separateMessages" = true;
-        "lastMessagePattern" = 10;
-        "lastMessageColor" = "#ff7f0002";
-        "usernameDisplayMode" = 1;
-      };
-      "currentFontSize" = 12;
-      "splitheader" = {
-        "showUptime" = true;
-        "showViewerCount" = true;
-        "showGame" = true;
-        "showTitle" = true;
-      };
-      "boldScale" = 63.0;
-    };
-    accounts = secrets.chatterino.accounts;
-    "behaviour" = {
-      "pauseOnHoverDuration" = 5.0;
-      "usernameRightClickBehavior" = 0;
-      "usernameRightClickBehaviorWithModifier" = 1;
-      "showJoins" = false;
-    };
-    "highlighting" = {
-      "selfMessageHighlight" = {
-        "enabled" = true;
-        "color" = "#73008cff";
-      };
-      "badges" = [
-        {
-          "name" = "broadcaster";
-          "displayName" = "Broadcaster";
-          "showInMentions" = false;
-          "alert" = false;
-          "sound" = false;
-          "soundUrl" = "";
-          "color" = "#7f7f3f49";
-        }
-        {
-          "name" = "admin";
-          "displayName" = "Admin";
-          "showInMentions" = false;
-          "alert" = false;
-          "sound" = false;
-          "soundUrl" = "";
-          "color" = "#7f7f3f49";
-        }
-        {
-          "name" = "staff";
-          "displayName" = "Staff";
-          "showInMentions" = false;
-          "alert" = false;
-          "sound" = false;
-          "soundUrl" = "";
-          "color" = "#7f7f3f49";
-        }
-        {
-          "name" = "moderator";
-          "displayName" = "Moderator";
-          "showInMentions" = false;
-          "alert" = false;
-          "sound" = false;
-          "soundUrl" = "";
-        }
-        {
-          "name" = "vip";
-          "displayName" = "VIP";
-          "showInMentions" = false;
-          "alert" = false;
-          "sound" = false;
-          "soundUrl" = "";
-          "color" = "#7f7f3578";
-        }
-      ];
-    };
-    "emotes" = {
-      "removeSpacesBetweenEmotes" = false;
-      "showUnlistedSevenTVEmotes" = false;
-    };
-    "similarity" = {
-      "similarityEnabled" = false;
-      "hideSimilar" = false;
-      "hideSimilarMaxDelay" = 30;
-      "hideSimilarMaxMessagesToCheck" = 5;
-    };
-  };
+  home.file.".local/share/chatterino/Settings/settings.json".text = with secrets.chatterino; ''
+  {
+      "accounts": {
+          "current": "${username}",
+          "uid189594946": {
+              "clientID": "${clientID}",
+              "oauthToken": "${oauthToken}",
+              "userID": "${userID}",
+              "username": "${username}"
+          }
+      },
+      "appearance": {
+          "boldScale": 63.0,
+          "currentFontFamily": "${rice.font.base.name}",
+          "currentFontSize": 12,
+          "messages": {
+              "alternateMessageBackground": true,
+              "lastMessageColor": "#ff7f0002",
+              "lastMessagePattern": 10,
+              "separateMessages": true,
+              "showTimestamps": false,
+              "timestampFormat": "h =mm",
+              "usernameDisplayMode": 1
+          },
+          "splitheader": {
+              "showGame": true,
+              "showTitle": true,
+              "showUptime": true,
+              "showViewerCount": true
+          },
+          "tabVisibility": 1,
+          "theme": {
+              "name": "Black"
+          }
+      },
+      "behaviour": {
+          "pauseOnHoverDuration": 5.0,
+          "showJoins": false,
+          "usernameRightClickBehavior": 0,
+          "usernameRightClickBehaviorWithModifier": 1
+      },
+      "emotes": {
+          "removeSpacesBetweenEmotes": false,
+          "showUnlistedSevenTVEmotes": true
+      },
+      "highlighting": {
+          "badges": [
+              {
+                  "alert": false,
+                  "color": "#7f7f3f49",
+                  "displayName": "Broadcaster",
+                  "name": "broadcaster",
+                  "showInMentions": false,
+                  "sound": false,
+                  "soundUrl": ""
+              },
+              {
+                  "alert": false,
+                  "color": "#7f7f3f49",
+                  "displayName": "Admin",
+                  "name": "admin",
+                  "showInMentions": false,
+                  "sound": false,
+                  "soundUrl": ""
+              },
+              {
+                  "alert": false,
+                  "color": "#7f7f3f49",
+                  "displayName": "Staff",
+                  "name": "staff",
+                  "showInMentions": false,
+                  "sound": false,
+                  "soundUrl": ""
+              },
+              {
+                  "alert": false,
+                  "displayName": "Moderator",
+                  "name": "moderator",
+                  "showInMentions": false,
+                  "sound": false,
+                  "soundUrl": ""
+              },
+              {
+                  "alert": false,
+                  "color": "#7f7f3578",
+                  "displayName": "VIP",
+                  "name": "vip",
+                  "showInMentions": false,
+                  "sound": false,
+                  "soundUrl": ""
+              }
+          ],
+          "selfMessageHighlight": {
+              "color": "#73008cff",
+              "enabled": true
+          }
+      },
+      "hotkeys": {
+          "addedDefaults": [
+              "change channel",
+              "close popup window",
+              "create clip",
+              "delete",
+              "emote picker",
+              "focus down",
+              "focus left",
+              "focus right",
+              "focus up",
+              "go to end of input",
+              "go to end of input with selection",
+              "go to start of input",
+              "go to start of input with selection",
+              "new popup window",
+              "new popup window from tab",
+              "new split",
+              "new tab",
+              "next message",
+              "open debug popup",
+              "open quick switcher",
+              "open settings",
+              "popup accept",
+              "popup focus search box",
+              "popup reject",
+              "popup scroll down",
+              "popup scroll up",
+              "popup select last tab",
+              "popup select next tab",
+              "popup select previous tab",
+              "popup select tab #1",
+              "popup select tab #2",
+              "popup select tab #3",
+              "popup select tab #4",
+              "popup select tab #5",
+              "popup select tab #6",
+              "popup select tab #7",
+              "popup select tab #8",
+              "previous message",
+              "reconnect",
+              "reload emotes",
+              "remove tab",
+              "reopen split",
+              "scroll page down",
+              "scroll page up",
+              "scroll to bottom",
+              "scroll to top",
+              "select last tab",
+              "select next tab",
+              "select previous tab",
+              "select tab #1",
+              "select tab #2",
+              "select tab #3",
+              "select tab #4",
+              "select tab #5",
+              "select tab #6",
+              "select tab #7",
+              "select tab #8",
+              "send message",
+              "send message and keep text",
+              "show global search",
+              "show search",
+              "toggle live tabs only",
+              "toggle local r9k",
+              "toggle tab visibility",
+              "zoom in",
+              "zoom out",
+              "zoom reset"
+          ],
+          "change channel": {
+              "action": "changeChannel",
+              "arguments": [],
+              "category": "split",
+              "keySequence": "Ctrl+R"
+          },
+          "close popup window": {
+              "action": "delete",
+              "arguments": [],
+              "category": "popupWindow",
+              "keySequence": "Esc"
+          },
+          "create clip": {
+              "action": "createClip",
+              "arguments": [],
+              "category": "split",
+              "keySequence": "Alt+X"
+          },
+          "delete": {
+              "action": "delete",
+              "arguments": [],
+              "category": "split",
+              "keySequence": "Ctrl+W"
+          },
+          "emote picker": {
+              "action": "openEmotesPopup",
+              "arguments": [],
+              "category": "splitInput",
+              "keySequence": "Ctrl+E"
+          },
+          "focus down": {
+              "action": "focus",
+              "arguments": [
+                  "down"
+              ],
+              "category": "split",
+              "keySequence": "Alt+Down"
+          },
+          "focus left": {
+              "action": "focus",
+              "arguments": [
+                  "left"
+              ],
+              "category": "split",
+              "keySequence": "Alt+Left"
+          },
+          "focus right": {
+              "action": "focus",
+              "arguments": [
+                  "right"
+              ],
+              "category": "split",
+              "keySequence": "Alt+Right"
+          },
+          "focus up": {
+              "action": "focus",
+              "arguments": [
+                  "up"
+              ],
+              "category": "split",
+              "keySequence": "Alt+Up"
+          },
+          "go to end of input": {
+              "action": "cursorToEnd",
+              "arguments": [
+                  "withoutSelection"
+              ],
+              "category": "splitInput",
+              "keySequence": "End"
+          },
+          "go to end of input with selection": {
+              "action": "cursorToEnd",
+              "arguments": [
+                  "withSelection"
+              ],
+              "category": "splitInput",
+              "keySequence": "Shift+End"
+          },
+          "go to start of input": {
+              "action": "cursorToStart",
+              "arguments": [
+                  "withoutSelection"
+              ],
+              "category": "splitInput",
+              "keySequence": "Home"
+          },
+          "go to start of input with selection": {
+              "action": "cursorToStart",
+              "arguments": [
+                  "withSelection"
+              ],
+              "category": "splitInput",
+              "keySequence": "Shift+Home"
+          },
+          "new popup window": {
+              "action": "popup",
+              "arguments": [
+                  "split"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+N"
+          },
+          "new popup window from tab": {
+              "action": "popup",
+              "arguments": [
+                  "window"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+Shift+N"
+          },
+          "new split": {
+              "action": "newSplit",
+              "arguments": [],
+              "category": "window",
+              "keySequence": "Ctrl+T"
+          },
+          "new tab": {
+              "action": "newTab",
+              "arguments": [],
+              "category": "window",
+              "keySequence": "Ctrl+Shift+T"
+          },
+          "next message": {
+              "action": "nextMessage",
+              "arguments": [],
+              "category": "splitInput",
+              "keySequence": "Down"
+          },
+          "open debug popup": {
+              "action": "debug",
+              "arguments": [],
+              "category": "split",
+              "keySequence": "F10"
+          },
+          "open quick switcher": {
+              "action": "openQuickSwitcher",
+              "arguments": [],
+              "category": "window",
+              "keySequence": "Ctrl+K"
+          },
+          "open settings": {
+              "action": "openSettings",
+              "arguments": [],
+              "category": "window",
+              "keySequence": "Ctrl+P"
+          },
+          "popup accept": {
+              "action": "accept",
+              "arguments": [],
+              "category": "popupWindow",
+              "keySequence": "Return"
+          },
+          "popup focus search box": {
+              "action": "search",
+              "arguments": [],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+F"
+          },
+          "popup reject": {
+              "action": "reject",
+              "arguments": [],
+              "category": "popupWindow",
+              "keySequence": "Esc"
+          },
+          "popup scroll down": {
+              "action": "scrollPage",
+              "arguments": [
+                  "down"
+              ],
+              "category": "popupWindow",
+              "keySequence": "PgDown"
+          },
+          "popup scroll up": {
+              "action": "scrollPage",
+              "arguments": [
+                  "up"
+              ],
+              "category": "popupWindow",
+              "keySequence": "PgUp"
+          },
+          "popup select last tab": {
+              "action": "openTab",
+              "arguments": [
+                  "last"
+              ],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+9"
+          },
+          "popup select next tab": {
+              "action": "openTab",
+              "arguments": [
+                  "next"
+              ],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+Tab"
+          },
+          "popup select previous tab": {
+              "action": "openTab",
+              "arguments": [
+                  "previous"
+              ],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+Shift+Tab"
+          },
+          "popup select tab #1": {
+              "action": "openTab",
+              "arguments": [
+                  "0"
+              ],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+1"
+          },
+          "popup select tab #2": {
+              "action": "openTab",
+              "arguments": [
+                  "1"
+              ],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+2"
+          },
+          "popup select tab #3": {
+              "action": "openTab",
+              "arguments": [
+                  "2"
+              ],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+3"
+          },
+          "popup select tab #4": {
+              "action": "openTab",
+              "arguments": [
+                  "3"
+              ],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+4"
+          },
+          "popup select tab #5": {
+              "action": "openTab",
+              "arguments": [
+                  "4"
+              ],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+5"
+          },
+          "popup select tab #6": {
+              "action": "openTab",
+              "arguments": [
+                  "5"
+              ],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+6"
+          },
+          "popup select tab #7": {
+              "action": "openTab",
+              "arguments": [
+                  "6"
+              ],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+7"
+          },
+          "popup select tab #8": {
+              "action": "openTab",
+              "arguments": [
+                  "7"
+              ],
+              "category": "popupWindow",
+              "keySequence": "Ctrl+8"
+          },
+          "previous message": {
+              "action": "previousMessage",
+              "arguments": [],
+              "category": "splitInput",
+              "keySequence": "Up"
+          },
+          "reconnect": {
+              "action": "reconnect",
+              "arguments": [],
+              "category": "split",
+              "keySequence": "Ctrl+F5"
+          },
+          "reload emotes": {
+              "action": "reloadEmotes",
+              "arguments": [],
+              "category": "split",
+              "keySequence": "F5"
+          },
+          "remove tab": {
+              "action": "removeTab",
+              "arguments": [],
+              "category": "window",
+              "keySequence": "Ctrl+Shift+W"
+          },
+          "reopen split": {
+              "action": "reopenSplit",
+              "arguments": [],
+              "category": "window",
+              "keySequence": "Ctrl+G"
+          },
+          "scroll page down": {
+              "action": "scrollPage",
+              "arguments": [
+                  "down"
+              ],
+              "category": "split",
+              "keySequence": "PgDown"
+          },
+          "scroll page up": {
+              "action": "scrollPage",
+              "arguments": [
+                  "up"
+              ],
+              "category": "split",
+              "keySequence": "PgUp"
+          },
+          "scroll to bottom": {
+              "action": "scrollToBottom",
+              "arguments": [],
+              "category": "split",
+              "keySequence": "Ctrl+End"
+          },
+          "scroll to top": {
+              "action": "scrollToTop",
+              "arguments": [],
+              "category": "split",
+              "keySequence": "Ctrl+Home"
+          },
+          "select last tab": {
+              "action": "openTab",
+              "arguments": [
+                  "last"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+9"
+          },
+          "select next tab": {
+              "action": "openTab",
+              "arguments": [
+                  "next"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+Tab"
+          },
+          "select previous tab": {
+              "action": "openTab",
+              "arguments": [
+                  "previous"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+Shift+Tab"
+          },
+          "select tab #1": {
+              "action": "openTab",
+              "arguments": [
+                  "0"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+1"
+          },
+          "select tab #2": {
+              "action": "openTab",
+              "arguments": [
+                  "1"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+2"
+          },
+          "select tab #3": {
+              "action": "openTab",
+              "arguments": [
+                  "2"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+3"
+          },
+          "select tab #4": {
+              "action": "openTab",
+              "arguments": [
+                  "3"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+4"
+          },
+          "select tab #5": {
+              "action": "openTab",
+              "arguments": [
+                  "4"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+5"
+          },
+          "select tab #6": {
+              "action": "openTab",
+              "arguments": [
+                  "5"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+6"
+          },
+          "select tab #7": {
+              "action": "openTab",
+              "arguments": [
+                  "6"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+7"
+          },
+          "select tab #8": {
+              "action": "openTab",
+              "arguments": [
+                  "7"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+8"
+          },
+          "send message": {
+              "action": "sendMessage",
+              "arguments": [],
+              "category": "splitInput",
+              "keySequence": "Return"
+          },
+          "send message and keep text": {
+              "action": "sendMessage",
+              "arguments": [
+                  "keepInput"
+              ],
+              "category": "splitInput",
+              "keySequence": "Ctrl+Return"
+          },
+          "show global search": {
+              "action": "showGlobalSearch",
+              "arguments": [],
+              "category": "split",
+              "keySequence": "Ctrl+Shift+F"
+          },
+          "show search": {
+              "action": "showSearch",
+              "arguments": [],
+              "category": "split",
+              "keySequence": "Ctrl+F"
+          },
+          "toggle live tabs only": {
+              "action": "setTabVisibility",
+              "arguments": [
+                  "toggleLiveOnly"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+Shift+L"
+          },
+          "toggle local r9k": {
+              "action": "toggleLocalR9K",
+              "arguments": [],
+              "category": "window",
+              "keySequence": "Ctrl+H"
+          },
+          "toggle tab visibility": {
+              "action": "setTabVisibility",
+              "arguments": [
+                  "toggle"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+U"
+          },
+          "zoom in": {
+              "action": "zoom",
+              "arguments": [
+                  "in"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl++"
+          },
+          "zoom out": {
+              "action": "zoom",
+              "arguments": [
+                  "out"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+-"
+          },
+          "zoom reset": {
+              "action": "zoom",
+              "arguments": [
+                  "reset"
+              ],
+              "category": "window",
+              "keySequence": "Ctrl+0"
+          }
+      },
+      "misc": {
+          "currentVersion": "2.5.1",
+          "lockNotebookLayout": false
+      },
+      "similarity": {
+          "hideSimilar": false,
+          "hideSimilarMaxDelay": 30,
+          "hideSimilarMaxMessagesToCheck": 5,
+          "similarityEnabled": false
+      },
+      "ui": {
+          "lastSelectChannelTab": 0,
+          "lastSelectIrcConn": -1
+      }
+    }
+  '';
+  # home.file.".local/share/chatterino/Settings/settings.json".text = builtins.toJSON {
+  #   hotkeys = {
+  #     addedDefaults = [
+  #       "change channel"
+  #       "close popup window"
+  #       "create clip"
+  #       "delete"
+  #       "emote picker"
+  #       "focus down"
+  #       "focus left"
+  #       "focus right"
+  #       "focus up"
+  #       "go to end of input"
+  #       "go to end of input with selection"
+  #       "go to start of input"
+  #       "go to start of input with selection"
+  #       "new popup window"
+  #       "new popup window from tab"
+  #       "new split"
+  #       "new tab"
+  #       "next message"
+  #       "open debug popup"
+  #       "open quick switcher"
+  #       "open settings"
+  #       "popup accept"
+  #       "popup focus search box"
+  #       "popup reject"
+  #       "popup scroll down"
+  #       "popup scroll up"
+  #       "popup select last tab"
+  #       "popup select next tab"
+  #       "popup select previous tab"
+  #       "popup select tab #1"
+  #       "popup select tab #2"
+  #       "popup select tab #3"
+  #       "popup select tab #4"
+  #       "popup select tab #5"
+  #       "popup select tab #6"
+  #       "popup select tab #7"
+  #       "popup select tab #8"
+  #       "previous message"
+  #       "reconnect"
+  #       "reload emotes"
+  #       "remove tab"
+  #       "reopen split"
+  #       "scroll page down"
+  #       "scroll page up"
+  #       "scroll to bottom"
+  #       "scroll to top"
+  #       "select last tab"
+  #       "select next tab"
+  #       "select previous tab"
+  #       "select tab #1"
+  #       "select tab #2"
+  #       "select tab #3"
+  #       "select tab #4"
+  #       "select tab #5"
+  #       "select tab #6"
+  #       "select tab #7"
+  #       "select tab #8"
+  #       "send message"
+  #       "send message and keep text"
+  #       "show global search"
+  #       "show search"
+  #       "toggle live tabs only"
+  #       "toggle local r9k"
+  #       "toggle tab visibility"
+  #       "zoom in"
+  #       "zoom out"
+  #       "zoom reset"
+  #     ];
+  #     "close popup window" = {
+  #       action = "delete";
+  #       keySequence = "Esc";
+  #       category = "popupWindow";
+  #       arguments = [ ];
+  #     };
+  #     "popup accept" = {
+  #       action = "accept";
+  #       keySequence = "Return";
+  #       category = "popupWindow";
+  #       arguments = [ ];
+  #     };
+  #     "popup focus search box" = {
+  #       action = "search";
+  #       keySequence = "Ctrl+F";
+  #       category = "popupWindow";
+  #       arguments = [ ];
+  #     };
+  #     "popup reject" = {
+  #       action = "reject";
+  #       keySequence = "Esc";
+  #       category = "popupWindow";
+  #       arguments = [ ];
+  #     };
+  #     "popup scroll down" = {
+  #       action = "scrollPage";
+  #       keySequence = "PgDown";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "down"
+  #       ];
+  #     };
+  #     "popup scroll up" = {
+  #       action = "scrollPage";
+  #       keySequence = "PgUp";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "up"
+  #       ];
+  #     };
+  #     "popup select last tab" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+9";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "last"
+  #       ];
+  #     };
+  #     "popup select next tab" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+Tab";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "next"
+  #       ];
+  #     };
+  #     "popup select previous tab" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+Shift+Tab";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "previous"
+  #       ];
+  #     };
+  #     "popup select tab #1" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+1";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "0"
+  #       ];
+  #     };
+  #     "popup select tab #2" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+2";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "1"
+  #       ];
+  #     };
+  #     "popup select tab #3" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+3";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "2"
+  #       ];
+  #     };
+  #     "popup select tab #4" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+4";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "3"
+  #       ];
+  #     };
+  #     "popup select tab #5" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+5";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "4"
+  #       ];
+  #     };
+  #     "popup select tab #6" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+6";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "5"
+  #       ];
+  #     };
+  #     "popup select tab #7" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+7";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "6"
+  #       ];
+  #     };
+  #     "popup select tab #8" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+8";
+  #       category = "popupWindow";
+  #       arguments = [
+  #         "7"
+  #       ];
+  #     };
+  #     "change channel" = {
+  #       action = "changeChannel";
+  #       keySequence = "Ctrl+R";
+  #       category = "split";
+  #       arguments = [ ];
+  #     };
+  #     "create clip" = {
+  #       action = "createClip";
+  #       keySequence = "Alt+X";
+  #       category = "split";
+  #       arguments = [ ];
+  #     };
+  #     delete = {
+  #       action = "delete";
+  #       keySequence = "Ctrl+W";
+  #       category = "split";
+  #       arguments = [ ];
+  #     };
+  #     "focus down" = {
+  #       action = "focus";
+  #       keySequence = "Alt+Down";
+  #       category = "split";
+  #       arguments = [
+  #         "down"
+  #       ];
+  #     };
+  #     "focus left" = {
+  #       action = "focus";
+  #       keySequence = "Alt+Left";
+  #       category = "split";
+  #       arguments = [
+  #         "left"
+  #       ];
+  #     };
+  #     "focus right" = {
+  #       action = "focus";
+  #       keySequence = "Alt+Right";
+  #       category = "split";
+  #       arguments = [
+  #         "right"
+  #       ];
+  #     };
+  #     "focus up" = {
+  #       action = "focus";
+  #       keySequence = "Alt+Up";
+  #       category = "split";
+  #       arguments = [
+  #         "up"
+  #       ];
+  #     };
+  #     "open debug popup" = {
+  #       action = "debug";
+  #       keySequence = "F10";
+  #       category = "split";
+  #       arguments = [ ];
+  #     };
+  #     reconnect = {
+  #       action = "reconnect";
+  #       keySequence = "Ctrl+F5";
+  #       category = "split";
+  #       arguments = [ ];
+  #     };
+  #     "reload emotes" = {
+  #       action = "reloadEmotes";
+  #       keySequence = "F5";
+  #       category = "split";
+  #       arguments = [ ];
+  #     };
+  #     "scroll page down" = {
+  #       action = "scrollPage";
+  #       keySequence = "PgDown";
+  #       category = "split";
+  #       arguments = [
+  #         "down"
+  #       ];
+  #     };
+  #     "scroll page up" = {
+  #       action = "scrollPage";
+  #       keySequence = "PgUp";
+  #       category = "split";
+  #       arguments = [
+  #         "up"
+  #       ];
+  #     };
+  #     "scroll to bottom" = {
+  #       action = "scrollToBottom";
+  #       keySequence = "Ctrl+End";
+  #       category = "split";
+  #       arguments = [ ];
+  #     };
+  #     "scroll to top" = {
+  #       action = "scrollToTop";
+  #       keySequence = "Ctrl+Home";
+  #       category = "split";
+  #       arguments = [ ];
+  #     };
+  #     "show global search" = {
+  #       action = "showGlobalSearch";
+  #       keySequence = "Ctrl+Shift+F";
+  #       category = "split";
+  #       arguments = [ ];
+  #     };
+  #     "show search" = {
+  #       action = "showSearch";
+  #       keySequence = "Ctrl+F";
+  #       category = "split";
+  #       arguments = [ ];
+  #     };
+  #     "emote picker" = {
+  #       action = "openEmotesPopup";
+  #       keySequence = "Ctrl+E";
+  #       category = "splitInput";
+  #       arguments = [ ];
+  #     };
+  #     "go to end of input" = {
+  #       action = "cursorToEnd";
+  #       keySequence = "End";
+  #       category = "splitInput";
+  #       arguments = [
+  #         "withoutSelection"
+  #       ];
+  #     };
+  #     "go to end of input with selection" = {
+  #       action = "cursorToEnd";
+  #       keySequence = "Shift+End";
+  #       category = "splitInput";
+  #       arguments = [
+  #         "withSelection"
+  #       ];
+  #     };
+  #     "go to start of input" = {
+  #       action = "cursorToStart";
+  #       keySequence = "Home";
+  #       category = "splitInput";
+  #       arguments = [
+  #         "withoutSelection"
+  #       ];
+  #     };
+  #     "go to start of input with selection" = {
+  #       action = "cursorToStart";
+  #       keySequence = "Shift+Home";
+  #       category = "splitInput";
+  #       arguments = [
+  #         "withSelection"
+  #       ];
+  #     };
+  #     "next message" = {
+  #       action = "nextMessage";
+  #       keySequence = "Down";
+  #       category = "splitInput";
+  #       arguments = [ ];
+  #     };
+  #     "previous message" = {
+  #       action = "previousMessage";
+  #       keySequence = "Up";
+  #       category = "splitInput";
+  #       arguments = [ ];
+  #     };
+  #     "send message" = {
+  #       action = "sendMessage";
+  #       keySequence = "Return";
+  #       category = "splitInput";
+  #       arguments = [ ];
+  #     };
+  #     "send message and keep text" = {
+  #       action = "sendMessage";
+  #       keySequence = "Ctrl+Return";
+  #       category = "splitInput";
+  #       arguments = [
+  #         "keepInput"
+  #       ];
+  #     };
+  #     "new popup window" = {
+  #       action = "popup";
+  #       keySequence = "Ctrl+N";
+  #       category = "window";
+  #       arguments = [
+  #         "split"
+  #       ];
+  #     };
+  #     "new popup window from tab" = {
+  #       action = "popup";
+  #       keySequence = "Ctrl+Shift+N";
+  #       category = "window";
+  #       arguments = [
+  #         "window"
+  #       ];
+  #     };
+  #     "new split" = {
+  #       action = "newSplit";
+  #       keySequence = "Ctrl+T";
+  #       category = "window";
+  #       arguments = [ ];
+  #     };
+  #     "new tab" = {
+  #       action = "newTab";
+  #       keySequence = "Ctrl+Shift+T";
+  #       category = "window";
+  #       arguments = [ ];
+  #     };
+  #     "open quick switcher" = {
+  #       action = "openQuickSwitcher";
+  #       keySequence = "Ctrl+K";
+  #       category = "window";
+  #       arguments = [ ];
+  #     };
+  #     "open settings" = {
+  #       action = "openSettings";
+  #       keySequence = "Ctrl+P";
+  #       category = "window";
+  #       arguments = [ ];
+  #     };
+  #     "remove tab" = {
+  #       action = "removeTab";
+  #       keySequence = "Ctrl+Shift+W";
+  #       category = "window";
+  #       arguments = [ ];
+  #     };
+  #     "reopen split" = {
+  #       action = "reopenSplit";
+  #       keySequence = "Ctrl+G";
+  #       category = "window";
+  #       arguments = [ ];
+  #     };
+  #     "select last tab" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+9";
+  #       category = "window";
+  #       arguments = [
+  #         "last"
+  #       ];
+  #     };
+  #     "select next tab" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+Tab";
+  #       category = "window";
+  #       arguments = [
+  #         "next"
+  #       ];
+  #     };
+  #     "select previous tab" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+Shift+Tab";
+  #       category = "window";
+  #       arguments = [
+  #         "previous"
+  #       ];
+  #     };
+  #     "select tab #1" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+1";
+  #       category = "window";
+  #       arguments = [
+  #         "0"
+  #       ];
+  #     };
+  #     "select tab #2" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+2";
+  #       category = "window";
+  #       arguments = [
+  #         "1"
+  #       ];
+  #     };
+  #     "select tab #3" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+3";
+  #       category = "window";
+  #       arguments = [
+  #         "2"
+  #       ];
+  #     };
+  #     "select tab #4" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+4";
+  #       category = "window";
+  #       arguments = [
+  #         "3"
+  #       ];
+  #     };
+  #     "select tab #5" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+5";
+  #       category = "window";
+  #       arguments = [
+  #         "4"
+  #       ];
+  #     };
+  #     "select tab #6" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+6";
+  #       category = "window";
+  #       arguments = [
+  #         "5"
+  #       ];
+  #     };
+  #     "select tab #7" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+7";
+  #       category = "window";
+  #       arguments = [
+  #         "6"
+  #       ];
+  #     };
+  #     "select tab #8" = {
+  #       action = "openTab";
+  #       keySequence = "Ctrl+8";
+  #       category = "window";
+  #       arguments = [
+  #         "7"
+  #       ];
+  #     };
+  #     "toggle live tabs only" = {
+  #       action = "setTabVisibility";
+  #       keySequence = "Ctrl+Shift+L";
+  #       category = "window";
+  #       arguments = [
+  #         "toggleLiveOnly"
+  #       ];
+  #     };
+  #     "toggle local r9k" = {
+  #       action = "toggleLocalR9K";
+  #       keySequence = "Ctrl+H";
+  #       category = "window";
+  #       arguments = [ ];
+  #     };
+  #     "toggle tab visibility" = {
+  #       action = "setTabVisibility";
+  #       keySequence = "Ctrl+U";
+  #       category = "window";
+  #       arguments = [
+  #         "toggle"
+  #       ];
+  #     };
+  #     "zoom in" = {
+  #       action = "zoom";
+  #       keySequence = "Ctrl++";
+  #       category = "window";
+  #       arguments = [
+  #         "in"
+  #       ];
+  #     };
+  #     "zoom out" = {
+  #       action = "zoom";
+  #       keySequence = "Ctrl+-";
+  #       category = "window";
+  #       arguments = [
+  #         "out"
+  #       ];
+  #     };
+  #     "zoom reset" = {
+  #       action = "zoom";
+  #       keySequence = "Ctrl+0";
+  #       category = "window";
+  #       arguments = [
+  #         "reset"
+  #       ];
+  #     };
+  #   };
+  #   misc = {
+  #     currentVersion = "2.5.1";
+  #     lockNotebookLayout = false;
+  #   };
+  #   ui = {
+  #     lastSelectChannelTab = 0;
+  #     lastSelectIrcConn = -1;
+  #   };
+  #   appearance = {
+  #     theme = {
+  #       name = "Black";
+  #     };
+  #     tabVisibility = 1;
+  #     smoothScrollingNewMessages = true;o
+  #     currentFontFamily = rice.font.base.name;
+  #     messages = {
+  #       alternateMessageBackground = true;
+  #       showTimestamps = false;
+  #       timestampFormat = "h =mm";
+  #       separateMessages = true;
+  #       lastMessagePattern = 10;
+  #       lastMessageColor = "#ff7f0002";
+  #       usernameDisplayMode = 1;
+  #     };
+  #     currentFontSize = 12;
+  #     splitheader = {
+  #       showUptime = true;
+  #       showViewerCount = true;
+  #       showGame = true;
+  #       showTitle = true;
+  #     };
+  #     boldScale = 63.0;
+  #   };
+  #   accounts = secrets.chatterino.accounts;
+  #   behaviour = {
+  #     pauseOnHoverDuration = 5.0;
+  #     usernameRightClickBehavior = 0;
+  #     usernameRightClickBehaviorWithModifier = 1;
+  #     showJoins = false;
+  #   };
+  #   highlighting = {
+  #     selfMessageHighlight = {
+  #       enabled = true;
+  #       color = "#73008cff";
+  #     };
+  #     badges = [
+  #       {
+  #         name = "broadcaster";
+  #         displayName = "Broadcaster";
+  #         showInMentions = false;
+  #         alert = false;
+  #         sound = false;
+  #         soundUrl = "";
+  #         color = "#7f7f3f49";
+  #       }
+  #       {
+  #         name = "admin";
+  #         displayName = "Admin";
+  #         showInMentions = false;
+  #         alert = false;
+  #         sound = false;
+  #         soundUrl = "";
+  #         color = "#7f7f3f49";
+  #       }
+  #       {
+  #         name = "staff";
+  #         displayName = "Staff";
+  #         showInMentions = false;
+  #         alert = false;
+  #         sound = false;
+  #         soundUrl = "";
+  #         color = "#7f7f3f49";
+  #       }
+  #       {
+  #         name = "moderator";
+  #         displayName = "Moderator";
+  #         showInMentions = false;
+  #         alert = false;
+  #         sound = false;
+  #         soundUrl = "";
+  #       }
+  #       {
+  #         name = "vip";
+  #         displayName = "VIP";
+  #         showInMentions = false;
+  #         alert = false;
+  #         sound = false;
+  #         soundUrl = "";
+  #         color = "#7f7f3578";
+  #       }
+  #     ];
+  #   };
+  #   emotes = {
+  #     removeSpacesBetweenEmotes = false;
+  #     showUnlistedSevenTVEmotes = true;
+  #   };
+  #   similarity = {
+  #     similarityEnabled = false;
+  #     hideSimilar = false;
+  #     hideSimilarMaxDelay = 30;
+  #     hideSimilarMaxMessagesToCheck = 5;
+  #   };
+  # };
 
 
 
   home.file.".local/share/chatterino/Settings/window-layout.json".text = builtins.toJSON {
-    "windows" = [
+    windows = [
       {
-        "emotePopup" = {
-          "x" = 0;
-          "y" = 0;
+        emotePopup = {
+          x = 0;
+          y = 0;
         };
-        "height" = 569;
-        "state" = "maximized";
-        "tabs" = map tabber channels;
-        "type" = "main";
-        "width" = 943;
-        "x" = 0;
-        "y" = 0;
+        height = 569;
+        state = "maximized";
+        tabs = map tabber channels;
+        type = "main";
+        width = 943;
+        x = 0;
+        y = 0;
       }
     ];
   };
diff --git a/home-modules/fish.nix b/home-modules/fish.nix
index 9cf9d44..4c13a14 100755
--- a/home-modules/fish.nix
+++ b/home-modules/fish.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, rice, user, allowed, secrets, ... }: 
+{ pkgs, lib, rice, user, ... }: 
 lib.mkIf (user != "tv")
 {
   home.packages = with pkgs; [
@@ -24,11 +24,11 @@ lib.mkIf (user != "tv")
         $(echo -e "$logo" | sed -n 3p): $(cat /etc/*-release | grep PRETTY_NAME | cut -c 14- | rev | cut -c 2- | rev)
         $(echo -e "$logo" | sed -n 4p): ''${XDG_CURRENT_DESKTOP^}
         $(echo -e "$logo" | sed -n 5p): ''${TERM^}
-        $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ')
+        $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ' | sed -E 's-(.*?), version (.*?)\(.*-\1 \2-g')
         $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev)
         $(echo -e "$logo" | sed -n 8p): ''$(uname -r)
-        $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1)
-        $(echo -e "$logo" | sed -n 10p): $(yazi --version)
+        $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g')
+        $(echo -e "$logo" | sed -n 10p): $(yazi --version | yazi --version | sed -E 's-(.*?) \(.*-\1-g')
         $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1)
         "
         echo -e "$msg"
diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix
index 26aa8cc..2b5a063 100755
--- a/home-modules/hyprland.nix
+++ b/home-modules/hyprland.nix
@@ -291,6 +291,7 @@ lib.mkIf (user != "tv")
         "float, title:^(wlogout)$"
         "float, imv"
         "float, title:^(Page Info — .*)$"
+        "float, title:^(Compact folders)$"
         "tile, sent"
         "fullscreen, wlogout"
         "workspace 14, lutris"
@@ -381,9 +382,9 @@ lib.mkIf (user != "tv")
         # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace""
         "SUPER,       T, exec, kitty"
         "SUPER SHIFT, T, exec, kitty -e sh -c 'ssh nxace'"
-        "SUPER,       Z, swapactiveworkspaces, HDMI-A-1 HDMI-A-2"
+        # "SUPER,       Z, "
         "SUPER,       U, exec, thunderbird "
-        # "SUPER,       I,  "
+        "SUPER,       I, exec, kitty -e fish -c 'hx ~/nix-dots/ && fish'"
         "SUPER,       O, exec, obsidian "
         "SUPER,       P, pin "
         # "SUPER,       Ü,"
@@ -398,13 +399,11 @@ lib.mkIf (user != "tv")
         "SUPER,       S, exec, spotify"
         "SUPER,       D, exec, vesktop"
         "SUPER,       F, fullscreen"
-        "SUPER,       G, exec, xrandr --verbose --output 'DP-1' --primary && lutris"
-        "SUPER SHIFT, G, exec, /home/nx2/scripts/cursor-lock-toggle.sh"
-        # "SUPER SHIFT CTRL, G, exec, /home/nx2/scripts/disable-side-monitors.sh"
-        "SUPER,       H, exec, chatterino"
-        "SUPER,       J, focusmonitor, $left"
-        "SUPER,       K, focusmonitor, $main"
-        "SUPER,       L, focusmonitor, $right"
+        # "SUPER,       G,"
+        "SUPER,       H, movefocus, l"
+        "SUPER,       J, movefocus, d"
+        "SUPER,       K, movefocus, u"
+        "SUPER,       L, movefocus, r"
         # "SUPER,       Ö,"
         # "SUPER,       Ä,"
         # "SUPER,       #,"
@@ -417,9 +416,9 @@ lib.mkIf (user != "tv")
         "SUPER,       Y, submap, scrR"
         "SUPER,       X, exec, pkill wlogout || wlogout --protocol layer-shell -b 3"
         # "SUPER,       C, exec, /home/nx2/scripts/quickconfig/quickconfig.sh "
-        "SUPER,       C, exec, codium,"
+        "SUPER,       C, exec, chatterino"
         "SUPER,       V, togglefloating, "
-        "SUPER,       B, exec, bitwarden-desktop"
+        "SUPER,       B, exec, bitwarden"
         "SUPER,       N, togglesplit"
         # "SUPER,       M, exec, /home/nx2/scripts/meme-full-screen/meme-full-screen.sh "
         # "SUPER,       comma, exec, /home/nx2/scripts/change-language.sh"
diff --git a/home-modules/programming/gleam.nix b/home-modules/programming/gleam.nix
index 841a4b6..8d6ba8f 100644
--- a/home-modules/programming/gleam.nix
+++ b/home-modules/programming/gleam.nix
@@ -2,5 +2,6 @@
 {
   home.packages = with pkgs; [
     gleam
+    erlang
   ];
 }
diff --git a/system-modules/fonts.nix b/system-modules/fonts.nix
new file mode 100644
index 0000000..b2e1661
--- /dev/null
+++ b/system-modules/fonts.nix
@@ -0,0 +1,15 @@
+{ pkgs, ... }:
+{
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    newcomputermodern
+    atkinson-hyperlegible
+    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+  ] ++ (with rice.font; [
+    base.package
+    code.package
+  ]) ++ (with pkgs-unstable; [
+  ]);
+}
diff --git a/system-modules/gpg.nix b/system-modules/gpg.nix
index 2b0b108..a483e0b 100644
--- a/system-modules/gpg.nix
+++ b/system-modules/gpg.nix
@@ -3,6 +3,7 @@
   environment.systemPackages = with pkgs; [
     gnupg
   ];
+
   programs.gnupg = {
     dirmngr.enable = true;
     agent = {

From de3973b4e4d8dd625bdbb10e066ea1b515d74fe1 Mon Sep 17 00:00:00 2001
From: "Lennart J. Kurzweg (Nx2)" <git@nx2.site>
Date: Thu, 20 Jun 2024 20:44:30 +0200
Subject: [PATCH 4/4] font.nix syntax fix

---
 system-modules/fonts.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/system-modules/fonts.nix b/system-modules/fonts.nix
index b2e1661..7d32cd4 100644
--- a/system-modules/fonts.nix
+++ b/system-modules/fonts.nix
@@ -1,4 +1,9 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  # pkgs-unstable,
+  rice,
+  ...
+}:
 {
   fonts.packages = with pkgs; [
     noto-fonts
@@ -10,6 +15,6 @@
   ] ++ (with rice.font; [
     base.package
     code.package
-  ]) ++ (with pkgs-unstable; [
+  # ]) ++ (with pkgs-unstable; [
   ]);
 }