From 7886b23099d6ef0db9e5903fc83dfeab9b091133 Mon Sep 17 00:00:00 2001
From: lostecho <752549025@qq.com>
Date: Wed, 12 Jul 2023 21:18:59 +0800
Subject: [PATCH] update config

---
 config.yaml                               | 10 +++++++++-
 dotfiles/config/hypr/hyprland.conf        |  6 ++----
 dotfiles/config/hypr/hyprv_util           |  0
 dotfiles/config/hypr/scripts/bgaction     |  6 +++---
 dotfiles/config/waybar/scripts/brightness |  0
 dotfiles/oh-my-zsh                        |  1 +
 dotfiles/software                         | 14 ++++++++++++++
 dotfiles/zshrc                            |  1 +
 8 files changed, 30 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 dotfiles/config/hypr/hyprv_util
 mode change 100755 => 100644 dotfiles/config/waybar/scripts/brightness
 create mode 160000 dotfiles/oh-my-zsh
 create mode 100644 dotfiles/software

diff --git a/config.yaml b/config.yaml
index 3f281fa..0154988 100644
--- a/config.yaml
+++ b/config.yaml
@@ -29,8 +29,14 @@ dotfiles:
   d_swaylock:
     src: config/swaylock
     dst: ~/.config/swaylock
+  f_software:
+    src: software
+    dst: ~/.software
+  d_oh-my-zsh:
+    src: oh-my-zsh
+    dst: ~/.oh-my-zsh
 profiles:
-  lostecho-nuc11pahi5:
+  arch:
     dotfiles:
     - f_zshrc
     - d_hypr
@@ -39,3 +45,5 @@ profiles:
     - d_kitty
     - d_dunst
     - d_swaylock
+    - f_software
+    - d_oh-my-zsh
diff --git a/dotfiles/config/hypr/hyprland.conf b/dotfiles/config/hypr/hyprland.conf
index aa16084..27f98bb 100644
--- a/dotfiles/config/hypr/hyprland.conf
+++ b/dotfiles/config/hypr/hyprland.conf
@@ -13,9 +13,7 @@ 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=DP-1,preferred,auto,1
-monitor=DP-2,2560x1440@75,0x0,1
+monitor=DP-2,2560x1440@75,auto,1
 
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
@@ -41,7 +39,7 @@ exec-once = udiskie &
 # Source a file (multi-file configs)
 # source = ~/.config/hypr/myColors.conf
 #source = ~/.config/hypr/env_var.conf
-source = ~/.config/hypr/media-binds.conf
+#source = ~/.config/hypr/media-binds.conf
 
 # Some default env vars.
 env = XCURSOR_SIZE,24
diff --git a/dotfiles/config/hypr/hyprv_util b/dotfiles/config/hypr/hyprv_util
old mode 100755
new mode 100644
diff --git a/dotfiles/config/hypr/scripts/bgaction b/dotfiles/config/hypr/scripts/bgaction
index 3b14d8c..f4aece0 100755
--- a/dotfiles/config/hypr/scripts/bgaction
+++ b/dotfiles/config/hypr/scripts/bgaction
@@ -1,14 +1,14 @@
 #!/usr/bin/bash
 
 #start swwww
-swww query || swww init
+swww init
 
 #figure out which waybar theme is set
 THEMEIS=$(readlink -f ~/.config/waybar/style.css | cut -d '-' -f2)
 
 #show the correct wallpapper based on the theme
 if [ $THEMEIS == "dark.css" ]; then
-    swww img -o eDP-1 ~/.config/hypr/wallpaper-dark.jpg && swww img -o DP-1 ~/.config/hypr/wallpaper-dark.jpg
+    swww img -o DP-2 ~/.config/hypr/wallpaper-dark.jpg
 else
-    swww img -o eDP-1 ~/.config/hypr/wallpaper.jpg && swww img -o DP-1 ~/.config/hypr/wallpaper.jpg
+    swww img -o DP-2 ~/.config/hypr/wallpaper.jpg
 fi
diff --git a/dotfiles/config/waybar/scripts/brightness b/dotfiles/config/waybar/scripts/brightness
old mode 100755
new mode 100644
diff --git a/dotfiles/oh-my-zsh b/dotfiles/oh-my-zsh
new file mode 160000
index 0000000..fe4b565
--- /dev/null
+++ b/dotfiles/oh-my-zsh
@@ -0,0 +1 @@
+Subproject commit fe4b5659863c388786986d70fa6d1bb66b00afb6
diff --git a/dotfiles/software b/dotfiles/software
new file mode 100644
index 0000000..06fc016
--- /dev/null
+++ b/dotfiles/software
@@ -0,0 +1,14 @@
+# pacman
+archlinuxcn-keyring yay paru hyprland-git 
+zsh ketty dunst polkit-kde-agent wofi xdg-desktop-portal-hyprland 
+waybar-hyprland-git curl sddm ttf-jetbrains-mono-nerd noto-fonts-emoji
+swaylock-effects udiskie 
+way-zenhei wqy-microhei wqy-microhei-lite wqy-bitmapfont 
+alsa-utils pulseaudio pamixer pavuconrtol blueman network-manager-applet btop
+fcitx5 fcitx5-rime fcitx5-chinese-addons fcitx5-material-color fcitx5-configtool
+obsidain neofetch
+
+plasma-desktop
+
+# yay
+google-chrome dotdrop swww wlogout logseq-desktop-wayland-bin
diff --git a/dotfiles/zshrc b/dotfiles/zshrc
index 6d8fc27..115385b 100644
--- a/dotfiles/zshrc
+++ b/dotfiles/zshrc
@@ -121,6 +121,7 @@ alias dotdrop="dotdrop --cfg=~/.dotfiles/config.yaml"
 alias vhypr="vim ~/.config/hypr/hyprland.conf" # edit hyprland config
 alias vzsh="vim ~/.zshrc" # edit zsh config
 alias szsh="source ~/.zshrc" # source the zshrc file
+alias hyprloadreins="curl -sSL https://raw.githubusercontent.com/Duckonaut/hyprload/main/install.sh | bash"
 
 # quick command
 alias pdf="zathura"