From f970615cbb9a1d4ad1160571aac902e20307ca64 Mon Sep 17 00:00:00 2001
From: NunoSempere <nuno.semperelh@protonmail.com>
Date: Tue, 14 Nov 2023 22:48:51 +0000
Subject: [PATCH] savepoint

---
 1-bootstrap.sh                      |  2 +-
 2-core.sh                           |  3 ++-
 3-tmux.sh                           |  1 -
 4-finegrained.sh                    |  2 ++
 README.md                           | 14 ++++++--------
 config/bash/utils.sh                |  3 +++
 packages/core/3-gnome-extensions.sh |  2 ++
 packages/finegrained/1-rose.sh      | 14 ++++++++++++++
 8 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 config/bash/utils.sh
 create mode 100644 packages/finegrained/1-rose.sh

diff --git a/1-bootstrap.sh b/1-bootstrap.sh
index 67b2638..f4de18c 100644
--- a/1-bootstrap.sh
+++ b/1-bootstrap.sh
@@ -15,4 +15,4 @@ sudo apt install git
 git clone https://git.nunosempere.com/open.source/nunOS.git
 cd nunOS
 
-bash 2-core.sh
+source 2-core.sh
diff --git a/2-core.sh b/2-core.sh
index e82ac62..96dd0d8 100644
--- a/2-core.sh
+++ b/2-core.sh
@@ -13,4 +13,5 @@ bash packages/core/4-alacritty.sh
 
 # hand off to alacritty
 chmod +x 3-tmux.sh
-alacritty --config-file ./config/alacritty/alacritty-autostart.yml --command "$HOME/nunOS/3-tmux.sh" &
+alacritty --config-file ./config/alacritty/alacritty-autostart.yml --command "$HOME/nunOS/3-tmux.sh" & 
+exit 1
diff --git a/3-tmux.sh b/3-tmux.sh
index d4ecae0..1417b24 100755
--- a/3-tmux.sh
+++ b/3-tmux.sh
@@ -2,4 +2,3 @@
 chmod +x 4-finegrained.sh
 /usr/bin/tmux new-session -d -s nunos "bash 4-finegrained.sh"
 /usr/bin/tmux attach -t nunos
-# -c "4-finegrained.sh"
diff --git a/4-finegrained.sh b/4-finegrained.sh
index 638a1bc..82686bc 100755
--- a/4-finegrained.sh
+++ b/4-finegrained.sh
@@ -1 +1,3 @@
+source packages/finegrained/1-rose.sh
+
 echo 1 && sleep 2 && bash
diff --git a/README.md b/README.md
index ea2eb4a..b5a2d60 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@
   - Sensible array of default applications
   - Doesn't try to imitate Windows
   - I like the search with the "windows" key
+  - Escape hatch
+  - Xmonad too hardcore
 - [ ] Figure out a few basic things
   - how to specify shortcuts in the command line: gsettings, or dconf-editor
 - [ ] Describe how to get debian step by step
@@ -30,6 +32,8 @@
 - But the name "nunOS" (I'm Nuño Sempere) was too good to pass up
 - The next step might be to: make this a [Debian derivative](https://www.debian.org/derivatives/)? But not close to it
 
+userland distribution
+
 ### Debian installer instructions
 
 Partition > Guided - use entire disk and set up encrypted LVM.
@@ -37,12 +41,6 @@ Partition > Guided - use entire disk and set up encrypted LVM.
 ## How to get this distribution
 
 ```
-wget ...
-chmod +x bootstrap.sh
-bash bootstrap.sh
-```
-
-```
-sudo apt install neovim
-git config --global core.editor "vim"
+wget https://git.nunosempere.com/open.source/nunOS/raw/branch/master/1-bootstrap.sh
+source bootstrap.sh
 ```
diff --git a/config/bash/utils.sh b/config/bash/utils.sh
new file mode 100644
index 0000000..379c7ac
--- /dev/null
+++ b/config/bash/utils.sh
@@ -0,0 +1,3 @@
+function bright(){
+  xrandr --output eDP --brightness $1
+}
diff --git a/packages/core/3-gnome-extensions.sh b/packages/core/3-gnome-extensions.sh
index 72899a7..77177b2 100644
--- a/packages/core/3-gnome-extensions.sh
+++ b/packages/core/3-gnome-extensions.sh
@@ -8,6 +8,8 @@ rm gtktitlebar-11.0.zip
 # autohide top bar
 sudo apt install gnome-shell-extension-autohidetopbar
 
+# soft brightness
+
 # refresh gnome shell
 name=$(xdotool getwindowfocus getwindowname)
 killall -3 gnome-shell && sleep 5
diff --git a/packages/finegrained/1-rose.sh b/packages/finegrained/1-rose.sh
new file mode 100644
index 0000000..46a1c24
--- /dev/null
+++ b/packages/finegrained/1-rose.sh
@@ -0,0 +1,14 @@
+cd /var/local
+
+sudo rm -r rosenrot-browser
+sudo mkdir rosenrot-browser
+sudo chown $(whoami) rosenrot-browser
+git clone https://github.com/NunoSempere/rosenrot-browser
+
+cd rosenrot-browser
+cd user-scripts
+cd debian-12
+bash install-with-dependencies.sh
+
+rose https://git.nunosempere.com/open.source/nunOS https://git.nunosempere.com/open.source/rosenrot &
+cd ~/nunOS