From b9131e67293a415526b5061067817f41be466193 Mon Sep 17 00:00:00 2001 From: Melissa Dumont Date: Wed, 25 Jun 2025 19:20:07 -0400 Subject: [PATCH] emergency save after bricked device --- .config/kdedefaults/kdeglobals | 4 +-- .config/kdedefaults/kscreenlockerrc | 2 +- .config/kdedefaults/ksplashrc | 2 +- .config/kdedefaults/kwinrc | 5 +++ .config/kdedefaults/package | 2 +- .config/kdedefaults/plasmarc | 2 +- .../kglobalshortcutsrc##hostname.bellaciao | 8 ++--- .config/xsettingsd/xsettingsd.conf | 8 ++--- .ssh/known_hosts | 3 ++ .ssh/known_hosts.old | 6 ++++ scripts/bootstrap.sh | 32 ++++++++++++++++--- 11 files changed, 56 insertions(+), 18 deletions(-) diff --git a/.config/kdedefaults/kdeglobals b/.config/kdedefaults/kdeglobals index e931e0d..8e256d4 100644 --- a/.config/kdedefaults/kdeglobals +++ b/.config/kdedefaults/kdeglobals @@ -1,8 +1,8 @@ [General] -ColorScheme=Sweet +ColorScheme=BreezeLight [Icons] -Theme=breeze-dark +Theme=breeze [KDE] widgetStyle=Breeze diff --git a/.config/kdedefaults/kscreenlockerrc b/.config/kdedefaults/kscreenlockerrc index 7e949cf..e6a2d2c 100644 --- a/.config/kdedefaults/kscreenlockerrc +++ b/.config/kdedefaults/kscreenlockerrc @@ -1,2 +1,2 @@ [Greeter] -Theme=org.kde.breeze.desktop +Theme=org.debian.desktop diff --git a/.config/kdedefaults/ksplashrc b/.config/kdedefaults/ksplashrc index 56a8fb1..5e5998b 100644 --- a/.config/kdedefaults/ksplashrc +++ b/.config/kdedefaults/ksplashrc @@ -1,3 +1,3 @@ [KSplash] Engine=KSplashQML -Theme=org.kde.breezedark.desktop +Theme=org.debian.desktop diff --git a/.config/kdedefaults/kwinrc b/.config/kdedefaults/kwinrc index 13b0dbc..883ff0f 100644 --- a/.config/kdedefaults/kwinrc +++ b/.config/kdedefaults/kwinrc @@ -1,3 +1,8 @@ +[TabBox] +DesktopLayout=org.kde.breeze.desktop +DesktopListLayout=org.kde.breeze.desktop +LayoutName=org.kde.breeze.desktop + [Windows] Placement=Centered diff --git a/.config/kdedefaults/package b/.config/kdedefaults/package index c188391..2374a96 100644 --- a/.config/kdedefaults/package +++ b/.config/kdedefaults/package @@ -1 +1 @@ -org.kde.breezedark.desktop \ No newline at end of file +org.debian.desktop \ No newline at end of file diff --git a/.config/kdedefaults/plasmarc b/.config/kdedefaults/plasmarc index 8b58863..f89bcd9 100644 --- a/.config/kdedefaults/plasmarc +++ b/.config/kdedefaults/plasmarc @@ -1,2 +1,2 @@ [Theme] -name=default +name=breeze-dark diff --git a/.config/kglobalshortcutsrc##hostname.bellaciao b/.config/kglobalshortcutsrc##hostname.bellaciao index 711090f..f9dc71e 100644 --- a/.config/kglobalshortcutsrc##hostname.bellaciao +++ b/.config/kglobalshortcutsrc##hostname.bellaciao @@ -213,11 +213,11 @@ view_zoom_out=Meta+-,Meta+-,Zoom Out [mediacontrol] _k_friendly_name=Media Controller -mediavolumedown=none,,Media volume down -mediavolumeup=none,,Media volume up +mediavolumedown=none,none,Media volume down +mediavolumeup=none,none,Media volume up nextmedia=Media Next,Media Next,Media playback next pausemedia=Media Pause,Media Pause,Pause media playback -playmedia=none,,Play media playback +playmedia=none,none,Play media playback playpausemedia=Media Play,Media Play,Play/Pause media playback previousmedia=Media Previous,Media Previous,Media playback previous stopmedia=Media Stop,Media Stop,Stop media playback @@ -280,7 +280,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 activate widget 113=none,none,Activate Application Launcher Widget activate widget 137=none,none,Activate Application Launcher Widget -activate widget 3=none,none,Activate Application Launcher Widget +activate widget 3=,none,Activate Application Launcher Widget activate widget 30=Meta+Space,none,Activate Application Launcher Widget activate widget 94=none,none,Activate Compact Pager Widget clear-history=none,,Clear Clipboard History diff --git a/.config/xsettingsd/xsettingsd.conf b/.config/xsettingsd/xsettingsd.conf index a81e56b..7042b34 100644 --- a/.config/xsettingsd/xsettingsd.conf +++ b/.config/xsettingsd/xsettingsd.conf @@ -4,12 +4,12 @@ Gdk/UnscaledDPI 98304 Gdk/WindowScalingFactor 1 Gtk/EnableAnimations 1 Gtk/DecorationLayout "icon:minimize,maximize,close" -Gtk/PrimaryButtonWarpsSlider 1 +Gtk/PrimaryButtonWarpsSlider 0 Gtk/ToolbarStyle 3 Gtk/MenuImages 1 Gtk/ButtonImages 1 -Gtk/CursorThemeSize 48 -Gtk/CursorThemeName "HighContrast" -Net/IconThemeName "candy-icons" +Gtk/CursorThemeSize 24 +Gtk/CursorThemeName "breeze_cursors" +Net/IconThemeName "breeze" Gtk/FontName "Noto Sans, 10" diff --git a/.ssh/known_hosts b/.ssh/known_hosts index 4022172..8b5568b 100644 --- a/.ssh/known_hosts +++ b/.ssh/known_hosts @@ -15,3 +15,6 @@ 195.201.62.156 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBN2QXRPZTGgPHwroU6Q+kqytcr/C0yueRsg2EyRAc1Mf7cSfyj+qazdPJb8XqGPARWEexk3s6JQZ+z03E6u6gUU= >>>>>>> Stashed changes |1|7VtgMeEonexq0vMPp4Cai2NXbBk=|3zl4oXSwzYPVVh+6L7csAddjUWI= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOcp/+jhkNiyH6Pul4dHvG38sp3RNFZdODMS5U+HX3c2 +|1|bxtf4G72Msif8ZiwDWgCWi9KiqM=|d3/z+NbKzwm4Pmsx5Kcd+IdG8x8= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIxcGWZQBeM9F/SY1BjZEjRIEm86cqHjJh94Ief8iJeR +|1|k2kN7i/CvyhzjH7qgwTdygaMoQk=|0EuRpcnPtxFwpd3On2lzk9e755E= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJRA7oun9bD1wEkBJfl/2J4+Ed9C/8gQMRTV+j4Azv/yzGqg+oBlWYrXWXy5kSjSu8nau46BbutfVzpGILPRHiz9gOnaghPr/38dc0NIkuGCDAu9zCCenU298ha6oBiQYMBv9sVIMegKMZSk+OBog1mvmAKDawJ6PSJNTnUWMKsiC31ilnJN5kR05BawIQ4VicDt5/UziJ53KGxXMzxoDyTh0Pk6wtBbY2XTrvX0P1qE8p/0eYIYodo0Xs2NpuEHuYXwLS/cDClK6/hBS5s1ealepwbemvdqa1PZNeZGgnroBLToGxoCwabWg/a2gT+frFcUYegofqEyHWSSInmvfDqRs8OhQPl+VHmOCCseKRuxjjd7qluylsazbzaUDZhfoB2oD63OSZOLzUnbAV9z1tjZU+cqaPRJF5Yzr6jCwFdHEVFw3t8eHs0mMTtUmKuyg+RTQQ3PwHx84oEq3rtgLk89ZtsHr86CanFaZePMl2y8Fs9ySz2ID/NzEVIzYDUOU= +|1|Y82Ni1xJKiWseF6GvHObDW7rWME=|kMsRZ0pfJjkAicqsFZidahaqJsU= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJWeZR8Kw1Dgm/ve5J1zQH+LjtzCl/R9lBc6vh+O5s2XoKT7+7k+MBAaUFFCA+AqyHB7xvvrvDyAZkZOace0zkA= diff --git a/.ssh/known_hosts.old b/.ssh/known_hosts.old index bd9ce15..cc365f0 100644 --- a/.ssh/known_hosts.old +++ b/.ssh/known_hosts.old @@ -4,9 +4,15 @@ |1|D9Bv6jPEIB47YzuHGC0LL2YDt/s=|rygofhV6C+KhiH1ZlONiK3T3Ulk= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJb4HNpdaFDTKRGoHtr7ouhe3jyaU4wYvs27Bwjr80nymRFiyf7XKQPeqVafpTccT9T/xh0pa58tAlWe/UypRUg= |1|bTvHy9F0V14dX4vvQDw9Lcn5ZIg=|XUaP3AJFjWatNQudHFklIoYuoWs= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHMqCZl7yz4mtQ8ZrkflMDjIv4mNMEddDOpgSnX6h6oD |1|KTg4V/zMQsP9BL6g0vWjvLsx780=|pM0w6MdM4XqEMqjFR3gsxPhIv0s= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqdL9vj6MS9ElHlJ+/I/Mmnu2NoqBKffGrZx/4CVqJX +|1|rjtoWihyPbLUvJ7xIzgEDmx1UiA=|d9ekfzTU6y6bu0srytGqPlaBNGw= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxxfRB87h3BqKH8gP9SDWsGi7oXlquxEWni73xWw7dpqedq5pD0G7DxMpFuhk37PtcgZ9M3lRps7e15EOcmtH+vCw/TjkkwOP+LKCT20LK/46/IE9VvOnGt1cLq4PZ1cFCQJrMrGm9lZp7lnbItmyW+fUCfqDiEUBmm4vO9IFs2cTvCk1crpJUHPz+TiwA9rxy752cRru43HY605SwRycrNo3lHRdPbbXys32j8W+iA07AQnGcQNJGt3gsJvV7VlVyvEOtWqQBSiIEdM8tmFULigDUW0tSEx3pGVs2p1EBt3TH5+fwYt6vR2B3T3E31fL5eMWNlnhHjZdFiy9oS4GK/ttNJ4OHZpz5vDPrPB+jSpWzWy5wsyJypF0Lipvd9LlOKzgyAcXP+StoAi5Js0EJCZVrMTxfyWNRshSOnpsZWeIdlRhf2AhDrrOqxNIvQrpH+knz6Q2b7LBKq1hPAcNtTYNuUode/ZZIDYdS0HLVBATYKW4SzDO5a4/ytSb/SMU= +|1|nXidiHLqkSFrS2HagaIMVDGnCyM=|F/mkoMiNZgZlUD7Jnh8SGenLX0U= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBN2QXRPZTGgPHwroU6Q+kqytcr/C0yueRsg2EyRAc1Mf7cSfyj+qazdPJb8XqGPARWEexk3s6JQZ+z03E6u6gUU= ======= 192.168.1.32 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOcp/+jhkNiyH6Pul4dHvG38sp3RNFZdODMS5U+HX3c2 192.168.1.32 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDUeP7MKpbuxzN7RiaQswjd+OVtJvdBrHi5jD+pt7CQ8aBONZ/h53+Ek9NDjXANfJMZFK4smTGRc7rQqg/dgp1cNEXPQ6e5zME3zFuu3807ZK/ZTScP2vQhOlwTbi2uob4dm+9n0lwu0bSxVZ2Fl6Ofh8JB2ixDxHO/APYWqupXyp6N0d+zyN2VmWytKzu3LmZeTNZlmXLDfYCpsRRwi7szJVT8XVhmdiBKDbtSb3u76WZcyecrs4ur06DWFRAgunH1yT9F4o+AgQWtteJps5eNxqXK4neHglOYZ5GMcSsZ5ijKAQVao3yR2lg215bLsWc48jggx/exua/OpdcmsMQVrH5JrPxL8+xZZxWyBcpAN8N63gHU0FfDst8rgjj/fCypMYMyMWJXK5XUlu5Rz7axVa9PGUSAH+JJyS2sM0My+U8Q8PDnvNL1TpuKIBXPSpHDj9E4K9D3AO4SBV+bGiMf0ktNn70qz+dfq/9uZ3/GLQdXEQQc+a8MrdW61voP/DE= 192.168.1.32 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBExUJnOVVXAgDkmvhgxD3cgqWD9Yx1UagsE2+hKWxd97F1g+Qq2Eko0xP0F1JnDyz22hME1NHu0LDZxoc1qVt54= 195.201.62.156 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqdL9vj6MS9ElHlJ+/I/Mmnu2NoqBKffGrZx/4CVqJX +195.201.62.156 ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCxxfRB87h3BqKH8gP9SDWsGi7oXlquxEWni73xWw7dpqedq5pD0G7DxMpFuhk37PtcgZ9M3lRps7e15EOcmtH+vCw/TjkkwOP+LKCT20LK/46/IE9VvOnGt1cLq4PZ1cFCQJrMrGm9lZp7lnbItmyW+fUCfqDiEUBmm4vO9IFs2cTvCk1crpJUHPz+TiwA9rxy752cRru43HY605SwRycrNo3lHRdPbbXys32j8W+iA07AQnGcQNJGt3gsJvV7VlVyvEOtWqQBSiIEdM8tmFULigDUW0tSEx3pGVs2p1EBt3TH5+fwYt6vR2B3T3E31fL5eMWNlnhHjZdFiy9oS4GK/ttNJ4OHZpz5vDPrPB+jSpWzWy5wsyJypF0Lipvd9LlOKzgyAcXP+StoAi5Js0EJCZVrMTxfyWNRshSOnpsZWeIdlRhf2AhDrrOqxNIvQrpH+knz6Q2b7LBKq1hPAcNtTYNuUode/ZZIDYdS0HLVBATYKW4SzDO5a4/ytSb/SMU= +195.201.62.156 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBN2QXRPZTGgPHwroU6Q+kqytcr/C0yueRsg2EyRAc1Mf7cSfyj+qazdPJb8XqGPARWEexk3s6JQZ+z03E6u6gUU= >>>>>>> Stashed changes +|1|7VtgMeEonexq0vMPp4Cai2NXbBk=|3zl4oXSwzYPVVh+6L7csAddjUWI= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOcp/+jhkNiyH6Pul4dHvG38sp3RNFZdODMS5U+HX3c2 +|1|bxtf4G72Msif8ZiwDWgCWi9KiqM=|d3/z+NbKzwm4Pmsx5Kcd+IdG8x8= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIxcGWZQBeM9F/SY1BjZEjRIEm86cqHjJh94Ief8iJeR diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index fe19047..7a4e6b2 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -1,12 +1,33 @@ #!/bin/bash +# sys yadm +# might not actually need this after all? +# sudo yadm --yadm-dir /etc/yadm --yadm-data /etc/yadm/data clone -w /etc/ https://git.shoofle.net/melissasage/sysyadm -# Assumes both regular yadm and sysyadm are set up! -sudo apt install autorandr i3gaps polybar cargo lightdm-gtk-greeter lightdm Xorg flatpak yadm git python3 pipx alacritty i3lock-fancy nm-applet rofi dunst neofetch htop wget keepassxc-full net-tools vim mullvad-vpn flameshot caffeine pasystray tmux plasma-discover-backend-flatpak zsh autorandr kdeconnect +sudo apt-add-repository -yns main non-free-firmware contrib non-free +# gpg +sudo curl -fsSLo /usr/share/keyrings/steam.gpg http://repo.steampowered.com/steam/archive/stable/steam.gpg +sudo curl -fsSLo /usr/share/keyrings/mullvad-keyring.asc https://repository.mullvad.net/deb/mullvad-keyring.asc + + +# add additional files +echo "deb [arch=amd64,i386 signed-by=/usr/share/keyrings/steam.gpg] http://repo.steampowered.com/steam/ stable steam" | sudo tee /etc/apt/sources.list.d/steam.list +echo "deb [signed-by=/usr/share/keyrings/mullvad-keyring.asc arch=$( dpkg --print-architecture )] https://repository.mullvad.net/deb/stable stable main" | sudo tee /etc/apt/sources.list.d/mullvad.list + +bash -ci "$(wget -qO - 'https://shlink.makedeb.org/install')" + +# update files from sys +sudo apt update + +# apt +sudo apt install autorandr i3gaps polybar cargo lightdm-gtk-greeter lightdm Xorg flatpak yadm git python3 pipx alacritty i3lock-fancy nm-applet rofi dunst neofetch htop wget keepassxc-full net-tools vim mullvad-vpn flameshot caffeine pasystray tmux plasma-discover-backend-flatpak zsh autorandr kdeconnect zsh am fwupd numlockx + +# chsh +sudo chsh /bin/zsh # omz -sh ~/.oh-my-zsh/tools/install.sh --keep-zshrc --unattended +sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh) --keep-zshrc --unattended" # flatpak setup flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo @@ -18,10 +39,13 @@ flatpak install com.discordapp.Discord com.spotify.Client mo.kozec.syncthingtk o # none currently # cargo installs -cargo install rustup +cargo install rustup cargo-update # pipx pipx install topgrade termdown # doom emacs ~/.config/emacs/bin/doom install + +# finally, update everything +topgrade