diff --git a/modules/home/hyprland/conf/hypr/keybindings.conf b/modules/home/hyprland/conf/hypr/keybindings.conf index 6e68435..4e6021b 100644 --- a/modules/home/hyprland/conf/hypr/keybindings.conf +++ b/modules/home/hyprland/conf/hypr/keybindings.conf @@ -17,7 +17,7 @@ $filemanager = dolphin ################################################ # Main actions ################################################ -bind = $mainMod, Q, exec, ~/.config/hypr/scripts/dontkillsteam.sh # killactive, # kill the window on focus +bind = $mainMod, C, exec, ~/.config/hypr/scripts/dontkillsteam.sh # killactive, # kill the window on focus bind = $mainMod CTRL, delete, exit, # kill hyperland session bind = $mainMod, F, togglefloating, # toggle the window on focus to float bind = $mainMod CTRL, L, exec, swaylock # lock screen diff --git a/modules/home/hyprland/conf/hypr/windowrules.conf b/modules/home/hyprland/conf/hypr/windowrules.conf index c09d754..17d55f8 100644 --- a/modules/home/hyprland/conf/hypr/windowrules.conf +++ b/modules/home/hyprland/conf/hypr/windowrules.conf @@ -22,6 +22,9 @@ windowrulev2 = center,class:^(.*)$,title:^(Save [Ff]ile) windowrulev2 = float,class:^(.*)$,title:^(Save [Aa]s) windowrulev2 = center,class:^(.*)$,title:^(Save [Aa]s) +windowrulev2 = float,class:^(wechat)$,title:^(预览)$ +windowrulev2 = center,class:^(wechat)$,title:^(预览)$ + windowrulev2 = center,class:^(.*)$,title:^(Location)$ windowrulev2 = center,class:^(Code)$ diff --git a/modules/home/hyprland/conf/waybar/config.jsonc b/modules/home/hyprland/conf/waybar/config.jsonc index 159347b..7bd1dee 100644 --- a/modules/home/hyprland/conf/waybar/config.jsonc +++ b/modules/home/hyprland/conf/waybar/config.jsonc @@ -66,13 +66,17 @@ "format-window-separator": " ", "window-rewrite-default": "", "window-rewrite": { + "fcitx": "󰌌", + "code": "󰨞", + "Cursor": "󰅪", + "jetbrains-idea-ce": "", + "dbeaver": "", + "class": "", "class": "", "title<.*youtube.*>": "", "rofi": "󱓞", "kitty": "", - "code": "󰨞", - "Cursor": "󰅪", "org.gnome.Nautilus": "󰪶", "wechat": "", "wps": "󰈬", @@ -129,14 +133,14 @@ }, "cpu": { - "interval": 10, + "interval": 5, "format": "󰍛 {usage}%", "format-alt": "{icon0}{icon1}{icon2}{icon3}", "format-icons": ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█"] }, "temperature": { - "interval": 10, + "interval": 5, "hwmon-path": "/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input", "format": " {temperatureC}°C" }, @@ -151,14 +155,14 @@ }, "network": { + "interval": 5, // "interface": "wlp2*", // (Optional) To force the use of this interface "format-wifi": "󰤨 {essid}", "format-ethernet": "󱘖 Wired", "tooltip-format": "󱘖 {ipaddr}  {bandwidthUpBytes}  {bandwidthDownBytes}", "format-linked": "󱘖 {ifname} (No IP)", "format-disconnected": " Disconnected", - "format-alt": "󰤨 {signalStrength}%", - "interval": 5 + "format-alt": "󰤨 {signalStrength}%" }, "bluetooth": { diff --git a/modules/home/xdg.nix b/modules/home/xdg.nix index 3a56381..5f3b833 100644 --- a/modules/home/xdg.nix +++ b/modules/home/xdg.nix @@ -75,8 +75,8 @@ download = config.home.homeDirectory + "/tmp"; videos = config.home.homeDirectory + "/tmp"; pictures = config.home.homeDirectory + "/tmp"; - templates = config.home.homeDirectory + "/tmp"; - publicShare = config.home.homeDirectory + "/tmp"; + # templates = config.home.homeDirectory + "/tmp"; + # publicShare = config.home.homeDirectory + "/tmp"; extraConfig = { XDG_SCREENSHOTS_DIR = config.home.homeDirectory + "/tmp/Screenshots"; }; diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix index e753b7c..5ea267c 100644 --- a/modules/home/zsh/default.nix +++ b/modules/home/zsh/default.nix @@ -17,7 +17,7 @@ history.size = 10000; history.ignoreAllDups = true; history.path = "$HOME/.zsh_history"; - history.ignorePatterns = [ "rm *" "pkill *" "cp *" ]; + # history.ignorePatterns = [ "rm *" "pkill *" "cp *" ]; oh-my-zsh = { enable = true; diff --git a/profiles/apollo/hm/default.nix b/profiles/apollo/hm/default.nix index 2af7fe8..1167947 100644 --- a/profiles/apollo/hm/default.nix +++ b/profiles/apollo/hm/default.nix @@ -1,6 +1,10 @@ -{ ... }: { +{ pkgs, ... }: { imports = [ ./ssh ./hyprland.nix ]; + + home.packages = with pkgs; [ + nextcloud-client + ]; } diff --git a/profiles/apollo/hm/hyprland.nix b/profiles/apollo/hm/hyprland.nix index 4da7a2b..c6bb6a7 100644 --- a/profiles/apollo/hm/hyprland.nix +++ b/profiles/apollo/hm/hyprland.nix @@ -5,7 +5,8 @@ sessionVariables = { # for hyprland with nvidia gpu, ref https://wiki.hyprland.org/Nvidia/ # 启用注释部分会导致NVIDIA下无法启动hyprland - WLR_DRM_DEVICES = "/dev/dri/card1:/dev/dri/card0"; + WLR_DRM_DEVICES = "/dev/dri/card1"; + AQ_DRM_DEVICES = "/dev/dri/card1"; }; }; }