modules/desktop-environment/eduroam.nix

@@ -1,5 +1,5 @@
 # Thanks @ kloenk (@kloenk@catcatnya.com) for making this for me at MRMCD 2024 :33
-{pkgs-stable, ...}: let
+{pkgs, ...}: let
   caDir = "/var/lib/easyroam";
   uuid = "821ad781-76a3-447f-a2e8-c7f18a1df3bc";
 in {
@@ -7,7 +7,7 @@ in {
     requires = ["NetworkManager.service"];
     after = ["NetworkManager.service"];
     requiredBy = ["network-online.target"];
-    path = with pkgs-stable; [networkmanager openssl gnused];
+    path = with pkgs; [networkmanager openssl gnused];
     script = ''
       set -x
       openssl pkcs12 -password pass: -in ${caDir}/my_easyroam_cert.p12 -legacy -nokeys | openssl x509 > ${caDir}/easyroam_client_cert.pem

modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck

@@ -8,7 +8,7 @@
   :exclusive true
   :geometry (geometry
               :width "100%"
-              :height "33px"
+              :height "32px"
               :anchor "bottom center")
   (bottomBar))
 

modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck

@@ -9,7 +9,7 @@
   :exclusive true
   :geometry (geometry
               :width "100%"
-              :height "33px"
+              :height "32px"
               :anchor "top center")
   (topBar))
 

modules/desktop-environment/home/typst.nix

@@ -8,14 +8,12 @@
       domain = "forge.katzen.cafe";
       owner = "schrottkatze";
       repo = "typst-configs";
-      rev = "569cd8525a85878140baf5952597f27fd7ea51d3";
+      rev = "3a09cd374f0508c8e0c5d95f5ad7358adc50bafa";
-      sha256 = "sha256-4pAammwrFGhpSquEsh4QSd8Hw/ioHm3fMiC5oqNgbAQ=";
     };
-    flow = pkgs.fetchFromGitHub {
+    flow = pkgs.fetchFromGithub {
       owner = "MultisampledNight";
       repo = "flow";
       rev = "f5c653c706d80145165ec684b217b803a0246e8c";
-      sha256 = "sha256-tXfogxo1DGmsrwjOhF2h+60825P6NVcgQGN6Q1tspZA=";
     };
   };
   mkTypstPath = name: ".local/share/typst/packages/local/${name}/0.1.0";

modules/desktop/fonts.nix

@@ -1,6 +1,6 @@
 {pkgs, ...}: {
   fonts.packages = with pkgs; [
-    nerd-fonts.fira-code
+    (nerdfonts.override {fonts = ["FiraCode" "AnonymousPro"];})
     google-fonts
     montserrat
     noto-fonts

modules/shell/direnv.nix

@@ -2,6 +2,7 @@
   home-manager.users.jade = {pkgs, ...}: {
     programs.direnv = {
       enable = true;
+      nix-direnv.enable = true;
     };
   };
 }

modules/shell/tty.nix

@@ -59,7 +59,7 @@ in {
     fonts = [
       {
         name = "FiraCode Nerd Font";
-        package = pkgs.nerd-fonts.fira-code;
+        package = pkgs.nerdfonts.override {fonts = ["FiraCode"];};
       }
     ];
     extraConfig = "font-size=14";

other/config.nu

@@ -271,7 +271,7 @@ $env.config = {
     render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt.
 
     hooks: {
-        pre_prompt: []
+        pre_prompt: { null }
         pre_execution: [{ $env.CMD_COUNT = $env.CMD_COUNT + 1; }] # run before the repl input is run
         env_change: {
             PWD: [{|before, after| null }] # run if the PWD environment is different since the last repl input

other/scripts/desktop/shell-startup.nu

@@ -39,10 +39,10 @@ def flag [
 
   let amount = $rest / 2;
 
-  $cols = ($cols | update 0 { $in | update width {|w| (($w.width | into int) + $amount) } } | update $last { $in | update width {|w| ($w.width + $amount) } });
+  $cols = ($cols | update 0 { $in | update width {|w| ($w.width + $amount) } } | update $last { $in | update width {|w| ($w.width + $amount) } });
 
   $cols | each {|col| 
-    $character | std repeat ($col.width | into int) | prepend (ansi {fg: $"#($col.color)" }) | str join
+    $character | std repeat $col.width | prepend (ansi {fg: $"#($col.color)" }) | str join
   } | prepend (ansi attr_bold) | append (ansi reset) | str join
 }
 
@@ -51,14 +51,10 @@ def main [] {
   let next_events = open ~/Docs/dates.csv
     | update datetime {|ev| $ev.datetime | into datetime }
     | sort-by datetime 
-    | filter {|ev| ($ev.datetime > (date now))};
+    | filter {|ev| ($ev.datetime > (date now))}
-
+    | first
-  let evstr = if ($next_events | is-not-empty) {
+    | each {|ev| $"(ansi attr_bold)($ev.event)(ansi reset) in (ansi attr_bold)(tfmt ($ev.datetime - (date now)))s(ansi reset)" };
-    let ev = $next_events | first;
+  print $"Hi jade, you're on HRT for (ansi reset)(ansi attr_bold)((date now) - ('2024-02-18T20:53' | into datetime) | format duration month)s(ansi reset) now! | Next Event: ($next_events)";
-    $" | Next Event: (ansi attr_bold)($ev.event)(ansi reset) in (ansi attr_bold)(tfmt ($ev.datetime - (date now)))s(ansi reset)"
-  } else "";
-
-  print $"Hi jade, you're on HRT for (ansi reset)(ansi attr_bold)((date now) - ('2024-02-18T20:53' | into datetime) | format duration month)s(ansi reset) now!($evstr)";
 }
 
 def tfmt [dur: duration] {