diff --git a/Dockerfile b/Dockerfile index 6d86499..fa96508 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,61 +1,39 @@ -FROM docker.io/library/archlinux:latest AS arch +FROM docker.io/cachyos/cachyos-v3:latest AS arch -# Initialization -RUN sed -i 's/#Color/Color/g' /etc/pacman.conf && \ - printf "[multilib]\nInclude = /etc/pacman.d/mirrorlist\n" | tee -a /etc/pacman.conf && \ - sed -i 's/#MAKEFLAGS="-j2"/MAKEFLAGS="-j$(nproc)"/g' /etc/makepkg.conf && \ - pacman -Syu \ - # Base Tools - base-devel wget git nano htop \ - # Desktop Environment - xorg-server plasma-desktop xdg-desktop-portal-kde vulkan-nouveau lib32-vulkan-nouveau vulkan-tools fuse3 kwin-x11 \ - # Audio - pulseaudio plasma-pa kde-gtk-config pkg-config \ - # GUI Apps - firefox discover konsole dolphin kate \ - flatpak steam lutris \ - prismlauncher jre17-openjdk jre21-openjdk \ - # Dependencies - cargo rye \ - --noconfirm && \ - useradd -m --shell=/bin/bash build && usermod -L build && \ - echo "build ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \ - echo "root ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers +COPY ./home/pacman.conf /etc/pacman.conf -# Install DCSPkg -RUN cargo install dcspkg --root /usr +RUN pacman-key --init && \ + pacman-key --populate archlinux -# Add yay and install AUR packages -USER build -WORKDIR /home/build -RUN git clone https://aur.archlinux.org/yay-bin.git --single-branch && \ - cd yay-bin && \ - makepkg -si --noconfirm && \ - cd .. && \ - rm -drf yay-bin -# RUN yay --noconfirm -S PKGNAME -USER root -WORKDIR / +RUN pacman -Sy --noconfirm \ + cachyos-keyring \ + cachyos-mirrorlist + +RUN sed -i 's/#MAKEFLAGS="-j2"/MAKEFLAGS="-j$(nproc)"/g' /etc/makepkg.conf && \ + pacman -Syu --noconfirm \ + base-devel wget git nano htop \ + xorg-server plasma-desktop xdg-desktop-portal-kde fuse3 vulkan-tools kwin-x11 \ + pulseaudio plasma-pa kde-gtk-config \ + firefox discover konsole dolphin kate \ + flatpak steam lutris yay \ + prismlauncher jre21-openjdk proton-cachyos && \ + pacman -S --noconfirm rust && \ + cargo install dcspkg --root /usr && \ + pacman -Rns --noconfirm rust && \ + rm -rf \ + ~/.cache/yay/* \ + /tmp/* /var/cache/pacman/* \ + /var/lib/pacman/sync/* \ + /root/.cargo \ + /usr/share/man/* \ + /usr/share/doc/* \ + /usr/share/gtk-doc/* && \ + echo "ALL ALL=(ALL:ALL) NOPASSWD: ALL" > /etc/sudoers.d/acc && \ + chmod 0440 /etc/sudoers.d/acc -# Create home directory RUN mkdir -p /home/fng WORKDIR /home/fng COPY home ./ -# Install DCSLauncher -RUN git clone https://github.com/UWCS/dcslauncher.git -# Install FNG-Admin Client -RUN mkdir -p fng-admin/client && cd fng-admin/client && \ - python -m venv .venv && \ - .venv/bin/python -m pip install https://github.com/UWCS/fng-admin/releases/download/AAAAAUUGGGGGGGHHHHH/client-0.1.0-py3-none-any.whl -WORKDIR / +RUN git clone --depth=1 https://github.com/UWCS/dcslauncher.git -# Cleanup -# We do this last because it'll only apply to updates the user makes going forward. We don't want to optimize for the build host's environment. -RUN sed -i 's/-march=x86-64 -mtune=generic/-march=native -mtune=native/g' /etc/makepkg.conf && \ - userdel -r build && \ - rm -drf /home/build && \ - sed -i '/build ALL=(ALL) NOPASSWD: ALL/d' /etc/sudoers && \ - sed -i '/root ALL=(ALL) NOPASSWD: ALL/d' /etc/sudoers && \ - rm -rf \ - /tmp/* \ - /var/cache/pacman/pkg/* +RUN sed -i 's/-march=x86-64 -mtune=generic/-march=native -mtune=native/g' /etc/makepkg.conf diff --git a/builddev.sh b/builddev.sh index a8152a1..93c1b65 100755 --- a/builddev.sh +++ b/builddev.sh @@ -1,2 +1,11 @@ #!/bin/bash -podman build -t fng:dev . \ No newline at end of file + +./local-registry.sh + +podman build -t localhost:5000/fng:dev . + +podman push --tls-verify=false localhost:5000/fng:dev + +echo "Build and push complete." + +podman stop local-registry diff --git a/home/.bashrc b/home/.bashrc deleted file mode 100644 index e69de29..0000000 diff --git a/home/.config/Trolltech.conf b/home/.config/Trolltech.conf deleted file mode 100644 index e153706..0000000 --- a/home/.config/Trolltech.conf +++ /dev/null @@ -1,17 +0,0 @@ -[qt] -GUIEffects=none -KDE\contrast=7 -KWinPalette\activeBackground=#31363b -KWinPalette\activeBlend=#fcfcfc -KWinPalette\activeForeground=#fcfcfc -KWinPalette\activeTitleBtnBg=#2a2e32 -KWinPalette\frame=#2a2e32 -KWinPalette\inactiveBackground=#2a2e32 -KWinPalette\inactiveBlend=#a1a9b1 -KWinPalette\inactiveForeground=#a1a9b1 -KWinPalette\inactiveFrame=#2a2e32 -KWinPalette\inactiveTitleBtnBg=#2a2e32 -Palette\active=#fcfcfc, #31363b, #474d54, #3a4045, #141618, #24282b, #fcfcfc, #ffffff, #fcfcfc, #1b1e20, #2a2e32, #0f1012, #3daee9, #fcfcfc, #1d99f3, #9b59b6, #232629, #000000, #31363b, #fcfcfc, #a1a9b1, #3daee9 -Palette\disabled=#6e7173, #2f3338, #454c52, #393e44, #131517, #222629, #656768, #ffffff, #727679, #1a1d1f, #282c30, #0e0f11, #282c30, #6e7173, #1a4665, #443051, #212427, #000000, #31363b, #fcfcfc, #464b4f, #282c30 -Palette\inactive=#fcfcfc, #31363b, #474d54, #3a4045, #141618, #24282b, #fcfcfc, #ffffff, #fcfcfc, #1b1e20, #2a2e32, #0f1012, #1f485e, #fcfcfc, #1d99f3, #9b59b6, #232629, #000000, #31363b, #fcfcfc, #a1a9b1, #1f485e -font="Noto Sans,10,-1,0,400,0,0,0,0,0,0,0,0,0,0,1" diff --git a/home/.config/autostart/fng-admin-client.desktop b/home/.config/autostart/fng-admin-client.desktop deleted file mode 100644 index f42e0bd..0000000 --- a/home/.config/autostart/fng-admin-client.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=FNG-Admin-Client -Comment=Friday Night Gaming -Exec=/home/fng/fng-admin/client/.venv/bin/python -m client -Terminal=false -Type=Application diff --git a/home/.config/autostart/pulseaudio.desktop b/home/.config/autostart/pulseaudio.desktop deleted file mode 100644 index 0ded4ee..0000000 --- a/home/.config/autostart/pulseaudio.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Name=Pulseaudio -Comment=Pulseaudio -Exec=pulseaudio -Terminal=false -Type=Application diff --git a/home/.config/dconf/user b/home/.config/dconf/user deleted file mode 100644 index a98b2e2..0000000 Binary files a/home/.config/dconf/user and /dev/null differ diff --git a/home/.config/gtk-3.0/assets/close-active.svg b/home/.config/gtk-3.0/assets/close-active.svg deleted file mode 100644 index 37fe71e..0000000 --- a/home/.config/gtk-3.0/assets/close-active.svg +++ /dev/null @@ -1,28 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/close-backdrop-active.svg b/home/.config/gtk-3.0/assets/close-backdrop-active.svg deleted file mode 100644 index 834d46f..0000000 --- a/home/.config/gtk-3.0/assets/close-backdrop-active.svg +++ /dev/null @@ -1,28 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/close-backdrop-hover.svg b/home/.config/gtk-3.0/assets/close-backdrop-hover.svg deleted file mode 100644 index 89cb048..0000000 --- a/home/.config/gtk-3.0/assets/close-backdrop-hover.svg +++ /dev/null @@ -1,28 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/close-backdrop-normal.svg b/home/.config/gtk-3.0/assets/close-backdrop-normal.svg deleted file mode 100644 index 211fa64..0000000 --- a/home/.config/gtk-3.0/assets/close-backdrop-normal.svg +++ /dev/null @@ -1,22 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/close-hover.svg b/home/.config/gtk-3.0/assets/close-hover.svg deleted file mode 100644 index 9f41eed..0000000 --- a/home/.config/gtk-3.0/assets/close-hover.svg +++ /dev/null @@ -1,28 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/close-normal.svg b/home/.config/gtk-3.0/assets/close-normal.svg deleted file mode 100644 index 020e1cc..0000000 --- a/home/.config/gtk-3.0/assets/close-normal.svg +++ /dev/null @@ -1,22 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximize-active.svg b/home/.config/gtk-3.0/assets/maximize-active.svg deleted file mode 100644 index 74f85de..0000000 --- a/home/.config/gtk-3.0/assets/maximize-active.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximize-backdrop-active.svg b/home/.config/gtk-3.0/assets/maximize-backdrop-active.svg deleted file mode 100644 index f23d00a..0000000 --- a/home/.config/gtk-3.0/assets/maximize-backdrop-active.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximize-backdrop-hover.svg b/home/.config/gtk-3.0/assets/maximize-backdrop-hover.svg deleted file mode 100644 index b9f8da5..0000000 --- a/home/.config/gtk-3.0/assets/maximize-backdrop-hover.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximize-backdrop-normal.svg b/home/.config/gtk-3.0/assets/maximize-backdrop-normal.svg deleted file mode 100644 index d90a986..0000000 --- a/home/.config/gtk-3.0/assets/maximize-backdrop-normal.svg +++ /dev/null @@ -1,21 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximize-hover.svg b/home/.config/gtk-3.0/assets/maximize-hover.svg deleted file mode 100644 index 4629fb9..0000000 --- a/home/.config/gtk-3.0/assets/maximize-hover.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximize-normal.svg b/home/.config/gtk-3.0/assets/maximize-normal.svg deleted file mode 100644 index 257cc45..0000000 --- a/home/.config/gtk-3.0/assets/maximize-normal.svg +++ /dev/null @@ -1,21 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximized-active.svg b/home/.config/gtk-3.0/assets/maximized-active.svg deleted file mode 100644 index 2fbc917..0000000 --- a/home/.config/gtk-3.0/assets/maximized-active.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximized-backdrop-active.svg b/home/.config/gtk-3.0/assets/maximized-backdrop-active.svg deleted file mode 100644 index aecf98b..0000000 --- a/home/.config/gtk-3.0/assets/maximized-backdrop-active.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximized-backdrop-hover.svg b/home/.config/gtk-3.0/assets/maximized-backdrop-hover.svg deleted file mode 100644 index 1a88e16..0000000 --- a/home/.config/gtk-3.0/assets/maximized-backdrop-hover.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximized-backdrop-normal.svg b/home/.config/gtk-3.0/assets/maximized-backdrop-normal.svg deleted file mode 100644 index d83c822..0000000 --- a/home/.config/gtk-3.0/assets/maximized-backdrop-normal.svg +++ /dev/null @@ -1,21 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximized-hover.svg b/home/.config/gtk-3.0/assets/maximized-hover.svg deleted file mode 100644 index 748d4a7..0000000 --- a/home/.config/gtk-3.0/assets/maximized-hover.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/maximized-normal.svg b/home/.config/gtk-3.0/assets/maximized-normal.svg deleted file mode 100644 index c466d87..0000000 --- a/home/.config/gtk-3.0/assets/maximized-normal.svg +++ /dev/null @@ -1,21 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/minimize-active.svg b/home/.config/gtk-3.0/assets/minimize-active.svg deleted file mode 100644 index 63d4583..0000000 --- a/home/.config/gtk-3.0/assets/minimize-active.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/minimize-backdrop-active.svg b/home/.config/gtk-3.0/assets/minimize-backdrop-active.svg deleted file mode 100644 index 9a7bc8d..0000000 --- a/home/.config/gtk-3.0/assets/minimize-backdrop-active.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/minimize-backdrop-hover.svg b/home/.config/gtk-3.0/assets/minimize-backdrop-hover.svg deleted file mode 100644 index 762e041..0000000 --- a/home/.config/gtk-3.0/assets/minimize-backdrop-hover.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/minimize-backdrop-normal.svg b/home/.config/gtk-3.0/assets/minimize-backdrop-normal.svg deleted file mode 100644 index e73dea6..0000000 --- a/home/.config/gtk-3.0/assets/minimize-backdrop-normal.svg +++ /dev/null @@ -1,21 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/minimize-hover.svg b/home/.config/gtk-3.0/assets/minimize-hover.svg deleted file mode 100644 index 7422652..0000000 --- a/home/.config/gtk-3.0/assets/minimize-hover.svg +++ /dev/null @@ -1,27 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/assets/minimize-normal.svg b/home/.config/gtk-3.0/assets/minimize-normal.svg deleted file mode 100644 index 24529ed..0000000 --- a/home/.config/gtk-3.0/assets/minimize-normal.svg +++ /dev/null @@ -1,21 +0,0 @@ - - -Qt SVG Document -Generated with Qt - - - - - - - - - - - - diff --git a/home/.config/gtk-3.0/colors.css b/home/.config/gtk-3.0/colors.css deleted file mode 100644 index 821726e..0000000 --- a/home/.config/gtk-3.0/colors.css +++ /dev/null @@ -1,84 +0,0 @@ -@define-color borders_breeze #5f6265; -@define-color content_view_bg_breeze #1b1e20; -@define-color error_color_backdrop_breeze #da4453; -@define-color error_color_breeze #da4453; -@define-color error_color_insensitive_backdrop_breeze #592930; -@define-color error_color_insensitive_breeze #592930; -@define-color insensitive_base_color_breeze #1a1d1f; -@define-color insensitive_base_fg_color_breeze #656768; -@define-color insensitive_bg_color_breeze #282c30; -@define-color insensitive_borders_breeze #3a3d41; -@define-color insensitive_fg_color_breeze #6e7173; -@define-color insensitive_selected_bg_color_breeze #282c30; -@define-color insensitive_selected_fg_color_breeze #6e7173; -@define-color insensitive_unfocused_bg_color_breeze #282c30; -@define-color insensitive_unfocused_fg_color_breeze #6e7173; -@define-color insensitive_unfocused_selected_bg_color_breeze #282c30; -@define-color insensitive_unfocused_selected_fg_color_breeze #6e7173; -@define-color link_color_breeze #1d99f3; -@define-color link_visited_color_breeze #9b59b6; -@define-color success_color_backdrop_breeze #27ae60; -@define-color success_color_breeze #27ae60; -@define-color success_color_insensitive_backdrop_breeze #1e4d34; -@define-color success_color_insensitive_breeze #1e4d34; -@define-color theme_base_color_breeze #1b1e20; -@define-color theme_bg_color_breeze #2a2e32; -@define-color theme_button_background_backdrop_breeze #31363b; -@define-color theme_button_background_backdrop_insensitive_breeze #2f3338; -@define-color theme_button_background_insensitive_breeze #2f3338; -@define-color theme_button_background_normal_breeze #31363b; -@define-color theme_button_decoration_focus_backdrop_breeze #3daee9; -@define-color theme_button_decoration_focus_backdrop_insensitive_breeze #335c72; -@define-color theme_button_decoration_focus_breeze #3daee9; -@define-color theme_button_decoration_focus_insensitive_breeze #335c72; -@define-color theme_button_decoration_hover_backdrop_breeze #3daee9; -@define-color theme_button_decoration_hover_backdrop_insensitive_breeze #335c72; -@define-color theme_button_decoration_hover_breeze #3daee9; -@define-color theme_button_decoration_hover_insensitive_breeze #335c72; -@define-color theme_button_foreground_active_backdrop_breeze #fcfcfc; -@define-color theme_button_foreground_active_backdrop_insensitive_breeze #6e7173; -@define-color theme_button_foreground_active_breeze #fcfcfc; -@define-color theme_button_foreground_active_insensitive_breeze #6e7173; -@define-color theme_button_foreground_backdrop_breeze #fcfcfc; -@define-color theme_button_foreground_backdrop_insensitive_breeze #727679; -@define-color theme_button_foreground_insensitive_breeze #727679; -@define-color theme_button_foreground_normal_breeze #fcfcfc; -@define-color theme_fg_color_breeze #fcfcfc; -@define-color theme_header_background_backdrop_breeze #2a2e32; -@define-color theme_header_background_breeze #31363b; -@define-color theme_header_background_light_breeze #2a2e32; -@define-color theme_header_foreground_backdrop_breeze #fcfcfc; -@define-color theme_header_foreground_breeze #fcfcfc; -@define-color theme_header_foreground_insensitive_backdrop_breeze #fcfcfc; -@define-color theme_header_foreground_insensitive_breeze #fcfcfc; -@define-color theme_hovering_selected_bg_color_breeze #3daee9; -@define-color theme_selected_bg_color_breeze #3daee9; -@define-color theme_selected_fg_color_breeze #fcfcfc; -@define-color theme_text_color_breeze #fcfcfc; -@define-color theme_titlebar_background_backdrop_breeze #2a2e32; -@define-color theme_titlebar_background_breeze #31363b; -@define-color theme_titlebar_background_light_breeze #2a2e32; -@define-color theme_titlebar_foreground_backdrop_breeze #fcfcfc; -@define-color theme_titlebar_foreground_breeze #fcfcfc; -@define-color theme_titlebar_foreground_insensitive_backdrop_breeze #fcfcfc; -@define-color theme_titlebar_foreground_insensitive_breeze #fcfcfc; -@define-color theme_unfocused_base_color_breeze #1b1e20; -@define-color theme_unfocused_bg_color_breeze #2a2e32; -@define-color theme_unfocused_fg_color_breeze #fcfcfc; -@define-color theme_unfocused_selected_bg_color_alt_breeze #1f485e; -@define-color theme_unfocused_selected_bg_color_breeze #1f485e; -@define-color theme_unfocused_selected_fg_color_breeze #fcfcfc; -@define-color theme_unfocused_text_color_breeze #fcfcfc; -@define-color theme_unfocused_view_bg_color_breeze #1a1d1f; -@define-color theme_unfocused_view_text_color_breeze #656768; -@define-color theme_view_active_decoration_color_breeze #3daee9; -@define-color theme_view_hover_decoration_color_breeze #3daee9; -@define-color tooltip_background_breeze #31363b; -@define-color tooltip_border_breeze #64686b; -@define-color tooltip_text_breeze #fcfcfc; -@define-color unfocused_borders_breeze #5f6265; -@define-color unfocused_insensitive_borders_breeze #3a3d41; -@define-color warning_color_backdrop_breeze #f67400; -@define-color warning_color_breeze #f67400; -@define-color warning_color_insensitive_backdrop_breeze #633914; -@define-color warning_color_insensitive_breeze #633914; diff --git a/home/.config/gtk-3.0/gtk.css b/home/.config/gtk-3.0/gtk.css deleted file mode 100644 index c9763f7..0000000 --- a/home/.config/gtk-3.0/gtk.css +++ /dev/null @@ -1 +0,0 @@ -@import 'colors.css'; \ No newline at end of file diff --git a/home/.config/gtk-3.0/settings.ini b/home/.config/gtk-3.0/settings.ini deleted file mode 100644 index 6575d9f..0000000 --- a/home/.config/gtk-3.0/settings.ini +++ /dev/null @@ -1,16 +0,0 @@ -[Settings] -gtk-application-prefer-dark-theme=true -gtk-button-images=true -gtk-cursor-theme-name=breeze_cursors -gtk-cursor-theme-size=24 -gtk-decoration-layout=icon:minimize,maximize,close -gtk-enable-animations=true -gtk-font-name=Noto Sans, 10 -gtk-icon-theme-name=breeze-dark -gtk-menu-images=true -gtk-modules=colorreload-gtk-module:window-decorations-gtk-module -gtk-primary-button-warps-slider=true -gtk-sound-theme-name=ocean -gtk-theme-name=Breeze -gtk-toolbar-style=3 -gtk-xft-dpi=98304 diff --git a/home/.config/gtk-3.0/window_decorations.css b/home/.config/gtk-3.0/window_decorations.css deleted file mode 100644 index ca70a8a..0000000 --- a/home/.config/gtk-3.0/window_decorations.css +++ /dev/null @@ -1,71 +0,0 @@ -headerbar button.titlebutton.close, .titlebar button.titlebutton.close { - background-image: url("assets/close-normal.svg"); } - -headerbar button.titlebutton.close:hover, .titlebar button.titlebutton.close:hover { - background-image: url("assets/close-hover.svg"); } - -headerbar button.titlebutton.close:active, .titlebar button.titlebutton.close:active { - background-image: url("assets/close-active.svg"); } - -headerbar button.titlebutton.close:backdrop, .titlebar button.titlebutton.close:backdrop { - background-image: url("assets/close-backdrop-normal.svg"); } - -headerbar button.titlebutton.close:backdrop:hover, .titlebar button.titlebutton.close:backdrop:hover { - background-image: url("assets/close-backdrop-hover.svg"); } - -headerbar button.titlebutton.close:backdrop:active, .titlebar button.titlebutton.close:backdrop:active { - background-image: url("assets/close-backdrop-active.svg"); } - -headerbar button.titlebutton.maximize, .titlebar button.titlebutton.maximize { - background-image: url("assets/maximize-normal.svg"); } - -headerbar button.titlebutton.maximize:hover, .titlebar button.titlebutton.maximize:hover { - background-image: url("assets/maximize-hover.svg"); } - -headerbar button.titlebutton.maximize:active, .titlebar button.titlebutton.maximize:active { - background-image: url("assets/maximize-active.svg"); } - -headerbar button.titlebutton.maximize:backdrop, .titlebar button.titlebutton.maximize:backdrop { - background-image: url("assets/maximize-backdrop-normal.svg"); } - -headerbar button.titlebutton.maximize:backdrop:hover, .titlebar button.titlebutton.maximize:backdrop:hover { - background-image: url("assets/maximize-backdrop-hover.svg"); } - -headerbar button.titlebutton.maximize:backdrop:active, .titlebar button.titlebutton.maximize:backdrop:active { - background-image: url("assets/maximize-backdrop-active.svg"); } - -headerbar button.titlebutton.minimize, .titlebar button.titlebutton.minimize { - background-image: url("assets/minimize-normal.svg"); } - -headerbar button.titlebutton.minimize:hover, .titlebar button.titlebutton.minimize:hover { - background-image: url("assets/minimize-hover.svg"); } - -headerbar button.titlebutton.minimize:active, .titlebar button.titlebutton.minimize:active { - background-image: url("assets/minimize-active.svg"); } - -headerbar button.titlebutton.minimize:backdrop, .titlebar button.titlebutton.minimize:backdrop { - background-image: url("assets/minimize-backdrop-normal.svg"); } - -headerbar button.titlebutton.minimize:backdrop:hover, .titlebar button.titlebutton.minimize:backdrop:hover { - background-image: url("assets/minimize-backdrop-hover.svg"); } - -headerbar button.titlebutton.minimize:backdrop:active, .titlebar button.titlebutton.minimize:backdrop:active { - background-image: url("assets/minimize-backdrop-active.svg"); } - -.maximized headerbar button.titlebutton.maximize, .maximized .titlebar button.titlebutton.maximize { - background-image: url("assets/maximized-normal.svg"); } - -.maximized headerbar button.titlebutton.maximize:hover, .maximized .titlebar button.titlebutton.maximize:hover { - background-image: url("assets/maximized-hover.svg"); } - -.maximized headerbar button.titlebutton.maximize:active, .maximized .titlebar button.titlebutton.maximize:active { - background-image: url("assets/maximized-active.svg"); } - -.maximized headerbar button.titlebutton.maximize:backdrop, .maximized .titlebar button.titlebutton.maximize:backdrop { - background-image: url("assets/maximized-backdrop-normal.svg"); } - -.maximized headerbar button.titlebutton.maximize:backdrop:hover, .maximized .titlebar button.titlebutton.maximize:backdrop:hover { - background-image: url("assets/maximized-backdrop-hover.svg"); } - -.maximized headerbar button.titlebutton.maximize:backdrop:active, .maximized .titlebar button.titlebutton.maximize:backdrop:active { - background-image: url("assets/maximized-backdrop-active.svg"); } diff --git a/home/.config/gtk-4.0/colors.css b/home/.config/gtk-4.0/colors.css deleted file mode 100644 index 821726e..0000000 --- a/home/.config/gtk-4.0/colors.css +++ /dev/null @@ -1,84 +0,0 @@ -@define-color borders_breeze #5f6265; -@define-color content_view_bg_breeze #1b1e20; -@define-color error_color_backdrop_breeze #da4453; -@define-color error_color_breeze #da4453; -@define-color error_color_insensitive_backdrop_breeze #592930; -@define-color error_color_insensitive_breeze #592930; -@define-color insensitive_base_color_breeze #1a1d1f; -@define-color insensitive_base_fg_color_breeze #656768; -@define-color insensitive_bg_color_breeze #282c30; -@define-color insensitive_borders_breeze #3a3d41; -@define-color insensitive_fg_color_breeze #6e7173; -@define-color insensitive_selected_bg_color_breeze #282c30; -@define-color insensitive_selected_fg_color_breeze #6e7173; -@define-color insensitive_unfocused_bg_color_breeze #282c30; -@define-color insensitive_unfocused_fg_color_breeze #6e7173; -@define-color insensitive_unfocused_selected_bg_color_breeze #282c30; -@define-color insensitive_unfocused_selected_fg_color_breeze #6e7173; -@define-color link_color_breeze #1d99f3; -@define-color link_visited_color_breeze #9b59b6; -@define-color success_color_backdrop_breeze #27ae60; -@define-color success_color_breeze #27ae60; -@define-color success_color_insensitive_backdrop_breeze #1e4d34; -@define-color success_color_insensitive_breeze #1e4d34; -@define-color theme_base_color_breeze #1b1e20; -@define-color theme_bg_color_breeze #2a2e32; -@define-color theme_button_background_backdrop_breeze #31363b; -@define-color theme_button_background_backdrop_insensitive_breeze #2f3338; -@define-color theme_button_background_insensitive_breeze #2f3338; -@define-color theme_button_background_normal_breeze #31363b; -@define-color theme_button_decoration_focus_backdrop_breeze #3daee9; -@define-color theme_button_decoration_focus_backdrop_insensitive_breeze #335c72; -@define-color theme_button_decoration_focus_breeze #3daee9; -@define-color theme_button_decoration_focus_insensitive_breeze #335c72; -@define-color theme_button_decoration_hover_backdrop_breeze #3daee9; -@define-color theme_button_decoration_hover_backdrop_insensitive_breeze #335c72; -@define-color theme_button_decoration_hover_breeze #3daee9; -@define-color theme_button_decoration_hover_insensitive_breeze #335c72; -@define-color theme_button_foreground_active_backdrop_breeze #fcfcfc; -@define-color theme_button_foreground_active_backdrop_insensitive_breeze #6e7173; -@define-color theme_button_foreground_active_breeze #fcfcfc; -@define-color theme_button_foreground_active_insensitive_breeze #6e7173; -@define-color theme_button_foreground_backdrop_breeze #fcfcfc; -@define-color theme_button_foreground_backdrop_insensitive_breeze #727679; -@define-color theme_button_foreground_insensitive_breeze #727679; -@define-color theme_button_foreground_normal_breeze #fcfcfc; -@define-color theme_fg_color_breeze #fcfcfc; -@define-color theme_header_background_backdrop_breeze #2a2e32; -@define-color theme_header_background_breeze #31363b; -@define-color theme_header_background_light_breeze #2a2e32; -@define-color theme_header_foreground_backdrop_breeze #fcfcfc; -@define-color theme_header_foreground_breeze #fcfcfc; -@define-color theme_header_foreground_insensitive_backdrop_breeze #fcfcfc; -@define-color theme_header_foreground_insensitive_breeze #fcfcfc; -@define-color theme_hovering_selected_bg_color_breeze #3daee9; -@define-color theme_selected_bg_color_breeze #3daee9; -@define-color theme_selected_fg_color_breeze #fcfcfc; -@define-color theme_text_color_breeze #fcfcfc; -@define-color theme_titlebar_background_backdrop_breeze #2a2e32; -@define-color theme_titlebar_background_breeze #31363b; -@define-color theme_titlebar_background_light_breeze #2a2e32; -@define-color theme_titlebar_foreground_backdrop_breeze #fcfcfc; -@define-color theme_titlebar_foreground_breeze #fcfcfc; -@define-color theme_titlebar_foreground_insensitive_backdrop_breeze #fcfcfc; -@define-color theme_titlebar_foreground_insensitive_breeze #fcfcfc; -@define-color theme_unfocused_base_color_breeze #1b1e20; -@define-color theme_unfocused_bg_color_breeze #2a2e32; -@define-color theme_unfocused_fg_color_breeze #fcfcfc; -@define-color theme_unfocused_selected_bg_color_alt_breeze #1f485e; -@define-color theme_unfocused_selected_bg_color_breeze #1f485e; -@define-color theme_unfocused_selected_fg_color_breeze #fcfcfc; -@define-color theme_unfocused_text_color_breeze #fcfcfc; -@define-color theme_unfocused_view_bg_color_breeze #1a1d1f; -@define-color theme_unfocused_view_text_color_breeze #656768; -@define-color theme_view_active_decoration_color_breeze #3daee9; -@define-color theme_view_hover_decoration_color_breeze #3daee9; -@define-color tooltip_background_breeze #31363b; -@define-color tooltip_border_breeze #64686b; -@define-color tooltip_text_breeze #fcfcfc; -@define-color unfocused_borders_breeze #5f6265; -@define-color unfocused_insensitive_borders_breeze #3a3d41; -@define-color warning_color_backdrop_breeze #f67400; -@define-color warning_color_breeze #f67400; -@define-color warning_color_insensitive_backdrop_breeze #633914; -@define-color warning_color_insensitive_breeze #633914; diff --git a/home/.config/gtk-4.0/gtk.css b/home/.config/gtk-4.0/gtk.css deleted file mode 100644 index c9763f7..0000000 --- a/home/.config/gtk-4.0/gtk.css +++ /dev/null @@ -1 +0,0 @@ -@import 'colors.css'; \ No newline at end of file diff --git a/home/.config/gtk-4.0/settings.ini b/home/.config/gtk-4.0/settings.ini deleted file mode 100644 index 22c7e42..0000000 --- a/home/.config/gtk-4.0/settings.ini +++ /dev/null @@ -1,12 +0,0 @@ -[Settings] -gtk-application-prefer-dark-theme=true -gtk-cursor-theme-name=breeze_cursors -gtk-cursor-theme-size=24 -gtk-decoration-layout=icon:minimize,maximize,close -gtk-enable-animations=true -gtk-font-name=Noto Sans, 10 -gtk-icon-theme-name=breeze-dark -gtk-modules=colorreload-gtk-module:window-decorations-gtk-module -gtk-primary-button-warps-slider=true -gtk-sound-theme-name=ocean -gtk-xft-dpi=98304 diff --git a/home/.config/gtk-4.0/window_decorations.css b/home/.config/gtk-4.0/window_decorations.css deleted file mode 100644 index ca70a8a..0000000 --- a/home/.config/gtk-4.0/window_decorations.css +++ /dev/null @@ -1,71 +0,0 @@ -headerbar button.titlebutton.close, .titlebar button.titlebutton.close { - background-image: url("assets/close-normal.svg"); } - -headerbar button.titlebutton.close:hover, .titlebar button.titlebutton.close:hover { - background-image: url("assets/close-hover.svg"); } - -headerbar button.titlebutton.close:active, .titlebar button.titlebutton.close:active { - background-image: url("assets/close-active.svg"); } - -headerbar button.titlebutton.close:backdrop, .titlebar button.titlebutton.close:backdrop { - background-image: url("assets/close-backdrop-normal.svg"); } - -headerbar button.titlebutton.close:backdrop:hover, .titlebar button.titlebutton.close:backdrop:hover { - background-image: url("assets/close-backdrop-hover.svg"); } - -headerbar button.titlebutton.close:backdrop:active, .titlebar button.titlebutton.close:backdrop:active { - background-image: url("assets/close-backdrop-active.svg"); } - -headerbar button.titlebutton.maximize, .titlebar button.titlebutton.maximize { - background-image: url("assets/maximize-normal.svg"); } - -headerbar button.titlebutton.maximize:hover, .titlebar button.titlebutton.maximize:hover { - background-image: url("assets/maximize-hover.svg"); } - -headerbar button.titlebutton.maximize:active, .titlebar button.titlebutton.maximize:active { - background-image: url("assets/maximize-active.svg"); } - -headerbar button.titlebutton.maximize:backdrop, .titlebar button.titlebutton.maximize:backdrop { - background-image: url("assets/maximize-backdrop-normal.svg"); } - -headerbar button.titlebutton.maximize:backdrop:hover, .titlebar button.titlebutton.maximize:backdrop:hover { - background-image: url("assets/maximize-backdrop-hover.svg"); } - -headerbar button.titlebutton.maximize:backdrop:active, .titlebar button.titlebutton.maximize:backdrop:active { - background-image: url("assets/maximize-backdrop-active.svg"); } - -headerbar button.titlebutton.minimize, .titlebar button.titlebutton.minimize { - background-image: url("assets/minimize-normal.svg"); } - -headerbar button.titlebutton.minimize:hover, .titlebar button.titlebutton.minimize:hover { - background-image: url("assets/minimize-hover.svg"); } - -headerbar button.titlebutton.minimize:active, .titlebar button.titlebutton.minimize:active { - background-image: url("assets/minimize-active.svg"); } - -headerbar button.titlebutton.minimize:backdrop, .titlebar button.titlebutton.minimize:backdrop { - background-image: url("assets/minimize-backdrop-normal.svg"); } - -headerbar button.titlebutton.minimize:backdrop:hover, .titlebar button.titlebutton.minimize:backdrop:hover { - background-image: url("assets/minimize-backdrop-hover.svg"); } - -headerbar button.titlebutton.minimize:backdrop:active, .titlebar button.titlebutton.minimize:backdrop:active { - background-image: url("assets/minimize-backdrop-active.svg"); } - -.maximized headerbar button.titlebutton.maximize, .maximized .titlebar button.titlebutton.maximize { - background-image: url("assets/maximized-normal.svg"); } - -.maximized headerbar button.titlebutton.maximize:hover, .maximized .titlebar button.titlebutton.maximize:hover { - background-image: url("assets/maximized-hover.svg"); } - -.maximized headerbar button.titlebutton.maximize:active, .maximized .titlebar button.titlebutton.maximize:active { - background-image: url("assets/maximized-active.svg"); } - -.maximized headerbar button.titlebutton.maximize:backdrop, .maximized .titlebar button.titlebutton.maximize:backdrop { - background-image: url("assets/maximized-backdrop-normal.svg"); } - -.maximized headerbar button.titlebutton.maximize:backdrop:hover, .maximized .titlebar button.titlebutton.maximize:backdrop:hover { - background-image: url("assets/maximized-backdrop-hover.svg"); } - -.maximized headerbar button.titlebutton.maximize:backdrop:active, .maximized .titlebar button.titlebutton.maximize:backdrop:active { - background-image: url("assets/maximized-backdrop-active.svg"); } diff --git a/home/.config/gtkrc b/home/.config/gtkrc deleted file mode 100644 index 13b745f..0000000 --- a/home/.config/gtkrc +++ /dev/null @@ -1,2 +0,0 @@ -# created by KDE Plasma, Sat Sep 28 15:42:33 2024 -# diff --git a/home/.config/gtkrc-2.0 b/home/.config/gtkrc-2.0 deleted file mode 100644 index 76b9948..0000000 --- a/home/.config/gtkrc-2.0 +++ /dev/null @@ -1,5 +0,0 @@ -# created by KDE Plasma, Sat Sep 28 15:42:33 2024 -# - -gtk-alternative-button-order = 1 - diff --git a/home/.config/kactivitymanagerd-statsrc b/home/.config/kactivitymanagerd-statsrc deleted file mode 100644 index da7def0..0000000 --- a/home/.config/kactivitymanagerd-statsrc +++ /dev/null @@ -1,5 +0,0 @@ -[Favorites-org.kde.plasma.kickoff.favorites.instance-3-c0af9e06-3f95-40b7-98c1-7fdcb30d509a] -ordering=preferred://browser,org.kde.kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.discover.desktop - -[Favorites-org.kde.plasma.kickoff.favorites.instance-3-global] -ordering=preferred://browser,org.kde.kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.discover.desktop diff --git a/home/.config/kactivitymanagerdrc b/home/.config/kactivitymanagerdrc deleted file mode 100644 index 065a96c..0000000 --- a/home/.config/kactivitymanagerdrc +++ /dev/null @@ -1,5 +0,0 @@ -[activities] -c0af9e06-3f95-40b7-98c1-7fdcb30d509a=Default - -[main] -currentActivity=c0af9e06-3f95-40b7-98c1-7fdcb30d509a diff --git a/home/.config/kconf_updaterc b/home/.config/kconf_updaterc deleted file mode 100644 index 367ca8d..0000000 --- a/home/.config/kconf_updaterc +++ /dev/null @@ -1,29 +0,0 @@ -updateInfoAdded=true - -[gtkconfig.upd] -done=gtk_theme,dont_use_gtk_css_for_window_decorations,remove_deprecated_gtk4_option -mtime=1726043042 - -[kwin.upd] -done=remove_deprecated_gtk4_option,kwin-6.0-reset-active-mouse-screen,kwin-6.0-delete-desktop-switching-shortcuts,kwin-6.0-remove-breeze-tabbox-default,kwin-6.1-remove-gridview-expose-shortcuts -mtime=1727448773 - -[migrate-calendar-to-plugin-id.upd] -done=kwin-6.1-remove-gridview-expose-shortcuts,migrate-calendar-plugins -mtime=1726042232 - -[plasma6.0-remove-dpi-settings.upd] -done=migrate-calendar-plugins,plasma6.0-remove-dpi-settings -mtime=1726042232 - -[plasma6.0-remove-old-shortcuts.upd] -done=plasma6.0-remove-dpi-settings,plasma6.0-remove-old-shortcuts -mtime=1726042232 - -[plasmashell-6.0-keep-custom-position-of-panels.upd] -done=plasma6.0-remove-old-shortcuts,plasmashell-6.0-keep-custom-position-of-panels -mtime=1726042232 - -[plasmashell-6.0-keep-default-floating-setting-for-plasma-5-panels.upd] -done=plasmashell-6.0-keep-custom-position-of-panels,plasmashell-6.0-keep-default-floating-setting-for-plasma-5-panels -mtime=1726042232 diff --git a/home/.config/kde.org/UserFeedback.org.kde.plasmashell.conf b/home/.config/kde.org/UserFeedback.org.kde.plasmashell.conf deleted file mode 100644 index f3bc642..0000000 --- a/home/.config/kde.org/UserFeedback.org.kde.plasmashell.conf +++ /dev/null @@ -1,30 +0,0 @@ -[Source-applicationVersion] -dataSourceCommonSettings\activeState=true - -[Source-compiler] -dataSourceCommonSettings\activeState=true - -[Source-opengl] -dataSourceCommonSettings\activeState=true - -[Source-panelCount] -dataSourceCommonSettings\activeState=true - -[Source-platform] -dataSourceCommonSettings\activeState=true - -[Source-qpa] -dataSourceCommonSettings\activeState=true - -[Source-qtVersion] -dataSourceCommonSettings\activeState=true - -[Source-screens] -dataSourceCommonSettings\activeState=true - -[Source-usageTime] -dataSourceCommonSettings\activeState=true - -[UserFeedback] -ApplicationStartCount=2 -ApplicationTime=1172 diff --git a/home/.config/kded5rc b/home/.config/kded5rc deleted file mode 100644 index a005860..0000000 --- a/home/.config/kded5rc +++ /dev/null @@ -1,2 +0,0 @@ -[Module-device_automounter] -autoload=false diff --git a/home/.config/baloofilerc b/home/.config/kdedefaults/baloofilerc similarity index 96% rename from home/.config/baloofilerc rename to home/.config/kdedefaults/baloofilerc index 653e2f3..72881cf 100644 --- a/home/.config/baloofilerc +++ b/home/.config/kdedefaults/baloofilerc @@ -1,4 +1,4 @@ [General] dbVersion=2 exclude filters=*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.tfstate*,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.terraform,.venv,venv,core-dumps,lost+found -exclude filters version=9 +exclude filters version=9 \ No newline at end of file diff --git a/home/.config/kdedefaults/kactivitymanagerdrc b/home/.config/kdedefaults/kactivitymanagerdrc new file mode 100644 index 0000000..57de909 --- /dev/null +++ b/home/.config/kdedefaults/kactivitymanagerdrc @@ -0,0 +1,5 @@ +[activities] +aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa=Default + +[main] +currentActivity=aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa \ No newline at end of file diff --git a/home/.config/kdedefaults/kcminputrc b/home/.config/kdedefaults/kcminputrc deleted file mode 100644 index 779b957..0000000 --- a/home/.config/kdedefaults/kcminputrc +++ /dev/null @@ -1,2 +0,0 @@ -[Mouse] -cursorTheme=breeze_cursors diff --git a/home/.config/kdedefaults/kdeglobals b/home/.config/kdedefaults/kdeglobals index 5bdede9..3d3164b 100644 --- a/home/.config/kdedefaults/kdeglobals +++ b/home/.config/kdedefaults/kdeglobals @@ -5,4 +5,8 @@ ColorScheme=BreezeDark Theme=breeze-dark [KDE] -widgetStyle=Breeze +LookAndFeelPackage=org.kde.breezedark.desktop + +[KDE Action Restrictions][$i] +action/lock_screen=false +action/switch_user=false \ No newline at end of file diff --git a/home/.config/kscreenlockerrc b/home/.config/kdedefaults/kscreenlockerrc similarity index 81% rename from home/.config/kscreenlockerrc rename to home/.config/kdedefaults/kscreenlockerrc index e49ea4e..9ecc618 100644 --- a/home/.config/kscreenlockerrc +++ b/home/.config/kdedefaults/kscreenlockerrc @@ -1,4 +1,4 @@ [Daemon] Autolock=false LockOnResume=false -Timeout=0 +Timeout=0 \ No newline at end of file diff --git a/home/.config/kdedefaults/ksplashrc b/home/.config/kdedefaults/ksplashrc deleted file mode 100644 index 56a8fb1..0000000 --- a/home/.config/kdedefaults/ksplashrc +++ /dev/null @@ -1,3 +0,0 @@ -[KSplash] -Engine=KSplashQML -Theme=org.kde.breezedark.desktop diff --git a/home/.config/kdedefaults/kwinrc b/home/.config/kdedefaults/kwinrc deleted file mode 100644 index 5288667..0000000 --- a/home/.config/kdedefaults/kwinrc +++ /dev/null @@ -1,4 +0,0 @@ -[org.kde.kdecoration2] -NoPlugin=false -library=org.kde.breeze -theme=Breeze diff --git a/home/.config/kdedefaults/package b/home/.config/kdedefaults/package deleted file mode 100644 index c188391..0000000 --- a/home/.config/kdedefaults/package +++ /dev/null @@ -1 +0,0 @@ -org.kde.breezedark.desktop \ No newline at end of file diff --git a/home/.config/kdedefaults/plasmarc b/home/.config/kdedefaults/plasmarc deleted file mode 100644 index 8b58863..0000000 --- a/home/.config/kdedefaults/plasmarc +++ /dev/null @@ -1,2 +0,0 @@ -[Theme] -name=default diff --git a/home/.config/kdeglobals b/home/.config/kdeglobals deleted file mode 100644 index 7ed11d6..0000000 --- a/home/.config/kdeglobals +++ /dev/null @@ -1,167 +0,0 @@ -[ColorEffects:Disabled] -ChangeSelectionColor= -Color=56,56,56 -ColorAmount=0 -ColorEffect=0 -ContrastAmount=0.65 -ContrastEffect=1 -Enable= -IntensityAmount=0.1 -IntensityEffect=2 - -[ColorEffects:Inactive] -ChangeSelectionColor=true -Color=112,111,110 -ColorAmount=0.025 -ColorEffect=2 -ContrastAmount=0.1 -ContrastEffect=2 -Enable=false -IntensityAmount=0 -IntensityEffect=0 - -[Colors:Button] -BackgroundAlternate=30,87,116 -BackgroundNormal=49,54,59 -DecorationFocus=61,174,233 -DecorationHover=61,174,233 -ForegroundActive=61,174,233 -ForegroundInactive=161,169,177 -ForegroundLink=29,153,243 -ForegroundNegative=218,68,83 -ForegroundNeutral=246,116,0 -ForegroundNormal=252,252,252 -ForegroundPositive=39,174,96 -ForegroundVisited=155,89,182 - -[Colors:Complementary] -BackgroundAlternate=30,87,116 -BackgroundNormal=42,46,50 -DecorationFocus=61,174,233 -DecorationHover=61,174,233 -ForegroundActive=61,174,233 -ForegroundInactive=161,169,177 -ForegroundLink=29,153,243 -ForegroundNegative=218,68,83 -ForegroundNeutral=246,116,0 -ForegroundNormal=252,252,252 -ForegroundPositive=39,174,96 -ForegroundVisited=155,89,182 - -[Colors:Header] -BackgroundAlternate=42,46,50 -BackgroundNormal=49,54,59 -DecorationFocus=61,174,233 -DecorationHover=61,174,233 -ForegroundActive=61,174,233 -ForegroundInactive=161,169,177 -ForegroundLink=29,153,243 -ForegroundNegative=218,68,83 -ForegroundNeutral=246,116,0 -ForegroundNormal=252,252,252 -ForegroundPositive=39,174,96 -ForegroundVisited=155,89,182 - -[Colors:Header][Inactive] -BackgroundAlternate=49,54,59 -BackgroundNormal=42,46,50 -DecorationFocus=61,174,233 -DecorationHover=61,174,233 -ForegroundActive=61,174,233 -ForegroundInactive=161,169,177 -ForegroundLink=29,153,243 -ForegroundNegative=218,68,83 -ForegroundNeutral=246,116,0 -ForegroundNormal=252,252,252 -ForegroundPositive=39,174,96 -ForegroundVisited=155,89,182 - -[Colors:Selection] -BackgroundAlternate=30,87,116 -BackgroundNormal=61,174,233 -DecorationFocus=61,174,233 -DecorationHover=61,174,233 -ForegroundActive=252,252,252 -ForegroundInactive=161,169,177 -ForegroundLink=253,188,75 -ForegroundNegative=176,55,69 -ForegroundNeutral=198,92,0 -ForegroundNormal=252,252,252 -ForegroundPositive=23,104,57 -ForegroundVisited=155,89,182 - -[Colors:Tooltip] -BackgroundAlternate=42,46,50 -BackgroundNormal=49,54,59 -DecorationFocus=61,174,233 -DecorationHover=61,174,233 -ForegroundActive=61,174,233 -ForegroundInactive=161,169,177 -ForegroundLink=29,153,243 -ForegroundNegative=218,68,83 -ForegroundNeutral=246,116,0 -ForegroundNormal=252,252,252 -ForegroundPositive=39,174,96 -ForegroundVisited=155,89,182 - -[Colors:View] -BackgroundAlternate=35,38,41 -BackgroundNormal=27,30,32 -DecorationFocus=61,174,233 -DecorationHover=61,174,233 -ForegroundActive=61,174,233 -ForegroundInactive=161,169,177 -ForegroundLink=29,153,243 -ForegroundNegative=218,68,83 -ForegroundNeutral=246,116,0 -ForegroundNormal=252,252,252 -ForegroundPositive=39,174,96 -ForegroundVisited=155,89,182 - -[Colors:Window] -BackgroundAlternate=49,54,59 -BackgroundNormal=42,46,50 -DecorationFocus=61,174,233 -DecorationHover=61,174,233 -ForegroundActive=61,174,233 -ForegroundInactive=161,169,177 -ForegroundLink=29,153,243 -ForegroundNegative=218,68,83 -ForegroundNeutral=246,116,0 -ForegroundNormal=252,252,252 -ForegroundPositive=39,174,96 -ForegroundVisited=155,89,182 - -[General] -ColorSchemeHash=38f350e0530aaa58cc20a2cf2011a8a2d0c7a4fc - -[KDE] -LookAndFeelPackage=org.kde.breezedark.desktop - -[KFileDialog Settings] -Allow Expansion=false -Automatically select filename extension=true -Breadcrumb Navigation=true -Decoration position=2 -LocationCombo Completionmode=5 -PathCombo Completionmode=5 -Show Bookmarks=false -Show Full Path=false -Show Inline Previews=true -Show Preview=false -Show Speedbar=true -Show hidden files=false -Sort by=Name -Sort directories first=true -Sort hidden files last=false -Sort reversed=false -Speedbar Width=140 -View Style=DetailTree - -[WM] -activeBackground=49,54,59 -activeBlend=252,252,252 -activeForeground=252,252,252 -inactiveBackground=42,46,50 -inactiveBlend=161,169,177 -inactiveForeground=161,169,177 diff --git a/home/.config/kglobalshortcutsrc b/home/.config/kglobalshortcutsrc deleted file mode 100644 index c5f94b2..0000000 --- a/home/.config/kglobalshortcutsrc +++ /dev/null @@ -1,252 +0,0 @@ -[ActivityManager] -_k_friendly_name=Activity Manager -switch-to-activity-c0af9e06-3f95-40b7-98c1-7fdcb30d509a=none,none,Switch to activity "Default" - -[KDE Keyboard Layout Switcher] -Switch to Last-Used Keyboard Layout=none,none,Switch to Last-Used Keyboard Layout -Switch to Next Keyboard Layout=none,none,Switch to Next Keyboard Layout -_k_friendly_name=Keyboard Layout Switcher - -[kaccess] -Toggle Screen Reader On and Off=Meta+Alt+S,Meta+Alt+S,Toggle Screen Reader On and Off -_k_friendly_name=Accessibility - -[kcm_touchpad] -Disable Touchpad=Touchpad Off,Touchpad Off,Disable Touchpad -Enable Touchpad=Touchpad On,Touchpad On,Enable Touchpad -Toggle Touchpad=Touchpad Toggle,Touchpad Toggle,Toggle Touchpad -_k_friendly_name=Touchpad - -[kmix] -_k_friendly_name=Audio Volume -decrease_microphone_volume=none,none,Decrease Microphone Volume -decrease_volume=none,none,Decrease Volume -decrease_volume_small=none,none,Decrease Volume by 1% -increase_microphone_volume=none,none,Increase Microphone Volume -increase_volume=none,none,Increase Volume -increase_volume_small=none,none,Increase Volume by 1% -mic_mute=none,none,Mute Microphone -mute=none,none,Mute - -[ksmserver] -Halt Without Confirmation=none,none,Shut Down Without Confirmation -Lock Session=,none,Lock Session -Log Out=none,none,Show Logout Prompt -Log Out Without Confirmation=none,none,Log Out Without Confirmation -LogOut=none,none,Log Out -Reboot=none,none,Reboot -Reboot Without Confirmation=none,none,Reboot Without Confirmation -Shut Down=none,none,Shut Down -_k_friendly_name=Session Management - -[kwin] -Activate Window Demanding Attention=none,none,Activate Window Demanding Attention -Cycle Overview=none,none,Cycle through Overview and Grid View -Cycle Overview Opposite=none,none,Cycle through Grid View and Overview -Decrease Opacity=none,none,Decrease Opacity of Active Window by 5% -Edit Tiles=none,Meta+T,Toggle Tiles Editor -Expose=Ctrl+F9,Ctrl+F9,Toggle Present Windows (Current desktop) -ExposeAll=Ctrl+F10\tLaunch (C),Ctrl+F10\tLaunch (C),Toggle Present Windows (All desktops) -ExposeClass=Ctrl+F7,Ctrl+F7,Toggle Present Windows (Window class) -ExposeClassCurrentDesktop=none,none,Toggle Present Windows (Window class on current desktop) -Grid View=none,Meta+G,Toggle Grid View -Increase Opacity=none,none,Increase Opacity of Active Window by 5% -Kill Window=none,none,Kill Window -MoveMouseToCenter=none,Meta+F6,Move Mouse to Center -MoveMouseToFocus=none,Meta+F5,Move Mouse to Focus -MoveZoomDown=none,none,Move Zoomed Area Downwards -MoveZoomLeft=none,none,Move Zoomed Area to Left -MoveZoomRight=none,none,Move Zoomed Area to Right -MoveZoomUp=none,none,Move Zoomed Area Upwards -Overview=none,Meta+W,Toggle Overview -Setup Window Shortcut=none,none,Setup Window Shortcut -Show Desktop=none,none,Peek at Desktop -Suspend Compositing=none,none,Suspend Compositing -Switch One Desktop Down=none,none,Switch One Desktop Down -Switch One Desktop Up=none,none,Switch One Desktop Up -Switch One Desktop to the Left=none,none,Switch One Desktop to the Left -Switch One Desktop to the Right=none,none,Switch One Desktop to the Right -Switch Window Down=none,none,Switch to Window Below -Switch Window Left=none,none,Switch to Window to the Left -Switch Window Right=none,none,Switch to Window to the Right -Switch Window Up=none,none,Switch to Window Above -Switch to Desktop 1=none,none,Switch to Desktop 1 -Switch to Desktop 10=none,none,Switch to Desktop 10 -Switch to Desktop 11=none,none,Switch to Desktop 11 -Switch to Desktop 12=none,none,Switch to Desktop 12 -Switch to Desktop 13=none,none,Switch to Desktop 13 -Switch to Desktop 14=none,none,Switch to Desktop 14 -Switch to Desktop 15=none,none,Switch to Desktop 15 -Switch to Desktop 16=none,none,Switch to Desktop 16 -Switch to Desktop 17=none,none,Switch to Desktop 17 -Switch to Desktop 18=none,none,Switch to Desktop 18 -Switch to Desktop 19=none,none,Switch to Desktop 19 -Switch to Desktop 2=none,none,Switch to Desktop 2 -Switch to Desktop 20=none,none,Switch to Desktop 20 -Switch to Desktop 3=none,none,Switch to Desktop 3 -Switch to Desktop 4=none,none,Switch to Desktop 4 -Switch to Desktop 5=none,none,Switch to Desktop 5 -Switch to Desktop 6=none,none,Switch to Desktop 6 -Switch to Desktop 7=none,none,Switch to Desktop 7 -Switch to Desktop 8=none,none,Switch to Desktop 8 -Switch to Desktop 9=none,none,Switch to Desktop 9 -Switch to Next Desktop=none,none,Switch to Next Desktop -Switch to Next Screen=none,none,Switch to Next Screen -Switch to Previous Desktop=none,none,Switch to Previous Desktop -Switch to Previous Screen=none,none,Switch to Previous Screen -Switch to Screen 0=none,none,Switch to Screen 0 -Switch to Screen 1=none,none,Switch to Screen 1 -Switch to Screen 2=none,none,Switch to Screen 2 -Switch to Screen 3=none,none,Switch to Screen 3 -Switch to Screen 4=none,none,Switch to Screen 4 -Switch to Screen 5=none,none,Switch to Screen 5 -Switch to Screen 6=none,none,Switch to Screen 6 -Switch to Screen 7=none,none,Switch to Screen 7 -Switch to Screen Above=none,none,Switch to Screen Above -Switch to Screen Below=none,none,Switch to Screen Below -Switch to Screen to the Left=none,none,Switch to Screen to the Left -Switch to Screen to the Right=none,none,Switch to Screen to the Right -Toggle Night Color=none,none,Suspend/Resume Night Light -Toggle Window Raise/Lower=none,none,Toggle Window Raise/Lower -Walk Through Windows=none,none,Walk Through Windows -Walk Through Windows (Reverse)=none,none,Walk Through Windows (Reverse) -Walk Through Windows Alternative=none,none,Walk Through Windows Alternative -Walk Through Windows Alternative (Reverse)=none,none,Walk Through Windows Alternative (Reverse) -Walk Through Windows of Current Application=none,none,Walk Through Windows of Current Application -Walk Through Windows of Current Application (Reverse)=none,none,Walk Through Windows of Current Application (Reverse) -Walk Through Windows of Current Application Alternative=none,none,Walk Through Windows of Current Application Alternative -Walk Through Windows of Current Application Alternative (Reverse)=none,none,Walk Through Windows of Current Application Alternative (Reverse) -Window Above Other Windows=none,none,Keep Window Above Others -Window Below Other Windows=none,none,Keep Window Below Others -Window Close=none,none,Close Window -Window Fullscreen=none,none,Make Window Fullscreen -Window Grow Horizontal=none,none,Expand Window Horizontally -Window Grow Vertical=none,none,Expand Window Vertically -Window Lower=none,none,Lower Window -Window Maximize=none,none,Maximize Window -Window Maximize Horizontal=none,none,Maximize Window Horizontally -Window Maximize Vertical=none,none,Maximize Window Vertically -Window Minimize=none,none,Minimize Window -Window Move=none,none,Move Window -Window Move Center=none,none,Move Window to the Center -Window No Border=none,none,Toggle Window Titlebar and Frame -Window On All Desktops=none,none,Keep Window on All Desktops -Window One Desktop Down=none,none,Window One Desktop Down -Window One Desktop Up=none,none,Window One Desktop Up -Window One Desktop to the Left=none,none,Window One Desktop to the Left -Window One Desktop to the Right=none,none,Window One Desktop to the Right -Window One Screen Down=none,none,Move Window One Screen Down -Window One Screen Up=none,none,Move Window One Screen Up -Window One Screen to the Left=none,none,Move Window One Screen to the Left -Window One Screen to the Right=none,none,Move Window One Screen to the Right -Window Operations Menu=none,none,Window Operations Menu -Window Pack Down=none,none,Move Window Down -Window Pack Left=none,none,Move Window Left -Window Pack Right=none,none,Move Window Right -Window Pack Up=none,none,Move Window Up -Window Quick Tile Bottom=none,none,Quick Tile Window to the Bottom -Window Quick Tile Bottom Left=none,none,Quick Tile Window to the Bottom Left -Window Quick Tile Bottom Right=none,none,Quick Tile Window to the Bottom Right -Window Quick Tile Left=none,none,Quick Tile Window to the Left -Window Quick Tile Right=none,none,Quick Tile Window to the Right -Window Quick Tile Top=none,none,Quick Tile Window to the Top -Window Quick Tile Top Left=none,none,Quick Tile Window to the Top Left -Window Quick Tile Top Right=none,none,Quick Tile Window to the Top Right -Window Raise=none,none,Raise Window -Window Resize=none,none,Resize Window -Window Shade=none,none,Shade Window -Window Shrink Horizontal=none,none,Shrink Window Horizontally -Window Shrink Vertical=none,none,Shrink Window Vertically -Window to Desktop 1=none,none,Window to Desktop 1 -Window to Desktop 10=none,none,Window to Desktop 10 -Window to Desktop 11=none,none,Window to Desktop 11 -Window to Desktop 12=none,none,Window to Desktop 12 -Window to Desktop 13=none,none,Window to Desktop 13 -Window to Desktop 14=none,none,Window to Desktop 14 -Window to Desktop 15=none,none,Window to Desktop 15 -Window to Desktop 16=none,none,Window to Desktop 16 -Window to Desktop 17=none,none,Window to Desktop 17 -Window to Desktop 18=none,none,Window to Desktop 18 -Window to Desktop 19=none,none,Window to Desktop 19 -Window to Desktop 2=none,none,Window to Desktop 2 -Window to Desktop 20=none,none,Window to Desktop 20 -Window to Desktop 3=none,none,Window to Desktop 3 -Window to Desktop 4=none,none,Window to Desktop 4 -Window to Desktop 5=none,none,Window to Desktop 5 -Window to Desktop 6=none,none,Window to Desktop 6 -Window to Desktop 7=none,none,Window to Desktop 7 -Window to Desktop 8=none,none,Window to Desktop 8 -Window to Desktop 9=none,none,Window to Desktop 9 -Window to Next Desktop=none,none,Window to Next Desktop -Window to Next Screen=none,none,Move Window to Next Screen -Window to Previous Desktop=none,none,Window to Previous Desktop -Window to Previous Screen=none,none,Move Window to Previous Screen -Window to Screen 0=none,none,Move Window to Screen 0 -Window to Screen 1=none,none,Move Window to Screen 1 -Window to Screen 2=none,none,Move Window to Screen 2 -Window to Screen 3=none,none,Move Window to Screen 3 -Window to Screen 4=none,none,Move Window to Screen 4 -Window to Screen 5=none,none,Move Window to Screen 5 -Window to Screen 6=none,none,Move Window to Screen 6 -Window to Screen 7=none,none,Move Window to Screen 7 -_k_friendly_name=KWin -view_actual_size=none,Meta+0,Zoom to Actual Size -view_zoom_in=none,Meta++\tMeta+=,Zoom In -view_zoom_out=none,Meta+-,Zoom Out - -[mediacontrol] -_k_friendly_name=Media Controller -mediavolumedown=none,none,Media volume down -mediavolumeup=none,none,Media volume up -nextmedia=none,none,Media playback next -pausemedia=none,none,Pause media playback -playmedia=none,none,Play media playback -playpausemedia=none,none,Play/Pause media playback -previousmedia=none,none,Media playback previous -stopmedia=none,none,Stop media playback - -[org_kde_powerdevil] -Decrease Keyboard Brightness=Keyboard Brightness Down,Keyboard Brightness Down,Decrease Keyboard Brightness -Decrease Screen Brightness=Monitor Brightness Down,Monitor Brightness Down,Decrease Screen Brightness -Decrease Screen Brightness Small=Shift+Monitor Brightness Down,Shift+Monitor Brightness Down,Decrease Screen Brightness by 1% -Hibernate=Hibernate,Hibernate,Hibernate -Increase Keyboard Brightness=Keyboard Brightness Up,Keyboard Brightness Up,Increase Keyboard Brightness -Increase Screen Brightness=Monitor Brightness Up,Monitor Brightness Up,Increase Screen Brightness -Increase Screen Brightness Small=Shift+Monitor Brightness Up,Shift+Monitor Brightness Up,Increase Screen Brightness by 1% -PowerDown=Power Down,Power Down,Power Down -PowerOff=Power Off,Power Off,Power Off -Sleep=Sleep,Sleep,Suspend -Toggle Keyboard Backlight=Keyboard Light On/Off,Keyboard Light On/Off,Toggle Keyboard Backlight -Turn Off Screen=none,none,Turn Off Screen -_k_friendly_name=Power Management -powerProfile=Battery\tMeta+B,Battery\tMeta+B,Switch Power Profile - -[plasmashell] -_k_friendly_name=plasmashell -activate application launcher=Meta\tAlt+F1,Meta\tAlt+F1,Activate Application Launcher -activate task manager entry 1=Meta+1,Meta+1,Activate Task Manager Entry 1 -activate task manager entry 10=Meta+0,Meta+0,Activate Task Manager Entry 10 -activate task manager entry 2=Meta+2,Meta+2,Activate Task Manager Entry 2 -activate task manager entry 3=Meta+3,Meta+3,Activate Task Manager Entry 3 -activate task manager entry 4=Meta+4,Meta+4,Activate Task Manager Entry 4 -activate task manager entry 5=Meta+5,Meta+5,Activate Task Manager Entry 5 -activate task manager entry 6=Meta+6,Meta+6,Activate Task Manager Entry 6 -activate task manager entry 7=Meta+7,Meta+7,Activate Task Manager Entry 7 -activate task manager entry 8=Meta+8,Meta+8,Activate Task Manager Entry 8 -activate task manager entry 9=Meta+9,Meta+9,Activate Task Manager Entry 9 -clear-history=,,Clear Clipboard History -clipboard_action=Meta+Ctrl+X,Meta+Ctrl+X,Automatic Action Popup Menu -cycle-panels=Meta+Alt+P,Meta+Alt+P,Move keyboard focus between panels -cycleNextAction=,,Next History Item -cyclePrevAction=,,Previous History Item -manage activities=Meta+Q,Meta+Q,Show Activity Switcher -next activity=Meta+A,none,Walk through activities -previous activity=Meta+Shift+A,none,Walk through activities (Reverse) -repeat_action=Meta+Ctrl+R,Meta+Ctrl+R,Manually Invoke Action on Current Clipboard -show dashboard=Ctrl+F12,Ctrl+F12,Show Desktop -show-barcode=,,Show Barcode… -show-on-mouse-pos=Meta+V,Meta+V,Show Clipboard Items at Mouse Position -stop current activity=Meta+S,Meta+S,Stop Current Activity -switch to next activity=,,Switch to Next Activity -switch to previous activity=,,Switch to Previous Activity -toggle do not disturb=,,Toggle do not disturb diff --git a/home/.config/konsolerc b/home/.config/konsolerc deleted file mode 100644 index 4da8e0a..0000000 --- a/home/.config/konsolerc +++ /dev/null @@ -1,8 +0,0 @@ -[General] -ConfigVersion=1 - -[MainWindow] -ToolBarsMovable=Disabled - -[UiSettings] -ColorScheme= diff --git a/home/.config/ksmserverrc b/home/.config/ksmserverrc deleted file mode 100644 index b47cc89..0000000 --- a/home/.config/ksmserverrc +++ /dev/null @@ -1,2 +0,0 @@ -[General] -loginMode=emptySession diff --git a/home/.config/ksplashrc b/home/.config/ksplashrc deleted file mode 100644 index 8835d78..0000000 --- a/home/.config/ksplashrc +++ /dev/null @@ -1,2 +0,0 @@ -[KSplash] -Theme=org.kde.breeze.desktop diff --git a/home/.config/ktimezonedrc b/home/.config/ktimezonedrc deleted file mode 100644 index 2fb3ac7..0000000 --- a/home/.config/ktimezonedrc +++ /dev/null @@ -1,4 +0,0 @@ -[TimeZones] -LocalZone=UCT -ZoneinfoDir=/usr/share/zoneinfo -Zonetab=/usr/share/zoneinfo/zone.tab diff --git a/home/.config/kwinrc b/home/.config/kwinrc deleted file mode 100644 index d176f65..0000000 --- a/home/.config/kwinrc +++ /dev/null @@ -1,10 +0,0 @@ -[Desktops] -Id_1=a7944349-c11a-4850-bee6-1ea57bf0ca15 -Number=1 -Rows=1 - -[Tiling] -padding=4 - -[Tiling][61a9cda2-c784-5476-9585-83eaed337290] -tiles={"layoutDirection":"horizontal","tiles":[{"width":0.25},{"width":0.5},{"width":0.25}]} diff --git a/home/.config/plasma-localerc b/home/.config/plasma-localerc deleted file mode 100644 index f726843..0000000 --- a/home/.config/plasma-localerc +++ /dev/null @@ -1,2 +0,0 @@ -[Formats] -LANG=C.UTF-8 diff --git a/home/.config/plasma-org.kde.plasma.desktop-appletsrc b/home/.config/plasma-org.kde.plasma.desktop-appletsrc index 0bb0197..6419a44 100644 --- a/home/.config/plasma-org.kde.plasma.desktop-appletsrc +++ b/home/.config/plasma-org.kde.plasma.desktop-appletsrc @@ -1,144 +1,82 @@ [ActionPlugins][0] -MiddleButton;NoModifier=org.kde.paste RightButton;NoModifier=org.kde.contextmenu [ActionPlugins][1] RightButton;NoModifier=org.kde.contextmenu -[Containments][20] -ItemGeometries-1024x768= -ItemGeometriesHorizontal= -activityId=c0af9e06-3f95-40b7-98c1-7fdcb30d509a +[Containments][1] +activityId=aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa formfactor=0 -immutability=1 lastScreen=0 location=0 plugin=org.kde.plasma.folder wallpaperplugin=org.kde.image -[Containments][20][ConfigDialog] -DialogHeight=540 -DialogWidth=720 +[Containments][1][Wallpaper][org.kde.image][General] +DynamicMode=2 +Image=file:///home/fng/Pictures/wallpaper.png -[Containments][20][Wallpaper][org.kde.image][General] -FillMode=0 -Image=/home/fng/Pictures/wallpaper.png -SlidePaths=/usr/share/wallpapers/ - -[Containments][21] +[Containments][2] activityId= formfactor=2 -immutability=1 lastScreen=0 location=4 plugin=org.kde.panel -wallpaperplugin=org.kde.image -[Containments][21][Applets][22] -immutability=1 +[Containments][2][Applets][1] plugin=org.kde.plasma.kickoff -[Containments][21][Applets][22][Configuration] -PreloadWeight=100 -popupHeight=510 -popupWidth=647 - -[Containments][21][Applets][22][Configuration][ConfigDialog] -DialogHeight=540 -DialogWidth=720 - -[Containments][21][Applets][22][Configuration][General] -favoritesPortedToKAstats=true -systemFavorites=logout +[Containments][2][Applets][1][Shortcuts] +global=Meta -[Containments][21][Applets][23] -immutability=1 +[Containments][2][Applets][2] plugin=org.kde.plasma.pager -[Containments][21][Applets][24] -immutability=1 +[Containments][2][Applets][3] plugin=org.kde.plasma.icontasks -[Containments][21][Applets][25] -immutability=1 +[Containments][2][Applets][4] plugin=org.kde.plasma.marginsseparator -[Containments][21][Applets][26] -immutability=1 +[Containments][2][Applets][5] +activityId= +formfactor=0 +location=0 plugin=org.kde.plasma.systemtray -[Containments][21][Applets][26][Configuration] -PreloadWeight=55 -SystrayContainmentId=27 - -[Containments][21][Applets][35] -immutability=1 -plugin=org.kde.plasma.digitalclock +[Containments][2][Applets][5][Applets][8] +plugin=org.kde.plasma.cameraindicator -[Containments][21][Applets][36] -immutability=1 -plugin=org.kde.plasma.showdesktop +[Containments][2][Applets][5][Applets][9] +plugin=org.kde.plasma.clipboard -[Containments][21][General] -AppletOrder=22;23;24;25;26;35;36 +[Containments][2][Applets][5][Applets][10] +plugin=org.kde.plasma.devicenotifier -[Containments][27] -activityId= -formfactor=2 -immutability=1 -lastScreen=0 -location=4 -plugin=org.kde.plasma.private.systemtray -popupHeight=432 -popupWidth=432 -wallpaperplugin=org.kde.image +[Containments][2][Applets][5][Applets][11] +plugin=org.kde.plasma.keyboardlayout -[Containments][27][Applets][28] -immutability=1 -plugin=org.kde.plasma.cameraindicator +[Containments][2][Applets][5][Applets][12] +plugin=org.kde.plasma.manage-inputmethod -[Containments][27][Applets][29] -immutability=1 +[Containments][2][Applets][5][Applets][13] plugin=org.kde.plasma.notifications -[Containments][27][Applets][30] -immutability=1 +[Containments][2][Applets][5][Applets][14] plugin=org.kde.plasma.volume -[Containments][27][Applets][30][Configuration] -PreloadWeight=60 - -[Containments][27][Applets][30][Configuration][General] -migrated=true - -[Containments][27][Applets][31] -immutability=1 -plugin=org.kde.plasma.devicenotifier - -[Containments][27][Applets][32] -immutability=1 -plugin=org.kde.plasma.manage-inputmethod - -[Containments][27][Applets][33] -immutability=1 -plugin=org.kde.plasma.keyboardlayout - -[Containments][27][Applets][34] -immutability=1 -plugin=org.kde.plasma.clipboard +[Containments][2][Applets][5][General] +extraItems=org.kde.plasma.cameraindicator,org.kde.plasma.clipboard,org.kde.plasma.devicenotifier,org.kde.plasma.keyboardlayout,org.kde.plasma.manage-inputmethod,org.kde.plasma.mediacontroller,org.kde.plasma.notifications,org.kde.plasma.volume +knownItems=org.kde.plasma.cameraindicator,org.kde.plasma.clipboard,org.kde.plasma.devicenotifier,org.kde.plasma.keyboardlayout,org.kde.plasma.manage-inputmethod,org.kde.plasma.mediacontroller,org.kde.plasma.notifications,org.kde.plasma.volume -[Containments][27][Applets][37] -immutability=1 -plugin=org.kde.plasma.brightness +[Containments][2][Applets][6] +plugin=org.kde.plasma.digitalclock -[Containments][27][Applets][38] -immutability=1 -plugin=org.kde.plasma.battery +[Containments][2][Applets][7] +plugin=org.kde.plasma.showdesktop -[Containments][27][General] -extraItems=org.kde.plasma.cameraindicator,org.kde.plasma.notifications,org.kde.plasma.volume,org.kde.plasma.devicenotifier,org.kde.plasma.brightness,org.kde.plasma.battery,org.kde.plasma.manage-inputmethod,org.kde.plasma.keyboardlayout,org.kde.plasma.clipboard,org.kde.plasma.mediacontroller -knownItems=org.kde.plasma.cameraindicator,org.kde.plasma.notifications,org.kde.plasma.volume,org.kde.plasma.devicenotifier,org.kde.plasma.brightness,org.kde.plasma.battery,org.kde.plasma.manage-inputmethod,org.kde.plasma.keyboardlayout,org.kde.plasma.clipboard,org.kde.plasma.mediacontroller +[Containments][2][General] +AppletOrder=1;2;3;4;5;6;7 [ScreenMapping] -itemsOnDisabledScreens= -screenMapping=desktop:/org.prismlauncher.PrismLauncher.desktop,0,c0af9e06-3f95-40b7-98c1-7fdcb30d509a,desktop:/dcslauncher.desktop,0,c0af9e06-3f95-40b7-98c1-7fdcb30d509a,desktop:/steam.desktop,0,c0af9e06-3f95-40b7-98c1-7fdcb30d509a,desktop:/FixDesktop.sh,0,c0af9e06-3f95-40b7-98c1-7fdcb30d509a +screenMapping=desktop:/dcslauncher.desktop,0,aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,desktop:/prismlauncher.desktop,0,aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa,desktop:/steam.desktop,0,aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa diff --git a/home/.config/plasmarc b/home/.config/plasmarc deleted file mode 100644 index 70b04af..0000000 --- a/home/.config/plasmarc +++ /dev/null @@ -1,2 +0,0 @@ -[Wallpapers] -usersWallpapers=/home/fng/Pictures/wallpaper.png diff --git a/home/.config/plasmashellrc b/home/.config/plasmashellrc index ce968c0..7da5c1a 100644 --- a/home/.config/plasmashellrc +++ b/home/.config/plasmashellrc @@ -1,14 +1,5 @@ [PlasmaViews][Panel 2] -floating=1 +panelOpacity=2 [PlasmaViews][Panel 2][Defaults] -thickness=44 - -[PlasmaViews][Panel 21] -floating=1 - -[PlasmaViews][Panel 21][Defaults] -thickness=44 - -[Updates] -performed=/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/klipper_clear_config.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/systemloadviewer_systemmonitor.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/keyboardlayout_remove_shortcut.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/maintain_existing_desktop_icon_sizes.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/migrate_font_weights.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/containmentactions_middlebutton.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/digitalclock_rename_timezonedisplay_key.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/keyboardlayout_migrateiconsetting.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/digitalclock_migrate_font_settings.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/folderview_fix_recursive_screenmapping.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/no_middle_click_paste_on_panels.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/mediaframe_migrate_useBackground_setting.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/unlock_widgets.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/digitalclock_migrate_showseconds_setting.js,/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/move_desktop_layout_config.js +thickness=44 \ No newline at end of file diff --git a/home/.config/powermanagementprofilesrc b/home/.config/powermanagementprofilesrc deleted file mode 100644 index 0f36073..0000000 --- a/home/.config/powermanagementprofilesrc +++ /dev/null @@ -1,2 +0,0 @@ -[Migration] -MigratedProfilesToPlasma6=powerdevilrc diff --git a/home/.config/user-dirs.dirs b/home/.config/user-dirs.dirs deleted file mode 100644 index 7f9a959..0000000 --- a/home/.config/user-dirs.dirs +++ /dev/null @@ -1,15 +0,0 @@ -# This file is written by xdg-user-dirs-update -# If you want to change or add directories, just edit the line you're -# interested in. All local changes will be retained on the next run. -# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped -# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an -# absolute path. No other format is supported. -# -XDG_DESKTOP_DIR="$HOME/Desktop" -XDG_DOWNLOAD_DIR="$HOME/Downloads" -XDG_TEMPLATES_DIR="$HOME/Templates" -XDG_PUBLICSHARE_DIR="$HOME/Public" -XDG_DOCUMENTS_DIR="$HOME/Documents" -XDG_MUSIC_DIR="$HOME/Music" -XDG_PICTURES_DIR="$HOME/Pictures" -XDG_VIDEOS_DIR="$HOME/Videos" diff --git a/home/.config/user-dirs.locale b/home/.config/user-dirs.locale deleted file mode 100644 index 96d80cd..0000000 --- a/home/.config/user-dirs.locale +++ /dev/null @@ -1 +0,0 @@ -C \ No newline at end of file diff --git a/home/.config/xsettingsd/xsettingsd.conf b/home/.config/xsettingsd/xsettingsd.conf deleted file mode 100644 index ac191c7..0000000 --- a/home/.config/xsettingsd/xsettingsd.conf +++ /dev/null @@ -1,15 +0,0 @@ -Gdk/UnscaledDPI 98304 -Gdk/WindowScalingFactor 1 -Gtk/EnableAnimations 1 -Gtk/DecorationLayout "icon:minimize,maximize,close" -Net/ThemeName "Breeze-Dark" -Gtk/PrimaryButtonWarpsSlider 1 -Gtk/ToolbarStyle 3 -Gtk/MenuImages 1 -Gtk/ButtonImages 1 -Gtk/CursorThemeSize 24 -Gtk/CursorThemeName "breeze_cursors" -Net/SoundThemeName "ocean" -Net/IconThemeName "breeze-dark" -Gtk/FontName "Noto Sans, 10" - diff --git a/home/.gtkrc-2.0 b/home/.gtkrc-2.0 deleted file mode 100644 index 9b109e4..0000000 --- a/home/.gtkrc-2.0 +++ /dev/null @@ -1,12 +0,0 @@ -gtk-enable-animations=1 -gtk-theme-name="Breeze-Dark" -gtk-primary-button-warps-slider=1 -gtk-toolbar-style=3 -gtk-menu-images=1 -gtk-button-images=1 -gtk-cursor-theme-size=24 -gtk-cursor-theme-name="breeze_cursors" -gtk-sound-theme-name="ocean" -gtk-icon-theme-name="breeze-dark" -gtk-font-name="Noto Sans, 10" - diff --git a/home/.local/state/konsolestaterc b/home/.local/state/konsolestaterc deleted file mode 100644 index 0e99b3b..0000000 --- a/home/.local/state/konsolestaterc +++ /dev/null @@ -1,8 +0,0 @@ -[MainWindow] -1024x768 screen: Height=468 -1024x768 screen: Width=911 -1024x768 screen: XPosition=178 -1024x768 screen: YPosition=114 -RestorePositionForNextInstance=false -State=AAAA/wAAAAD9AAAAAQAAAAAAAAAAAAAAAPwCAAAAAvsAAAAcAFMAUwBIAE0AYQBuAGEAZwBlAHIARABvAGMAawAAAAAA/////wAAAREA////+wAAACIAUQB1AGkAYwBrAEMAbwBtAG0AYQBuAGQAcwBEAG8AYwBrAAAAAAD/////AAABcgD///8AAAOPAAABpgAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAACAAAAFgBtAGEAaQBuAFQAbwBvAGwAQgBhAHIBAAAAAP////8AAAAAAAAAAAAAABwAcwBlAHMAcwBpAG8AbgBUAG8AbwBsAGIAYQByAQAAAOj/////AAAAAAAAAAA= -VNC-0=VNC-0 diff --git a/home/.local/state/plasmashellstaterc b/home/.local/state/plasmashellstaterc deleted file mode 100644 index 8666c7e..0000000 --- a/home/.local/state/plasmashellstaterc +++ /dev/null @@ -1,2 +0,0 @@ -[KickerRunnerManager][History] -c0af9e06-3f95-40b7-98c1-7fdcb30d509a=kon diff --git a/home/.local/state/systemsettingsstaterc b/home/.local/state/systemsettingsstaterc deleted file mode 100644 index f51426b..0000000 --- a/home/.local/state/systemsettingsstaterc +++ /dev/null @@ -1,11 +0,0 @@ -[KFileDialog Settings] -Recent Files[$e]=file:$HOME/Pictures/wallpaper.png -Recent URLs[$e]=file:$HOME/Pictures/ - -[MainWindow] -1024x768 screen: Height=650 -1024x768 screen: Width=922 -1024x768 screen: XPosition=50 -1024x768 screen: YPosition=50 -State=AAAA/wAAAAD9AAAAAAAAA5oAAAKKAAAABAAAAAQAAAAIAAAACPwAAAAA -VNC-0=VNC-0 diff --git a/home/.nvidia-settings-rc b/home/.nvidia-settings-rc deleted file mode 100644 index 3aeab4c..0000000 --- a/home/.nvidia-settings-rc +++ /dev/null @@ -1,84 +0,0 @@ -# -# /home/fng/.nvidia-settings-rc -# -# Configuration file for nvidia-settings - the NVIDIA Settings utility -# Generated on Fri May 31 11:39:59 2024 -# - -# ConfigProperties: - -RcFileLocale = C -DisplayStatusBar = Yes -SliderTextEntries = Yes -IncludeDisplayNameInConfigFile = No -UpdateRulesOnProfileNameChange = Yes -Timer = PowerMizer_Monitor_(GPU_0),Yes,1000 -Timer = Thermal_Monitor_(GPU_0),Yes,1000 -Timer = Memory_Used_(GPU_0),Yes,3000 - -# Attributes: - -0/SyncToVBlank=1 -0/LogAniso=0 -0/FSAA=0 -0/TextureClamping=1 -0/FXAA=0 -0/AllowFlipping=1 -0/FSAAAppControlled=1 -0/LogAnisoAppControlled=1 -0/OpenGLImageSettings=1 -0/FSAAAppEnhanced=0 -0/ShowGraphicsVisualIndicator=0 -[DPY:HDMI-0]/Dithering=0 -[DPY:HDMI-0]/DitheringMode=0 -[DPY:HDMI-0]/DitheringDepth=0 -[DPY:HDMI-0]/ColorSpace=0 -[DPY:HDMI-0]/ColorRange=0 -[DPY:HDMI-0]/SynchronousPaletteUpdates=0 -[DPY:DP-0]/Dithering=0 -[DPY:DP-0]/DitheringMode=0 -[DPY:DP-0]/DitheringDepth=0 -[DPY:DP-0]/ColorSpace=0 -[DPY:DP-0]/ColorRange=0 -[DPY:DP-0]/SynchronousPaletteUpdates=0 -[DPY:DP-1]/Dithering=0 -[DPY:DP-1]/DitheringMode=0 -[DPY:DP-1]/DitheringDepth=0 -[DPY:DP-1]/ColorSpace=0 -[DPY:DP-1]/ColorRange=0 -[DPY:DP-1]/SynchronousPaletteUpdates=0 -[DPY:DP-2]/Dithering=0 -[DPY:DP-2]/DitheringMode=0 -[DPY:DP-2]/DitheringDepth=0 -[DPY:DP-2]/ColorSpace=0 -[DPY:DP-2]/ColorRange=0 -[DPY:DP-2]/SynchronousPaletteUpdates=0 -[DPY:DP-3]/Dithering=0 -[DPY:DP-3]/DitheringMode=0 -[DPY:DP-3]/DitheringDepth=0 -[DPY:DP-3]/ColorSpace=0 -[DPY:DP-3]/ColorRange=0 -[DPY:DP-3]/SynchronousPaletteUpdates=0 -[DPY:DP-4]/RedBrightness=0.000000 -[DPY:DP-4]/GreenBrightness=0.000000 -[DPY:DP-4]/BlueBrightness=0.000000 -[DPY:DP-4]/RedContrast=0.000000 -[DPY:DP-4]/GreenContrast=0.000000 -[DPY:DP-4]/BlueContrast=0.000000 -[DPY:DP-4]/RedGamma=1.000000 -[DPY:DP-4]/GreenGamma=1.000000 -[DPY:DP-4]/BlueGamma=1.000000 -[DPY:DP-4]/Dithering=0 -[DPY:DP-4]/DitheringMode=0 -[DPY:DP-4]/DitheringDepth=0 -[DPY:DP-4]/DigitalVibrance=0 -[DPY:DP-4]/ColorSpace=0 -[DPY:DP-4]/ColorRange=0 -[DPY:DP-4]/SynchronousPaletteUpdates=0 -[DPY:DP-5]/Dithering=0 -[DPY:DP-5]/DitheringMode=0 -[DPY:DP-5]/DitheringDepth=0 -[DPY:DP-5]/ColorSpace=0 -[DPY:DP-5]/ColorRange=0 -[DPY:DP-5]/SynchronousPaletteUpdates=0 -[GPU:0]/GPUPowerMizerMode=2 diff --git a/home/pacman.conf b/home/pacman.conf new file mode 100644 index 0000000..fc18f6d --- /dev/null +++ b/home/pacman.conf @@ -0,0 +1,107 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +#UseDelta = 0.7 +Architecture = auto + +#IgnorePkg = +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +NoExtract = usr/share/man/* usr/share/doc/* usr/share/gtk-doc/* usr/share/help/* + +# Misc options +#UseSyslog +Color +ILoveCandy +#NoProgressBar +#CheckSpace +VerbosePkgLists +DisableDownloadTimeout +DisableSandboxNetwork +ParallelDownloads = 10 + +# By default, pacman accepts packages signed by keys that its local keyring +# trusts (see pacman-key and its man page), as well as unsigned packages. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Arch Linux +# packagers with `pacman-key --populate archlinux`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The testing repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[cachyos-v3] +Include = /etc/pacman.d/cachyos-v3-mirrorlist +[cachyos-core-v3] +Include = /etc/pacman.d/cachyos-v3-mirrorlist +[cachyos-extra-v3] +Include = /etc/pacman.d/cachyos-v3-mirrorlist +[cachyos] +Include = /etc/pacman.d/cachyos-mirrorlist + +[core] +Include = /etc/pacman.d/mirrorlist + +[extra] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + +[multilib] +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs diff --git a/home/startsession.sh b/home/startsession.sh index 4afa21d..d92f611 100755 --- a/home/startsession.sh +++ b/home/startsession.sh @@ -1,5 +1,8 @@ #!/bin/bash -sudo flatpak remote-delete flathub -flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo -flatpak install --user org.vinegarhq.Sober -dbus-run-session startplasma-x11 \ No newline at end of file +export __EGL_VENDOR_LIBRARY_FILENAMES=/usr/share/glvnd/egl_vendor.d/10_nvidia.json +#nvidia-settings --assign CurrentMetaMode="nvidia-auto-select +0+0 {ForceFullCompositionPipeline=On}" || true +export __GL_SHADER_DISK_CACHE_SKIP_CLEANUP=1 + +flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + +startplasma-x11 diff --git a/host/.xsession b/host/.xsession index ca40d6a..c1d13c8 100755 --- a/host/.xsession +++ b/host/.xsession @@ -1,6 +1,6 @@ #!/bin/bash # Redirect output to a log file and to the console -exec > >(tee -i -a /tmp/$USER-xsession.log) 2>&1 +exec > >(tee -i -a $USER-xsession.log) 2>&1 # Check if DISPLAY is set if [ -z "$DISPLAY" ] @@ -9,6 +9,14 @@ then exit 1 fi +xsetroot -solid black +xhost +local: + +flatpak override --user --filesystem=./ io.mpv.Mpv + +flatpak run --user io.mpv.Mpv --fs --geometry=1920x1080+0+0 --panscan=1.0 --no-border --no-osc --no-osd-bar --loop-file=inf ./GOOSE.mp4 & SPLASH=$! + + # Find the distrobox binary # Using a list loop over the possible locations if command -v distrobox &> /dev/null @@ -24,23 +32,42 @@ fi echo "Using distrobox from \"$distrobox\"" +podman kill arch +podman rm -f arch +podman unshare buildah unmount --all + +( + until podman container inspect -f '{{.State.Running}}' arch 2>/dev/null | grep -q "true"; do + sleep 0.5 + done + + until podman exec arch pgrep -x "plasmashell" > /dev/null 2>&1; do + sleep 0.5 + done + sleep 2 + + flatpak kill io.mpv.Mpv + + kill -9 $SPLASH 2>/dev/null +) & + + mkdir -p "/var/tmp/$USER" -# if DEV variable is set run dev container -if [ -n "$DEV" ] -then - echo "Running in dev mode" - image="localhost/fng:dev" -else - echo "Pulling the Latest container image" - image="ghcr.io/uwcs/fng:latest" - podman pull $image -fi +./local-registry.sh + +image="localhost:5000/fng:dev" + +podman pull --tls-verify=false $image + +echo "Running in dev mode" + +ulimit -n $(ulimit -Hn) podman create \ --hostname $(hostname) \ --name "arch" \ - --privileged --security-opt label=disable --security-opt apparmor=unconfined \ + --privileged --security-opt label=disable \ --pids-limit=-1 \ --user root:root \ --ipc host --network host \ @@ -49,11 +76,15 @@ podman create \ --env "HOME=/home/fng" \ --env "container=podman" \ --env "CONTAINER_ID=arch" \ + --env "TZ=Europe/London" \ + --env "LANG=en_GB.UTF-8" \ + --env "HOST_LOCALE=en_GB.UTF-8" \ --volume /tmp:/tmp:rslave \ --volume $distrobox-init:/usr/bin/entrypoint:ro \ - --volume /:/run/host/:rslave \ + --volume /var/run/dbus/system_bus_socket:/var/run/dbus/system_bus_socket:ro \ --volume /dev:/dev:rslave \ --volume /sys:/sys:rslave \ + --volume /:/run/host/:rprivate \ --volume /dev/pts \ --volume /dev/null:/dev/ptmx \ --volume /var/log/journal \ @@ -66,9 +97,10 @@ podman create \ $image \ --verbose --name $USER --user $(id -u) --group $(id -g) \ --home "/home/fng" --init "1" --nvidia "1" \ - --pre-init-hooks "mkdir -p /usr/local/bin && chown -R $(id -u):$(id -g) /home/fng" \ - --additional-packages "" -- '' - + --pre-init-hooks "mkdir -p /usr/local/bin && chown -R $(id -u):$(id -g) /home/fng && mv /usr/bin/pacman /usr/bin/p && ln -s /usr/bin/true /usr/bin/pacman && mv /etc/pacman.conf /etc/p.conf && touch /etc/pacman.conf" \ + --additional-packages "" \ + -- "rm -f /usr/bin/pacman && mv /usr/bin/p /usr/bin/pacman && mv /etc/p.conf /etc/pacman.conf" + ## setup_pacman more like go eat yourself $distrobox enter arch -- echo "Started Container" podman exec \ @@ -81,5 +113,6 @@ podman exec \ --env DISPLAY=$DISPLAY \ arch bash -l -c "./startsession.sh; logout" -podman stop -it 0 arch +podman stop arch podman rm -f arch +podman unshare buildah unmount --all diff --git a/host/storage.conf b/host/storage.conf index 1b99a32..da3d915 100644 --- a/host/storage.conf +++ b/host/storage.conf @@ -8,4 +8,4 @@ mount_program = "/usr/bin/fuse-overlayfs" #[storage.options.overlay] #force_mask = "0755" -#ignore_chown_errors = "true" \ No newline at end of file +#ignore_chown_errors = "true" diff --git a/local-registry.sh b/local-registry.sh new file mode 100755 index 0000000..f25c0c3 --- /dev/null +++ b/local-registry.sh @@ -0,0 +1,14 @@ +#!/bin/bash +REGISTRY_DIR="$HOME/.local/share/container-registry" +mkdir -p "$REGISTRY_DIR" + +podman kill local-registry 2>/dev/null +podman rm -f local-registry 2>/dev/null +podman unshare buildah unmount --all + +podman run -d --name local-registry -p 5000:5000 \ + -v "$REGISTRY_DIR:/var/lib/registry:Z" \ + --restart=always \ + docker.io/library/registry:2 + +echo "Registry is running on localhost:5000" diff --git a/rundev.sh b/rundev.sh index ccd6ce2..9093314 100755 --- a/rundev.sh +++ b/rundev.sh @@ -1,6 +1,6 @@ #!/bin/bash # Redirect output to a log file and to the console -exec > >(tee -i -a /tmp/$USER-xsession.log) 2>&1 +exec > >(tee -i -a $USER-xsession.log) 2>&1 set -e @@ -21,4 +21,4 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) DEV=1 $SCRIPT_DIR/host/.xsession # Kill the Xephyr process -kill $XPID \ No newline at end of file +kill $XPID