From 8eca001c3222b5fa08535640936d105dc8ce51d9 Mon Sep 17 00:00:00 2001 From: Christoffer Martinsson Date: Fri, 14 Mar 2025 23:25:25 +0100 Subject: [PATCH] Updated scripts. File cleanup --- Dockerfile | 27 --------------------------- config/hypr/hyprland.conf | 32 +++++++++++--------------------- dockerrun.sh | 21 --------------------- update_arch.sh | 10 +++++----- 4 files changed, 16 insertions(+), 74 deletions(-) delete mode 100644 Dockerfile delete mode 100644 dockerrun.sh diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index a3f4d6d..0000000 --- a/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM ubuntu:22.04 - -# Update the system, install OpenSSH Server, and set up users -RUN apt-get update && apt-get upgrade -y && \ - DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata && \ - apt-get install -y openssh-server git sudo udev software-properties-common locales - -# Create user and set password for user and root user -ARG CODE_PASSWORD -RUN useradd -rm -d /home/code -s /bin/bash -g root -G sudo -u 1000 code && \ - echo 'code:'$CODE_PASSWORD | chpasswd - -# Set up configuration for SSH -RUN mkdir /var/run/sshd && \ - sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd && \ - echo "export VISIBLE=now" >> /etc/profile - -# Expose the SSH port -EXPOSE 22 - -# Add firstrun.sh to runit -ADD dockerrun.sh /dockerrun.sh -RUN chmod +x /dockerrun.sh - -# Run SSH -#CMD ["/usr/sbin/sshd", "-D"] -CMD ["/dockerrun.sh"] \ No newline at end of file diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf index ae8ccc2..7163b6e 100644 --- a/config/hypr/hyprland.conf +++ b/config/hypr/hyprland.conf @@ -3,14 +3,6 @@ ################ monitor=,2560x1440,auto,1 -#monitor=desc:Lenovo Group Limited P24h-10 0x01010101,2560x1440,auto,1 - -# xwayland { -# force_zero_scaling = true -# } -# env = GDK_SCALE,1.333333 -# env = XCURSOR_SIZE,49 - ################### ### MY PROGRAMS ### ################### @@ -193,7 +185,6 @@ bind = $mainMod, B, togglespecialworkspace, btop bind = $mainMod, D, togglespecialworkspace, discord bind = $mainMod, W, togglespecialworkspace, web bind = $mainMod, F, togglespecialworkspace, fzfmenu -bind = $mainMod, P, togglespecialworkspace, prusaslicer bind = $mainMod, V, togglespecialworkspace, mixer # Move focus with mainMod + arrow keys @@ -273,7 +264,7 @@ windowrulev2 = workspace e+0, initialTitle:^(Picture in picture)$ # FzfMenu windowrulev2 = float, onworkspace:special:fzfmenu -windowrulev2 = size 30% 80%, onworkspace:special:fzfmenu +windowrulev2 = size 50% 30%, onworkspace:special:fzfmenu workspace = special:fzfmenu, on-created-empty:kitty fzfmenu # Btop @@ -281,13 +272,6 @@ windowrulev2 = float, onworkspace:special:btop windowrulev2 = size 80% 80%, onworkspace:special:btop workspace = special:btop, on-created-empty:kitty btop -# prusaSlicer -windowrulev2 = float, initialTitle:^(.*PrusaSlicer.*)$ -windowrulev2 = size 80% 80%, initialTitle:^(.*PrusaSlicer.*)$ -workspace = special:prusaslicer, on-created-empty:com.prusa3d.PrusaSlicer -windowrulev2 = center, initialTitle:^(.*PrusaSlicer.*)$ -windowrulev2 = workspace special:prusaslicer, initialTitle:^(.*PrusaSlicer.*)$ - # Discord windowrulev2 = size 450 253, initialTitle:^(Discord Popout)$ windowrulev2 = float, onworkspace:special:discord @@ -310,8 +294,6 @@ windowrulev2 = float, onworkspace:special:mixer windowrulev2 = size 80% 80%, onworkspace:special:mixer workspace = special:mixer, on-created-empty:pavucontrol -# Web on worlspace 2 - # Moonlight windowrulev2 = workspace emptyn, title:^(.*- Moonlight.*)$ windowrulev2 = float, initialTitle:^(Moonlight)$ @@ -327,13 +309,21 @@ windowrulev2 = center, initialTitle:^(Remmina Remote Desktop Client)$ windowrulev2 = dimaround, initialTitle:^(Remmina Remote Desktop Client)$ # KiCad -windowrulev2 = workspace 5, class:^(.*kicad.*)$ +windowrulev2 = workspace emptyn, initialTitle:^(.*KiCad.*)$ +windowrulev2 = workspace emptyn, initialTitle:^(.*PCB Editor.*)$ +windowrulev2 = workspace emptyn, initialTitle:^(.*Schematic Editor.*)$ windowrulev2 = float, initialTitle:^(3D Viewer)$ windowrulev2 = dimaround, initialTitle:^(3D Viewer)$ windowrulev2 = size 80% 80%, $initialTitle:^(3D Viewer)$ +# Gimp +windowrulev2 = workspace emptyn, initialTitle:^(.*GNU Image Manipulation Program.*)$ + +# prusaSlicer +windowrulev2 = workspace emptyn, initialTitle:^(.*PrusaSlicer.*)$ + # FreeCad -windowrulev2 = workspace 6, class:^(.*org.freecad.FreeCAD.*)$ +windowrulev2 = workspace emptyn, initialTitle:^(FreeCAD.*)$ # Ignore maximize requests from apps. You'll probably like this. windowrulev2 = suppressevent maximize, class:.* diff --git a/dockerrun.sh b/dockerrun.sh deleted file mode 100644 index b21ce3d..0000000 --- a/dockerrun.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -if [ ! -d /config/code ]; then - echo "Copying current home directory to config path." - cp -r /home/code /config/ - chown code:root /config/code -fi -echo "Remapping home directory" -rm -rf /home/code -ln -s /config/code /home/code - -if [ ! -d /config/ssh ]; then - echo "Copying current ssh directory to config path." - cp -r /etc/ssh /config/ -fi -echo "Remapping ssh directory" -rm -rf /etc/ssh -ln -s /config/ssh /etc/ssh - -echo "Starting SSH server" -/usr/sbin/sshd -D \ No newline at end of file diff --git a/update_arch.sh b/update_arch.sh index 18655f4..eadf555 100755 --- a/update_arch.sh +++ b/update_arch.sh @@ -370,11 +370,11 @@ fc-cache -fv printf -- '\033[33m Installing Brave Browser\n\033[37m' yay --noconfirm -S --needed --aur brave-bin -# Install Virtualbox -printf -- '\033[33m Installing Virtualbox\n\033[37m' -sudo pacman --noconfirm --needed -S virtualbox virtualbox-guest-iso -yay --noconfirm -S --needed --aur virtualbox-ext-oracle -sudo usermod -a -G vboxusers "$USER" +# # Install Virtualbox +# printf -- '\033[33m Installing Virtualbox\n\033[37m' +# sudo pacman --noconfirm --needed -S virtualbox virtualbox-guest-iso +# yay --noconfirm -S --needed --aur virtualbox-ext-oracle +# sudo usermod -a -G vboxusers "$USER" # Install timeshift printf -- '\033[33m Installing Timeshift\n\033[37m'