Merge branch 'master' of ssh://git.nx2.site:20022/nx2/dotfiles

configuration.nix

@@ -1,6 +1,4 @@
-{  pkgs, pkgs-unstable, rice, inputs, ... }:
+{  pkgs, pkgs-unstable, inputs, ... }:
-let
-in
 {
   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

flake.lock

@@ -42,11 +42,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1717931498,
+        "lastModified": 1718337800,
-        "narHash": "sha256-8j6h9gZmAngPXLFRRtd8ySRb0I43f0rRW0puU8IBwKA=",
+        "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,
+        "lastModified": 1718365532,
-        "narHash": "sha256-0fPh9sFwzWbvDTTY6omTrYk2r9nBz7e4AzGH6HlRLCo=",
+        "narHash": "sha256-2wd1ytcpvnBlhTxP1O/G4PJSY3fKuTxQLDxp+kFP4Sg=",
         "ref": "refs/heads/main",
-        "rev": "121c6ac3eae1601a1498e52a9be7030ebfed242c",
+        "rev": "a9d53a2252f7ec084e2487d18777e2df01c8c351",
-        "revCount": 4788,
+        "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,
+        "lastModified": 1718111105,
-        "narHash": "sha256-chdXRv+JoiLQ9xwwq4q14X14em94VQaxk+tzkxRnQ5c=",
+        "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,
+        "lastModified": 1717881852,
-        "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=",
+        "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,
+        "lastModified": 1717974879,
-        "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=",
+        "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,
+        "lastModified": 1718160348,
-        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
+        "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
+        "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
         "type": "github"
       },
       "original": {
@@ -431,11 +466,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1717696253,
+        "lastModified": 1718208800,
-        "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
+        "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,
+        "lastModified": 1718137936,
-        "narHash": "sha256-OQTjaEZcByyVmHwJlKp/8SE9ikC4w+mFd3X0jJs6wiA=",
+        "narHash": "sha256-psA+1Q5fPaK6yI3vzlLINNtb6EeXj111zQWnZYyJS9c=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "f0922ad001829b400f0160ba85b47d252fa3d925",
+        "rev": "c279dec105dd53df13a5e57525da97905cc0f0d6",
         "type": "github"
       },
       "original": {
@@ -580,11 +615,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716290197,
+        "lastModified": 1717918856,
-        "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=",
+        "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438",
+        "rev": "72907822c19afc0983c69d59d299204381623725",
         "type": "github"
       },
       "original": {

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;
           };

home-modules/bitwarden.nix

@@ -6,28 +6,28 @@ lib.mkIf (host != "NxACE")
     bitwarden-cli
   ];
 
-  home.file.".config/Bitwarden CLI/data.json".text = ''
+  # home.file.".config/Bitwarden CLI/data.json".text = ''
-    {
+  #   {
-      "stateVersion": 9,
+  #     "stateVersion": 9,
-      "global": {
+  #     "global": {
-        "theme": "system",
+  #       "theme": "system",
-        "window": {},
+  #       "window": {},
-        "environmentUrls": {
+  #       "environmentUrls": {
-          "base": "https://pw.nx2.site",
+  #         "base": "https://pw.nx2.site",
-          "api": null,
+  #         "api": null,
-          "identity": null,
+  #         "identity": null,
-          "webVault": null,
+  #         "webVault": null,
-          "icons": null,
+  #         "icons": null,
-          "notifications": null,
+  #         "notifications": null,
-          "events": null,
+  #         "events": null,
-          "keyConnector": null
+  #         "keyConnector": null
-        },
+  #       },
-        "region": "Self-hosted",
+  #       "region": "Self-hosted",
-        "installedVersion": "2023.12.0"
+  #       "installedVersion": "2023.12.0"
-      }
+  #     }
-    }
+  #   }
-  '';
+  # '';
 
-  home.sessionVariables.BW_SESSION = secrets.bitwarden.env.bw-session;
+  # home.sessionVariables.BW_SESSION = secrets.bitwarden.env.bw-session;
 
 }

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 = {
+  accounts.email.accounts = 
-    "gamil-online" = {
+  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" ];
-    #   };
-    # };
   };
 }
 

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

home-modules/fish.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, system, 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 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g')
-        $(echo -e "$logo" | sed -n 10p): $(yazi --version)
+        $(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"
@@ -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

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.list" = accent.bright; 
-        "markup.quote" = foreground; 
+        "markup.quote" = weird.bright; 
-        "markup.raw" = foreground; 
+        "markup.raw" = special.bright; 
         "markup.strikethrough" = {
           "modifiers" = [ "crossed_out" ];
         };

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
+    hyprlock
-    pkgs-unstable.hypridle
+    hypridle
 
-    pkgs.grim
+    grim
-    pkgs.slurp
+    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 = [
@@ -261,6 +264,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"
@@ -287,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"
@@ -377,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,       Ü,"
@@ -394,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,       G,"
-        "SUPER SHIFT, G, exec, /home/nx2/scripts/cursor-lock-toggle.sh"
+        "SUPER,       H, movefocus, l"
-        # "SUPER SHIFT CTRL, G, exec, /home/nx2/scripts/disable-side-monitors.sh"
+        "SUPER,       J, movefocus, d"
-        "SUPER,       H, exec, chatterino"
+        "SUPER,       K, movefocus, u"
-        "SUPER,       J, focusmonitor, $left"
+        "SUPER,       L, movefocus, r"
-        "SUPER,       K, focusmonitor, $main"
-        "SUPER,       L, focusmonitor, $right"
         # "SUPER,       Ö,"
         # "SUPER,       Ä,"
         # "SUPER,       #,"
@@ -413,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"

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
+    defaultTimeout = 5000; # in ms
-    backgroundColor = "#${rice.color.background}";
+    backgroundColor = color.background;
-    textColor = "#${rice.color.foreground}";
+    textColor = color.foreground;
-    borderColor = "#${rice.color.border}";
+    borderColor = color.border;
-    font = rice.font.code.name2;
+    borderSize = border-width;
+    font = font.code.name2;
+    borderRadius = rounding;
+    anchor = "bottom-right";
+    margin = builtins.toString (gap-size * 2) ;
   };
 }

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";
+    };
+  };
+}

home-modules/programming/gleam.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    gleam
+    erlang
+  ];
+}

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;
+    '';  
+  };
+}

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

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,7 +49,9 @@
     ./home-modules/pandoc.nix
 
     ./home-modules/programming/python.nix
+    ./home-modules/programming/c.nix
     ./home-modules/programming/node.nix
+    ./home-modules/programming/gleam.nix
 
     ./home-modules/color-pallete.nix
   ];
@@ -60,7 +63,6 @@
     permittedInsecurePackages = allowed.inecure-packages;
   };
   home.packages = with pkgs; [
-    firefox
     chromium 
     
     zathura 
@@ -88,8 +90,9 @@
     gsettings-desktop-schemas
     wl-clipboard
     xclip
+    xournal
   ] ++ (with pkgs-unstable; [
-    # firefox
+    firefox
   ]) ++ (if host != "NxACE" then (with pkgs; [
     signal-desktop
     obsidian

system-modules/fonts.nix

@@ -0,0 +1,20 @@
+{
+  pkgs,
+  # pkgs-unstable,
+  rice,
+  ...
+}:
+{
+  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; [
+  ]);
+}

system-modules/gpg.nix

@@ -3,6 +3,7 @@
   environment.systemPackages = with pkgs; [
     gnupg
   ];
+
   programs.gnupg = {
     dirmngr.enable = true;
     agent = {