diff --git a/config.yaml b/config.yaml index 63e8b5f..3f281fa 100644 --- a/config.yaml +++ b/config.yaml @@ -29,26 +29,8 @@ dotfiles: d_swaylock: src: config/swaylock dst: ~/.config/swaylock - d_sddm.conf.d: - src: etc/sddm.conf.d - dst: /etc/sddm.conf.d - f_pacman.conf: - src: etc/pacman.conf - dst: /etc/pacman.conf - f_mirrorlist: - src: etc/pacman.d/mirrorlist - dst: /etc/pacman.d/mirrorlist - f_backlight.rules: - src: etc/udev/rules.d/backlight.rules - dst: /etc/udev/rules.d/backlight.rules - f_asoundrc: - src: asoundrc - dst: ~/.asoundrc - d_modprobe.d: - src: etc/modprobe.d - dst: /etc/modprobe.d profiles: - arch-hyprland: + lostecho-nuc11pahi5: dotfiles: - f_zshrc - d_hypr @@ -57,9 +39,3 @@ profiles: - d_kitty - d_dunst - d_swaylock - - d_sddm.conf.d - - f_pacman.conf - - f_mirrorlist - - f_backlight.rules - - f_asoundrc - - d_modprobe.d diff --git a/dotfiles/asoundrc b/dotfiles/asoundrc deleted file mode 100644 index 4648262..0000000 --- a/dotfiles/asoundrc +++ /dev/null @@ -1,9 +0,0 @@ -pcm.!default { - type hw - card 0 -} - -ctl.!default { - type hw - card 0 -} diff --git a/dotfiles/config/hypr/hyprland.conf b/dotfiles/config/hypr/hyprland.conf index 9c5d30d..e10a561 100644 --- a/dotfiles/config/hypr/hyprland.conf +++ b/dotfiles/config/hypr/hyprland.conf @@ -13,9 +13,9 @@ OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. # autogenerated = 1 # remove this line to remove the warning # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=eDP-1,1920x1080@60,0x1440,1 +#monitor=eDP-1,1920x1080@60,0x1440,1 #monitor=DP-1,preferred,auto,1 -monitor=DP-1,2560x1440@75,0x0,1 +monitor=DP-2,2560x1440@75,0x0,1 # See https://wiki.hyprland.org/Configuring/Keywords/ for more @@ -23,19 +23,20 @@ monitor=DP-1,2560x1440@75,0x0,1 # exec-once = waybar & hyprpaper & firefox exec-once = waybar # status bar exec-once = dunst # notification daemon -exec-once = fcitx5 --replace -d # input method -exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # Wayland magic (screen sharing etc.) -exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # More wayland magic (screen sharing etc.) +exec-once = fcitx --replace -d # input method +# exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # Wayland magic (screen sharing etc.) +# exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # More wayland magic (screen sharing etc.) exec-once = ~/.config/hypr/scripts/xdg-portal-hyprland # hyprland init parameter # exec-once = cliphist wipe # clear clipboard exec-once = /usr/lib/polkit-kde-authentication-agent-1 # root certifaction exec-once = ~/.config/hypr/scripts/bgaction # swww wallpaper -exec-once = wl-paste --type text --watch cliphist store -exec-once = wl-paste --type image --watch cliphist store +# exec-once = wl-paste --type text --watch cliphist store +# exec-once = wl-paste --type image --watch cliphist store # exec-once = hyprpaper # wallpaper # exec-once = ~/.config/hypr/scripts/launch_bar # status bar # exec-once = nm-applet --indicator # Systray app for Network/Wifi exec-once = udiskie & +exec-once = $HOME/.local/share/hyprload/hyprload.sh # Source a file (multi-file configs) # source = ~/.config/hypr/myColors.conf @@ -57,6 +58,7 @@ input { natural_scroll = yes tap-to-click = yes drag_lock = yes + scroll_factor = 0.3 } sensitivity = 0 # -1.0 - 1.0, 0 means no modification. @@ -65,9 +67,9 @@ input { general { # See https://wiki.hyprland.org/Configuring/Variables/ for more - gaps_in = 5 - gaps_out = 5 - border_size = 5 + gaps_in = 2 + gaps_out = 2 + border_size = 2 col.active_border = rgba(5fc9f8ee) rgba(fecb2eee) rgba(fd9426ee) rgba(fc3158ee) rgba(147efbee) rgba(53d769ee) rgba(fc3d39ee) rgba(f77737ee) rgba(fcaf45ee) rgba(ffdc80ee) 36deg col.inactive_border = rgba(595959aa) @@ -90,7 +92,7 @@ decoration { inactive_opacity=0.95 fullscreen_opacity=1.0 - rounding = 10 + rounding = 5 blur = yes blur_size = 5 blur_passes = 2 @@ -130,13 +132,15 @@ master { gestures { # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = off + workspace_swipe = yes + workspace_swipe_fingers = 3 } # Example per-device config # See https://wiki.hyprland.org/Configuring/Keywords/#executing for more -device:epic-mouse-v1 { - sensitivity = -0.5 +device:apple-inc.-magic-trackpad-1 { + #scroll_factor = 1.0 + #middle_button_emulation=0 } # Example windowrule v1 @@ -154,6 +158,7 @@ windowrulev2 = animation popin,class:^(kitty)$,title:^(update-sys)$ windowrulev2 = animation slide,class:^(wofi)$ windowrulev2 = move 100%-433 53,class:^(wofi)$,title:^(clippick)$ windowrulev2 = opacity 0.8 1.0,class:^(obsidian)$ +windowrulev2 = tile,title:^(微信读书) # See https://wiki.hyprland.org/Configuring/Keywords/ for more @@ -165,20 +170,21 @@ bind = $mainMod, Q, exec, kitty bind = $mainMod, R, exec, pkill wofi; wofi --show drun # bind = $mainMod, E, exec, kitty ranger bind = $mainMod, E, exec, dolphin -bind = $mainMod, N, exec, env DESKTOPINTEGRATION=false /usr/bin/obsidian %u --no-sandbox %U -bind = $mainMod, W, exec, /usr/bin/logseq %U +bind = $mainMod, O, exec, obsidian +bind = $mainMod, P, exec, logseq bind = $mainMod, L, exec, swaylock # Lock the screen bind = $mainMod, G, exec, google-chrome-stable bind = $mainMod, C, killactive, bind = $mainMod, M, exec, wlogout --protocol layer-shell # show the logout window +bind = $mainMod, W, exec, google-chrome-stable --profile-directory=Default --app-id=magamgmomalmppfcmkgppgboggkfiphd # bind = $mainMod, V, exec, cliphist list | rofi -dmenu | cliphist decode | wl-copy # bind = $mainMod, U, exec, grim -g "$(slurp)" - | wl-copy # bind = $mainMod SHIFT, U, exec, grim $screen_file # bind = $mainMod, Y, exec, grim -g "$(slurp)" $screen_file # bind = $mainMod SHIFT, Y, exec, grim - | wl-copy bind = $mainMod, F, togglefloating, -bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod SHIFT, P, pseudo, # dwindle +bind = $mainMod SHIFT, J, togglesplit, # dwindle bind = $mainMod, Space, fullscreen # Move focus with mainMod + arrow keys diff --git a/dotfiles/config/hypr/hyprload.toml b/dotfiles/config/hypr/hyprload.toml new file mode 100644 index 0000000..c07129e --- /dev/null +++ b/dotfiles/config/hypr/hyprload.toml @@ -0,0 +1,9 @@ +plugins = [ + "horriblename/hyprland-touch-gestures", + # Installs the plugin from https://github.com/Duckonaut/split-monitor-workspaces + "Duckonaut/split-monitor-workspaces", + # A more explicit definition of the git install + { git = "https://github.com/Duckonaut/split-monitor-workspaces", branch = "main", name = "split-monitor-workspaces" }, + # Installs the same plugin from a local folder + { local = "/home/duckonaut/repos/split-monitor-workspaces" }, +] diff --git a/dotfiles/etc/modprobe.d/alsa-base.conf.bak b/dotfiles/etc/modprobe.d/alsa-base.conf.bak deleted file mode 100644 index 253c5f2..0000000 --- a/dotfiles/etc/modprobe.d/alsa-base.conf.bak +++ /dev/null @@ -1,3 +0,0 @@ -options snd_hda_intel index=0 -options snd_mia index=-2 - diff --git a/dotfiles/etc/modprobe.d/alsa-skl.conf.bak b/dotfiles/etc/modprobe.d/alsa-skl.conf.bak deleted file mode 100644 index b3dcaec..0000000 --- a/dotfiles/etc/modprobe.d/alsa-skl.conf.bak +++ /dev/null @@ -1 +0,0 @@ -blacklist snd_hda_intel diff --git a/dotfiles/etc/modprobe.d/alsa.conf b/dotfiles/etc/modprobe.d/alsa.conf deleted file mode 100644 index 6034eea..0000000 --- a/dotfiles/etc/modprobe.d/alsa.conf +++ /dev/null @@ -1 +0,0 @@ -options snd_hda_intel index=0 diff --git a/dotfiles/etc/modprobe.d/alsa.conf.bak b/dotfiles/etc/modprobe.d/alsa.conf.bak deleted file mode 100644 index 40e99df..0000000 --- a/dotfiles/etc/modprobe.d/alsa.conf.bak +++ /dev/null @@ -1,38 +0,0 @@ -# Alsa kernel modules' configuration file. - -# ALSA portion -alias char-major-116 snd -# OSS/Free portion -alias char-major-14 soundcore - -## -## IMPORTANT: -## You need to customise this section for your specific sound card(s) -## and then run `update-modules' command. -## Read alsa-driver's INSTALL file in /usr/share/doc for more info. -## -## ALSA portion -## alias snd-card-0 snd-interwave -## alias snd-card-1 snd-ens1371 -## OSS/Free portion -## alias sound-slot-0 snd-card-0 -## alias sound-slot-1 snd-card-1 -## - -# OSS/Free portion - card #1 -alias sound-service-0-0 snd-mixer-oss -alias sound-service-0-1 snd-seq-oss -alias sound-service-0-3 snd-pcm-oss -alias sound-service-0-8 snd-seq-oss -alias sound-service-0-12 snd-pcm-oss -## OSS/Free portion - card #2 -## alias sound-service-1-0 snd-mixer-oss -## alias sound-service-1-3 snd-pcm-oss -## alias sound-service-1-12 snd-pcm-oss - -alias /dev/mixer snd-mixer-oss -alias /dev/dsp snd-pcm-oss -alias /dev/midi snd-seq-oss - -# Set this to the correct number of cards. -options snd cards_limit=1 diff --git a/dotfiles/etc/modprobe.d/blacklist.conf.bak b/dotfiles/etc/modprobe.d/blacklist.conf.bak deleted file mode 100644 index d95da71..0000000 --- a/dotfiles/etc/modprobe.d/blacklist.conf.bak +++ /dev/null @@ -1 +0,0 @@ -blacklist snd_intel18x0m diff --git a/dotfiles/etc/modprobe.d/inteldsp.conf b/dotfiles/etc/modprobe.d/inteldsp.conf deleted file mode 100644 index adda853..0000000 --- a/dotfiles/etc/modprobe.d/inteldsp.conf +++ /dev/null @@ -1,2 +0,0 @@ -options snd-hda-intel disable_dmic_detect=0 -options snd-intel-dspcfg dsp_driver=1 diff --git a/dotfiles/etc/pacman.conf b/dotfiles/etc/pacman.conf deleted file mode 100644 index fe0612a..0000000 --- a/dotfiles/etc/pacman.conf +++ /dev/null @@ -1,112 +0,0 @@ -# -# /etc/pacman.conf -# -# See the pacman.conf(5) manpage for option and repository directives - -# -# GENERAL OPTIONS -# -[options] -# The following paths are commented out with their default values listed. -# If you wish to use different paths, uncomment and update the paths. -#RootDir = / -#DBPath = /var/lib/pacman/ -#CacheDir = /var/cache/pacman/pkg/ -#LogFile = /var/log/pacman.log -#GPGDir = /etc/pacman.d/gnupg/ -#HookDir = /etc/pacman.d/hooks/ -HoldPkg = pacman glibc -#XferCommand = /usr/bin/curl -L -C - -f -o %o %u -#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -#CleanMethod = KeepInstalled -Architecture = auto - -# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup -#IgnorePkg = -#IgnoreGroup = - -#NoUpgrade = -#NoExtract = - -# Misc options -#UseSyslog -Color -#NoProgressBar -CheckSpace -#VerbosePkgLists -ParallelDownloads = 32 - -# By default, pacman accepts packages signed by keys that its local keyring -# trusts (see pacman-key and its man page), as well as unsigned packages. -SigLevel = Required DatabaseOptional -LocalFileSigLevel = Optional -#RemoteFileSigLevel = Required - -# NOTE: You must run `pacman-key --init` before first using pacman; the local -# keyring can then be populated with the keys of all official Arch Linux -# packagers with `pacman-key --populate archlinux`. - -# -# REPOSITORIES -# - can be defined here or included from another file -# - pacman will search repositories in the order defined here -# - local/custom mirrors can be added here or in separate files -# - repositories listed first will take precedence when packages -# have identical names, regardless of version number -# - URLs will have $repo replaced by the name of the current repo -# - URLs will have $arch replaced by the name of the architecture -# -# Repository entries are of the format: -# [repo-name] -# Server = ServerName -# Include = IncludePath -# -# The header [repo-name] is crucial - it must be present and -# uncommented to enable the repo. -# - -# The testing repositories are disabled by default. To enable, uncomment the -# repo name header and Include lines. You can add preferred servers immediately -# after the header, and they will be used before the default mirrors. - -#[testing] -#Include = /etc/pacman.d/mirrorlist - -[core] -Include = /etc/pacman.d/mirrorlist - -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] -#Include = /etc/pacman.d/mirrorlist - -[community] -Include = /etc/pacman.d/mirrorlist - -[archlinuxcn] -Server = https://mirrors.tuna.tsinghua.edu.cn/archlinuxcn/$arch - -#[chaotic-aur] -#Include = /etc/pacman.d/chaotic-mirrorlist - -#[Clansty] -#SigLevel = Never -#Server = https://repo.lwqwq.com/archlinux/$arch -#Server = https://pacman.ltd/archlinux/$arch -#Server = https://repo.clansty.com/archlinux/$arch - -# If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repositories as required here. - -#[multilib-testing] -#Include = /etc/pacman.d/mirrorlist - -#[multilib] -#Include = /etc/pacman.d/mirrorlist - -# An example of a custom package repository. See the pacman manpage for -# tips on creating your own repositories. -#[custom] -#SigLevel = Optional TrustAll -#Server = file:///home/custompkgs diff --git a/dotfiles/etc/pacman.d/mirrorlist b/dotfiles/etc/pacman.d/mirrorlist deleted file mode 100644 index f390de1..0000000 --- a/dotfiles/etc/pacman.d/mirrorlist +++ /dev/null @@ -1 +0,0 @@ -Server = https://mirrors.tuna.tsinghua.edu.cn/archlinux/$repo/os/$arch diff --git a/dotfiles/etc/sddm.conf.d/10-theme.conf b/dotfiles/etc/sddm.conf.d/10-theme.conf deleted file mode 100644 index 4eb51a2..0000000 --- a/dotfiles/etc/sddm.conf.d/10-theme.conf +++ /dev/null @@ -1,2 +0,0 @@ -[Theme] -Current=sugar-candy diff --git a/dotfiles/etc/sddm.conf.d/autologin.conf b/dotfiles/etc/sddm.conf.d/autologin.conf deleted file mode 100644 index b069134..0000000 --- a/dotfiles/etc/sddm.conf.d/autologin.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Autologin] -User=lostecho -Session=hyprland.desktop diff --git a/dotfiles/etc/sddm.conf.d/hidpi.conf b/dotfiles/etc/sddm.conf.d/hidpi.conf deleted file mode 100644 index c2557d2..0000000 --- a/dotfiles/etc/sddm.conf.d/hidpi.conf +++ /dev/null @@ -1,5 +0,0 @@ -yland] -EnableHiDPI=true - -[X11] -EnableHiDPI=true diff --git a/dotfiles/etc/sddm.conf.d/kde_settings.conf b/dotfiles/etc/sddm.conf.d/kde_settings.conf deleted file mode 100644 index 351716e..0000000 --- a/dotfiles/etc/sddm.conf.d/kde_settings.conf +++ /dev/null @@ -1,15 +0,0 @@ -[Autologin] -Relogin=false -Session=hyprland.desktop -User=lostecho - -[General] -HaltCommand=/usr/bin/systemctl poweroff -RebootCommand=/usr/bin/systemctl reboot - -[Theme] -Current=breeze - -[Users] -MaximumUid=60513 -MinimumUid=1000 diff --git a/dotfiles/etc/udev/rules.d/backlight.rules b/dotfiles/etc/udev/rules.d/backlight.rules deleted file mode 100644 index c5bc5cd..0000000 --- a/dotfiles/etc/udev/rules.d/backlight.rules +++ /dev/null @@ -1 +0,0 @@ -ACTION=="add", SUBSYSTEM=="backlight", RUN+="/bin/chgrp video $sys$devpath/brightness" diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 777f7a1..6d8fc27 100644 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -73,7 +73,8 @@ ZSH_THEME="zhann" plugins=( git sudo - zsh-syntax-highlighting + #zsh-syntax-highlighting + F-Sy-H zsh-autosuggestions history-substring-search )