From 130064db3bc37e152c52ca2b2a0e5b11ab34a58b Mon Sep 17 00:00:00 2001 From: gaitas13 <91051922+gaitas13@users.noreply.github.com> Date: Sun, 14 Sep 2025 01:32:21 +0200 Subject: [PATCH] updated doom, hyprland, sway, zed and mpv --- .config/doom/config.el | 12 +++- .config/hypr/UserConfigs/UserSettings.conf | 61 ++----------------- .../UserConfigs/UserSettingsDecoration.conf | 9 +++ .../animations.d/animations-default.conf | 23 +++++++ .../UserConfigs/animations.d/animations.conf | 1 + .../hypr/UserConfigs/gaps.d/gaps-default.conf | 6 ++ .config/hypr/UserConfigs/gaps.d/gaps.conf | 1 + .../hypr/UserConfigs/graphics.d/blur-no.conf | 6 ++ .../hypr/UserConfigs/graphics.d/blur-yes.conf | 12 ++++ .config/hypr/UserConfigs/graphics.d/blur.conf | 1 + .../graphics.d/border-radius-no.conf | 3 + .../graphics.d/border-radius-yes.conf | 3 + .../UserConfigs/graphics.d/border-radius.conf | 1 + .../UserConfigs/graphics.d/shadow-no.conf | 6 ++ .../UserConfigs/graphics.d/shadow-yes.conf | 10 +++ .../hypr/UserConfigs/graphics.d/shadow.conf | 1 + .../graphics.d/window-default.conf | 7 +++ .../hypr/UserConfigs/graphics.d/window.conf | 1 + .config/mpv/mpv.conf | 38 ++++++++---- .config/sway/blur | 1 + .config/sway/colors.d/catppuccin-macchiato | 26 ++++++++ .config/sway/config | 15 ++++- .config/sway/corner | 1 + .config/sway/graphics.d/blur-no | 0 .config/sway/graphics.d/blur-yes | 5 ++ .config/sway/graphics.d/corner-radius-no | 0 .config/sway/graphics.d/corner-radius-yes | 1 + .../sway/theme.d/catppuccin-macchiato-theme | 0 .config/zed/settings.json | 18 ++++++ 29 files changed, 198 insertions(+), 71 deletions(-) create mode 100644 .config/hypr/UserConfigs/UserSettingsDecoration.conf create mode 100644 .config/hypr/UserConfigs/animations.d/animations-default.conf create mode 120000 .config/hypr/UserConfigs/animations.d/animations.conf create mode 100644 .config/hypr/UserConfigs/gaps.d/gaps-default.conf create mode 120000 .config/hypr/UserConfigs/gaps.d/gaps.conf create mode 100644 .config/hypr/UserConfigs/graphics.d/blur-no.conf create mode 100644 .config/hypr/UserConfigs/graphics.d/blur-yes.conf create mode 120000 .config/hypr/UserConfigs/graphics.d/blur.conf create mode 100644 .config/hypr/UserConfigs/graphics.d/border-radius-no.conf create mode 100644 .config/hypr/UserConfigs/graphics.d/border-radius-yes.conf create mode 120000 .config/hypr/UserConfigs/graphics.d/border-radius.conf create mode 100644 .config/hypr/UserConfigs/graphics.d/shadow-no.conf create mode 100644 .config/hypr/UserConfigs/graphics.d/shadow-yes.conf create mode 120000 .config/hypr/UserConfigs/graphics.d/shadow.conf create mode 100644 .config/hypr/UserConfigs/graphics.d/window-default.conf create mode 120000 .config/hypr/UserConfigs/graphics.d/window.conf create mode 120000 .config/sway/blur create mode 100644 .config/sway/colors.d/catppuccin-macchiato create mode 120000 .config/sway/corner create mode 100644 .config/sway/graphics.d/blur-no create mode 100644 .config/sway/graphics.d/blur-yes create mode 100644 .config/sway/graphics.d/corner-radius-no create mode 100644 .config/sway/graphics.d/corner-radius-yes create mode 100644 .config/sway/theme.d/catppuccin-macchiato-theme create mode 100755 .config/zed/settings.json diff --git a/.config/doom/config.el b/.config/doom/config.el index fadbb78..19a7d9f 100755 --- a/.config/doom/config.el +++ b/.config/doom/config.el @@ -32,10 +32,13 @@ ;; There are two ways to load a theme. Both assume the theme is installed and ;; available. You can either set `doom-theme' or manually load a theme with the ;; `load-theme' function. This is the default: -(setq doom-theme 'doom-one) +(setq doom-theme 'catppuccin) +(setq catppuccin-flavor 'macchiato) ;; This determines the style of line numbers in effect. If set to `nil', line ;; numbers are disabled. For relative line numbers, set this to `relative'. +(global-visual-line-mode 1) +(global-display-line-numbers-mode 1) (setq display-line-numbers-type t) ;; If you use `org' and don't want your org files in the default location below, @@ -75,5 +78,8 @@ ;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how ;; they are implemented. -(setq doom-theme 'catppuccin) -(setq catppuccin-flavor 'macchiato) \ No newline at end of file + + + +(setq projectile-project-search-path '(("~/Documents/0_mycode" . 1))) + diff --git a/.config/hypr/UserConfigs/UserSettings.conf b/.config/hypr/UserConfigs/UserSettings.conf index c20bff4..1d3cdfe 100644 --- a/.config/hypr/UserConfigs/UserSettings.conf +++ b/.config/hypr/UserConfigs/UserSettings.conf @@ -21,13 +21,13 @@ # mfact = 0.5 #} + +source = $HOME/.config/hypr/UserConfigs/gaps.d/gaps.conf general { # sensitivity=1.00 # apply_sens_to_raw=1 - gaps_in = 4 - gaps_out = 8 - border_size = 2 - resize_on_border = true + + #col.active_border = $color0 $color2 $color4 $color6 $color8 90deg #col.inactive_border = $backgroundCol @@ -43,60 +43,11 @@ group { } } -decoration { - rounding = 12 - - active_opacity = 1.0 - inactive_opacity = 0.9 - fullscreen_opacity = 1.0 +source = $HOME/.config/hypr/UserConfigs/UserSettingsDecoration.conf - dim_inactive = true - dim_strength = 0.1 - - #battery culprit 1 - shadow { - enabled=false - range=5 - render_power=2 - #color= $color2 - #color_inactive = 0x50000000 - } - - #battery culprit 2 - blur { - # either 4 at 2 passes or 7 at 1 - enabled = true - size = 7 - passes = 1 - ignore_opacity = true - new_optimizations = true - noise = 0.20 - } -} -animations { - enabled = yes +source = $HOME/.config/hypr/UserConfigs/animations.d/animations.conf - bezier = myBezier, 0.05, 0.9, 0.1, 1.05 - bezier = linear, 0.0, 0.0, 1.0, 1.0 - bezier = wind, 0.05, 0.9, 0.1, 1.05 - bezier = winIn, 0.1, 1.1, 0.1, 1.1 - bezier = winOut, 0.3, -0.3, 0, 1 - bezier = slow, 0, 0.85, 0.3, 1 - bezier = overshot, 0.7, 0.6, 0.1, 1.1 - bezier = bounce, 1.1, 1.6, 0.1, 0.85 - bezier = sligshot, 1, -1, 0.15, 1.25 - bezier = nice, 0, 6.9, 0.5, -4.20 - - animation = windowsIn, 1, 5, slow, popin - animation = windowsOut, 1, 5, winOut, popin - animation = windowsMove, 1, 5, wind, slide - animation = border, 1, 10, linear - animation = borderangle, 1, 180, linear, loop #used by rainbow borders and rotating colors - animation = fade, 1, 5, overshot - animation = workspaces, 1, 5, wind - animation = windows, 1, 5, bounce, popin -} input { kb_layout=es,us diff --git a/.config/hypr/UserConfigs/UserSettingsDecoration.conf b/.config/hypr/UserConfigs/UserSettingsDecoration.conf new file mode 100644 index 0000000..a04e81e --- /dev/null +++ b/.config/hypr/UserConfigs/UserSettingsDecoration.conf @@ -0,0 +1,9 @@ + + source = $HOME/.config/hypr/UserConfigs/graphics.d/window.conf + source = $HOME/.config/hypr/UserConfigs/graphics.d/border-radius.conf + + #battery culprit 1 + source = $HOME/.config/hypr/UserConfigs/graphics.d/shadow.conf + + #battery culprit 2 + source = $HOME/.config/hypr/UserConfigs/graphics.d/blur.conf diff --git a/.config/hypr/UserConfigs/animations.d/animations-default.conf b/.config/hypr/UserConfigs/animations.d/animations-default.conf new file mode 100644 index 0000000..3a7885a --- /dev/null +++ b/.config/hypr/UserConfigs/animations.d/animations-default.conf @@ -0,0 +1,23 @@ +animations { + enabled = yes + + bezier = myBezier, 0.05, 0.9, 0.1, 1.05 + bezier = linear, 0.0, 0.0, 1.0, 1.0 + bezier = wind, 0.05, 0.9, 0.1, 1.05 + bezier = winIn, 0.1, 1.1, 0.1, 1.1 + bezier = winOut, 0.3, -0.3, 0, 1 + bezier = slow, 0, 0.85, 0.3, 1 + bezier = overshot, 0.7, 0.6, 0.1, 1.1 + bezier = bounce, 1.1, 1.6, 0.1, 0.85 + bezier = sligshot, 1, -1, 0.15, 1.25 + bezier = nice, 0, 6.9, 0.5, -4.20 + + animation = windowsIn, 1, 5, slow, popin + animation = windowsOut, 1, 5, winOut, popin + animation = windowsMove, 1, 5, wind, slide + animation = border, 1, 10, linear + animation = borderangle, 1, 180, linear, loop #used by rainbow borders and rotating colors + animation = fade, 1, 5, overshot + animation = workspaces, 1, 5, wind + animation = windows, 1, 5, bounce, popin +} diff --git a/.config/hypr/UserConfigs/animations.d/animations.conf b/.config/hypr/UserConfigs/animations.d/animations.conf new file mode 120000 index 0000000..1b35115 --- /dev/null +++ b/.config/hypr/UserConfigs/animations.d/animations.conf @@ -0,0 +1 @@ +animations-default.conf \ No newline at end of file diff --git a/.config/hypr/UserConfigs/gaps.d/gaps-default.conf b/.config/hypr/UserConfigs/gaps.d/gaps-default.conf new file mode 100644 index 0000000..95efb71 --- /dev/null +++ b/.config/hypr/UserConfigs/gaps.d/gaps-default.conf @@ -0,0 +1,6 @@ +general{ +gaps_in = 4 +gaps_out = 8 +border_size = 2 +resize_on_border = true +} diff --git a/.config/hypr/UserConfigs/gaps.d/gaps.conf b/.config/hypr/UserConfigs/gaps.d/gaps.conf new file mode 120000 index 0000000..2052d75 --- /dev/null +++ b/.config/hypr/UserConfigs/gaps.d/gaps.conf @@ -0,0 +1 @@ +gaps-default.conf \ No newline at end of file diff --git a/.config/hypr/UserConfigs/graphics.d/blur-no.conf b/.config/hypr/UserConfigs/graphics.d/blur-no.conf new file mode 100644 index 0000000..b73d245 --- /dev/null +++ b/.config/hypr/UserConfigs/graphics.d/blur-no.conf @@ -0,0 +1,6 @@ +decoration{ +blur { + enabled = false + } +} + diff --git a/.config/hypr/UserConfigs/graphics.d/blur-yes.conf b/.config/hypr/UserConfigs/graphics.d/blur-yes.conf new file mode 100644 index 0000000..846c261 --- /dev/null +++ b/.config/hypr/UserConfigs/graphics.d/blur-yes.conf @@ -0,0 +1,12 @@ +decoration{ +blur { + # either 4 at 2 passes or 7 at 1 + enabled = true + size = 7 + passes = 1 + ignore_opacity = true + new_optimizations = true + noise = 0.20 + } +} + diff --git a/.config/hypr/UserConfigs/graphics.d/blur.conf b/.config/hypr/UserConfigs/graphics.d/blur.conf new file mode 120000 index 0000000..861652d --- /dev/null +++ b/.config/hypr/UserConfigs/graphics.d/blur.conf @@ -0,0 +1 @@ +blur-yes.conf \ No newline at end of file diff --git a/.config/hypr/UserConfigs/graphics.d/border-radius-no.conf b/.config/hypr/UserConfigs/graphics.d/border-radius-no.conf new file mode 100644 index 0000000..ff9a95d --- /dev/null +++ b/.config/hypr/UserConfigs/graphics.d/border-radius-no.conf @@ -0,0 +1,3 @@ +decoration{ +rounding = 0 +} diff --git a/.config/hypr/UserConfigs/graphics.d/border-radius-yes.conf b/.config/hypr/UserConfigs/graphics.d/border-radius-yes.conf new file mode 100644 index 0000000..7823dc8 --- /dev/null +++ b/.config/hypr/UserConfigs/graphics.d/border-radius-yes.conf @@ -0,0 +1,3 @@ +decoration{ + rounding = 12 +} diff --git a/.config/hypr/UserConfigs/graphics.d/border-radius.conf b/.config/hypr/UserConfigs/graphics.d/border-radius.conf new file mode 120000 index 0000000..4812762 --- /dev/null +++ b/.config/hypr/UserConfigs/graphics.d/border-radius.conf @@ -0,0 +1 @@ +border-radius-yes.conf \ No newline at end of file diff --git a/.config/hypr/UserConfigs/graphics.d/shadow-no.conf b/.config/hypr/UserConfigs/graphics.d/shadow-no.conf new file mode 100644 index 0000000..b3eb529 --- /dev/null +++ b/.config/hypr/UserConfigs/graphics.d/shadow-no.conf @@ -0,0 +1,6 @@ +decoration{ +shadow { + enabled=false + } +} + diff --git a/.config/hypr/UserConfigs/graphics.d/shadow-yes.conf b/.config/hypr/UserConfigs/graphics.d/shadow-yes.conf new file mode 100644 index 0000000..5e5fedb --- /dev/null +++ b/.config/hypr/UserConfigs/graphics.d/shadow-yes.conf @@ -0,0 +1,10 @@ +decoration{ + shadow { + enabled=true + range=5 + render_power=2 + #color= $color2 + #color_inactive = 0x50000000 + } +} + diff --git a/.config/hypr/UserConfigs/graphics.d/shadow.conf b/.config/hypr/UserConfigs/graphics.d/shadow.conf new file mode 120000 index 0000000..138cd65 --- /dev/null +++ b/.config/hypr/UserConfigs/graphics.d/shadow.conf @@ -0,0 +1 @@ +shadow-no.conf \ No newline at end of file diff --git a/.config/hypr/UserConfigs/graphics.d/window-default.conf b/.config/hypr/UserConfigs/graphics.d/window-default.conf new file mode 100644 index 0000000..8ad8e9f --- /dev/null +++ b/.config/hypr/UserConfigs/graphics.d/window-default.conf @@ -0,0 +1,7 @@ +decoration{ +active_opacity = 1.0 +inactive_opacity = 0.9 +fullscreen_opacity = 1.0 +dim_inactive = true +dim_strength = 0.1 +} diff --git a/.config/hypr/UserConfigs/graphics.d/window.conf b/.config/hypr/UserConfigs/graphics.d/window.conf new file mode 120000 index 0000000..8fec5f9 --- /dev/null +++ b/.config/hypr/UserConfigs/graphics.d/window.conf @@ -0,0 +1 @@ +window-default.conf \ No newline at end of file diff --git a/.config/mpv/mpv.conf b/.config/mpv/mpv.conf index 5e37057..17e6cee 100755 --- a/.config/mpv/mpv.conf +++ b/.config/mpv/mpv.conf @@ -1,6 +1,6 @@ profile=pc-stuff profile=tonemaping-pc -profile=pc-sdr-display-conf +#profile=pc-sdr-display-conf #profile=tv-display-auto #profile=android-decent-hw @@ -72,7 +72,7 @@ screenshot-template="mpv-shot-%tY-%tm-%td_%tH-%tM-%tS" screenshot-directory="~/Pictures/mpv" -screenshot-png-compression=9 +screenshot-png-compression=7 screenshot-png-filter=0 @@ -160,30 +160,32 @@ deband=no vo=gpu-next #on windows be careful of using dxva2, d3d11va is better. -#hwdec=auto-safe -hwdec=auto-copy-safe #enables copyback, requires more resources +hwdec=auto-safe +#hwdec=auto-copy-safe #enables copyback, requires more resources #bwdif is now the fallback deinterlacer, but only vulkan has bwdif hw deinterlacing -#hwdec=vulkan-copy +#hwdec=vulkan +#hwdec=vulkan-copy + #vulkan uses more resources,but has better hdr compatibility #gpu-api=opengl # Uncomment this if you notice stuttering with vulkan, opengl may cause screen tearing depending of your config -#gpu-api=vulkan # Comment this if you notice stuttering and uncomment the above line +gpu-api=vulkan # Comment this if you notice stuttering and uncomment the above line #vulkan-device='Intel(R) Iris(R) Xe Graphics' #vulkan-device='NVIDIA GeForce RTX 4060 Laptop GPU' #gpu-context=winvk -vulkan-async-compute=yes -vulkan-async-transfer=yes -vulkan-queue-count=1 +#vulkan-async-compute=yes +#vulkan-async-transfer=yes +#vulkan-queue-count=1 #opengl-waitvsync=yes -vd-lavc-dr=yes -spirv-compiler=auto +#vd-lavc-dr=yes +#spirv-compiler=auto # TEMPORAL INTERPOLATION (BETWEEN FRAMES) @@ -334,3 +336,17 @@ vf-clr #[bwdifdeint-autoprofile] #profile-cond=p["video-format/tff"] #profile=bwdifdeint + +[SDR] +profile-cond=p["video-params/gamma"] ~= "pq" and p["video-params/gamma"] ~= "hlg" +target-colorspace-hint=no +target-peak=203 +[HDR/DV] +profile-cond=p["video-params/gamma"] == "pq" or p["video-params/gamma"] == "hlg" + +target-contrast=8000 ##inf is for OLED, for LCD get the contrast value from rtings or similar +target-trc=pq +#target-prim=dci-p3 +target-prim=auto +target-peak=700 ## If you have an HDR display, adjust this to the 10% peak +target-colorspace-hint=yes diff --git a/.config/sway/blur b/.config/sway/blur new file mode 120000 index 0000000..5e006b7 --- /dev/null +++ b/.config/sway/blur @@ -0,0 +1 @@ +graphics.d/blur-yes \ No newline at end of file diff --git a/.config/sway/colors.d/catppuccin-macchiato b/.config/sway/colors.d/catppuccin-macchiato new file mode 100644 index 0000000..7523f26 --- /dev/null +++ b/.config/sway/colors.d/catppuccin-macchiato @@ -0,0 +1,26 @@ +set $rosewater #f4dbd6 +set $flamingo #f0c6c6 +set $pink #f5bde6 +set $mauve #c6a0f6 +set $red #ed8796 +set $maroon #ee99a0 +set $peach #f5a97f +set $yellow #eed49f +set $green #a6da95 +set $teal #8bd5ca +set $sky #91d7e3 +set $sapphire #7dc4e4 +set $blue #8aadf4 +set $lavender #b7bdf8 +set $text #cad3f5 +set $subtext1 #b8c0e0 +set $subtext0 #a5adcb +set $overlay2 #939ab7 +set $overlay1 #8087a2 +set $overlay0 #6e738d +set $surface2 #5b6078 +set $surface1 #494d64 +set $surface0 #363a4f +set $base #24273a +set $mantle #1e2030 +set $crust #181926 diff --git a/.config/sway/config b/.config/sway/config index 313ba9e..cd1a4ba 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -3,11 +3,11 @@ ### Variables # Logo key. Use Mod1 for Alt. -set $mod Mod4 +set $mod mod4 #set $background ~/Pictures/wallpaper/arch.jpg # Your preferred terminal emulator -set $term kitty +set $term ghostty # Your preferred application launcher # Note: pass the final command to swaymsg so that the resulting window can be opened @@ -21,6 +21,7 @@ set $menu rofi -show drun # Start your launcher bindsym $mod+d exec $menu|xargs swaymsg exec -- +bindsym --release Super_L exec $menu|xargs swaymsg exec -- # Home row direction keys, like vim set $left h @@ -361,4 +362,14 @@ exec pavucontrol-qt #GTK+ apps long time to load fix exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK + +#swayfx + +include $HOME/.config/sway/blur +include $HOME/.config/sway/corner + + include /etc/sway/config.d/* + + + diff --git a/.config/sway/corner b/.config/sway/corner new file mode 120000 index 0000000..512c1c0 --- /dev/null +++ b/.config/sway/corner @@ -0,0 +1 @@ +graphics.d/corner-radius-yes \ No newline at end of file diff --git a/.config/sway/graphics.d/blur-no b/.config/sway/graphics.d/blur-no new file mode 100644 index 0000000..e69de29 diff --git a/.config/sway/graphics.d/blur-yes b/.config/sway/graphics.d/blur-yes new file mode 100644 index 0000000..03e0bf2 --- /dev/null +++ b/.config/sway/graphics.d/blur-yes @@ -0,0 +1,5 @@ +blur enable +blur_xray disable +blur_passes 1 +blur_radius 7 +blur_noise 0.20 diff --git a/.config/sway/graphics.d/corner-radius-no b/.config/sway/graphics.d/corner-radius-no new file mode 100644 index 0000000..e69de29 diff --git a/.config/sway/graphics.d/corner-radius-yes b/.config/sway/graphics.d/corner-radius-yes new file mode 100644 index 0000000..d49f8ea --- /dev/null +++ b/.config/sway/graphics.d/corner-radius-yes @@ -0,0 +1 @@ +corner_radius 12 diff --git a/.config/sway/theme.d/catppuccin-macchiato-theme b/.config/sway/theme.d/catppuccin-macchiato-theme new file mode 100644 index 0000000..e69de29 diff --git a/.config/zed/settings.json b/.config/zed/settings.json new file mode 100755 index 0000000..44beb37 --- /dev/null +++ b/.config/zed/settings.json @@ -0,0 +1,18 @@ +// Zed settings +// +// For information on how to configure Zed, see the Zed +// documentation: https://zed.dev/docs/configuring-zed +// +// To see all of Zed's default settings without changing your +// custom settings, run `zed: open default settings` from the +// command palette (cmd-shift-p / ctrl-shift-p) +{ + "ui_font_size": 16, + "buffer_font_size": 16, + "soft_wrap": "bounded", + "theme": { + "mode": "system", + "light": "Catppuccin Macchiato", + "dark": "Catppuccin Macchiato" + } +}