From b220ff36bbdb98846cdfa276331ce0d3011de2ff Mon Sep 17 00:00:00 2001 From: Lilith Date: Thu, 4 Dec 2025 15:49:10 +0100 Subject: [PATCH] update --- home/lilith/git.nix | 11 ++++-- home/lilith/hyprland/default.nix | 4 +- home/lilith/hyprland/hyprgrass.nix | 2 +- home/lilith/hyprland/settings.nix | 61 +++++++++++++++--------------- home/lilith/input.nix | 2 +- home/lilith/packages.nix | 2 +- home/lilith/ssh.nix | 1 + home/lilith/stylix.nix | 1 + system/core/default.nix | 2 - system/core/packages.nix | 3 +- system/optional/desktop.nix | 2 +- system/optional/nfs.nix | 12 +----- 12 files changed, 49 insertions(+), 54 deletions(-) diff --git a/home/lilith/git.nix b/home/lilith/git.nix index 4946e8cd..1c3fd270 100644 --- a/home/lilith/git.nix +++ b/home/lilith/git.nix @@ -3,14 +3,16 @@ programs.git = { enable = true; lfs.enable = true; - userName = "Lilith"; - userEmail = "liv@benstem.de"; - difftastic.enable = true; signing = { key = "B96CE30E7F0B4319DE0025B4272C807BD91F8446"; signByDefault = true; }; - extraConfig = { + settings = { + user = { + name = "Lilith"; + email = "liv@benstem.de"; + }; + diff = { algorith = "histogram"; submodule = "log"; @@ -32,4 +34,5 @@ init.defaultBranch = "main"; }; }; + programs.difftastic.enable = true; } diff --git a/home/lilith/hyprland/default.nix b/home/lilith/hyprland/default.nix index 8881edb1..64f89e99 100644 --- a/home/lilith/hyprland/default.nix +++ b/home/lilith/hyprland/default.nix @@ -1,4 +1,4 @@ -{ hyprland, ... }: +{ hyprland, pkgs, ... }: { imports = [ hyprland.homeManagerModules.default @@ -12,7 +12,7 @@ wayland.windowManager.hyprland = { enable = true; - # package = hyprland.packages.${pkgs.system}.hyprland; + package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; xwayland.enable = true; diff --git a/home/lilith/hyprland/hyprgrass.nix b/home/lilith/hyprland/hyprgrass.nix index 2dd8ea0b..db0e5dec 100644 --- a/home/lilith/hyprland/hyprgrass.nix +++ b/home/lilith/hyprland/hyprgrass.nix @@ -8,7 +8,7 @@ { options.desktop.touchSupport = lib.mkEnableOption "Enables touch-related features"; config.wayland.windowManager.hyprland = lib.mkIf config.desktop.touchSupport { - plugins = [ hyprgrass.packages.${pkgs.system}.default ]; + plugins = [ hyprgrass.packages.${pkgs.stdenv.hostPlatform.system}.default ]; settings.plugin.touch_gestures = { sensitivity = 4.0; diff --git a/home/lilith/hyprland/settings.nix b/home/lilith/hyprland/settings.nix index e0de17eb..40986bd9 100644 --- a/home/lilith/hyprland/settings.nix +++ b/home/lilith/hyprland/settings.nix @@ -2,49 +2,50 @@ { wayland.windowManager.hyprland.settings.windowrule = [ # keepass special workplace - "workspace special:keepass,class:org.keepassxc.KeePassXC,title:^(.*)(KeePassXC)(.*)$" + "workspace special:keepass,match:class org.keepassxc.KeePassXC,match:title ^(.*)(KeePassXC)(.*)$" # show database unlock prompt on all workspaces - "workspace unset silent,class:org.keepassxc.KeePassXC,title:Unlock Database - KeePassXC," - "center,class:org.keepassxc.KeePassXC,title:Unlock Database - KeePassXC," - "pin,class:org.keepassxc.KeePassXC,title:Unlock Database - KeePassXC," + "workspace unset silent,match:class org.keepassxc.KeePassXC,match:title Unlock Database - KeePassXC," + "center on,match:class org.keepassxc.KeePassXC,match:title Unlock Database - KeePassXC," + "pin on,match:class org.keepassxc.KeePassXC,match:title Unlock Database - KeePassXC," + "stay_focused on,match:class org.keepassxc.KeePassXC,match:title Unlock Database - KeePassXC," # show inline images with ueberzugpp - "noanim, class:^ueberzugpp_(.*)$" + "no_anim on, match:class ^ueberzugpp_(.*)$" # clipboard manager clipse - "float,class:(clipse)" - "size 50% 50%,class:(clipse)" - "center, class:(clipse)" + "float on,match:class (clipse)" + "size 50% 50%,match:class (clipse)" + "center on, match:class (clipse)" # path of exile / poetrade hacks - "tag +poe, class:^(steam_app_238960)$" - "tag +poe, class:^(steam_app_2694490)$" - "tag +poe, title:^(Path of Exile)$" - "fullscreen, tag:poe" + "tag +poe, match:class ^(steam_app_238960)$" + "tag +poe, match:class ^(steam_app_2694490)$" + "tag +poe, match:title ^(Path of Exile)$" + "fullscreen on, match:tag poe" - "tag +awakened-poe-trade,class:^(awakened-poe-trade)$" - "tag +awakened-poe-trade,class:^(exiled-exchange-2)$" - "float,tag:awakened-poe-trade" - "noblur,tag:awakened-poe-trade" - "nofocus,tag:awakened-poe-trade" - "noshadow,tag:awakened-poe-trade" - "noborder,tag:awakened-poe-trade" - "pin,tag:awakened-poe-trade" - "renderunfocused,tag:awakened-poe-trade" - "size 90% 90%,tag:awakened-poe-trade" - "center,tag:awakened-poe-trade" + "tag +awakened-poe-trade,match:class ^(awakened-poe-trade)$" + "tag +awakened-poe-trade,match:class ^(exiled-exchange-2)$" + "float on,match:tag awakened-poe-trade" + "no_blur on,match:tag awakened-poe-trade" + "no_focus on,match:tag awakened-poe-trade" + "no_shadow on,match:tag awakened-poe-trade" + "border_size 0, match:tag awakened-poe-trade" + "pin on,match:tag awakened-poe-trade" + "render_unfocused on,match:tag awakened-poe-trade" + "size 90% 90%,match:tag awakened-poe-trade" + "center on,match:tag awakened-poe-trade" - # "stayfocused,class:^(steam_app_238960)$" + # "stayfocused,match:class ^(steam_app_238960)$" ]; wayland.windowManager.hyprland.settings.bind = [ - "SHIFT,Space,pass,class:^(awakened-poe-trade)$" - "CTRL,D,pass,class:^(awakened-poe-trade)$" - "CTRL ALT,D,pass,class:^(awakened-poe-trade)$" + "SHIFT,Space,pass,match:class ^(awakened-poe-trade)$" + "CTRL,D,pass,match:class ^(awakened-poe-trade)$" + "CTRL ALT,D,pass,match:class ^(awakened-poe-trade)$" - "SHIFT,Space,pass,class:^(exiled-exchange-2)$" - "CTRL,D,pass,class:^(exiled-exchange-2)$" - "CTRL ALT,D,pass,class:^(exiled-exchange-2)$" + "SHIFT,Space,pass,match:class ^(exiled-exchange-2)$" + "CTRL,D,pass,match:class ^(exiled-exchange-2)$" + "CTRL ALT,D,pass,match:class ^(exiled-exchange-2)$" "SUPER, mouse_down, sendshortcut, , mouse:272" ]; diff --git a/home/lilith/input.nix b/home/lilith/input.nix index 471812f7..3b262a44 100644 --- a/home/lilith/input.nix +++ b/home/lilith/input.nix @@ -8,7 +8,7 @@ fcitx5 = { addons = with pkgs; [ fcitx5-gtk - fcitx5-chinese-addons + qt6Packages.fcitx5-chinese-addons fcitx5-nord ]; ignoreUserConfig = true; diff --git a/home/lilith/packages.nix b/home/lilith/packages.nix index 34e37900..22211772 100644 --- a/home/lilith/packages.nix +++ b/home/lilith/packages.nix @@ -1,7 +1,7 @@ { pkgs, rose-pine-hyprcursor, ... }: { home.packages = with pkgs; [ - rose-pine-hyprcursor.packages.${pkgs.system}.default + rose-pine-hyprcursor.packages.${pkgs.stdenv.hostPlatform.system}.default gcc gnumake diff --git a/home/lilith/ssh.nix b/home/lilith/ssh.nix index 720f4113..1ce745d8 100644 --- a/home/lilith/ssh.nix +++ b/home/lilith/ssh.nix @@ -6,6 +6,7 @@ programs.ssh = { enable = true; + enableDefaultConfig = false; matchBlocks = { "hpc" = { diff --git a/home/lilith/stylix.nix b/home/lilith/stylix.nix index 02bffc23..7c6c5974 100644 --- a/home/lilith/stylix.nix +++ b/home/lilith/stylix.nix @@ -2,5 +2,6 @@ { stylix.targets = { firefox.enable = true; + zen-browser.profileNames = [ "lilith" ]; }; } diff --git a/system/core/default.nix b/system/core/default.nix index 67756c19..8ad2e9b7 100644 --- a/system/core/default.nix +++ b/system/core/default.nix @@ -19,6 +19,4 @@ ./virtualization.nix ]; - - environment.systemPackages = with pkgs; [ distrobox ]; } diff --git a/system/core/packages.nix b/system/core/packages.nix index d106ad97..d6e16e13 100644 --- a/system/core/packages.nix +++ b/system/core/packages.nix @@ -13,12 +13,13 @@ git jq yq - du-dust + dust ripgrep sops wget wireguard-tools zip vpnc + distrobox ]; } diff --git a/system/optional/desktop.nix b/system/optional/desktop.nix index 4bd14a46..846ccace 100644 --- a/system/optional/desktop.nix +++ b/system/optional/desktop.nix @@ -17,7 +17,7 @@ services.dbus.enable = true; programs.hyprland.enable = true; - programs.hyprland.package = hyprland.packages.${pkgs.system}.hyprland; + programs.hyprland.package = hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; services.greetd = { enable = true; diff --git a/system/optional/nfs.nix b/system/optional/nfs.nix index 90d1d88f..8bdccfd2 100644 --- a/system/optional/nfs.nix +++ b/system/optional/nfs.nix @@ -13,17 +13,7 @@ "x-systemd.automount" "noauto" "x-systemd.idle-timeout=600" - "_netdev" - ]; - }; - fileSystems."/mnt/nas/torrent" = { - device = "nixserver:/torrent"; - fsType = "nfs"; - options = [ - "nfsvers=4.2" - "x-systemd.automount" - "noauto" - "x-systemd.idle-timeout=600" + "x-systemd.device-timeout=1" "_netdev" ]; };