From edbe4e7f66293bb97564d52b03f3f4dd7bfe2c60 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Wed, 20 Nov 2024 01:27:20 +0100 Subject: [PATCH 01/35] moved NORTH screen --- home-modules/hyprland.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 6f7e8b4..17c9b22 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -21,13 +21,13 @@ let main = { name = "DP-4"; resolution = "2560x1440"; - position = "1920x0"; + position = "1920x150"; scale = "1.0"; }; left = { name = "HDMI-A-2"; resolution = "1920x1080"; - position = "0x360"; + position = "0x0"; scale = "1.0"; }; # right = { From 947b824796198ed7760a16504bdf7d6835f6189a Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 21 Nov 2024 22:06:03 +0100 Subject: [PATCH 02/35] hyprland nxcolor-functions better --- home-modules/hyprland.nix | 19 +++++++++++++++++-- home-modules/wallpaper-to-colors.nix | 24 +++++++++++++++++------- 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 6f7e8b4..b6106fd 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -52,6 +52,7 @@ in { hyprland-protocols hyprlock hypridle + hyprpicker hyprcursor grim @@ -333,8 +334,8 @@ in { "SUPER, F6, exec, kitty -e 'htop'" "SUPER, F7, exec, kitty -e 'nmtui'" ''SUPER, F8, exec, find ~/Pictures/wallpapers/* -type f -not -path "~/Pictures/wallpapers/.git/*" | sort -R | head -n 1 | xargs swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120'' - ''SUPER, F9, exec, kitty -e sh -c 'change_colors_json $(swww query | sed -n 1p | sed -e "s-.*image: --g") && nh home switch && firefox /home/${user}/.config/color-pallete.html' '' - ''SUPER SHIFT, F9, exec, firefox /home/${user}/.config/color-pallete.html '' + "SUPER, F9, execr, waybar_mode set '󰸉 '" + "SUPER, F9, submap, color" # "SUPER, F10, hyprload,update" "SUPER, F11, exec, waybar" "SUPER SHIFT, F11, exec, pkill waybar " @@ -424,6 +425,7 @@ in { "SUPER, X, exec, pkill wlogout || wlogout --protocol layer-shell -b 3" # "SUPER, C, exec, /home/nx2/scripts/quickconfig/quickconfig.sh " "SUPER, C, exec, chatterino" + "SUPER SHIFT, C, exec, hyprpicker -n -a" "SUPER, V, togglefloating, " "SUPER, B, exec, bitwarden" "SUPER, N, togglesplit" @@ -505,6 +507,12 @@ in { # db 8D 88. .88 88 8D 88 88 88' '88 88 db 8D # '8888Y' 'Y8888P' Y8888P' YP YP 88 YP YP '8888Y' extraConfig = '' + extraConfig = let + action_simple = { mods ? "", key, cmd }: '' + bind=${mods},${key},execr,waybar_mode unset + bind=${mods},${key},${cmd} + bind=${mods},${key},submap,reset + ''; submap = browserSM bind = , W, exec, waybar_mode unset bind = , W, exec, hyprctl dispatch exec firefox @@ -787,6 +795,13 @@ in { bind = , Escape, submap, reset submap = reset + submap = color + ${action_simple { key = "W"; cmd = ''exec,kitty -e sh -c 'change_colors_json img $(swww query | sed -n 1p | sed -e "s-.*image: --g") && nh home switch''; }} + ${action_simple { key = "M"; cmd = ''exec,change_colors_json manual && kitty -e sh -c 'nh home switch && firefox /home/${user}/.config/color-pallete.html' ''; }} + ${action_simple { key = "D"; cmd = ''exec,firefox /home/${user}/.config/color-pallete.html ''; }} + bind = , Escape, execr, waybar_mode unset + bind = , Escape, submap, reset + submap = reset diff --git a/home-modules/wallpaper-to-colors.nix b/home-modules/wallpaper-to-colors.nix index 414e66d..0febfde 100644 --- a/home-modules/wallpaper-to-colors.nix +++ b/home-modules/wallpaper-to-colors.nix @@ -8,6 +8,7 @@ from colorsys import hls_to_rgb, rgb_to_hls import json import sys +import subprocess from typing import Literal, cast from numpy.typing import NDArray from sklearn.cluster import KMeans @@ -25,7 +26,7 @@ def fc(c: int) -> str: return s class Color(object): - def __init__(self, rgb: tuple[int, ...], frequency: float): + def __init__(self, rgb: tuple[int, ...], frequency: float = 1): assert len(rgb) == 3, "RGB values must be a tuple of length 3" self.rgb = cast(tuple[int, int, int], rgb) self.freq: float = frequency @@ -115,14 +116,23 @@ def extract_colors( colors.sort(reverse=True) return Palette(colors) + +def hyprpicker() -> Color: + ret = str(subprocess.run(["${pkgs.hyprpicker}/bin/hyprpicker", "-f", "rgb"], capture_output=True).stdout)[2:-3] + return Color([int(c) for c in ret.split(" ")]) + if __name__ == "__main__": - img = sys.argv[1] + if sys.argv[1] == "img": + img = sys.argv[2] + palette = extract_colors(image=img, palette_size=3) + accent = ensure_color(c=palette[0], alter_sat=False) + secondary = ensure_color(c=palette[1], alter_sat=True) + tertiary = ensure_color(c=palette[2], alter_sat=False) + elif sys.argv[1] == "manual": + accent = ensure_color(c=hyprpicker(), alter_sat=False) + secondary = ensure_color(c=hyprpicker(), alter_sat=True) + tertiary = ensure_color(c=hyprpicker(), alter_sat=False) - palette = extract_colors(image=img, palette_size=3) - - accent = ensure_color(c=palette[0], alter_sat=False) - secondary = ensure_color(c=palette[1], alter_sat=True) - tertiary = ensure_color(c=palette[2], alter_sat=False) weird = alter_hue(ilist=accent, hue=80) special = alter_hue(ilist=accent, hue=180) foreground = alter_l(accent, 0.9) From 298d31e21a90c5f0f608a562955146f1b1156934 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 21 Nov 2024 22:06:55 +0100 Subject: [PATCH 03/35] submaps als functions + TUDa submap --- home-modules/hyprland.nix | 398 ++++---------------------------------- 1 file changed, 42 insertions(+), 356 deletions(-) diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index b6106fd..8e28e7c 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -388,7 +388,8 @@ in { # "SUPER SHIFT, T, exec, alacritty -e sh -c "ssh nxace"" "SUPER, T, exec, SESSION_FROM_DE=TRUE kitty" "SUPER SHIFT, T, exec, kitty -e sh -c 'ssh nxace'" - # "SUPER, Z, " + "SUPER, Z, exec, waybar_mode set ' '" + "SUPER, Z, submap, tuda" "SUPER, U, exec, thunderbird " "SUPER, I, exec, kitty -e fish -c 'hx ~/nix-dots/ && fish'" "SUPER SHIFT, I, exec, kitty -e fish -c 'nh home switch || read'" @@ -397,7 +398,8 @@ in { "SUPER, P, pin " # "SUPER, Ü," # "SUPER, +," - # "SUPER, Enter," + "SUPER, Enter, exec, SESSION_FROM_DE=TRUE kitty" + ########################################################################### ## ROW 3: @@ -506,289 +508,56 @@ in { # 'Y8b. 88 88 88''Yb. 88 88 8888888 888888P' 'Y8b. # db 8D 88. .88 88 8D 88 88 88' '88 88 db 8D # '8888Y' 'Y8888P' Y8888P' YP YP 88 YP YP '8888Y' - extraConfig = '' extraConfig = let action_simple = { mods ? "", key, cmd }: '' bind=${mods},${key},execr,waybar_mode unset bind=${mods},${key},${cmd} bind=${mods},${key},submap,reset ''; + extra_workspace = { key, wsnumber }: '' + bind=,${key},execr,waybar_mode unset + bind=,${key},workspace,${wsnumber} + bind=,${key},submap,reset + bind=SUPER,${key},execr,waybar_mode unset + bind=SUPER,${key},workspace,${wsnumber} + bind=SUPER,${key},submap,reset + bind=SUPER SHIFT,${key},execr, waybar_mode unset + bind=SUPER SHIFT,${key},movetoworkspace,${wsnumber} + bind=SUPER SHIFT,${key},submap,reset + ''; + in '' submap = browserSM - bind = , W, exec, waybar_mode unset - bind = , W, exec, hyprctl dispatch exec firefox - bind = , W, submap, reset - - bind = , Y, exec, waybar_mode unset - bind = , Y, exec, firefox https://youtube.com - bind = , Y, submap, reset - - bind = , T, exec, waybar_mode unset - bind = , T, exec, hyprctl dispatch exec firefox https://twitch.tv - bind = , T, submap, reset - - bind = , R, exec, waybar_mode unset - bind = , R, exec, firefox https://reddit.com - bind = , R, submap, reset - - bind = , C, exec, waybar_mode unset - bind = , C, exec, firefox https://calendar.google.com - bind = , C, submap, reset - - bind = , Ü, exec, waybar_mode unset - bind = , Ü, exec, firefox https://translate.google.com - bind = , Ü, submap, reset - - bind = , N, exec, waybar_mode unset - bind = , N, exec, firefox https://Netflix.com - bind = , N, submap, reset - - bind = , A, exec, waybar_mode unset - bind = , A, exec, firefox https://www.amazon.de/b?node=3010075031&ref_=nav_ya_signin - bind = , A, submap, reset - - bind = , D, exec, waybar_mode unset - bind = , D, exec, firefox https://www.disneyplus.com/home - bind = , D, submap, reset - - bind = , H, exec, waybar_mode unset - bind = , H, exec, firefox https://www.hs-mittweida.de - bind = , H, submap, reset - - bind = , X, exec, waybar_mode unset - bind = , X, exec, firefox https://nx2.site - bind = , X, submap, reset - - bind = , L, exec, waybar_mode unset - bind = , L, exec, firefox https://feddit.de - bind = , L, submap, reset - - bind = , I, exec, waybar_mode unset - bind = , I, exec, firefox https://www.imdb.com - bind = , I, submap, reset - - bind = , M, exec, waybar_mode unset - bind = , M, exec, firefox https://ieji.de/home - bind = , M, submap, reset - - bind = , S, exec, waybar_mode unset - bind = , S, exec, firefox 127.0.0.1:8384/ - bind = , S, submap, reset - + ${action_simple { key = "A"; cmd = "exec,firefox https://www.amazon.de/b?node=3010075031&ref_=nav_ya_signin";}} + ${action_simple { key = "C"; cmd = "exec,firefox https://calendar.google.com";}} + ${action_simple { key = "D"; cmd = "exec,firefox https://www.disneyplus.com/home";}} + ${action_simple { key = "H"; cmd = "exec,firefox https://www.hs-mittweida.de";}} + ${action_simple { key = "I"; cmd = "exec,firefox https://www.imdb.com";}} + ${action_simple { key = "L"; cmd = "exec,firefox https://feddit.de";}} + ${action_simple { key = "M"; cmd = "exec,firefox https://ieji.de/home";}} + ${action_simple { key = "N"; cmd = "exec,firefox https://Netflix.com";}} + ${action_simple { key = "R"; cmd = "exec,firefox https://reddit.com";}} + ${action_simple { key = "S"; cmd = "exec,firefox 127.0.0.1:8384/";}} + ${action_simple { key = "T"; cmd = "exec,hyprctl dispatch exec firefox https://twitch.tv";}} + ${action_simple { key = "udiaeresis"; cmd = "exec,firefox https://translate.google.com";}} + ${action_simple { key = "W"; cmd = "exec,hyprctl dispatch exec firefox";}} + ${action_simple { key = "X"; cmd = "exec,firefox https://nx2.site";}} + ${action_simple { key = "Y"; cmd = "exec,firefox https://youtube.com";}} + ${action_simple { key = "P"; cmd = "exec,firefox https://pw.nx2.site";}} bind = , Escape, exec, waybar_mode unset bind = , Escape, submap, reset submap = reset submap = scrL - bind = , 1, execr, waybar_mode unset - bind = , 1, workspace, 21 - bind = , 1, submap, reset - bind = SUPER, 1, execr, waybar_mode unset - bind = SUPER, 1, workspace, 21 - bind = SUPER, 1, submap, reset - bind = SUPER SHIFT, 1, execr, waybar_mode unset - bind = SUPER SHIFT, 1, movetoworkspace, 21 - bind = SUPER SHIFT, 1, submap, reset - - bind = , 2, execr, waybar_mode unset - bind = , 2, workspace, 22 - bind = , 2, submap, reset - bind = SUPER, 2, execr, waybar_mode unset - bind = SUPER, 2, workspace, 22 - bind = SUPER, 2, submap, reset - bind = SUPER SHIFT, 2, execr, waybar_mode unset - bind = SUPER SHIFT, 2, movetoworkspace, 22 - bind = SUPER SHIFT, 2, submap, reset - - bind = , 3, execr, waybar_mode unset - bind = , 3, workspace, 23 - bind = , 3, submap, reset - bind = SUPER, 3, execr, waybar_mode unset - bind = SUPER, 3, workspace, 23 - bind = SUPER, 3, submap, reset - bind = SUPER SHIFT, 3, execr, waybar_mode unset - bind = SUPER SHIFT, 3, movetoworkspace, 23 - bind = SUPER SHIFT, 3, submap, reset - - bind = , 4, execr, waybar_mode unset - bind = , 4, workspace, 24 - bind = , 4, submap, reset - bind = SUPER, 4, execr, waybar_mode unset - bind = SUPER, 4, workspace, 24 - bind = SUPER, 4, submap, reset - bind = SUPER SHIFT, 4, execr, waybar_mode unset - bind = SUPER SHIFT, 4, movetoworkspace, 24 - bind = SUPER SHIFT, 4, submap, reset - - bind = , 5, execr, waybar_mode unset - bind = , 5, workspace, 25 - bind = , 5, submap, reset - bind = SUPER, 5, execr, waybar_mode unset - bind = SUPER, 5, workspace, 25 - bind = SUPER, 5, submap, reset - bind = SUPER SHIFT, 5, execr, waybar_mode unset - bind = SUPER SHIFT, 5, movetoworkspace, 25 - bind = SUPER SHIFT, 5, submap, reset - - bind = , 6, execr, waybar_mode unset - bind = , 6, workspace, 26 - bind = , 6, submap, reset - bind = SUPER, 6, execr, waybar_mode unset - bind = SUPER, 6, workspace, 26 - bind = SUPER, 6, submap, reset - bind = SUPER SHIFT, 6, execr, waybar_mode unset - bind = SUPER SHIFT, 6, movetoworkspace, 26 - bind = SUPER SHIFT, 6, submap, reset - - bind = , 7, execr, waybar_mode unset - bind = , 7, workspace, 27 - bind = , 7, submap, reset - bind = SUPER, 7, execr, waybar_mode unset - bind = SUPER, 7, workspace, 27 - bind = SUPER, 7, submap, reset - bind = SUPER SHIFT, 7, execr, waybar_mode unset - bind = SUPER SHIFT, 7, movetoworkspace, 27 - bind = SUPER SHIFT, 7, submap, reset - - bind = , 8, execr, waybar_mode unset - bind = , 8, workspace, 28 - bind = , 8, submap, reset - bind = SUPER, 8, execr, waybar_mode unset - bind = SUPER, 8, workspace, 28 - bind = SUPER, 8, submap, reset - bind = SUPER SHIFT, 8, execr, waybar_mode unset - bind = SUPER SHIFT, 8, movetoworkspace, 28 - bind = SUPER SHIFT, 8, submap, reset - - bind = , 9, execr, waybar_mode unset - bind = , 9, workspace, 29 - bind = , 9, submap, reset - bind = SUPER, 9, execr, waybar_mode unset - bind = SUPER, 9, workspace, 29 - bind = SUPER, 9, submap, reset - bind = SUPER SHIFT, 9, execr, waybar_mode unset - bind = SUPER SHIFT, 9, movetoworkspace, 29 - bind = SUPER SHIFT, 9, submap, reset - - bind = , 0, execr, waybar_mode unset - bind = , 0, workspace, 20 - bind = , 0, submap, reset - bind = SUPER, 0, execr, waybar_mode unset - bind = SUPER, 0, workspace, 20 - bind = SUPER, 0, submap, reset - bind = SUPER SHIFT, 0, execr, waybar_mode unset - bind = SUPER SHIFT, 0, movetoworkspace, 20 - bind = SUPER SHIFT, 0, submap, reset - - + ${builtins.concatStringsSep "\n" (builtins.map (num: extra_workspace { key = builtins.toString num; wsnumber = "2" + builtins.toString num;}) [1 2 3 4 5 6 7 8 9 0])} bind = , A, execr, waybar_mode unset bind = , A, submap, reset bind = , Escape, execr, waybar_mode unset bind = , Escape, submap, reset submap = reset - submap = scrR - bind = , 1, execr, waybar_mode unset - bind = , 1, workspace, 31 - bind = , 1, submap, reset - bind = SUPER, 1, execr, waybar_mode unset - bind = SUPER, 1, workspace, 31 - bind = SUPER, 1, submap, reset - bind = SUPER SHIFT, 1, execr, waybar_mode unset - bind = SUPER SHIFT, 1, movetoworkspace, 31 - bind = SUPER SHIFT, 1, submap, reset - - bind = , 2, execr, waybar_mode unset - bind = , 2, workspace, 32 - bind = , 2, submap, reset - bind = SUPER, 2, execr, waybar_mode unset - bind = SUPER, 2, workspace, 32 - bind = SUPER, 2, submap, reset - bind = SUPER SHIFT, 2, execr, waybar_mode unset - bind = SUPER SHIFT, 2, movetoworkspace, 32 - bind = SUPER SHIFT, 2, submap, reset - - bind = , 3, execr, waybar_mode unset - bind = , 3, workspace, 33 - bind = , 3, submap, reset - bind = SUPER, 3, execr, waybar_mode unset - bind = SUPER, 3, workspace, 33 - bind = SUPER, 3, submap, reset - bind = SUPER SHIFT, 3, execr, waybar_mode unset - bind = SUPER SHIFT, 3, movetoworkspace, 33 - bind = SUPER SHIFT, 3, submap, reset - - bind = , 4, execr, waybar_mode unset - bind = , 4, workspace, 34 - bind = , 4, submap, reset - bind = SUPER, 4, execr, waybar_mode unset - bind = SUPER, 4, workspace, 34 - bind = SUPER, 4, submap, reset - bind = SUPER SHIFT, 4, execr, waybar_mode unset - bind = SUPER SHIFT, 4, movetoworkspace, 34 - bind = SUPER SHIFT, 4, submap, reset - - bind = , 5, execr, waybar_mode unset - bind = , 5, workspace, 35 - bind = , 5, submap, reset - bind = SUPER, 5, execr, waybar_mode unset - bind = SUPER, 5, workspace, 35 - bind = SUPER, 5, submap, reset - bind = SUPER SHIFT, 5, execr, waybar_mode unset - bind = SUPER SHIFT, 5, movetoworkspace, 35 - bind = SUPER SHIFT, 5, submap, reset - - bind = , 6, execr, waybar_mode unset - bind = , 6, workspace, 36 - bind = , 6, submap, reset - bind = SUPER, 6, execr, waybar_mode unset - bind = SUPER, 6, workspace, 36 - bind = SUPER, 6, submap, reset - bind = SUPER SHIFT, 6, execr, waybar_mode unset - bind = SUPER SHIFT, 6, movetoworkspace, 36 - bind = SUPER SHIFT, 6, submap, reset - - bind = , 7, execr, waybar_mode unset - bind = , 7, workspace, 37 - bind = , 7, submap, reset - bind = SUPER, 7, execr, waybar_mode unset - bind = SUPER, 7, workspace, 37 - bind = SUPER, 7, submap, reset - bind = SUPER SHIFT, 7, execr, waybar_mode unset - bind = SUPER SHIFT, 7, movetoworkspace, 37 - bind = SUPER SHIFT, 7, submap, reset - - bind = , 8, execr, waybar_mode unset - bind = , 8, workspace, 38 - bind = , 8, submap, reset - bind = SUPER, 8, execr, waybar_mode unset - bind = SUPER, 8, workspace, 38 - bind = SUPER, 8, submap, reset - bind = SUPER SHIFT, 8, execr, waybar_mode unset - bind = SUPER SHIFT, 8, movetoworkspace, 38 - bind = SUPER SHIFT, 8, submap, reset - - bind = , 9, execr, waybar_mode unset - bind = , 9, workspace, 39 - bind = , 9, submap, reset - bind = SUPER, 9, execr, waybar_mode unset - bind = SUPER, 9, workspace, 39 - bind = SUPER, 9, submap, reset - bind = SUPER SHIFT, 9, execr, waybar_mode unset - bind = SUPER SHIFT, 9, movetoworkspace, 39 - bind = SUPER SHIFT, 9, submap, reset - - bind = , 0, execr, waybar_mode unset - bind = , 0, workspace, 30 - bind = , 0, submap, reset - bind = SUPER, 0, execr, waybar_mode unset - bind = SUPER, 0, workspace, 30 - bind = SUPER, 0, submap, reset - bind = SUPER SHIFT, 0, execr, waybar_mode unset - bind = SUPER SHIFT, 0, movetoworkspace, 30 - bind = SUPER SHIFT, 0, submap, reset - + ${builtins.concatStringsSep "\n" (builtins.map (num: extra_workspace { key = builtins.toString num; wsnumber = "3" + builtins.toString num;}) [1 2 3 4 5 6 7 8 9 0])} bind = , Y, execr, waybar_mode unset bind = , Y, submap, reset bind = , Escape, execr, waybar_mode unset @@ -803,97 +572,14 @@ in { bind = , Escape, submap, reset submap = reset - - - plugin { - hyprexpo { - columns = 5 - gap_size = ${builtins.toString rice.gap-size} - bg_col = rgb(${builtins.substring 1 6 rice.color.background}) - workspace_method = first 10 # [center/first] [workspace] e.g. first 1 or center m+1 - - enable_gesture = false # laptop touchpad, 4 fingers - gesture_distance = 300 # how far is the "max" - gesture_positive = true # positive = swipe down. Negative = swipe up. - } - } - - - plugin { - overview { - panelColor = rgba(00000088) - workspaceActiveBackground = rgba(00ff00ff) - workspaceInactiveBackground = rgba(0000ffff) - # workspaceActiveBorder = - # workspaceInactiveBorder = - dragAlpha = 0.5 - panelHeight = 200 - workspaceMargin = 30 - workspaceBorderSize = 3 - centerAligned = true - overrideGaps = false - gapsIn = 0 - gapsOut = 0 - hideBackgroundLayers = false - drawActiveWorkspace = true - autoDrag = true - autoScroll = true - exitOnClick = false - switchOnDrop = false - exitOnSwitch = trueß - showNewWorkspace = true - showEmptyWorkspace = false - } - } - - # allows repeated switching with same keypress that starts the submap - binde = SUPER, TAB, exec, hyprswitch --daemon --do-initial-execute - bind = SUPER, TAB, submap, switch - bind = SUPER, TAB, exec, waybar_mode set "sw" - - # allows repeated switching with same keypress that starts the submap - binde = SUPER SHIFT, TAB, exec, hyprswitch --daemon --do-initial-execute -r - bind = SUPER SHIFT, TAB, submap, switch - bind = SUPER, TAB, exec, waybar_mode set "swr" - - submap = switch - # allow repeated window switching in submap (same keys as repeating while starting) - binde = SUPER, TAB, exec, hyprswitch --daemon - binde = SUPER SHIFT, TAB, exec, hyprswitch --daemon -r - - # switch to specific window offset - bind = , 1, exec, hyprswitch --daemon --offset=1 - bind = , 2, exec, hyprswitch --daemon --offset=2 - bind = , 3, exec, hyprswitch --daemon --offset=3 - bind = , 4, exec, hyprswitch --daemon --offset=4 - bind = , 5, exec, hyprswitch --daemon --offset=5 - bind = , 6, exec, hyprswitch --daemon --offset=6 - bind = , 7, exec, hyprswitch --daemon --offset=7 - bind = , 8, exec, hyprswitch --daemon --offset=8 - bind = , 8, exec, hyprswitch --daemon --offset=8 - bind = , 9, exec, hyprswitch --daemon --offset=9 - - bind = SUPER $reverse, 1, exec, hyprswitch --daemon --offset=1 -r - bind = SUPER $reverse, 2, exec, hyprswitch --daemon --offset=2 -r - bind = SUPER $reverse, 3, exec, hyprswitch --daemon --offset=3 -r - bind = SUPER $reverse, 4, exec, hyprswitch --daemon --offset=4 -r - bind = SUPER $reverse, 5, exec, hyprswitch --daemon --offset=5 -r - bind = SUPER $reverse, 6, exec, hyprswitch --daemon --offset=6 -r - bind = SUPER $reverse, 7, exec, hyprswitch --daemon --offset=7 -r - bind = SUPER $reverse, 8, exec, hyprswitch --daemon --offset=8 -r - bind = SUPER $reverse, 9, exec, hyprswitch --daemon --offset=9 -r - bind = SUPER $reverse, 5, exec, hyprswitch --daemon --offset=5 -r - - - # exit submap and stop hyprswitch - bindrt = SUPER, SUPER_L, exec, hyprswitch --stop-daemon - bindrt = SUPER, SUPER_L, submap, reset - bindrt = SUPER, SUPER_L, exec, waybar_mode unset - - # if it somehow doesn't close on releasing $switch_release, escape can kill - bindr = ,escape, exec, pkill hyprswitch - bindr = ,escape, submap, reset + submap = tuda + ${action_simple { key = "T"; cmd = ''exec,firefox https://www.tucan.tu-darmstadt.de/''; }} + ${action_simple { key = "M"; cmd = ''exec,firefox https://moodle.tu-darmstadt.de/''; }} + ${action_simple { key = "I"; cmd = ''exec,firefox https://moodle.informatik.tu-darmstadt.de/''; }} + bind = , Escape, execr, waybar_mode unset + bind = , Escape, submap, reset submap = reset + ''; }; @@ -908,7 +594,7 @@ in { monitor = ${m} # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations - path = /home/nx2/Pictures/nix-wall.png + path = /home/nx2/Pictures/wallpapers/nix-wall.png blur_size = 4 blur_passes = 3 # 0 disables blurring noise = 0.0117 From 605381b553ca81d2ec90f7e67c0f68bdded3ab68 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 21 Nov 2024 22:07:07 +0100 Subject: [PATCH 04/35] waybar prettier battery --- home-modules/waybar.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix index b42b637..d7e0bed 100755 --- a/home-modules/waybar.nix +++ b/home-modules/waybar.nix @@ -238,11 +238,14 @@ in { color: rgb(${f green.base});; } - #battery.critical { - color: rgb(${f red.dark});; - background: rgb(${f red.bright}); + #battery.charging { + color: rgb(${f green.base}); + } + + #battery.critical { + background: rgb(${f negative.base}); + color: rgb(${f foreground}); } - #battery.charging { color: rgb(${f green.base}); } ''; #battery.critical:not(.charging) { From 80e06b3f491e9bc9745a7404931d483954a22d0d Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 21 Nov 2024 22:07:31 +0100 Subject: [PATCH 05/35] more userChrome --- home-modules/firefox.nix | 53 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 51 insertions(+), 2 deletions(-) diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index 5b9954a..ebafb53 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -140,7 +140,6 @@ @-moz-document domain(reddit.com) { header { background-color: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}) !important; - backdrop-filter: blur(20px); } body, html, reddit-sidebar-nav, shreddit-post, aside, .reddit-search-bar{ background-color: transparent !important; @@ -171,6 +170,24 @@ } } + @media (prefers-color-scheme: dark) { + :root .theme-system { + --color-bg: transtparent !important; + --color-text: ${rice.color.foreground} + } + } + + @-moz-document domain(developer.mozilla.org) { + html, body { + background-color: transparent !important; + } + .top-navigation, .article-actions-container { + background-color: rgba(0,0,0,1) !important; + backdrop-filter: blur(100px); + border-radius: ${builtins.toString rice.rounding}px; + } + } + @-moz-document domain(github.com) { body, html, header, #repository-container-header, .bgColor-muted, section { background-color: transparent !important; @@ -182,7 +199,8 @@ background-color: transparent !important; } header, footer { - background-color: rgba(0,0,0,0.5) !important; + background-color: rgba(0,0,0,1) !important; + backdrop-filter: blur(100px); border-radius: ${builtins.toString rice.rounding}px; } } @@ -203,6 +221,37 @@ background-size: 2vmin 2vmin !important; } } + + @-moz-document domain(pw.nx2.site) { + html { + background: radial-gradient(rgba(255, 255, 255, 0.8) 5%, transparent 5%) !important; + background-repeat: repeat !important; + background-size: 2vmin 2vmin !important; + } + body, .tw-bg-background-alt3, main, .card-header, .card-body, .modal-body { + background-color: transparent !important; + } + .modal-open, .modal-header, form.modal-content, .modal-footer { + background-color: rgba(0,0,0,0.8) !important; + backdrop-filter: blur(5px); + } + .cdk-virtual-scroll-content-wrapper, .card, .tw-bg-background, .modal-content { + background-color: rgba(0,0,0,0.8) !important; + border-radius: 10px !important; + border: ${toString rice.border-width}px solid ${border} !important; + } + } + + @-moz-document domain(chatgpt.com) { + body, html , .bg-token-sidebar-surface-primary { + background-color: transparent !important; + } + .bg-token-main-surface-primary { + background-color: rgba(0,0,0,1) !important; + backdrop-filter: blur(100px) !important; + border-radius: ${builtins.toString rice.rounding}px !important; + } + } ''; }; } From ebb1da3fc2e806886c4e484a4a765090151ddc1a Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 21 Nov 2024 22:07:36 +0100 Subject: [PATCH 06/35] typo --- home-modules/helix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home-modules/helix.nix b/home-modules/helix.nix index 56f3477..897b84b 100644 --- a/home-modules/helix.nix +++ b/home-modules/helix.nix @@ -1,4 +1,4 @@ -{ pkgs, pkgs-unstable,lib, rice, ... }: +{ pkgs, pkgs-unstable, lib, rice, ... }: { home = { packages = with pkgs; [ From e4ec830aaa51156ce14aa51d5043eb4a37b4c177 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 21 Nov 2024 22:07:53 +0100 Subject: [PATCH 07/35] better health reminder --- system-modules/health_reminder.nix | 75 ++++++++++++++---------------- 1 file changed, 35 insertions(+), 40 deletions(-) diff --git a/system-modules/health_reminder.nix b/system-modules/health_reminder.nix index 27f9ac2..494df26 100755 --- a/system-modules/health_reminder.nix +++ b/system-modules/health_reminder.nix @@ -1,7 +1,7 @@ -{ config, pkgs, lib, host, ... }: +{ pkgs, lib, host, ... }: lib.mkIf (host != "NxACE") { - systemd.timers."health_reminder" = { + systemd.user.timers."health_reminder" = { enable = true; wantedBy = [ "timers.target" ]; timerConfig = { @@ -11,49 +11,44 @@ lib.mkIf (host != "NxACE") }; }; - systemd.services."health_reminder" = - let - hm = - let p = /*python*/ '' - #!${pkgs.python3}/bin/python3 - import random - import re + systemd.user.services."health_reminder" = let + hm = pkgs.writers.writePython3Bin "health_reminder" { + text = /*python*/ '' + import random + import re - class Action: - def __init__(self, action: str, likelihood: int, options: list[str] = None): - self.action = action - self.likelihood = likelihood - self.options = options if options is not None else [] + class Action: + def __init__(self, action: str, likelihood: int, options: list[str] = None): + self.action = action + self.likelihood = likelihood + self.options = options if options is not None else [] - def __str__(self): - try: - choice = random.choice(self.options) - except IndexError: - choice = "" + def __str__(self): + try: + choice = random.choice(self.options) + except IndexError: + choice = "" - action = re.sub("%o", choice, self.action) - return action + action = re.sub("%o", choice, self.action) + return action - actions = [ - Action("look away for %o Seconds!",300, ["10", "15"] ), - Action("Posture Check!", 90 ), - Action("Do %o Biceps curls!", 5, ["50", "100", "150"] ), - Action("Do %o Shourlder thingees", 5, ["40 + 40", "50", "60"]), - Action("Plank for %o senonds!", 5, ["60", "60", "70"] ), - Action("Strech your upper body!", 20 ), - Action("Strech your core!", 10 ), - Action("Strech your legs!", 10 ), - Action("Make Tea!", 5 ), - Action("Touch Grass!", 5 ) - ] + actions = [ + Action(action="look away for %o Seconds!", likelyhood=300, options=["10", "15"]), + Action(action="Posture Check!", likelyhood=300), + Action(action="Strech your upper body!", likelyhood=20), + Action(action="Strech your core!", likelyhood=10), + Action(action="Strech your legs!", likelyhood=10), + Action(action="Strech your arms/hands!", likelyhood=10), + Action(action="Make Tea!", likelyhood=5), + Action(action="说现在中文的时间！", likelyhood=2), + ] - total_likelihood = sum(a.likelihood for a in actions) - random_action = random.choices(actions, [a.likelihood for a in actions], k=1)[0] - print(random_action) - ''; - in pkgs.writeScriptBin "health_reminder" p; - in - { + total_likelihood = sum(a.likelihood for a in actions) + random_action = random.choices(actions, [a.likelihood for a in actions], k=1)[0] + print(random_action) + ''; + }; + in { script = '' set -eu export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$UID/bus" From 971cea54182076de6a2c758d5259814ca1d3b316 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 21 Nov 2024 22:19:14 +0100 Subject: [PATCH 08/35] steam --- system-modules/games.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system-modules/games.nix b/system-modules/games.nix index c014fec..1ee3d21 100644 --- a/system-modules/games.nix +++ b/system-modules/games.nix @@ -2,6 +2,9 @@ lib.mkIf (host == "NxNORTH" || host == "NxACE") { programs = { + steam = { + enable = true; + }; gamemode = { enable = true; }; From b8199c24ef6de460ccfed6085ab6c6a1c67439f6 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 21 Nov 2024 22:27:28 +0100 Subject: [PATCH 09/35] health reminder syntax fix --- system-modules/health_reminder.nix | 62 +++++++++++++++--------------- 1 file changed, 30 insertions(+), 32 deletions(-) diff --git a/system-modules/health_reminder.nix b/system-modules/health_reminder.nix index 494df26..7e02ee2 100755 --- a/system-modules/health_reminder.nix +++ b/system-modules/health_reminder.nix @@ -12,42 +12,40 @@ lib.mkIf (host != "NxACE") }; systemd.user.services."health_reminder" = let - hm = pkgs.writers.writePython3Bin "health_reminder" { - text = /*python*/ '' - import random - import re + hm = pkgs.writers.writePython3Bin "health_reminder" {} /*python*/ '' + import random + import re - class Action: - def __init__(self, action: str, likelihood: int, options: list[str] = None): - self.action = action - self.likelihood = likelihood - self.options = options if options is not None else [] + class Action: + def __init__(self, action: str, likelihood: int, options: list[str] = None): + self.action = action + self.likelihood = likelihood + self.options = options if options is not None else [] - def __str__(self): - try: - choice = random.choice(self.options) - except IndexError: - choice = "" - - action = re.sub("%o", choice, self.action) - return action + def __str__(self): + try: + choice = random.choice(self.options) + except IndexError: + choice = "" + + action = re.sub("%o", choice, self.action) + return action - actions = [ - Action(action="look away for %o Seconds!", likelyhood=300, options=["10", "15"]), - Action(action="Posture Check!", likelyhood=300), - Action(action="Strech your upper body!", likelyhood=20), - Action(action="Strech your core!", likelyhood=10), - Action(action="Strech your legs!", likelyhood=10), - Action(action="Strech your arms/hands!", likelyhood=10), - Action(action="Make Tea!", likelyhood=5), - Action(action="说现在中文的时间！", likelyhood=2), - ] + actions = [ + Action(action="look away for %o Seconds!", likelyhood=300, options=["10", "15"]), + Action(action="Posture Check!", likelyhood=300), + Action(action="Strech your upper body!", likelyhood=20), + Action(action="Strech your core!", likelyhood=10), + Action(action="Strech your legs!", likelyhood=10), + Action(action="Strech your arms/hands!", likelyhood=10), + Action(action="Make Tea!", likelyhood=5), + Action(action="说现在中文的时间！", likelyhood=2), + ] - total_likelihood = sum(a.likelihood for a in actions) - random_action = random.choices(actions, [a.likelihood for a in actions], k=1)[0] - print(random_action) - ''; - }; + total_likelihood = sum(a.likelihood for a in actions) + random_action = random.choices(actions, [a.likelihood for a in actions], k=1)[0] + print(random_action) + ''; in { script = '' set -eu From a8c3a12089f555581f9d152be0a0fb17ccc5e1a6 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 21 Nov 2024 22:27:48 +0100 Subject: [PATCH 10/35] xps to linux_6_11 --- flake.lock | 125 +++++++++++++++++----------------------- system-modules/boot.nix | 2 +- 2 files changed, 55 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index 25a9b70..0e4b154 100755 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1728710667, - "narHash": "sha256-9HR9EePhzweUAUPUccByNYxKQzfFAnxfu2BXTLqOLZQ=", + "lastModified": 1730569007, + "narHash": "sha256-cwbcYg+rPmvHFFtAEie7nw5IaBidrTYe5XsTlhOyoyQ=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "e8406a7708bceb3b5bedf56b67490dbe3d27e6f8", + "rev": "260f386075c7f6818033b05466a368d8821cde2d", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1728902391, - "narHash": "sha256-44bnoY0nAvbBQ/lVjmn511yL39Sv7SknV0BDxn34P3Q=", + "lastModified": 1731774881, + "narHash": "sha256-1Dxryiw8u2ejntxrrv3sMtIE8WHKxmlN4KeH+uMGbmc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9874e08eec85b5542ca22494e127b0cdce46b786", + "rev": "b31a6a4da8199ae3489057db7d36069a70749a56", "type": "github" }, "original": { @@ -124,11 +124,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1727826117, - "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", + "lastModified": 1730504689, + "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", + "rev": "506278e768c2a08bec68eb62932193e341f55c90", "type": "github" }, "original": { @@ -302,11 +302,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1729629261, - "narHash": "sha256-IJtor2qFpsZkCm4UMnCHOSosW9GXKZVOm7DILtJJgoM=", + "lastModified": 1732100541, + "narHash": "sha256-vFeNbKUstvSZbe9TD4bDYozZd+A/bKD+fxCye+p/Mp8=", "ref": "refs/heads/main", - "rev": "29997ef4ba8ef0a80390e80199998d1390177454", - "revCount": 5366, + "rev": "940f7aa990dbc99815bab8d355999d8277534b17", + "revCount": 5484, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -334,11 +334,11 @@ ] }, "locked": { - "lastModified": 1729596320, - "narHash": "sha256-sBPr6O2Ad916f+L7biAjmJVx4TLDITC4joKgeOT47V8=", + "lastModified": 1732053779, + "narHash": "sha256-v9FS0r2XWMf/+uwevvzaF/2TimMFeLEQTf4T8cgc6c0=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "4d7f0b5d8b952f31f7d2e29af22ab0a55ca5c219", + "rev": "0bc619b2c3b4f9c2b65247e81d69f8bbc573d991", "type": "github" }, "original": { @@ -407,11 +407,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1725107917, - "narHash": "sha256-6on3nwb3gB4t+P/2IExgGhVLVgAkF6ZiE5x+qcQHEXU=", + "lastModified": 1732059967, + "narHash": "sha256-PN7B3bzpXJgfJ5oUzTWx7Y/v2Zeq6bsRLxqeWmqXN1I=", "owner": "h3rmt", "repo": "hyprswitch", - "rev": "f478c394ad6db5ba268f80052f1eb2366366b21e", + "rev": "e9c4cf7a9f69d52bdbaec14006f04b1205eeceb5", "type": "github" }, "original": { @@ -433,11 +433,11 @@ ] }, "locked": { - "lastModified": 1728941256, - "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", + "lastModified": 1731702627, + "narHash": "sha256-+JeO9gevnXannQxMfR5xzZtF4sYmSlWkX/BPmPx0mWk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", + "rev": "e911361a687753bbbdfe3b6a9eab755ecaf1d9e1", "type": "github" }, "original": { @@ -498,11 +498,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "lastModified": 1731676054, + "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", "type": "github" }, "original": { @@ -514,11 +514,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1729631290, - "narHash": "sha256-zVL79jvDihxcnq9FKkAoILYWxGmxCw1DGdBnpv/B+3s=", + "lastModified": 1732219096, + "narHash": "sha256-gbvtOPW7K7v4EFo7Feo5s+SI7FMVrCOA5CgnuMhWO/Y=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1f9d2cf67508efd9b5e81cdf7af556bbbfe02377", + "rev": "328abff1f7a707dc8da8e802f724f025521793ea", "type": "github" }, "original": { @@ -530,23 +530,23 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1727825735, - "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=", + "lastModified": 1730504152, + "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -572,29 +572,13 @@ "type": "github" } }, - "nixpkgs-stable_3": { - "locked": { - "lastModified": 1729357638, - "narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1729413321, - "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -636,11 +620,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729449015, - "narHash": "sha256-Gf04dXB0n4q0A9G5nTGH3zuMGr6jtJppqdeljxua1fo=", + "lastModified": 1731797254, + "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "89172919243df199fe237ba0f776c3e3e3d72367", + "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", "type": "github" }, "original": { @@ -692,11 +676,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1728778939, - "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -802,15 +786,14 @@ "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable_3" + ] }, "locked": { - "lastModified": 1729587807, - "narHash": "sha256-YOc4033a/j1TbdLfkaSOSX2SrvlmuM+enIFoveNTCz4=", + "lastModified": 1732186149, + "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "26642e8f193f547e72d38cd4c0c4e45b49236d27", + "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", "type": "github" }, "original": { @@ -907,11 +890,11 @@ ] }, "locked": { - "lastModified": 1728166987, - "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", + "lastModified": 1731703417, + "narHash": "sha256-rheDc/7C+yI+QspYr9J2z9kQ5P9F4ATapI7qyFAe1XA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", + "rev": "8070f36deec723de71e7557441acb17e478204d3", "type": "github" }, "original": { @@ -927,11 +910,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1729473414, - "narHash": "sha256-ffiEVFCUMnShcSa4hvCbT1EQeu7c2lVOk6OdaxjiUmU=", + "lastModified": 1732207337, + "narHash": "sha256-lPgx3ElbhNp2q0ASAIUDwuszh8cYGmJTNQSdiasmBGI=", "owner": "sxyazi", "repo": "yazi", - "rev": "0e118b5b3a5baacf7fe62971e2bfe2b0ad972bab", + "rev": "428c92270385c55ffc2862947f2377f4247268e4", "type": "github" }, "original": { diff --git a/system-modules/boot.nix b/system-modules/boot.nix index 3b4fa99..86a896e 100755 --- a/system-modules/boot.nix +++ b/system-modules/boot.nix @@ -105,7 +105,7 @@ in ''; }; }; - kernelPackages = pkgs-unstable.linuxPackages_6_10; + kernelPackages = pkgs-unstable.linuxPackages_6_11; extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; kernelModules = [ "v4l2loopback" ]; extraModprobeConfig = ''options v4l2loopback devices=1 video_nr=1 card_label="OBS VCam" exclusive_caps=1''; From f8497f55380e54f996ccb84719b5edddc7ec9e81 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 21 Nov 2024 22:33:47 +0100 Subject: [PATCH 11/35] health reminder syntax fix 2 --- system-modules/health_reminder.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/system-modules/health_reminder.nix b/system-modules/health_reminder.nix index 7e02ee2..a5e006c 100755 --- a/system-modules/health_reminder.nix +++ b/system-modules/health_reminder.nix @@ -12,7 +12,9 @@ lib.mkIf (host != "NxACE") }; systemd.user.services."health_reminder" = let - hm = pkgs.writers.writePython3Bin "health_reminder" {} /*python*/ '' + hm = pkgs.writers.writePython3Bin "health_reminder" { + flakeIgnore = [ "E302" "E305" "E226" "E501" ]; + } /*python*/ '' import random import re @@ -24,10 +26,10 @@ lib.mkIf (host != "NxACE") def __str__(self): try: - choice = random.choice(self.options) + choice = random.choice(self.options) except IndexError: choice = "" - + action = re.sub("%o", choice, self.action) return action From 837e64c3774f8721114d1b734f4603f0e88dffaa Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Thu, 21 Nov 2024 22:55:09 +0100 Subject: [PATCH 12/35] wallpaper to color hotkey syntax fix --- 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 f5354cb..bb527f9 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -565,7 +565,7 @@ in { submap = reset submap = color - ${action_simple { key = "W"; cmd = ''exec,kitty -e sh -c 'change_colors_json img $(swww query | sed -n 1p | sed -e "s-.*image: --g") && nh home switch''; }} + ${action_simple { key = "W"; cmd = ''exec,kitty -e sh -c 'change_colors_json img $(swww query | sed -n 1p | sed -e "s-.*image: --g") && nh home switch' ''; }} ${action_simple { key = "M"; cmd = ''exec,change_colors_json manual && kitty -e sh -c 'nh home switch && firefox /home/${user}/.config/color-pallete.html' ''; }} ${action_simple { key = "D"; cmd = ''exec,firefox /home/${user}/.config/color-pallete.html ''; }} bind = , Escape, execr, waybar_mode unset From 683913e0fe57b4b3898236d9b1ff795b974a813b Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:42:49 +0100 Subject: [PATCH 13/35] rice syntax --- flake-modules/rice.nix | 67 +++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/flake-modules/rice.nix b/flake-modules/rice.nix index 30cd6f7..49d9642 100644 --- a/flake-modules/rice.nix +++ b/flake-modules/rice.nix @@ -6,40 +6,39 @@ pkgs: rec { rounding = 3; gap-size = 5; border-width = 2; - color = - let - dark = (-0.5); - bright = (0.5); - alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; - alter = let f = lib.alter-luminace-hex; in color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; - # ccolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)); - ccolor = builtins.mapAttrs alter-set { - black = "#111111"; # "#111111" "#001100"; - white = "#dddddd"; # "#dddddd" "#66dd66"; - blue = "#4444dd"; # "#3333dd" "#003300"; - cyan = "#44dddd"; # "#11dddd" "#00dd55"; - green = "#44dd44"; # "#11dd11" "#11dd11"; - magenta = "#dd44dd"; # "#dd11dd" "#005500"; - red = "#dd4444"; # "#dd1111" "#00aa00"; - yellow = "#dddd44"; # "#dddd11" "#ffff00"; - }; - facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter; - fbcolor = (builtins.fromJSON (builtins.readFile ./colors.json)).base; - fcolor = facolor // fbcolor; - xcolor = with ccolor; with fcolor; rec { - background = "#000000"; - # foreground = "#dddddd"; - # accent = blue; - # secondary = cyan; - # tertiary = magenta; - # special = yellow; - # weird = green; - positive = alter "#00dd00"; - negative = alter "#dd0000"; - border = accent.base; - border2 = secondary.base; - }; - in ccolor // fcolor // xcolor; + color = let + dark = (-0.5); + bright = (0.5); + alter-set = let f = lib.alter-luminace-hex; in color-name: color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; + alter = let f = lib.alter-luminace-hex; in color-value: { base = color-value; dark = f color-value dark; bright = f color-value bright; }; + # ccolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)); + ccolor = builtins.mapAttrs alter-set { + black = "#111111"; # "#111111" "#001100"; + white = "#dddddd"; # "#dddddd" "#66dd66"; + blue = "#4444dd"; # "#3333dd" "#003300"; + cyan = "#44dddd"; # "#11dddd" "#00dd55"; + green = "#44dd44"; # "#11dd11" "#11dd11"; + magenta = "#dd44dd"; # "#dd11dd" "#005500"; + red = "#dd4444"; # "#dd1111" "#00aa00"; + yellow = "#dddd44"; # "#dddd11" "#ffff00"; + }; + facolor = builtins.mapAttrs alter-set (builtins.fromJSON (builtins.readFile ./colors.json)).to_alter; + fbcolor = (builtins.fromJSON (builtins.readFile ./colors.json)).base; + fcolor = facolor // fbcolor; + xcolor = with ccolor; with fcolor; { + background = "#000000"; + # foreground = "#dddddd"; + # accent = blue; + # secondary = cyan; + # tertiary = magenta; + # special = yellow; + # weird = green; + positive = alter "#00dd00"; + negative = alter "#dd0000"; + border = accent.base; + border2 = secondary.base; + }; + in ccolor // fcolor // xcolor; font = { code = { name = "JetBrainsMono-NF"; From 219a19a3a8bc858b34a60d9131c5cc6b1a7626eb Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:46:32 +0100 Subject: [PATCH 14/35] fonts (no name2) --- flake-modules/rice.nix | 3 +-- home-modules/color-pallete.nix | 2 +- home-modules/kitty.nix | 2 +- home-modules/mako.nix | 2 +- home-modules/rofi.nix | 2 +- home-modules/vscode.nix | 2 +- home-modules/waybar.nix | 4 ++-- system-modules/fonts.nix | 3 ++- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/flake-modules/rice.nix b/flake-modules/rice.nix index 49d9642..c5daa53 100644 --- a/flake-modules/rice.nix +++ b/flake-modules/rice.nix @@ -41,8 +41,7 @@ pkgs: rec { in ccolor // fcolor // xcolor; font = { code = { - name = "JetBrainsMono-NF"; - name2 = "JetBrainsMono Nerd Font"; + name = "JetBrainsMono Nerd Font"; package = (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }); # name = "CascadiaCove-NF"; # package = (pkgs.nerdfonts.override { fonts = [ "CascadiaCode" ]; }); diff --git a/home-modules/color-pallete.nix b/home-modules/color-pallete.nix index 797a03e..b8731de 100644 --- a/home-modules/color-pallete.nix +++ b/home-modules/color-pallete.nix @@ -46,7 +46,7 @@ margin: ${builtins.toString rice.gap-size}px; } .color-container { - font-family: ${rice.font.code.name2}; + font-family: ${rice.font.code.name}; display: flex; gap: ${builtins.toString rice.gap-size}px; margin: ${builtins.toString rice.gap-size}px; diff --git a/home-modules/kitty.nix b/home-modules/kitty.nix index 8a99779..710fb1e 100755 --- a/home-modules/kitty.nix +++ b/home-modules/kitty.nix @@ -3,7 +3,7 @@ programs.kitty = { enable = true; font = { - name = rice.font.code.name2; + name = rice.font.code.name; package = rice.font.code.package; }; settings = with rice.color; { diff --git a/home-modules/mako.nix b/home-modules/mako.nix index 0d9e4c2..712943b 100755 --- a/home-modules/mako.nix +++ b/home-modules/mako.nix @@ -8,7 +8,7 @@ textColor = color.foreground; borderColor = color.border; borderSize = border-width; - font = font.code.name2; + font = font.code.name; borderRadius = rounding; anchor = "top-right"; margin = builtins.toString (gap-size * 2) ; diff --git a/home-modules/rofi.nix b/home-modules/rofi.nix index b342b50..880b5e2 100755 --- a/home-modules/rofi.nix +++ b/home-modules/rofi.nix @@ -14,7 +14,7 @@ } * { - font: "${rice.font.code.name2} 12"; + font: "${rice.font.code.name} 12"; foreground: ${foreground}; background-color: ${background}${trdr}; padding: 0px; diff --git a/home-modules/vscode.nix b/home-modules/vscode.nix index b38d123..6ef5d6d 100755 --- a/home-modules/vscode.nix +++ b/home-modules/vscode.nix @@ -65,7 +65,7 @@ ]; userSettings = { workbench.colorTheme = "Just Black"; - editor.fontFamily = "'${rice.font.code.name2}', 'monospace', monospace"; + editor.fontFamily = "'${rice.font.code.name}', 'monospace', monospace"; remote.SSH.useLocalServer = false; }; enableUpdateCheck = false; diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix index d7e0bed..6cba5d8 100755 --- a/home-modules/waybar.nix +++ b/home-modules/waybar.nix @@ -163,7 +163,7 @@ in { }; style = with rice.color; let f = rice.lib.hex-to-rgb-comma-string; in '' * { - font-family: ${rice.font.code.name2}; + font-family: ${rice.font.code.name}; font-size: 1em; min-height: 0px; margin: 0px; @@ -223,7 +223,7 @@ in { } #window, #custom-ctimeremaining { - font-family: ${rice.font.base.name}, ${rice.font.code.name2}; + font-family: ${rice.font.base.name}, ${rice.font.code.name}; color: rgb(${f tertiary.bright}); } diff --git a/system-modules/fonts.nix b/system-modules/fonts.nix index 7d32cd4..9c88a2e 100644 --- a/system-modules/fonts.nix +++ b/system-modules/fonts.nix @@ -7,7 +7,8 @@ { fonts.packages = with pkgs; [ noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans + noto-fonts-cjk-serif noto-fonts-emoji newcomputermodern atkinson-hyperlegible From e36ffd828bc496a088c6d4ffacd3dd7365ab4b05 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:46:51 +0100 Subject: [PATCH 15/35] chatterino update --- git-crypt/secrets.nix | Bin 3129 -> 3129 bytes home-modules/chatterino.nix | 26 +++----------------------- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix index 7f066b13a1e712156ab46843331e2fd5162c2ad2..2ef5a992a9d7135afa13051372cc6ca283fe0eb8 100755 GIT binary patch literal 3129 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 literal 3129 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 diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix index 5a0970b..342d2a3 100755 --- a/home-modules/chatterino.nix +++ b/home-modules/chatterino.nix @@ -1,51 +1,31 @@ { pkgs, lib, rice, user, secrets, ... }: let channels = [ - "Caedrel" - "NoWay4u_Sir" - "zackrawrr" - "agurin" "asmongold" - "Broeki" - "Broxah" - # "Caedrel" - "chrissyofficial" + "Caedrel" "EintrachtSpandau" "GamesDoneQuick" "gdolphn" "GRONKH" "handofblood" "HisWattson" - "imls" - "iskall85" "Jankos" - "Karni" "KuruHS" "kutcherlol" - "LCK" - "LCS" "LEC" "lol_nemesis" - "loltyler1" - "LPL" - "maxim" "NASA" "NNOPrime" - # "NoWay4u_Sir" + "NoWay4u_Sir" "OfficialMikeShinoda" - "ow_esports" - "PrimeGaming" - "PrimeLeague" "Rekkles" "riotgames" - "Sola" "ThePrimeagen" "Tolkin" - "Trick2g" "TSM_ImperialHal" "Xisuma" - # "zackrawrr" + "zackrawrr" ]; tabber = channel-name: { highlightsEnabled = true; From 02c7814ce43d0e868dacc8c783c211d88750bfa3 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:49:33 +0100 Subject: [PATCH 16/35] better/less userChrome --- home-modules/email.nix | 28 +++++++++------------------- home-modules/firefox.nix | 11 +++++++++-- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/home-modules/email.nix b/home-modules/email.nix index b2a227c..36e9a98 100755 --- a/home-modules/email.nix +++ b/home-modules/email.nix @@ -9,14 +9,7 @@ lib.mkIf (host != "NxACE") 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; @@ -48,23 +41,20 @@ lib.mkIf (host != "NxACE") "mailnews.headers.showUserAgent" = true; "toolkit.legacyUserProfileCustomizations.stylesheets" = true; }; - userChrome = with rice.color; /* css */ '' - * { - color: ${rice.lib.hex-to-rgb-comma-string foreground} !important; - background-color: rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important; - border: none !important; - } - treechildren::-moz-tree-row(odd), treechildren::-moz-tree-row(even) { - background-color: rgba(${rice.lib.hex-to-rgb-comma-string background}, ${builtins.toString rice.transparency}) !important; - } - ''; + # userChrome = with rice.color; /* css */ '' + # * { + # color: ${foreground} !important; + # background-color: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString 0.1}) !important; + # border: none !important; + # -moz-appearance: none !important; + # } + # ''; }; }; }; - accounts.email.accounts = - let + accounts.email.accounts = let OAuth2Settings = id: { "mail.smtpserver.smtp_${id}.authMethod" = 10; "mail.server.server_${id}.authMethod" = 10; diff --git a/home-modules/firefox.nix b/home-modules/firefox.nix index ebafb53..8895660 100644 --- a/home-modules/firefox.nix +++ b/home-modules/firefox.nix @@ -1,10 +1,11 @@ # { pkgs-unstable, secrets, user, system, inputs, ...}: { rice, user, ... }: # browser.tabs.allow_transparent_browser +# https://www.reddit.com/r/FirefoxCSS/comments/1dqws4b/firefox_128_will_allow_the_main_browser_content/ { home.file = with rice.color; let - blur = builtins.toString 20; - in { + blur = builtins.toString 20; + in { ".mozilla/firefox/${user}/chrome/userChrome.css".text = /* css */ '' :root{ /* Popup panels */ @@ -110,9 +111,15 @@ /* new-tab */ @-moz-document url-prefix(about:home), url-prefix(about:newtab) { + :root{ + --newtab-background-color-secondary: ${background} !important; + } body, html { background: transparent !important; } + .tile, .search-handoff-button { + border: ${builtins.toString rice.border-width}px solid ${border} !important; + } } @-moz-document domain(youtube.com) { From f828268b14dc3d091fb80701f069102fcd28bc4c Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:59:00 +0100 Subject: [PATCH 17/35] 24.11 Vicuna --- configuration.nix | 2 +- flake.nix | 4 +- home-modules/fish.nix | 12 +-- home-modules/hyprland.nix | 122 +++++++++++----------- home.nix | 2 +- system-modules/hardware-configuration.nix | 2 +- system-modules/nvidia.nix | 7 +- system-modules/ollama.nix | 3 +- 8 files changed, 78 insertions(+), 76 deletions(-) diff --git a/configuration.nix b/configuration.nix index 9e989cb..20bd41d 100755 --- a/configuration.nix +++ b/configuration.nix @@ -117,7 +117,7 @@ xwayland.enable = true; }; - system.stateVersion = "24.05"; + system.stateVersion = "24.11"; nixpkgs.config.allowUnfree = true; diff --git a/flake.nix b/flake.nix index 3311f3f..e186242 100755 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "Multisystem NixOS Flake of Lennart J. Kurzweg"; inputs = { - nixpkgs = { url = "nixpkgs/nixos-24.05"; }; + nixpkgs = { url = "nixpkgs/nixos-24.11"; }; nixpkgs-unstable = { url = "nixpkgs/nixos-unstable"; }; nixpkgs-latest = { url = "github:nixos/nixpkgs?ref=master"; }; - home-manager = { url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; + home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; lanzaboote = { url = "github:nix-community/lanzaboote/v0.3.0"; }; diff --git a/home-modules/fish.nix b/home-modules/fish.nix index bff6943..0307a45 100755 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -27,7 +27,7 @@ $(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 | sed -E 's-(.+?) \(.*-\1-g') - $(echo -e "$logo" | sed -n 10p): $(yazi --version | yazi --version | sed -E 's-(.*?) \(.*-\1-g') + $(echo -e "$logo" | sed -n 10p): $(yazi --version | sed -E 's-(.*?) \(.*-\1-g') $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1) " echo -e "$msg" @@ -85,20 +85,18 @@ # ya = "yazi"; # function # nxfiglet = "figlet"; }; - interactiveShellInit = '' + interactiveShellInit = /* fish */ '' set -g fish_greeting if not set -q IN_NIX_SHELL - nxfetch - # yazi if set -q SESSION_FROM_DE - set -e SESSION_FROM_DE set tmp (mktemp -t "yazi-cwd.XXXXX") - yazi $argv --cwd-file="$tmp" + yazi --cwd-file="$tmp" if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] - cd -- "$cwd" + builtin cd -- "$cwd" end rm -f -- "$tmp" end + nxfetch end ''; functions = { diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index bb527f9..9f6a82f 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -92,47 +92,49 @@ in { "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}" ])); - workspace = - let - d1 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name); - d2 = if host == "NxXPS" then monitors.xps.second.name else (if host == "NxNORTH" then monitors.north.left.name else monitors.ace.main.name); - d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name); - # d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.right.name else monitors.ace.main.name); - compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false"; - in - [ - "11, monitor:${d1}, default:true" - "12, monitor:${d1}" - "13, monitor:${d1}" - "14, monitor:${d1}" - "15, monitor:${d1}" - "16, monitor:${d1}" - "17, monitor:${d1}" - "18, monitor:${d1}" - "19, monitor:${d1}" - "10, monitor:${d1}, ${compact}" - "100, monitor:${d1}, ${compact}" - "21, monitor:${d2}, default:true, ${compact}" - "22, monitor:${d2}" - "23, monitor:${d2}" - "24, monitor:${d2}" - "25, monitor:${d2}" - "26, monitor:${d2}" - "27, monitor:${d2}" - "28, monitor:${d2}" - "29, monitor:${d2}" - "20, monitor:${d2}" - "31, monitor:${d3}, default:${let x = if host == "NxNORTH" then "true" else "false"; in x}" - "32, monitor:${d3}" - "33, monitor:${d3}" - "34, monitor:${d3}" - "35, monitor:${d3}" - "36, monitor:${d3}" - "37, monitor:${d3}" - "38, monitor:${d3}" - "39, monitor:${d3}" - "30, monitor:${d3}, ${compact}" - ]; + workspace = let + d1 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name); + d2 = if host == "NxXPS" then monitors.xps.second.name else (if host == "NxNORTH" then monitors.north.left.name else monitors.ace.main.name); + d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.main.name else monitors.ace.main.name); + # d3 = if host == "NxXPS" then monitors.xps.main.name else (if host == "NxNORTH" then monitors.north.right.name else monitors.ace.main.name); + compact = "gapsin:0, gapsout:0, bordersize:1, rounding:false"; + in [ + "11, monitor:${d1}, default:true" + "12, monitor:${d1}" + "13, monitor:${d1}" + "14, monitor:${d1}" + "15, monitor:${d1}" + "16, monitor:${d1}" + "17, monitor:${d1}" + "18, monitor:${d1}" + "19, monitor:${d1}" + "10, monitor:${d1}, ${compact}" + "100, monitor:${d1}, ${compact}" + "21, monitor:${d2}, default:true, ${compact}" + "22, monitor:${d2}" + "23, monitor:${d2}" + "24, monitor:${d2}" + "25, monitor:${d2}" + "26, monitor:${d2}" + "27, monitor:${d2}" + "28, monitor:${d2}" + "29, monitor:${d2}" + "20, monitor:${d2}" + "31, monitor:${d3}, default:${let x = if host == "NxNORTH" then "true" else "false"; in x}" + "32, monitor:${d3}" + "33, monitor:${d3}" + "34, monitor:${d3}" + "35, monitor:${d3}" + "36, monitor:${d3}" + "37, monitor:${d3}" + "38, monitor:${d3}" + "39, monitor:${d3}" + "30, monitor:${d3}, ${compact}" + ] ++ [ + # no gaps when only + "w[tv1], gapsout:0, gapsin:0" + "f[1], gapsout:0, gapsin:0" + ]; # "device:logitech-wireless-mouse-mx-master-1" = { # sensitivity = -0.2; @@ -175,12 +177,12 @@ in { decoration = { rounding = rice.rounding; - drop_shadow = false; - shadow_range = "20"; - shadow_offset = "0 0"; - shadow_render_power = "4"; - "col.shadow" = "rgba(${rice.lib.nohash rice.color.red.base}ff)"; - "col.shadow_inactive" = "rgba(${rice.lib.nohash rice.color.black.base}ff)"; + # drop_shadow = false; + # shadow_range = "20"; + # shadow_offset = "0 0"; + # shadow_render_power = "4"; + # "col.shadow" = "rgba(${rice.lib.nohash rice.color.red.base}ff)"; + # "col.shadow_inactive" = "rgba(${rice.lib.nohash rice.color.black.base}ff)"; active_opacity = "1.0"; inactive_opacity = "1.0"; @@ -229,7 +231,6 @@ in { dwindle = { preserve_split = true; # you probably want this - no_gaps_when_only = true; }; # master = { @@ -259,6 +260,11 @@ in { "opacity ${transparency},class:^(com.chatterino.*)$" "opacity ${transparency},class:^(chatterino)$" "bordercolor rgba(${rice.lib.nohash rice.color.magenta.bright}ff), pinned:1" + ] ++ [ + "bordersize 0, floating:0, onworkspace:w[tv1]" + "rounding 0, floating:0, onworkspace:w[tv1]" + "bordersize 0, floating:0, onworkspace:f[1]" + "rounding 0, floating:0, onworkspace:f[1]" ]; windowrule = [ @@ -275,12 +281,12 @@ in { "opacity ${transparency}, discord" "opacity ${transparency}, vesktop" "opacity ${transparency}, Element" - "opacity ${transparency}, thunderbird" + # "opacity ${transparency}, thunderbird" "opacity ${transparency}, lutris" "opacity ${transparency}, element" - "opacity ${transparency}, ^([sS]potify)$" - "opacity ${transparency}, virt-manager" - "opacity ${transparency}, thunar" + # "opacity ${transparency}, ^([sS]potify)$" + # "opacity ${transparency}, virt-manager" + # "opacity ${transparency}, thunar" "opacity ${transparency}, title:^(wlogout)$" "opaque, title:^(GNU Image Manipulation Program)$" "float, title:^(Picture-in-Picture)$" @@ -327,7 +333,7 @@ in { "SUPER, F1, workspace, 100" "SUPER SHIFT, F1, movetoworkspace, 100" # "SUPER, F2," - "SUPER, F3, toggleopaque" + # "SUPER, F3, toggleopaque" # "SUPER, F4," "SUPER, F5, exec, nx_gcal_event force-lookup" "SUPER SHIFT, F5, exec, nx_gcal_event reauthenticate" @@ -584,12 +590,10 @@ in { ''; }; - home.file = - let - m = if host == "NxXPS" then monitors.xps.main.name else monitors.north.main.name; - in - { - ".config/hypr/hyprlock.conf".text = '' + home.file = let + m = if host == "NxXPS" then monitors.xps.main.name else monitors.north.main.name; + in { + ".config/hypr/hyprlock.conf".text = '' background { monitor = ${m} diff --git a/home.nix b/home.nix index ec362ee..ce74e4c 100755 --- a/home.nix +++ b/home.nix @@ -72,7 +72,7 @@ imv mpv mediainfo exiftool ffmpeg pavucontrol - fontpreview gtk2fontsel + fontpreview lynx w3m browsh bat du-dust eza neofetch tldr fzf figlet ripgrep lolcat jq glow brightnessctl wev diff --git a/system-modules/hardware-configuration.nix b/system-modules/hardware-configuration.nix index 4e01f1b..0d4bc33 100755 --- a/system-modules/hardware-configuration.nix +++ b/system-modules/hardware-configuration.nix @@ -46,7 +46,7 @@ } else {}; hardware.opengl.extraPackages = if host == "NxXPS" then with pkgs; [ - (if (lib.versionOlder (lib.versions.majorMinor lib.version) "24.05") then vaapiIntel else intel-vaapi-driver) + (if (lib.versionOlder (lib.versions.majorMinor lib.version) "24.11") then vaapiIntel else intel-vaapi-driver) libvdpau-va-gl intel-media-driver ] else []; diff --git a/system-modules/nvidia.nix b/system-modules/nvidia.nix index 4921080..e346349 100755 --- a/system-modules/nvidia.nix +++ b/system-modules/nvidia.nix @@ -57,11 +57,10 @@ lib.mkIf nvidia.enable nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.beta; }; - opengl = { + package = config.boot.kernelPackages.nvidiaPackages.beta; + }; + graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; }; }; } diff --git a/system-modules/ollama.nix b/system-modules/ollama.nix index 284f5cd..3927290 100755 --- a/system-modules/ollama.nix +++ b/system-modules/ollama.nix @@ -19,7 +19,8 @@ in { package = p; enable = true; acceleration = lib.mkIf nvidia.enable "cuda"; - listenAddress = if host == "NxACE" then "0.0.0.0:11434" else "127.0.0.1:11434"; + host = if host == "NxACE" then "0.0.0.0" else "127.0.0.1"; + port = 11434; environmentVariables = { OLLAMA_ORIGINS = "*"; }; From a82660b049a6b3a4786e726d515917235ff19a40 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 20:59:20 +0100 Subject: [PATCH 18/35] Gimp --- home-modules/gimp.nix | 9 +++++++++ home.nix | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100755 home-modules/gimp.nix diff --git a/home-modules/gimp.nix b/home-modules/gimp.nix new file mode 100755 index 0000000..4ed7ca4 --- /dev/null +++ b/home-modules/gimp.nix @@ -0,0 +1,9 @@ +{ pkgs, lib, host, ... }: +{ + home.packages = with pkgs; [ + (gimp-with-plugins.override { + plugins = with gimpPlugins; [ bimp ]; + }) + ]; +} + diff --git a/home.nix b/home.nix index ce74e4c..e11780e 100755 --- a/home.nix +++ b/home.nix @@ -14,6 +14,7 @@ # ./home-modules/foot.nix ./home-modules/games.nix ./home-modules/gestures.nix + ./home-modules/gimp.nix ./home-modules/git.nix ./home-modules/gpg.nix ./home-modules/gtk.nix @@ -103,7 +104,6 @@ ]) ++ (if host != "NxACE" then (with pkgs; [ signal-desktop zoom-us - gimp inkscape ]) else (with pkgs-unstable; [ From f5538e69a5a3569527ef11f93fd0123fc997f626 Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Dec 2024 21:00:01 +0100 Subject: [PATCH 19/35] better color changing (maual) --- home-modules/color-pallete.nix | 33 ++-- home-modules/hyprland.nix | 8 +- home-modules/wallpaper-to-colors.nix | 253 ++++++++++++++------------- 3 files changed, 150 insertions(+), 144 deletions(-) diff --git a/home-modules/color-pallete.nix b/home-modules/color-pallete.nix index b8731de..ea4696c 100644 --- a/home-modules/color-pallete.nix +++ b/home-modules/color-pallete.nix @@ -5,17 +5,18 @@

