From 7565b3163a5824da0e40956c69696b517344f23b Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Sun, 31 Aug 2025 21:25:28 +0200 Subject: [PATCH 01/16] hyperpanel++ --- home-modules/bar/hyprpanel.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/home-modules/bar/hyprpanel.nix b/home-modules/bar/hyprpanel.nix index c2de86c..a21eb02 100644 --- a/home-modules/bar/hyprpanel.nix +++ b/home-modules/bar/hyprpanel.nix @@ -75,7 +75,7 @@ "bar.workspaces.applicationIconEmptyWorkspace" = ""; "bar.workspaces.applicationIconOncePerWorkspace" = false; - "bar.workspaces.numbered_active_indicator" = "underline"; + "bar.workspaces.numbered_active_indicator" = "color"; "bar.workspaces.scroll_speed" = 1; "bar.workspaces.showAllActive" = false; "bar.workspaces.showApplicationIcons" = true; @@ -259,10 +259,11 @@ "theme.bar.buttons.workspaces.background" = background; "theme.bar.buttons.workspaces.border" = accent.base; "theme.bar.buttons.workspaces.hover" = foreground; - "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color" = accent.base; - "theme.bar.buttons.workspaces.numbered_active_highlight_padding" = "0.2em"; + "theme.bar.buttons.workspaces.numbered_active_highlighted" = accent.base; + "theme.bar.buttons.workspaces.numbered_active_highlighted_text_color" = accent.dark; + "theme.bar.buttons.workspaces.numbered_active_highlight_padding" = "0.4em"; "theme.bar.buttons.workspaces.numbered_active_underline_color" = accent.bright; - "theme.bar.buttons.workspaces.numbered_inactive_padding" = "0.2em"; + "theme.bar.buttons.workspaces.numbered_inactive_padding" = "0.4em"; "theme.bar.buttons.workspaces.occupied" = secondary.base; "theme.bar.buttons.workspaces.pill.width" = "4em"; "theme.bar.buttons.workspaces.smartHighlight" = true; From 03131c8a65cf32ec179cfce1f5f2a5b39a934ba4 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Sun, 31 Aug 2025 21:25:43 +0200 Subject: [PATCH 02/16] youtube rice --- home-modules/firefox.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index ca0dd51..03caadd 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -194,6 +194,21 @@ background-color: transparent !important; } } + @-moz-document domain(youtube.com) { + body, html, div#content, ytd-app, #frosted-glass.with-chipbar.ytd-app, ytd-shorts[is-dark] #cinematic-shorts-scrim.ytd-shorts { + background-color: transparent !important; + } + #background.ytd-masthead, div#background { + background-color: rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important; + backdrop-filter: blur(100px); + } + * { + --yt-spec-base-background: transparent; + --yt-spec-raised-background: rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important; + --yt-spec-menu-background: rgba(${rice.lib.hex-to-rgb-comma-string accent.dark}, ${builtins.toString rice.transparency}) !important; + --yt-spec-inverted-background: rgba(${rice.lib.hex-to-rgb-comma-string secondary.dark}, ${builtins.toString rice.transparency}) !important; + } + } @-moz-document domain(mynixos.com) { body, html { From 99b534a6a55d967e86b7d5c42f938e9bd7d3a7b3 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Sun, 31 Aug 2025 21:26:17 +0200 Subject: [PATCH 03/16] darker background in w2c --- home-modules/wallpaper-to-colors.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/wallpaper-to-colors.nix b/home-modules/wallpaper-to-colors.nix index 9e84206..6f042b4 100644 --- a/home-modules/wallpaper-to-colors.nix +++ b/home-modules/wallpaper-to-colors.nix @@ -139,7 +139,7 @@ weird = alter_hue(ilist=accent, hue=80) special = alter_hue(ilist=accent, hue=180) foreground = alter_l(accent, 0.9) - background = alter_l(accent, 0.1) + background = alter_l(accent, 0.05) d = { "base": { From f4f9e36b1697a08293eff5050825eef48350a592 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Sun, 31 Aug 2025 21:27:07 +0200 Subject: [PATCH 04/16] open firewall for ollama --- system-modules/networking.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/system-modules/networking.nix b/system-modules/networking.nix index 0092696..246a0f5 100644 --- a/system-modules/networking.nix +++ b/system-modules/networking.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }@all: with all; +{ config, pkgs, ... }@all: with all; { # sops.secrets = { # "wireless-networking.env" = {}; @@ -15,6 +15,7 @@ }; enableIPv6 = true; firewall.allowedTCPPorts = [ + (pkgs.lib.mkIf config.services.ollama.enable 11434) 80 443 8000 From 04b2b7da331b5a2e6aa1e153d25d3d07bf38a5bb Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Sun, 31 Aug 2025 21:27:26 +0200 Subject: [PATCH 05/16] nx_backup download function --- home-modules/fish.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/home-modules/fish.nix b/home-modules/fish.nix index afbf122..e6a721e 100644 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -110,6 +110,12 @@ mkdir $argv cd $argv ''; + nx_backup = let + destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/"; + in pkgs.lib.mkIf (hyper.host != "NxACE") '' + set RPATH (curl -s https://${hyper.domain}/latest-backup) + rsync -avz --info=progress2 -e "ssh -p ${builtins.toString secrets.ssh.port}" ${hyper.user}@ssh.${hyper.domain}:"$RPATH" ${destination} + ''; # gpg = ''; # set bold \e[1m # set green \e[32m From d0964c01a7e068df5b7d2fad29f8fe95f2e61271 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Sun, 31 Aug 2025 21:28:31 +0200 Subject: [PATCH 06/16] copyparty++ --- system-modules/nx2site/copyparty.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/system-modules/nx2site/copyparty.nix b/system-modules/nx2site/copyparty.nix index 93d97ca..a8dd8fe 100644 --- a/system-modules/nx2site/copyparty.nix +++ b/system-modules/nx2site/copyparty.nix @@ -8,16 +8,21 @@ package = pkgs.copyparty; openFilesLimit = 8192; settings = { - i = [ "0.0.0.0" "unix:770:copyparty:/dev/shm/party.sock" ]; + p = [ 3210 3211 ]; - no-reload = true; + i = [ "0.0.0.0" "unix:770:copyparty:/dev/shm/party.sock" ]; + name = "NxCopyParty"; + ignored-flag = false; - shr = "/shares"; - css-browser = "https://nx2.site/copyparty/extra-browser.css"; - theme = 6; - xff-hdr = "X-Forwarded-For"; # so that cpp knows the real client ip behind nginx. Must match with nginx config - rproxy = 1; + no-reload = true; no-robots = true; + + rproxy = 1; + xff-hdr = "X-Forwarded-For"; # so that cpp knows the real client ip behind nginx. Must match with nginx config + + shr = "/shares"; + css-browser = "https://${hyper.domain}/copyparty/extra-browser.css"; + theme = 6; }; accounts = { "${hyper.user}" = { From a2003bc5aaf00b324827425c0c23c87a95f199f1 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Sun, 31 Aug 2025 21:39:07 +0200 Subject: [PATCH 07/16] fix nginx redirects --- system-modules/nx2site/proxy.nix | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/system-modules/nx2site/proxy.nix b/system-modules/nx2site/proxy.nix index a8ab99a..9c620fc 100644 --- a/system-modules/nx2site/proxy.nix +++ b/system-modules/nx2site/proxy.nix @@ -90,24 +90,22 @@ default = true; listen = dl; locations = { - "/" = { - extraConfig = '' - index index.html; - ''; - }; - "~^(/ba)$" = { return = "301 /BA.pdf"; }; - "/.well-known/matrix/client" = { return = "502"; }; - "/.well-known/matrix/server" = { return = "502"; }; - "/phone" = { return = "301 /cards/phone"; }; - "/about-me" = { return = "301 /slides/about-me"; }; - "/about-this-site" = { return = "301 /slides/about-this-site"; }; - "/gpg" = { return = "301 /cards/gpg"; }; - "/contact" = { return = "301 /cards/contact"; }; + "/".extraConfig = '' + index index.html; + ''; + "~ ^(/.well-known/matrix/client)$".return = "502"; + "~ ^(/.well-known/matrix/server)$".return = "502"; + "~ ^(/phone)$".return = "301 /cards/phone"; + "~ ^(/about-me)$".return = "301 /slides/about-me"; + "~ ^(/about-this-site)$".return = "301 /slides/about-this-site"; + "~ ^(/gpg)$".return = "301 /cards/gpg"; + "~ ^(/contact)$".return = "301 /cards/contact"; + "~ ^(/ba)$".return = "301 /BA.pdf"; }; }; "matrix.${hyper.domain}" = { listen = dl; - locations = { "~.*" = { return = "502"; }; }; + locations."~.*".return = "502"; }; # "pw.${hyper.domain}" = vh // { # listen = dl; From 07c637749a7b420b358026e39284e9f326235d2b Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Sun, 31 Aug 2025 21:49:02 +0200 Subject: [PATCH 08/16] ace colors --- flake-modules/colors.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake-modules/colors.json b/flake-modules/colors.json index ea48ae1..61eecac 100644 --- a/flake-modules/colors.json +++ b/flake-modules/colors.json @@ -1,13 +1,13 @@ { "base": { - "foreground": "#dcd5f5", - "background": "#100929" + "foreground": "#fefefe", + "background": "#020202" }, "to_alter": { - "accent": "#765ad7", - "secondary": "#ce32ff", - "tertiary": "#879eaa", - "special": "#bad759", - "weird": "#d75991" + "accent": "#aaaaff", + "secondary": "#aaeeff", + "tertiary": "#aaffaa", + "special": "#aaffaa", + "weird": "#ffffaa" } } \ No newline at end of file From e98cc3f4c5515f1b309bef34a6ef0f1d4f764d76 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 1 Sep 2025 14:14:45 +0200 Subject: [PATCH 09/16] xps monitors --- home-modules/hyprland.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 05bf154..0e5cdfb 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -6,8 +6,9 @@ let terminal-exec = "ghostty --command="; monitors = { xps = { - main = { name = "eDP-1"; resolution = "1920x1200"; position = "0x1080"; scale = "1.0"; }; - second = { name = "desc:Sony SONY TV 0x01010101"; resolution = "1920x1080"; position = "0x0"; scale = "1.0"; }; + main = { name = "eDP-1"; resolution = "1920x1200"; position = "1920x1080"; scale = "1.0"; }; + second = { name = "DP-5"; resolution = "1920x1080"; position = "1920x0"; scale = "1.0"; }; + third = { name = "DP-6"; resolution = "1920x1080"; position = "0x0"; scale = "1.0"; }; }; north = { main = { name = "desc:Iiyama North America PL3270Q na"; resolution = "2560x1440"; position = "1920x0"; scale = "1.0"; }; @@ -51,6 +52,7 @@ in { if hyper.host == "NxXPS" then (with monitors.xps; [ "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}" "${second.name}, ${second.resolution}, ${second.position}, ${second.scale}" + "${third.name}, ${third.resolution}, ${third.position}, ${third.scale}" ]) else (if hyper.host == "NxNORTH" then (with monitors.north; [ "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}" "${left.name}, ${left.resolution}, ${left.position}, ${left.scale}" @@ -62,7 +64,7 @@ in { workspace = let d1 = if hyper.host == "NxXPS" then monitors.xps.main.name else (if hyper.host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name); d2 = if hyper.host == "NxXPS" then monitors.xps.second.name else (if hyper.host == "NxNORTH" then monitors.north.left.name else monitors.ace.main.name); - d3 = if hyper.host == "NxXPS" then monitors.xps.main.name else (if hyper.host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name); + d3 = if hyper.host == "NxXPS" then monitors.xps.third.name else (if hyper.host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name); # d3 = if hyper.host == "NxXPS" then monitors.xps.main.name else (if hyper.hyper.host == "NxNORTH" then monitors.north.right.name else monitors.ace.main.name); compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false"; in [ @@ -87,7 +89,7 @@ in { "28, monitor:${d2}" "29, monitor:${d2}" "20, monitor:${d2}, ${compact}" - "31, monitor:${d3}, default:${let x = if hyper.host == "NxNORTH" then "true" else "false"; in x}" + "31, monitor:${d3}, default:${let x = if hyper.host == "NxNORTH" then "true" else "false"; in x}, ${compact}" "32, monitor:${d3}" "33, monitor:${d3}" "34, monitor:${d3}" From 84f7003bb61f55703c58903faab21548f98ffff2 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 3 Sep 2025 15:48:51 +0200 Subject: [PATCH 10/16] fix caldav_event and submap hyprpanel --- home-modules/bar/hyprpanel.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/home-modules/bar/hyprpanel.nix b/home-modules/bar/hyprpanel.nix index a21eb02..128719d 100644 --- a/home-modules/bar/hyprpanel.nix +++ b/home-modules/bar/hyprpanel.nix @@ -24,12 +24,11 @@ hideOnEmpty = true; actions.onLeftClick = "menu:calendar"; }; - "custom/caldav_evnet" = { + "custom/caldav_event" = { execute = "caldav_event"; - executeOnAction = ""; - label = "{}"; - interval = 60000; - hideOnEmpty = true; + label = "󰃰 {}"; + interval = 1000; + hideOnEmpty = false; actions = {}; }; }; @@ -67,11 +66,14 @@ "bar.bluetooth.label" = true; - "bar.customModules.submap.enabledIcon" = "[󰧹]"; - "bar.customModules.submap.showSubmapName" = false; - "bar.customModules.submap.label" = false; - "bar.customModules.submap.icon" = true; "bar.customModules.submap.disabledIcon" = ""; + "bar.customModules.submap.disabledText" = ""; + "bar.customModules.submap.enabledIcon" = ""; + "bar.customModules.submap.enabledText" = "[SUBMAP]"; + "bar.customModules.submap.icon" = false; + "bar.customModules.submap.label" = true; + "bar.customModules.submap.showSubmapIcon" = false; + "bar.customModules.submap.showSubmapName" = false; "bar.workspaces.applicationIconEmptyWorkspace" = ""; "bar.workspaces.applicationIconOncePerWorkspace" = false; From 1da06c73d117e0f1e2e6016f77624e080e456218 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 3 Sep 2025 15:49:16 +0200 Subject: [PATCH 11/16] fix informatik moodle css --- home-modules/firefox.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index 03caadd..363e78a 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -226,7 +226,7 @@ background-color: transparent !important; } .bg-primary { - background-color: rgba(${rice.lib.hex-to-rgb-comma-string accent.base}, 0.5) !important! + background-color: rgba(${rice.lib.hex-to-rgb-comma-string accent.base},0.5) !important; } } From 9b999bae907e8331754aafe9d57240bb867c7c1a Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 3 Sep 2025 15:49:24 +0200 Subject: [PATCH 12/16] fix yazi task viewer --- home-modules/yazi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix index 848f4b8..752325d 100644 --- a/home-modules/yazi.nix +++ b/home-modules/yazi.nix @@ -181,7 +181,7 @@ in { { on = "{"; run = "tab_swap -1"; desc = "Swap current tab wittab"; } { on = "}"; run = "tab_swap 1"; desc = "Swap current tab with next tab"; } # Tasks - { on = "w"; run = "tasks_show"; desc = "Show task manager"; } + { on = "w"; run = "tasks:show"; desc = "Show Task View"; } ]; tasks.keymap = [ # Task From 10a50773e10daeba19ef17517653a0458d4ecf04 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 23 Sep 2025 15:33:56 +0200 Subject: [PATCH 13/16] xps monitors --- home-modules/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 0e5cdfb..b950bde 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -7,7 +7,7 @@ let monitors = { xps = { main = { name = "eDP-1"; resolution = "1920x1200"; position = "1920x1080"; scale = "1.0"; }; - second = { name = "DP-5"; resolution = "1920x1080"; position = "1920x0"; scale = "1.0"; }; + second = { name = "desc:Sony SONY TV 0x01010101"; resolution = "1920x1080"; position = "1920x0"; scale = "1.0"; }; third = { name = "DP-6"; resolution = "1920x1080"; position = "0x0"; scale = "1.0"; }; }; north = { From 939965746961928b07b33bc897ed83a5984d5ef1 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 23 Sep 2025 15:34:11 +0200 Subject: [PATCH 14/16] opaque vesktop --- home-modules/hyprland.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index b950bde..1451d0e 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -258,12 +258,11 @@ in { "opacity ${transparency}, class:^(Code)$" "opacity ${transparency}, class:^(code-oss)$" "opacity ${transparency}, class:^(discord)$" - "opacity ${transparency}, class:^(vesktop)$" + # "opacity ${transparency}, class:^(vesktop)$" # "opacity ${transparency}, class:^(Element)$" "opacity ${transparency}, class:^(lutris)$" "opacity ${transparency}, class:^(neovide)$" # "opacity ${transparency}, class:^(obsidian)$" - "opacity ${transparency}, class:^(vesktop)$" "opacity ${transparency}, class:^(VSCodium)$" "opacity ${transparency}, title:^(wlogout)$" From caf48a81dd5271ee8a0f65c8e066be632100a526 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 23 Sep 2025 15:34:23 +0200 Subject: [PATCH 15/16] no element hotkey --- home-modules/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 1451d0e..0720c3e 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -362,7 +362,7 @@ in { "SUPER, Q, killactive" "SUPER, W, exec, submap_indicator set '󰈹 '" "SUPER, W, submap, browserSM " - "SUPER, E, exec, element-desktop" + # "SUPER, E, exec, element-desktop" "SUPER, R, exec, rofi -show drun" # "SUPER, T, exec, alacritty" # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace"" From 9f49dbbd98cec5c43a5c72d6713807a4bdf1580a Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 23 Sep 2025 15:39:06 +0200 Subject: [PATCH 16/16] souce hm-session-vars only if user --- configuration.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 427350e..2e8762e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -65,6 +65,8 @@ system.stateVersion = hyper.pkgs-version; nix.settings.experimental-features = [ "nix-command" "flakes" ]; programs.bash.shellInit = '' - source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh + if [[ "$USER" == "${hyper.user}" ]]; then + source $HOME/.nix-profile/etc/profile.d/hm-session-vars.sh + fi ''; }