From 48d34ec7af998338bbe4a18bcd9b7f7e089731b4 Mon Sep 17 00:00:00 2001 From: Fabio Lenherr / DashieTM Date: Sun, 11 Feb 2024 16:39:23 +0100 Subject: [PATCH] chore: Move dotfiles part to different script --- copy_dotfiles.sh | 7 + scripts/flatpkg.txt | 67 +++++---- scripts/pac | 5 +- scripts/pacmanpkg.txt | 322 +++++++++++++++++++++++++++++++++++++++++- setup.sh | 35 +++-- 5 files changed, 386 insertions(+), 50 deletions(-) create mode 100644 copy_dotfiles.sh diff --git a/copy_dotfiles.sh b/copy_dotfiles.sh new file mode 100644 index 0000000..b66563d --- /dev/null +++ b/copy_dotfiles.sh @@ -0,0 +1,7 @@ +find $PWD -maxdepth 1 -mindepth 0 -exec ln -s '{}' $HOME/.config/ \; +mv $HOME/.config/.zshrc ../.zshrc +unlink $HOME/.config/.git +unlink $HOME/.config/.gitignore +unlink $HOME/.config/README.md +unlink $HOME/.config/setup.sh +unlink $HOME/.config/dotFiles diff --git a/scripts/flatpkg.txt b/scripts/flatpkg.txt index 01493ec..3d11f49 100644 --- a/scripts/flatpkg.txt +++ b/scripts/flatpkg.txt @@ -1,71 +1,68 @@ -chat.revolt.RevoltDesktop com.atlauncher.ATLauncher -Browser -com.github.GradienceTeam.Gradience.Devel +com.brave.Browser com.github.tchx84.Flatseal -Games +com.heroicgameslauncher.hgl com.lakoliu.Furtherance -Studio +com.obsproject.Studio com.rustdesk.RustDesk com.usebottles.bottles com.valvesoftware.Steam.Utility.gamescope de.haeckerfelix.Fragments de.shorsh.discord-screenaudio dev.lapce.lapce -All +dev.vencord.Vesktop +im.fluffychat.Fluffychat +info.beyondallreason.bar io.freetubeapp.FreeTube io.github.Foldex.AdwSteamGtk io.github.lainsce.Colorway -Settings +io.github.realmazharhussain.GdmSettings io.gitlab.theevilskeleton.Upscaler +net.ankiweb.Anki net.davidotek.pupgui2 -Picker +nl.hjdskes.gcolor3 +one.ablaze.floorp +org.Xetibo.ReSet org.flatpak.Builder -Platform -Platform -Platform +org.freedesktop.Platform +org.freedesktop.Platform +org.freedesktop.Platform org.freedesktop.Platform.Compat.i386 org.freedesktop.Platform.GL.default org.freedesktop.Platform.GL.default -(Extra) org.freedesktop.Platform.GL.default -(Extra) -org.freedesktop.Platform.GL32.default +org.freedesktop.Platform.GL.default +org.freedesktop.Platform.GL.default org.freedesktop.Platform.GL32.default org.freedesktop.Platform.GStreamer.gstreamer-vaapi org.freedesktop.Platform.ffmpeg-full org.freedesktop.Platform.ffmpeg_full.i386 org.freedesktop.Platform.openh264 -org.freedesktop.Platform.openh264 -org.freedesktop.Platform.openh264 -SDK -SDK -stable -Application -Application -Application -Application +org.freedesktop.Sdk +org.freedesktop.Sdk +org.freedesktop.Sdk.Extension.rust-stable +org.gnome.Calendar +org.gnome.Platform +org.gnome.Platform +org.gnome.Platform org.gnome.Platform.Compat.i386 -Software -Software -Library +org.gnome.Sdk +org.gnome.Sdk +org.gnome.design.IconLibrary org.gnome.dspy -Gtk -Gtk -theme -Application -Application -org.kde.PlatformTheme.QGnomePlatform +org.gtk.Gtk3theme.adw-gtk3 +org.gtk.Gtk3theme.adw-gtk3-dark +org.kde.Platform +org.kde.Platform org.kde.PlatformTheme.QGnomePlatform org.kde.PlatformTheme.QGnomePlatform org.kde.WaylandDecoration.QAdwaitaDecorations org.kde.WaylandDecoration.QAdwaitaDecorations org.kde.WaylandDecoration.QGnomePlatform-decoration org.kde.WaylandDecoration.QGnomePlatform-decoration -org.kde.WaylandDecoration.QGnomePlatform-decoration -Volume +org.onlyoffice.desktopeditors +org.pulseaudio.pavucontrol org.winehq.Wine.DLLs.dxvk org.winehq.Wine.gecko org.winehq.Wine.mono -org.xetibo.ReSet re.sonny.Workbench diff --git a/scripts/pac b/scripts/pac index ff4ae3d..2a9bab3 100755 --- a/scripts/pac +++ b/scripts/pac @@ -6,7 +6,7 @@ carfile="$HOME/.config/scripts/carpkg.txt" save() { pacvar=$(pacman -Q) - flatvar=$(flatpak list | awk '{ print $2 }') + flatvar=$(flatpak list --columns=application | tail -n +2) if [ "$pacfile" != ' ' ]; then touch "$pacfile" fi @@ -23,6 +23,9 @@ save() { } load() { + while read app; do + flatpak install "$app" -y + done <"$flatfile" sudo paru -S - <"$pacfile" } diff --git a/scripts/pacmanpkg.txt b/scripts/pacmanpkg.txt index 7893da1..b997c44 100644 --- a/scripts/pacmanpkg.txt +++ b/scripts/pacmanpkg.txt @@ -42,6 +42,7 @@ arm-none-eabi-gcc arm-none-eabi-newlib asciidoc asio +aspnet-runtime-7.0 assimp at-spi2-core atkmm @@ -91,6 +92,7 @@ blas blender blosc blueman +blueprint-compiler bluez bluez-libs bolt @@ -171,10 +173,14 @@ dav1d db db5.3 dbus +dbus-broker +dbus-broker-units dbus-glib dbus-python dconf +dconf-editor debootstrap +debugedit default-cursors deno desktop-file-utils @@ -198,12 +204,14 @@ dosfstools dotnet-host dotnet-runtime dotnet-runtime-6.0 +dotnet-runtime-7.0 dotnet-sdk dotnet-sdk-6.0 +dotnet-sdk-7.0 dotnet-targeting-pack dotnet-targeting-pack-6.0 +dotnet-targeting-pack-7.0 double-conversion -downgrade draco drawing dtc @@ -218,6 +226,7 @@ efibootmgr efivar electron electron25 +electron28 element-web elfutils embree @@ -226,6 +235,8 @@ enchant eslint ethtool evince +evolution +evolution-data-server exempi exiv2 exo @@ -246,6 +257,7 @@ file filesystem findutils firefox +firefox-developer-edition fish fisher flac @@ -293,6 +305,7 @@ geocode-glib geocode-glib-2 geocode-glib-common gettext +ghc-libs ghostscript giflib gimp @@ -301,6 +314,7 @@ git gitoxide gitui gjs +gklib glade glava glew @@ -343,6 +357,7 @@ gperftools gpgme gpm gptfdisk +gradience-git gradle graphene graphicsmagick @@ -388,6 +403,7 @@ gtkdatabox gtkmm gtkmm-4.0 gtkmm3 +gtksourceview3 gtksourceview4 gtksourceview5 gts @@ -402,6 +418,227 @@ gvfs-smb gzip 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-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 hdf5 helix hicolor-icon-theme @@ -410,6 +647,7 @@ highway hplip hsa-rocr hsakmt-roct +hslua-cli http-parser hunspell hunspell-en_us @@ -418,6 +656,7 @@ hwloc hyphen hyprdock hyprland +hyprlang iana-etc icu iio-sensor-proxy @@ -594,6 +833,8 @@ lib32-libice lib32-libidn2 lib32-libjpeg-turbo lib32-libldap +lib32-libnghttp2 +lib32-libnghttp3 lib32-libnl lib32-libogg lib32-libpcap @@ -625,6 +866,7 @@ lib32-libxfixes lib32-libxft lib32-libxi lib32-libxinerama +lib32-libxkbcommon lib32-libxml2 lib32-libxrandr lib32-libxrender @@ -849,6 +1091,8 @@ libnfnetlink libnfs libnftnl libnghttp2 +libnghttp3 +libngtcp2 libnice libnl libnm @@ -879,6 +1123,7 @@ libpciaccess libpeas libpeas-2 libpgm +libphonenumber libpipeline libpipewire libplacebo @@ -890,6 +1135,7 @@ libportal-gtk4 libppd libproxy libpsl +libpst libpulse libpwquality libqaccessibilityclient-qt5 @@ -917,6 +1163,7 @@ libsidplay libsidplayfp libsigc++ libsigc++-3.0 +libsixel libslirp libsm libsndfile @@ -977,6 +1224,7 @@ libvisio libvisual libvncserver libvorbis +libvpl libvpx libvterm libvterm01 @@ -1002,6 +1250,7 @@ libxcvt libxdamage libxdg-basedir libxdmcp +libxdp libxext libxfce4ui libxfce4util @@ -1031,6 +1280,7 @@ libxtst libxv libxxf86vm libyaml +libytnef libyuv libzip libzmf @@ -1058,9 +1308,12 @@ lsb-release lsd lsof lua +lua-lpeg lua51 +lua51-lgi lua51-lpeg luajit +lutris lv2 lvm2 lxappearance @@ -1072,6 +1325,7 @@ m4 mailcap make man-db +mangohud materialx mbedtls mbedtls2 @@ -1147,6 +1401,7 @@ nodejs nodejs-nopt noise-suppression-for-voice noto-fonts +noto-fonts-emoji npm npth nspr @@ -1159,7 +1414,6 @@ oath-toolkit ocl-icd onefetch onetbb -onevpl oniguruma openal opencl-clover-mesa @@ -1199,6 +1453,7 @@ pacman-mirrorlist pahole pam pambase +pandoc-cli pango pangomm pangomm-2.48 @@ -1362,11 +1617,14 @@ portmidi portsmf postgresql-libs potrace +powerline +powerline-common ppp prison5 procps-ng projectm protobuf +prrte psmisc ptex pugixml @@ -1380,6 +1638,7 @@ python python-aiohttp python-aiosignal python-annotated-types +python-anyascii python-anytree python-appdirs python-argcomplete @@ -1391,20 +1650,28 @@ python-autocommand python-babel python-bcrypt python-beautifulsoup4 +python-build python-cachecontrol +python-cachy python-cairo python-certifi python-cffi python-chardet python-charset-normalizer +python-cleo python-click python-cmake-build-extension python-colorama python-configobj python-construct +python-contourpy python-coverage +python-crashtest python-cryptography python-cssselect +python-cssselect2 +python-cssutils +python-cycler python-dacite python-dateutil python-decorator @@ -1418,6 +1685,7 @@ python-evdev python-fastbencode python-fastjsonschema python-filelock +python-fonttools python-frozenlist python-future python-gitdb @@ -1426,23 +1694,37 @@ python-gobject python-halo python-hid python-hjson +python-html5lib python-idna python-imagesize +python-importlib-metadata python-inflect +python-iniconfig +python-installer +python-jaraco.classes python-jaraco.context python-jaraco.functools +python-jaraco.test python-jaraco.text +python-jeepney python-jinja python-jsonschema python-jsonschema-specifications +python-keyring +python-kiwisolver +python-lark-parser +python-libsass python-lockfile python-log_symbols python-lxml python-mako python-markdown python-markupsafe +python-material-color-utilities +python-matplotlib python-merge3 python-milc +python-mock python-moddb python-more-itertools python-msgpack @@ -1455,13 +1737,22 @@ python-ordered-set python-packaging python-paramiko python-patiencediff +python-pbr +python-pexpect python-pillow python-pip python-pipenv python-pipx +python-pkginfo python-platformdirs +python-pluggy python-ply +python-poetry +python-poetry-core +python-poetry-plugin-export +python-powerline python-psutil +python-ptyprocess python-pycparser python-pycryptodomex python-pycups @@ -1473,17 +1764,25 @@ python-pykeepass python-pynacl python-pyotp python-pyparsing +python-pyproject-hooks python-pyrate-limiter python-pyrsistent python-pyserial +python-pytest python-pytz python-pyusb +python-rapidfuzz python-referencing +python-regex +python-reportlab python-requests +python-requests-toolbelt python-resolvelib python-rpds-py +python-secretstorage python-setuptools python-setuptools-scm +python-shellingham python-shiboken2 python-six python-smmap @@ -1498,9 +1797,12 @@ python-sphinxcontrib-jsmath python-sphinxcontrib-qthelp python-sphinxcontrib-serializinghtml python-spinners +python-svglib python-termcolor +python-tinycss2 python-toml python-tomli +python-tomlkit python-toolz python-tqdm python-trove-classifiers @@ -1511,10 +1813,14 @@ python-validate-pyproject python-validators python-virtualenv python-virtualenv-clone +python-webencodings +python-werkzeug python-wheel python-xlib python-yaml +python-yapsy python-yarl +python-zipp python-zstandard python-zxcvbn qca-qt5 @@ -1561,6 +1867,7 @@ qemu-ui-spice-core qemu-vhost-user-gpu qgnomeplatform-qt5 qgnomeplatform-qt6 +qhull qmk qpdf qqc2-desktop-style5 @@ -1726,9 +2033,9 @@ sqlcipher sqlite sratom srt -starship startup-notification steam +steamtinkerlaunch stoken sudo suil @@ -1771,6 +2078,7 @@ thunderbird timeshift tinycompress tinyxml +tomlplusplus totem totem-pl-parser tpm2-tss @@ -1814,11 +2122,14 @@ uwufetch v4l-utils v4l2loopback-dkms vala +valabind vamp-plugin-sdk +vapoursynth vcdimager vde2 -vencord-desktop-git vid.stab +vim +vim-runtime virglrenderer virt-install virt-manager @@ -1862,6 +2173,7 @@ wofi wolfssl wpa_supplicant wpebackend-fdo +wtype wxwidgets-common wxwidgets-gtk3 x264 @@ -1906,12 +2218,14 @@ xorg-xrdb xorg-xset xorg-xsetroot xorg-xwayland +xorg-xwininfo xorgproto xosd xournalpp xvidcore xxhash xz +yad yajl yaml-cpp yarn diff --git a/setup.sh b/setup.sh index 128f832..3611cf2 100755 --- a/setup.sh +++ b/setup.sh @@ -1,26 +1,41 @@ -find $PWD -maxdepth 1 -mindepth 0 -exec ln -s '{}' $HOME/.config/ \; -mv $HOME/.config/.zshrc ../.zshrc -unlink $HOME/.config/.git -unlink $HOME/.config/.gitignore -unlink $HOME/.config/README.md -unlink $HOME/.config/setup.sh -unlink $HOME/.config/dotFiles - -sudo pacman -S rustup +./copy_dotfiles.sh +sudo pacman -S rustup --noconfirm rustup default nightly cargo install paru -sudo pac load +pac load gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3' && gsettings set org.gnome.desktop.interface color-scheme 'default' cargo install oxinoti +sudo cp ~/.carbo/bin/oxinoti /usr/bin/. cargo install oxidash +sudo cp ~/.carbo/bin/oxidash /usr/bin/. cargo install oxishut +sudo cp ~/.carbo/bin/oxishut /usr/bin/. cargo install hyprdock +sudo cp ~/.carbo/bin/hyprdock /usr/bin/. cargo install reset +sudo cp ~/.carbo/bin/reset /usr/bin/. +cargo install rm-improved +sudo cp ~/.carbo/bin/rip /usr/bin/. +cargo install typstfmt +sudo cp ~/.carbo/bin/typstfmt /usr/bin/. +cargo install satty +sudo cp ~/.carbo/bin/satty /usr/bin/. flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo +git clone https://github.com/Kirottu/anyrun.git +cd anyrun +cargo build --release +cargo install --path anyrun/ +mkdir -p ~/.config/anyrun/plugins +cp target/release/*.so ~/.config/anyrun/plugins +cp examples/config.ron ~/.config/anyrun/config.ron + +curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher +fisher install IlanCosman/tide@v5 + sudo systemctl enable greetd reboot