From 9d6709629eba21b8a7b105963c7411efdf0db1c7 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Thu, 6 Jun 2024 15:23:21 +0200
Subject: [PATCH] add docker oops

---
 .config/i3/config                 | 42 ++++---------------------------
 .config/i3/scripts/lock.sh        | 30 ++++++++++++++++++++++
 modules/graphical/i3.nix          |  2 +-
 systems/mini-pc/configuration.nix |  1 +
 4 files changed, 37 insertions(+), 38 deletions(-)
 create mode 100755 .config/i3/scripts/lock.sh

diff --git a/.config/i3/config b/.config/i3/config
index 77556fb..416a2d5 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -10,33 +10,6 @@ font pango:monospace 8
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
 #font pango:DejaVu Sans Mono 8
 
-set $lock xss-lock --transfer-sleep-lock -- i3lock-color --nofork \
---insidever-color=$CLEAR     \
---ringver-color=$VERIFYING   \
-\
---insidewrong-color=$CLEAR   \
---ringwrong-color=$WRONG     \
-\
---inside-color=$BLANK        \
---ring-color=$DEFAULT        \
---line-color=$BLANK          \
---separator-color=$DEFAULT   \
-\
---verif-color=$TEXT          \
---wrong-color=$TEXT          \
---time-color=$TEXT           \
---date-color=$TEXT           \
---layout-color=$TEXT         \
---keyhl-color=$WRONG         \
---bshl-color=$WRONG          \
---fill                       \
--i ~/.config/wallpapers/yuyukowallpaper.png \
---clock                      \
---indicator                  \
---time-str="%H:%M:%S"        \
---date-str="%A, %Y-%m-%d"       \
---keylayout 1                \
-
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +5% && $refresh_i3status
@@ -185,8 +158,7 @@ bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+q exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
 
-bindsym $mod+Shift+p $lock && sleep 1 && pm-suspend
-
+bindsym $mod+Shift+p exec --no-startup-id systemctl suspend
 # resize window (you can also use the mouse for that)
 mode "resize" {
         # These bindings trigger as soon as you enter the resize mode
@@ -280,6 +252,9 @@ exec --no-startup-id picom --config  ~/.config/picom/picom.conf
 #status bar
 exec --no-startup-id ~/.config/i3/scripts/launch-polybar.sh
 
+# network manager applet
+exec --no-startup-id nm-applet
+
 
 # The combination of xss-lock, nm-applet and pactl is a popular choice, so
 # they are included here as an example. Modify as you see fit.
@@ -287,14 +262,7 @@ exec --no-startup-id ~/.config/i3/scripts/launch-polybar.sh
 # xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
 # screen before suspend. Use loginctl lock-session to lock your screen.
 
-set $BLANK #00000000
-set $CLEAR #ffffff22
-set $DEFAULT #ff00ffcc
-set $TEXT #ee00eeee
-set $WRONG #880000bb
-set $VERIFYING #bb00bbbb
-
-exec --no-startup-id $lock
+exec --no-startup-id xss-lock --transfer-sleep-lock -- ~/.config/i3/scripts/lock.sh
 
 
 # NetworkManager is the most popular way to manage wireless networks on Linux,
diff --git a/.config/i3/scripts/lock.sh b/.config/i3/scripts/lock.sh
new file mode 100755
index 0000000..ea880c7
--- /dev/null
+++ b/.config/i3/scripts/lock.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+BLANK=#00000000
+CLEAR=#ffffff22
+DEFAULT=#ff00ffcc
+TEXT=#ee00eeee
+WRONG=#880000bb
+VERIFYING=#bb00bbbb
+i3lock-color --nofork \
+--insidever-color=$CLEAR     \
+--ringver-color=$VERIFYING   \
+--insidewrong-color=$CLEAR   \
+--ringwrong-color=$WRONG     \
+--inside-color=$BLANK        \
+--ring-color=$DEFAULT        \
+--line-color=$BLANK          \
+--separator-color=$DEFAULT   \
+--verif-color=$TEXT          \
+--wrong-color=$TEXT          \
+--time-color=$TEXT           \
+--date-color=$TEXT           \
+--layout-color=$TEXT         \
+--keyhl-color=$WRONG         \
+--bshl-color=$WRONG          \
+--fill                       \
+-i ~/.config/wallpapers/yuyukowallpaper.png \
+--clock                      \
+--indicator                  \
+--time-str="%H:%M:%S"        \
+--date-str="%A, %Y-%m-%d"    \
+--keylayout 1
diff --git a/modules/graphical/i3.nix b/modules/graphical/i3.nix
index 0e60e3d..a86399d 100644
--- a/modules/graphical/i3.nix
+++ b/modules/graphical/i3.nix
@@ -48,7 +48,7 @@ in {
       pmutils # suspend with pm-suspend
       lm_sensors # for cpu in polybar
       feh # sets the wallpaper
-      nm-tray # NetworkManager tray icon
+      networkmanagerapplet
     ];
   };
 }
diff --git a/systems/mini-pc/configuration.nix b/systems/mini-pc/configuration.nix
index a30245c..7c11fec 100644
--- a/systems/mini-pc/configuration.nix
+++ b/systems/mini-pc/configuration.nix
@@ -37,6 +37,7 @@
     };
     misc = {
       btrfs.enable = true;
+      docker.enable = true;
       backup = let 
         kavita = "/data/kavita";
         gitolite = "/var/lib/gitolite";