diff --git a/home/.zshrc b/home/.zshrc index 46a71bb..d79b491 100644 --- a/home/.zshrc +++ b/home/.zshrc @@ -35,11 +35,7 @@ bindkey "^[[1;5D" backward-word plugins=(zsh-interactive-cd git aliases docker archlinux sudo vscode) -export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" -[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm -[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion - -source /usr/share/oh-my-zsh/oh-my-zsh.sh +#source /usr/share/oh-my-zsh/oh-my-zsh.sh source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/powerlevel10k/powerlevel10k.zsh-theme source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh source ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh diff --git a/home/config/gtk-3.0/settings.ini b/home/config/gtk-3.0/settings.ini index 89009ea..ca2298f 100644 --- a/home/config/gtk-3.0/settings.ini +++ b/home/config/gtk-3.0/settings.ini @@ -1,6 +1,6 @@ [Settings] gtk-theme-name=catppuccin-mocha-lavender-standard+default -gtk-icon-theme-name=Tela-circle-purple-dark +gtk-icon-theme-name=Newaita-reborn-dracula gtk-font-name=Hack Nerd Font 11 gtk-cursor-theme-name=Sweet-cursors gtk-cursor-theme-size=24 diff --git a/home/config/hypr/hl-autostart.conf b/home/config/hypr/hl-autostart.conf index ad80610..de7f922 100644 --- a/home/config/hypr/hl-autostart.conf +++ b/home/config/hypr/hl-autostart.conf @@ -4,15 +4,14 @@ # Execute your favorite apps at launch #exec-once = hyprctl plugin load /usr/lib/libhycov.so -exec-once = hyprpm reload -n +#exec-once = hyprpm reload -n exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP exec-once = ~/.config/hypr/xdg-portal-hyprland #exec-once = lxpolkit -#exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 -exec-once = /usr/lib/hyprpolkitagent +exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec-once = waypaper --restore #exec-once = hyprpanel @@ -28,4 +27,6 @@ exec-once = hypridle exec = hyprshade off # exec-once = sway-audio-idle-inhibit -#exec-once = xdg-mime default pcmanfm.desktop inode/directory \ No newline at end of file +exec-once = xdg-mime default pcmanfm.desktop inode/directory + +exec-once = hyprctl setcursor Sweet-cursors 24 \ No newline at end of file diff --git a/home/config/hypr/hl-decoration.conf b/home/config/hypr/hl-decoration.conf index f2cacf7..0e3abae 100644 --- a/home/config/hypr/hl-decoration.conf +++ b/home/config/hypr/hl-decoration.conf @@ -19,10 +19,10 @@ decoration { active_opacity=1.00 inactive_opacity=1.00 - drop_shadow = true - shadow_range = 10 - shadow_render_power = 3 - col.shadow = rgba(18182540) + #drop_shadow = true + #shadow_range = 10 + #shadow_render_power = 3 + #col.shadow = rgba(18182540) dim_inactive = true dim_strength = 0.2 diff --git a/home/config/hypr/hl-env.conf b/home/config/hypr/hl-env.conf index 19b3bb1..877d7a0 100644 --- a/home/config/hypr/hl-env.conf +++ b/home/config/hypr/hl-env.conf @@ -1,6 +1,4 @@ env = GDK_BACKEND,wayland,x11,* -env = GDK_DEBUG,portals - env = QT_QPA_PLATFORM,wayland env = SDL_VIDEODRIVER,wayland env = CLUTTER_BACKEND,wayland @@ -9,7 +7,6 @@ env = QT_AUTO_SCREEN_SCALE_FACTOR,1 env = QT_QPA_PLATFORM,wayland;xcb env = QT_QPA_PLATFORMTHEME,qt6ct env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 -env = QT_QPA_PLATFORMTHEME,gtk2 #env = XCURSOR_THEME,Sweet Cursors” #env = XCURSOR_SIZE,24 @@ -18,12 +15,9 @@ env = XDG_CURRENT_DESKTOP,Hyprland env = XDG_SESSION_DESKTOP,Hyprland env = XDG_SESSION_TYPE,wayland env = WINDOW_MANAGER,Hyprland - -env = GTK_THEME,catppuccin-mocha-lavender-standard+default -env = GTK_USE_PORTAL,1 +#env = GTK_THEME,Catppuccin-Mocha-Standard-Lavender-Dark env = LANG,de_DE.UTF-8 env = EDITOR,"subl" -env = SUDO_EDITOR,"nvim" - +env = SUDO_EDITOR,"subl -w" env = MOZ_ENABLE_WAYLAND,1 \ No newline at end of file diff --git a/home/config/hypr/hl-input.conf b/home/config/hypr/hl-input.conf index 0d792f3..3338a50 100644 --- a/home/config/hypr/hl-input.conf +++ b/home/config/hypr/hl-input.conf @@ -21,7 +21,7 @@ input { gestures { # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = false + # workspace_swipe = false } # Example per-device config diff --git a/home/config/hypr/hl-keybindings.conf b/home/config/hypr/hl-keybindings.conf index b6a4b8a..15d1b77 100644 --- a/home/config/hypr/hl-keybindings.conf +++ b/home/config/hypr/hl-keybindings.conf @@ -2,7 +2,7 @@ $mainMod = SUPER # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -#bind = $mainMod, RETURN, exec, kitty +#bind = $mainMod, RETURN, exec, alacritty bind = $mainMod, RETURN, exec, $terminal #bind = $mainMod, TAB, cyclenext bind = $mainMod SHIFT, TAB, cyclenext, prev diff --git a/home/config/hypr/hl-layout.conf b/home/config/hypr/hl-layout.conf index 41cec5e..c22b0c8 100644 --- a/home/config/hypr/hl-layout.conf +++ b/home/config/hypr/hl-layout.conf @@ -2,10 +2,10 @@ dwindle { # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below preserve_split = true # you probably want this - no_gaps_when_only = 0 # monocle layout + #no_gaps_when_only = 0 # monocle layout } master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_is_master = true + #new_is_master = true } \ No newline at end of file diff --git a/home/config/hypr/hl-windowrules.conf b/home/config/hypr/hl-windowrules.conf index b61b5d0..a8b991c 100644 --- a/home/config/hypr/hl-windowrules.conf +++ b/home/config/hypr/hl-windowrules.conf @@ -5,10 +5,10 @@ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more windowrulev2 = noshadow, floating:0 -windowrule = dimaround,^(polkit)$ +windowrule = dimaround,class:^(polkit)$ -windowrule = idleinhibit fullscreen,^(.*)$ -windowrule = idleinhibit focus, mpv +windowrule = idleinhibit fullscreen,class:^(.*)$ +windowrule = idleinhibit focus, class:mpv windowrule = idleinhibit focus, class:^(.*celluloid.*)$ # firefox Picture-in-Picture @@ -39,27 +39,28 @@ windowrule = float,title:^(galculator)$ windowrule = float,title:^(Dateien entpacken)$ windowrulev2 = float,class:^(nm-connection-editor)$ windowrulev2 = float,class:^(sddm-conf)$ -windowrule = float, mpv -windowrule = float, Vlc -windowrule = float, file_progress -windowrule = float, confirm -windowrule = float, dialog -windowrule = float, download -windowrule = float, notification -windowrule = float, error -windowrule = float, splash -windowrule = float, confirmreset +windowrule = float, class:mpv +windowrule = float, class:Vlc +windowrule = float, class:file_progress +windowrule = float, class:confirm +windowrule = float, class:dialog +windowrule = float, class:download +windowrule = float, class:notification +windowrule = float, class:error +windowrule = float, class:splash +windowrule = float, class:confirmreset windowrule = float, title:Open File windowrule = float, title:branchdialog -windowrule = float, Lxappearance -windowrule = float, Resources -windowrule = float, Rofi +windowrule = float, class:Lxappearance +windowrule = float, class:Resources +windowrule = float, class:Rofi windowrule = float, class:Viewnior -windowrule = float,feh -windowrule = float, pavucontrol-qt -windowrule = float, pavucontrol -windowrule = float, file-roller -windowrule = float, xarchiver +windowrule = float, class:feh +windowrule = float, class:pavucontrol-qt +windowrule = float, class:pavucontrol +windowrule = float, class:file-roller +windowrule = float, class:xarchiver +windowrule = float, class:mpv windowrulev2 = stayfocused, class:^(pinentry-) # fix pinentry losing focus windowrule = float, title:^(Media viewer)$ @@ -88,13 +89,13 @@ windowrulev2 = pin,class:^(Conky)$ windowrulev2 = move 100 100,class:^(Conky)$ # Audio Mixer -windowrule = float,pavucontrol -windowrule = center,pavucontrol +windowrule = float,class:pavucontrol +windowrule = center,class:pavucontrol windowrule = float,title:^(NoiseTorch)$ windowrule = float,title:^(Waydroid)$ # Nemo File Roller -windowrule = float,file-roller +windowrule = float,class:file-roller windowrule = float,title:(Properties)$ # VPN Connection Dialog diff --git a/home/config/hypr/hyprland.conf b/home/config/hypr/hyprland.conf index 8197c1a..57a915b 100644 --- a/home/config/hypr/hyprland.conf +++ b/home/config/hypr/hyprland.conf @@ -1,3 +1,4 @@ +# Set programs that you use $terminal = alacritty diff --git a/home/config/hypr/xdg-portal-hyprland b/home/config/hypr/xdg-portal-hyprland old mode 100755 new mode 100644 diff --git a/stower.sh b/stower.sh index 82bd36b..25cdcf3 100755 --- a/stower.sh +++ b/stower.sh @@ -87,7 +87,7 @@ function inst_sddm { sudo rm -rf /usr/share/sddm/themes/moonarch-sddm/.git sudo sed -i "s/^Current=.*/Current=moonarch-sddm/g" /etc/sddm.conf - sudo systemctl disable display-manager + #sudo systemctl disable display-manager sudo systemctl enable sddm cd $HYPRMOONARCH_DIR @@ -104,7 +104,7 @@ function inst_pkgs { then - declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet xarchiver man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop timeshift timeshift-autosnap flatery-icon-theme-git waterfox fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursor-theme-git sweet-cursors-hyprcursor-git catppuccin-gtk-theme-mocha rofi cmake meson cpio pkg-config ttf-ubuntu-nerd ttf-jetbrains-mono-nerd hyprsysteminfo qt5-styleplugins qt6gtk2 qt5gtk2 hyprpolkitagent hyprshade) + declare -a pkg_list=(wayland stow jq network-manager-applet alarm-clock-applet xarchiver man-db hardinfo networkmanager-openvpn udisks2 plocate vim alacritty gettext-hostname lsd alsa-utils ponymix btop timeshift timeshift-autosnap newaita-reborn-icons-git waterfox fzf unzip hyprland hypridle hyprlock hyprcursor hyprkeys hyprpicker swww waypaper xdg-desktop-portal-hyprland wdisplays waybar nwg-look cliphist wlogout hyprlock waybar-module-pacman-updates-git ufw zsh oh-my-zsh noise-suppression-for-voice grim satty-bin slurp dunst sweet-cursors-hyprcursor-git catppuccin-gtk-theme-mocha rofi cmake meson cpio pkg-config ttf-ubuntu-nerd ttf-hack-nerd ttf-jetbrains-mono-nerd hyprsysteminfo qt5-styleplugins qt6gtk2 qt5gtk2 hyprpolkitagent hyprshade) for key in "${pkg_list[@]}" do @@ -156,8 +156,8 @@ function inst_filemanager { pkg_inst $key done - sudo systemctl start bluetooth.service - sudo systemctl enable bluetooth.service + $(getent group storage) ] || groupadd storage + sudo usermod -a -G storage $USER fi cd $HYPRMOONARCH_DIR @@ -242,20 +242,26 @@ function setup { # GUI log "Set up GUI Themes" gsettings set org.gnome.desktop.interface gtk-theme "Catppuccin-Mocha-Standard-Lavender-Dark" + log "Setting cursor theme" + hyprctl setcursor Sweet-cursors-hyprcursor 32 log "Done... Window decorations" gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' log "Done... Set color-scheme to prefer-dark" gsettings set org.gnome.desktop.interface cursor-theme Sweet-cursors log "Done... Set a sweet cursor" - # Extra Font - log "Installing extra fonts" + # Extra Font + log "Installing extra fonts" sudo mkdir -p /usr/local/share/fonts/ sudo install -C $HYPRMOONARCH_DIR/usr/local/share/fonts/MonarchOS.ttf /usr/local/share/fonts/MonarchOS.ttf sudo install -C $HYPRMOONARCH_DIR/usr/local/share/fonts/Icomoon-Feather.ttf /usr/local/share/fonts/Icomoon-Feather.ttf sudo install -C $HYPRMOONARCH_DIR/etc/fonts/local.conf /etc/fonts/local.conf fc-cache -f + # Shared things + cp -R $HYPRMOONARCH_DIR/usr/share/* /usr/share/ + cp -R $HYPRMOONARCH_DIR/usr/local/* /usr/local/ + # Wallpaper log "Installing wallpapers" WALLPAPER_DIR=$HOME/Pictures/Wallpaper @@ -269,7 +275,7 @@ function setup { swww img $WALLPAPER_DIR/1586853771_daniel-leone-v7datklzzaw-unsplash-modded.jpg # dotfiles - log "Time to stow things up" + log "Time to stow things up... Installing dotfiles" rm -rf $HOME/.config/hypr cp -R $HYPRMOONARCH_DIR/home/config/ $HOME/.hyprm/.config/ cp -R $HYPRMOONARCH_DIR/home/.bashrc $HOME/.hyprm/.bashrc @@ -309,6 +315,8 @@ function init { inst_clamav inst_davfs + sudo gtk-update-icon-cache -f -t /usr/share/icons + rebooter }