From ae6dda30c655413370b8fef21007add03ba10cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Czy=C5=BC?= Date: Wed, 14 Aug 2024 09:51:02 +0200 Subject: [PATCH] fix: config sync issues --- .config/Kvantum/kvantum.kvconfig | 2 +- .config/blueblack/config.yaml | 4 +- .config/hypr/hyprland.conf | 5 + .config/kitty/colors.conf | 2 +- .config/mako/config | 2 +- .config/rofi/config.rasi | 2 +- .config/waybar/config.jsonc | 2 +- .config/waybar/style.css | 2 +- .config/zed/settings.json | 8 + .config/zsh/.aliases | 3 + .fehbg | 2 +- .gitconfig | 3 + currentPackages | 273 ++++++++++++++++++++++++++++++- 13 files changed, 294 insertions(+), 16 deletions(-) diff --git a/.config/Kvantum/kvantum.kvconfig b/.config/Kvantum/kvantum.kvconfig index c0ca7bc..3318945 100755 --- a/.config/Kvantum/kvantum.kvconfig +++ b/.config/Kvantum/kvantum.kvconfig @@ -1,2 +1,2 @@ [General] -theme=gruvbox-kvantum +theme=catppuccin-latte-sapphire diff --git a/.config/blueblack/config.yaml b/.config/blueblack/config.yaml index 2df9674..aabfda7 100644 --- a/.config/blueblack/config.yaml +++ b/.config/blueblack/config.yaml @@ -1,3 +1,3 @@ -"lat": 50.15 -"lng": 18.82 +"lat": 50.2 +"lng": 19.0 "update_days": 10 diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 27256a4..6fd4302 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -55,6 +55,7 @@ exec-once=zsh $HOME/.config/hypr/autostart.sh env = XCURSOR_SIZE,24 env = XCURSOR_THEME,/usr/share/icons/Gruvbox-Dark/index.theme env = HYPRCURSOR_SIZE,24 +env = HYPRCURSOR_THEME,/usr/share/icons/Gruvbox-Dark/index.theme env = CLUTTER_BACKEND,wayland env = GDK_BACKEND,wayland,x11 @@ -199,6 +200,8 @@ input { kb_options = kb_rules = + numlock_by_default = true + follow_mouse = 1 sensitivity = 0 # -1.0 - 1.0, 0 means no modification. @@ -268,6 +271,8 @@ bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle bind = $mainMod, F, fullscreen, 1 bind = $mainMod SHIFT, F, fullscreen, 0 +bind = $mainMod, T, togglefloating +bind = $mainMod, mouse:274, togglefloating # Move focus with mainMod + vim keys bind = $mainMod, H, movefocus, l diff --git a/.config/kitty/colors.conf b/.config/kitty/colors.conf index d73e911..163329c 100644 --- a/.config/kitty/colors.conf +++ b/.config/kitty/colors.conf @@ -1 +1 @@ -include gruvbox.conf +include latte.conf diff --git a/.config/mako/config b/.config/mako/config index 415c00c..25b35db 120000 --- a/.config/mako/config +++ b/.config/mako/config @@ -1 +1 @@ -/home/mike/.config/mako/config-dark \ No newline at end of file +/home/mike/.config/mako/config-light \ No newline at end of file diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi index bc422c9..e77af01 100644 --- a/.config/rofi/config.rasi +++ b/.config/rofi/config.rasi @@ -1 +1 @@ -@theme "/usr/share/rofi/themes/gruvbox-dark-soft.rasi" +@theme "/usr/share/rofi/themes/Arc.rasi" diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 9960405..afcc8f9 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -158,7 +158,7 @@ "show-passive-items": true, }, "clock": { - "format": "{:%b%e %I:%M %p}", + "format": "{:%b %d %I:%M %p}", "tooltip-format": "{:%d %B %Y}\n{calendar}", "format-alt": "{:%Y-%m-%d %I:%M %p}", }, diff --git a/.config/waybar/style.css b/.config/waybar/style.css index f1859df..19159e4 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1 +1 @@ -@import "layout.css"; @import "gruvbox-dark.css"; +@import "layout.css"; @import "catppuccin-latte.css"; diff --git a/.config/zed/settings.json b/.config/zed/settings.json index 215e6cb..016a39f 100644 --- a/.config/zed/settings.json +++ b/.config/zed/settings.json @@ -42,6 +42,14 @@ "command": "clippy" // rust-analyzer.check.command (default: "check") } } + }, + "eslint": { + "settings": { + "rulesCustomizations": [ + // set all eslint errors/warnings to show as warnings + { "rule": "*", "severity": "warn" } + ] + } } } } diff --git a/.config/zsh/.aliases b/.config/zsh/.aliases index c39ad21..b64c11b 100755 --- a/.config/zsh/.aliases +++ b/.config/zsh/.aliases @@ -1,5 +1,8 @@ #!/bin/zsh +# TEMP ZED FIX +alias zed='env WEBKIT_DISABLE_DMABUF_RENDERER=1 zed ' + alias ..="cd .." alias cd..="cd .." diff --git a/.fehbg b/.fehbg index 8fa6e3f..90b77c5 100755 --- a/.fehbg +++ b/.fehbg @@ -1,2 +1,2 @@ #!/bin/sh -feh --no-fehbg --bg-fill '/home/mike/Pictures/pexels-apasaric-2339009.jpg' +feh --no-fehbg --bg-fill '/home/mike/Wallpapers/pexels-apasaric-2339009.jpg' diff --git a/.gitconfig b/.gitconfig index 4d758fc..14a5c75 100644 --- a/.gitconfig +++ b/.gitconfig @@ -18,3 +18,6 @@ helper = /usr/lib/git-core/git-credential-libsecret [gpg] program = gpg +[pull] + revase = false + rebase = false diff --git a/currentPackages b/currentPackages index d0adef6..0321a25 100644 --- a/currentPackages +++ b/currentPackages @@ -1,5 +1,9 @@ a52dec aalib +aarch64-linux-gnu-binutils +aarch64-linux-gnu-gcc +aarch64-linux-gnu-glibc +aarch64-linux-gnu-linux-api-headers aardvark-dns abseil-cpp accounts-qml-module @@ -7,6 +11,7 @@ accountsservice acl acorn acpid +act adobe-source-code-pro-fonts adwaita-cursors adwaita-icon-theme @@ -20,6 +25,7 @@ alsa-topology-conf alsa-ucm-conf alsa-utils amd-ucode +anytype-bin aom appmenu-gtk-module appstream @@ -48,6 +54,7 @@ bat bc benchmark betterlockscreen-git +bind binutils bison blas @@ -133,6 +140,7 @@ djvulibre dkms dmenu dnsmasq +dnssec-anchors docbook-xml docbook-xsl docker-compose @@ -150,6 +158,7 @@ edk2-arm edk2-ovmf efibootmgr efivar +egl-wayland eglexternalplatform eigen electron @@ -186,6 +195,7 @@ ffcall ffmpeg ffmpeg4.4 fftw +figlet file filesystem findutils @@ -226,11 +236,13 @@ geocode-glib-2 geocode-glib-common gettext gflags +ghc-libs ghostscript gi-docgen giflib gimp git +github-cli glew glfw glib-networking @@ -306,11 +318,234 @@ gzip handbrake harfbuzz harfbuzz-icu +haskell-aeson +haskell-aeson-pretty +haskell-ansi-terminal +haskell-ansi-wl-pprint +haskell-appar +haskell-asn1-encoding +haskell-asn1-parse +haskell-asn1-types +haskell-assoc +haskell-async +haskell-attoparsec +haskell-attoparsec-aeson +haskell-attoparsec-iso8601 +haskell-auto-update +haskell-base-compat +haskell-base-compat-batteries +haskell-base-orphans +haskell-base-unicode-symbols +haskell-base16-bytestring +haskell-base64 +haskell-base64-bytestring +haskell-basement +haskell-bifunctors +haskell-bitvec +haskell-blaze-builder +haskell-blaze-html +haskell-blaze-markup +haskell-boring +haskell-bsb-http-chunked +haskell-byteorder +haskell-call-stack +haskell-case-insensitive +haskell-cassava +haskell-cereal +haskell-citeproc +haskell-cmdargs +haskell-colour +haskell-commonmark +haskell-commonmark-extensions +haskell-commonmark-pandoc +haskell-comonad +haskell-conduit +haskell-conduit-extra +haskell-constraints +haskell-contravariant +haskell-cookie +haskell-crypton +haskell-crypton-connection +haskell-crypton-x509 +haskell-crypton-x509-store +haskell-crypton-x509-system +haskell-crypton-x509-validation +haskell-data-array-byte +haskell-data-default +haskell-data-default-class +haskell-data-default-instances-containers +haskell-data-default-instances-dlist +haskell-data-default-instances-old-locale +haskell-data-fix +haskell-dec +haskell-digest +haskell-digits +haskell-distributive +haskell-dlist +haskell-doclayout +haskell-doctemplates +haskell-easy-file +haskell-emojis +haskell-erf +haskell-fast-logger +haskell-file-embed +haskell-foldable1-classes-compat +haskell-generically +haskell-ghc-bignum-orphans +haskell-glob +haskell-gridtables +haskell-haddock-library +haskell-hashable +haskell-hourglass +haskell-hslua +haskell-hslua-aeson +haskell-hslua-classes +haskell-hslua-core +haskell-hslua-list +haskell-hslua-marshalling +haskell-hslua-module-doclayout +haskell-hslua-module-path +haskell-hslua-module-system +haskell-hslua-module-text +haskell-hslua-module-version +haskell-hslua-module-zip +haskell-hslua-objectorientation +haskell-hslua-packaging +haskell-hslua-repl +haskell-hslua-typing +haskell-http-api-data +haskell-http-client +haskell-http-client-tls +haskell-http-date +haskell-http-media +haskell-http-types +haskell-http2 +haskell-hunit +haskell-indexed-traversable +haskell-indexed-traversable-instances +haskell-integer-logarithms +haskell-iproute +haskell-ipynb +haskell-isocline +haskell-jira-wiki-markup +haskell-juicypixels +haskell-lexer +haskell-libyaml +haskell-lpeg +haskell-lua +haskell-memory +haskell-mime-types +haskell-mmorph +haskell-monad-control +haskell-mono-traversable +haskell-network +haskell-network-byte-order +haskell-network-uri +haskell-old-locale +haskell-old-time +haskell-onetuple +haskell-only +haskell-optparse-applicative +haskell-ordered-containers +haskell-pandoc +haskell-pandoc-lua-engine +haskell-pandoc-lua-marshal +haskell-pandoc-server +haskell-pandoc-types +haskell-pem +haskell-pretty-show +haskell-prettyprinter +haskell-primitive +haskell-psqueues +haskell-quickcheck +haskell-random +haskell-recv +haskell-regex-base +haskell-regex-tdfa +haskell-resourcet +haskell-safe +haskell-safe-exceptions +haskell-scientific +haskell-semialign +haskell-semigroupoids +haskell-servant +haskell-servant-server +haskell-sha +haskell-simple-sendfile +haskell-singleton-bool +haskell-skylighting +haskell-skylighting-core +haskell-skylighting-format-ansi +haskell-skylighting-format-blaze-html +haskell-skylighting-format-context +haskell-skylighting-format-latex +haskell-socks +haskell-some +haskell-sop-core +haskell-split +haskell-splitmix +haskell-statevar +haskell-streaming-commons +haskell-strict +haskell-string-conversions +haskell-syb +haskell-tagged +haskell-tagsoup +haskell-temporary +haskell-texmath +haskell-text-conversions +haskell-text-icu +haskell-text-short +haskell-th-abstraction +haskell-th-compat +haskell-th-lift +haskell-th-lift-instances +haskell-these +haskell-time-compat +haskell-time-manager +haskell-tls +haskell-toml-parser +haskell-transformers-base +haskell-transformers-compat +haskell-type-equality +haskell-typed-process +haskell-typst +haskell-typst-symbols +haskell-unicode-collation +haskell-unicode-data +haskell-unicode-transforms +haskell-uniplate +haskell-unix-compat +haskell-unix-time +haskell-unliftio +haskell-unliftio-core +haskell-unordered-containers +haskell-utf8-string +haskell-uuid-types +haskell-vault +haskell-vector +haskell-vector-algorithms +haskell-vector-stream +haskell-wai +haskell-wai-app-static +haskell-wai-cors +haskell-wai-extra +haskell-wai-logger +haskell-warp +haskell-witherable +haskell-word8 +haskell-xml +haskell-xml-conduit +haskell-xml-types +haskell-yaml +haskell-zip-archive +haskell-zlib helix hicolor-icon-theme hidapi highway hoppscotch-bin +hslua-cli htop http-parser hunspell @@ -356,6 +591,7 @@ jdk17-openjdk jdk17-temurin jdk21-openjdk jdk21-temurin +jemalloc jq jre8-openjdk jre8-openjdk-headless @@ -504,9 +740,9 @@ lib32-mpg123 lib32-ncurses lib32-nspr lib32-nss -lib32-nvidia-dev-utils-tkg +lib32-nvidia-utils lib32-openal -lib32-opencl-nvidia-dev-tkg +lib32-opencl-nvidia lib32-openssl lib32-openssl-1.1 lib32-orc @@ -606,6 +842,7 @@ libevent libexif libexttextcat libfabric +libfaketime libfdk-aac libffi libfontenc @@ -664,6 +901,7 @@ libluv libmad libmanette libmatroska +libmaxminddb libmd libmfx libmicrodns @@ -774,6 +1012,7 @@ libtiff libtirpc libtommath libtool +libtpms libtraceevent libtracefs libunibreak @@ -836,6 +1075,7 @@ libxklavier libxml2 libxmlb libxmu +libxnvctrl libxpm libxpresent libxrandr @@ -870,6 +1110,7 @@ lpsolve lsb-release lsof lua +lua-lpeg lua51-lpeg lua53 luajit @@ -895,6 +1136,7 @@ meson miniupnpc minizip minizip-ng +miru-bin mjpegtools mkinitcpio mkinitcpio-busybox @@ -923,6 +1165,7 @@ neon neovim neovim-remote net-snmp +net-tools netavark nettle network-manager-applet @@ -930,8 +1173,11 @@ networkmanager nftables ninja nm-connection-editor +nmap node-gyp nodejs +nodejs-commitizen +nodejs-cross-env nodejs-nopt notmuch-runtime noto-fonts @@ -944,10 +1190,9 @@ nspr nss ntfs-3g numactl -nvidia-dev-egl-wayland-tkg -nvidia-dev-open-dkms-tkg -nvidia-dev-settings-tkg -nvidia-dev-utils-tkg +nvidia-open-dkms +nvidia-settings +nvidia-utils nvm nvtop nwg-look @@ -961,7 +1206,7 @@ oniguruma openal openbsd-netcat opencl-headers -opencl-nvidia-dev-tkg +opencl-nvidia opencolorio opencore-amr opencv @@ -981,6 +1226,7 @@ otf-aurulent-nerd otf-codenewroman-nerd otf-comicshanns-nerd otf-commit-mono-nerd +otf-crimson otf-droid-nerd otf-firamono-nerd otf-geist-mono-nerd @@ -997,6 +1243,7 @@ pahole pam pambase pamixer +pandoc-cli pango pangomm pangomm-2.48 @@ -1036,6 +1283,8 @@ play-with-mpv-git playerctl pnpm podman +podman-compose +podman-docker polkit polkit-kde-agent polkit-qt6 @@ -1091,6 +1340,7 @@ python-devgoldyutils python-distlib python-distro python-docopt +python-dotenv python-dulwich python-editor python-espeak-ng @@ -1323,6 +1573,7 @@ rav1e readline redland redshift +release-plz rhash ripgrep rnnoise @@ -1423,6 +1674,7 @@ svt-hevc swayidle swaylock-effects swig +swtpm swww systemd systemd-libs @@ -1460,6 +1712,8 @@ texlive-publishers texlive-xetex threadweaver thunderbird +ti-bin +ti-bin-debug timewall-bin tinyxml tk @@ -1500,6 +1754,7 @@ ttf-hack-nerd ttf-heavydata-nerd ttf-iawriter-nerd ttf-ibmplex-mono-nerd +ttf-inconsolata ttf-inconsolata-go-nerd ttf-inconsolata-lgc-nerd ttf-inconsolata-nerd @@ -1536,6 +1791,7 @@ ttf-ubuntu-mono-nerd ttf-ubuntu-nerd ttf-victor-mono-nerd ttf-zed-mono-nerd +tty-countdown-git twolame tzdata uchardet @@ -1693,13 +1949,16 @@ yajl yaml-cpp yarn youtube-dl +youtube-music-bin yt-dlp yyjson zbar zellij zenity +zenmap zeromq zerotier-one +zettlr zig zimg zip