From 9a23089b2365e8391c32a3f8379e8810ef80c4ce Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 1 Jan 2025 03:12:41 +0100 Subject: [PATCH 1/8] update nerd fonts --- modules/desktop/fonts.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix index cbb67d1..81f6c8c 100644 --- a/modules/desktop/fonts.nix +++ b/modules/desktop/fonts.nix @@ -1,6 +1,6 @@ {pkgs, ...}: { fonts.packages = with pkgs; [ - (nerdfonts.override {fonts = ["FiraCode" "AnonymousPro"];}) + nerd-fonts.fira-code google-fonts montserrat noto-fonts From e16b9be12059ea31538c3844bb0316194dc574ff Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 1 Jan 2025 03:13:45 +0100 Subject: [PATCH 2/8] update eduroam thing to use stable --- modules/desktop-environment/eduroam.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/desktop-environment/eduroam.nix b/modules/desktop-environment/eduroam.nix index 45c2c5c..d6bc3db 100644 --- a/modules/desktop-environment/eduroam.nix +++ b/modules/desktop-environment/eduroam.nix @@ -1,5 +1,5 @@ # Thanks @ kloenk (@kloenk@catcatnya.com) for making this for me at MRMCD 2024 :33 -{pkgs, ...}: let +{pkgs-stable, ...}: 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; [networkmanager openssl gnused]; + path = with pkgs-stable; [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 From 1e19aa996bcb7e000ea8a31e221725f88a53e53c Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 1 Jan 2025 03:14:19 +0100 Subject: [PATCH 3/8] update typst things --- modules/desktop-environment/home/typst.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/desktop-environment/home/typst.nix b/modules/desktop-environment/home/typst.nix index f60ed7c..c4ab6c1 100644 --- a/modules/desktop-environment/home/typst.nix +++ b/modules/desktop-environment/home/typst.nix @@ -8,12 +8,14 @@ domain = "forge.katzen.cafe"; owner = "schrottkatze"; repo = "typst-configs"; - rev = "3a09cd374f0508c8e0c5d95f5ad7358adc50bafa"; + rev = "569cd8525a85878140baf5952597f27fd7ea51d3"; + 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"; From db11ba184cd9b99a0444bb7b37118edd646935d5 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 1 Jan 2025 03:15:13 +0100 Subject: [PATCH 4/8] update height of bars --- .../home/panels/eww/configDir/bottomBar/bottomBar.yuck | 2 +- .../home/panels/eww/configDir/topBar/topBar.yuck | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck index 611590e..fd0bcbe 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck +++ b/modules/desktop-environment/home/panels/eww/configDir/bottomBar/bottomBar.yuck @@ -8,7 +8,7 @@ :exclusive true :geometry (geometry :width "100%" - :height "32px" + :height "33px" :anchor "bottom center") (bottomBar)) diff --git a/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck b/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck index bf20581..a2135cc 100644 --- a/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck +++ b/modules/desktop-environment/home/panels/eww/configDir/topBar/topBar.yuck @@ -9,7 +9,7 @@ :exclusive true :geometry (geometry :width "100%" - :height "32px" + :height "33px" :anchor "top center") (topBar)) From 554b573699512b7c3565183242516994256022ca Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 1 Jan 2025 03:15:29 +0100 Subject: [PATCH 5/8] remove nix-direnv --- modules/shell/direnv.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/shell/direnv.nix b/modules/shell/direnv.nix index c5f22ff..daa3707 100644 --- a/modules/shell/direnv.nix +++ b/modules/shell/direnv.nix @@ -2,7 +2,6 @@ home-manager.users.jade = {pkgs, ...}: { programs.direnv = { enable = true; - nix-direnv.enable = true; }; }; } From 78deecc427545711366bab54795fecab9927ac85 Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 1 Jan 2025 03:15:45 +0100 Subject: [PATCH 6/8] update tty font package thingy --- modules/shell/tty.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/shell/tty.nix b/modules/shell/tty.nix index 3070907..2213f22 100644 --- a/modules/shell/tty.nix +++ b/modules/shell/tty.nix @@ -59,7 +59,7 @@ in { fonts = [ { name = "FiraCode Nerd Font"; - package = pkgs.nerdfonts.override {fonts = ["FiraCode"];}; + package = pkgs.nerd-fonts.fira-code; } ]; extraConfig = "font-size=14"; From f8a322ca8e1b906c8d4e1de8cd6d55687d45ad8b Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 1 Jan 2025 03:15:54 +0100 Subject: [PATCH 7/8] update nu config --- other/config.nu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/other/config.nu b/other/config.nu index b03a517..6537149 100644 --- a/other/config.nu +++ b/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: { null } + pre_prompt: [] 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 From 96a2acd8cde17308204548a07d2f362d642cf51b Mon Sep 17 00:00:00 2001 From: Schrottkatze Date: Wed, 1 Jan 2025 03:17:22 +0100 Subject: [PATCH 8/8] fix shell startup shit --- other/scripts/desktop/shell-startup.nu | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/other/scripts/desktop/shell-startup.nu b/other/scripts/desktop/shell-startup.nu index debcf05..133f149 100644 --- a/other/scripts/desktop/shell-startup.nu +++ b/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 + $amount) } } | update $last { $in | update width {|w| ($w.width + $amount) } }); + $cols = ($cols | update 0 { $in | update width {|w| (($w.width | into int) + $amount) } } | update $last { $in | update width {|w| ($w.width + $amount) } }); $cols | each {|col| - $character | std repeat $col.width | prepend (ansi {fg: $"#($col.color)" }) | str join + $character | std repeat ($col.width | into int) | prepend (ansi {fg: $"#($col.color)" }) | str join } | prepend (ansi attr_bold) | append (ansi reset) | str join } @@ -51,10 +51,14 @@ 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))} - | first - | each {|ev| $"(ansi attr_bold)($ev.event)(ansi reset) in (ansi attr_bold)(tfmt ($ev.datetime - (date now)))s(ansi reset)" }; - 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)"; + | filter {|ev| ($ev.datetime > (date now))}; + + let evstr = if ($next_events | is-not-empty) { + let ev = $next_events | first; + $" | 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] {