From 2d697c079d74cfbbaf7bc25f3e4f1f0c01c2fdbc Mon Sep 17 00:00:00 2001 From: "Lennart J. Kurzweg (Nx2)" Date: Mon, 2 Jun 2025 14:51:38 +0200 Subject: [PATCH] merge --- configuration.nix | 24 +++++++------- home-modules/chatterino.nix | 4 +-- home-modules/hyprland.nix | 62 +++++++++++++++++++++---------------- 3 files changed, 51 insertions(+), 39 deletions(-) diff --git a/configuration.nix b/configuration.nix index 6b3ffc9..1060df1 100644 --- a/configuration.nix +++ b/configuration.nix @@ -4,25 +4,22 @@ inputs.sops-nix.nixosModules.sops ./system-modules/adb.nix ./system-modules/auto-mount.nix - ./system-modules/calendar.nix - ./system-modules/hardware-configuration.nix - ./system-modules/fuse.nix - ./system-modules/games.nix - ./system-modules/nvidia.nix - ./system-modules/users.nix - ./system-modules/sound.nix - ./system-modules/fonts.nix - ./system-modules/boot.nix - ./system-modules/gc.nix ./system-modules/boot.nix + ./system-modules/boot.nix + ./system-modules/calendar.nix ./system-modules/dm.nix ./system-modules/docker.nix ./system-modules/fcitx5.nix ./system-modules/fonts.nix + ./system-modules/fonts.nix ./system-modules/fuse.nix + ./system-modules/fuse.nix + ./system-modules/games.nix + ./system-modules/gc.nix ./system-modules/gc.nix ./system-modules/gpg.nix ./system-modules/hardware-configuration.nix + ./system-modules/hardware-configuration.nix ./system-modules/health_reminder.nix ./system-modules/hsmw.nix ./system-modules/kanata.nix @@ -30,13 +27,17 @@ ./system-modules/networking.nix ./system-modules/nixd.nix ./system-modules/nvidia.nix + ./system-modules/nvidia.nix ./system-modules/ollama.nix ./system-modules/qmk.nix ./system-modules/scanning.nix ./system-modules/sops.nix ./system-modules/sound.nix + ./system-modules/sound.nix ./system-modules/sshd.nix ./system-modules/syncthing.nix + ./system-modules/tuda.nix + ./system-modules/users.nix ./system-modules/users.nix ./system-modules/virtualisation.nix ./system-modules/ydotool.nix @@ -58,7 +59,8 @@ ./system-modules/calendar-lec.nix ./system-modules/calendar-lr.nix ./system-modules/calendar-dicos.nix - ] else []); + ] else [ + ]); # Set your time zone. time.timeZone = "Europe/Berlin"; diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix index 5853b2b..4f6e419 100644 --- a/home-modules/chatterino.nix +++ b/home-modules/chatterino.nix @@ -1,4 +1,4 @@ -{ config, pkgs, rice, user, secrets, ... }: +{ config, pkgs, hyper, rice, secrets, ... }: let channels = [ "Caedrel" @@ -193,7 +193,7 @@ in { "external": { "streamlink": { "quality": "", - "options": "--config /home/${user}/.config/streamlink/config" + "options": "--config /${hyper.home}/.config/streamlink/config" } } } diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 83b34a8..4f5255c 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -4,15 +4,27 @@ let transparency = builtins.toString rice.transparency; terminal = "ghostty"; terminal-exec = "ghostty --command="; - monitors = { + monitors = let + docked = false; + in { xps = { - main = { + main = if docked then { + name = "DP-5"; + resolution = "1920x1080"; + position = "1920x0"; + scale = "1.0"; + } else { name = "eDP-1"; resolution = "1920x1200"; position = "0x1080"; scale = "1.0"; }; - second = { + second = if docked then { + name = "DP-6"; + resolution = "1920x1080"; + position = "0x0"; + scale = "1.0"; + } else { name = "DP-3"; resolution = "1920x1080"; position = "0x0"; @@ -281,48 +293,46 @@ in { "rounding 0, floating:0, onworkspace:w[tv1]" "bordersize 0, floating:0, onworkspace:f[1]" "rounding 0, floating:0, onworkspace:f[1]" - ]; - windowrule = [ # "opacity ${transparency}, firefox" - "opacity ${transparency}, code-oss" - "opacity ${transparency}, VSCodium" - "opacity ${transparency}, Code" + "opacity ${transparency}, class:^(code-oss)$" + "opacity ${transparency}, class:^(VSCodium)$" + "opacity ${transparency}, class:^(Code)$" # "opacity ${transparency}, sent" - "opacity ${transparency}, neovide" - "opacity ${transparency}, obsidian" + "opacity ${transparency}, class:^(neovide)$" + "opacity ${transparency}, class:^(obsidian)$" # "opacity ${transparency}, zathura" # "bordercolor rgba(${rice.lib.nohash rice.color.foreground}ff) rgba(${rice.lib.nohash rice.color.background}${rice.lib.float-to-drune rice.transparency}), Alacritty" # "bordercolor rgba(${rice.lib.nohash rice.color.foreground}ff) rgba(${rice.lib.nohash rice.color.background}${rice.lib.float-to-drune rice.transparency}), ${terminal}" - "opacity ${transparency}, discord" - "opacity ${transparency}, vesktop" - "opacity ${transparency}, Element" - "opacity ${transparency}, lutris" - "opacity ${transparency}, element" + "opacity ${transparency}, class:^(discord)$" + "opacity ${transparency}, class:^(vesktop)$" + "opacity ${transparency}, class:^(Element)$" + "opacity ${transparency}, class:^(lutris)$" + "opacity ${transparency}, class:^(element)$" # "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)$" - "float, title:^(Ibus-ui.*)$" - "float, ^(ibus-ui.*)$" - "float, ^(ibus-ui-gtk3)$" + # "float, class:^(Ibus-ui.*)$" + # "float, ^(ibus-ui.*)$" + # "float, ^(ibus-ui-gtk3)$" "float, title:^(Ibus-ui-gtk3)$" "pin, title:^(Picture-in-Picture)$" - "float, org.kde.polkit-kde-authentication-agent-1" + "float, class:^(org.kde.polkit-kde-authentication-agent-1)$" "float, title:^(wlogout)$" - "float, imv" + "float, class:^(imv)$" "float, title:^(Page Info — .*)$" "float, title:^(Compact folders)$" - "tile, sent" - "fullscreen, wlogout" - "fullscreen, sent" - "workspace 14, lutris" + "tile, class:^(sent)$" + "fullscreen, class:^(wlogout)$" + "fullscreen, class:^(sent)$" + "workspace 14, class:^(lutris)$" "workspace 100, title:^(Apex Legends)$" - "workspace 100, ^(cyberpunk2077.exe)$" + # "workspace 100, ^(cyberpunk2077.exe)$" "workspace 100, title:^(No Man.s Sky)$" - "workspace 100, gamescope" + "workspace 100, class:^(gamescope)$" ];