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 1/8] 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 10a50773e10daeba19ef17517653a0458d4ecf04 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Tue, 23 Sep 2025 15:33:56 +0200 Subject: [PATCH 2/8] 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 3/8] 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 4/8] 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 5/8] 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 ''; } From d8704de501aacbf5aa6e4ee59c59a2c76849d76f Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 25 Sep 2025 07:20:36 +0000 Subject: [PATCH 6/8] wsl adjustments --- nixos-wsl.nix | 5 +++-- shell-only.nix | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos-wsl.nix b/nixos-wsl.nix index dc484cd..191a2a6 100644 --- a/nixos-wsl.nix +++ b/nixos-wsl.nix @@ -2,15 +2,16 @@ { imports = [ inputs.nixos-wsl.nixosModules.default - ./system-modules/users.nix - ./system-modules/gc.nix + ./system-modules/base-packages.nix ./system-modules/docker.nix + ./system-modules/gc.nix ./system-modules/gpg.nix ./system-modules/networking.nix ./system-modules/nixd.nix # ./system-modules/sops.nix # ./system-modules/sshd.nix # ./system-modules/syncthing.nix + ./system-modules/users.nix ]; system.stateVersion = pkgs.version; # system.stateVersion = "24.11"; diff --git a/shell-only.nix b/shell-only.nix index bf972ea..4f29f55 100644 --- a/shell-only.nix +++ b/shell-only.nix @@ -31,7 +31,7 @@ home.username = hyper.user; # home.homeDirectory = hyper.home; # for some reason you cant use hyper.home here home.homeDirectory = "/home/${hyper.user}"; - home.stateVersion = pkgs.version; + home.stateVersion = hyper.pkgs-version; xdg = { enable = true; configHome = "${hyper.home}/.config"; From 511dac22a828b04ba7baba09498cce2eca821d2d Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 25 Sep 2025 07:23:33 +0000 Subject: [PATCH 7/8] wsl manages resolv.conf --- system-modules/networking.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/system-modules/networking.nix b/system-modules/networking.nix index 246a0f5..0b43ad8 100644 --- a/system-modules/networking.nix +++ b/system-modules/networking.nix @@ -1,11 +1,6 @@ -{ config, pkgs, ... }@all: with all; -{ - # sops.secrets = { - # "wireless-networking.env" = {}; - # }; - +{ config, pkgs, ... }@all: with all; { networking = { - nameservers = [ + nameservers = pkgs.lib.mkIf (hyper.host != "NxWSL") [ # wsl manages resolv.conf "1.1.1.1" "8.8.8.8" ]; From fa168f01a6c3d5d2137b5d6b131370b9fadc1e98 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 25 Sep 2025 08:03:24 +0000 Subject: [PATCH 8/8] nxf robustness --- home-modules/fish.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/home-modules/fish.nix b/home-modules/fish.nix index e6a721e..07b33b4 100644 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -20,12 +20,12 @@ " | lolcat --force 2> /dev/null) msg=" - $(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 3p): $(cat /etc/*-releas 2> /dev/null || echo 'PRETTY_NAME="[No 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' ' | sed -E 's-(.*?), version (.*?)\(.*-\1 \2-g') $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\U&/') - $(echo -e "$logo" | sed -n 8p): ''$(uname -r) + $(echo -e "$logo" | sed -n 8p): ''$(uname -r | sed -E 's=(.+-.+-.+-.+)-.+=\1=g') $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | sed 's/./\U&/') $(echo -e "$logo" | sed -n 10p): $(yazi --version | sed -E 's-(.*?) \(.*-\1-g') $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | sed 's/./\U&/') @@ -112,7 +112,7 @@ ''; nx_backup = let destination = if hyper.host == "NxNORTH" then "${hyper.home}/shared/" else "${hyper.home}/backups/"; - in pkgs.lib.mkIf (hyper.host != "NxACE") '' + in pkgs.lib.mkIf (hyper.host != "NxACE" && hyper.host != "NxWSL") '' 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} '';