${color-name}.dark

+

${color-set.dark}

${color-name}.base

+

${color-set.base}

${color-name}.bright

+

${color-set.bright}

''; - - in /* html */ '' @@ -37,7 +38,7 @@ color: ${foreground}; width: fit-content; margin: 10px auto 10px auto; - background: ${background}; + background: rgba(${rice.lib.hex-to-rgb-comma-string background},${builtins.toString rice.transparency}); border: ${builtins.toString rice.border-width}px solid ${border}; border-radius: ${builtins.toString rice.rounding}px; padding: ${builtins.toString rice.gap-size}px; @@ -66,18 +67,20 @@ ${cb accent "accent" 100} ${cb secondary "secondary" 100} ${cb tertiary "tertiary" 100} - ${cb weird "weird" 75} - ${cb special "special" 75} - ${cb positive "positive" 30} - ${cb negative "negative" 30} - ${cb black "black" 25} - ${cb white "white" 25} - ${cb blue "blue" 25} - ${cb cyan "cyan" 25} - ${cb green "green" 25} - ${cb magenta "magenta" 25} - ${cb red "red" 25} - ${cb yellow "yellow" 25} + ${cb weird "weird" 100} + ${cb special "special" 100} +
+ ${cb positive "positive" 70} + ${cb negative "negative" 70} +
+ ${cb black "black" 50} + ${cb white "white" 50} + ${cb blue "blue" 50} + ${cb cyan "cyan" 50} + ${cb green "green" 50} + ${cb magenta "magenta" 50} + ${cb red "red" 50} + ${cb yellow "yellow" 50}