From d3fc9ff203cca2a9825484565fbb32e0733fa00d Mon Sep 17 00:00:00 2001
From: randomuser <randomuser@tilde.club>
Date: Wed, 15 Nov 2023 21:04:50 -0600
Subject: [PATCH] misc changes

---
 boxes/mainsail.nix   | 33 ++++++++++++++++++++++++++++++++-
 builds/utils.nix     |  3 ++-
 builds/utils/sh/mode |  4 ++++
 common/desktop.nix   |  1 +
 config/sx/sxrc       |  2 +-
 config/sxhkd/mouse   | 20 ++++++++++++++++++++
 config/sxhkd/sxhkdrc | 21 +++------------------
 7 files changed, 63 insertions(+), 21 deletions(-)
 create mode 100755 builds/utils/sh/mode
 create mode 100644 config/sxhkd/mouse

diff --git a/boxes/mainsail.nix b/boxes/mainsail.nix
index a19aad4..d420b9b 100644
--- a/boxes/mainsail.nix
+++ b/boxes/mainsail.nix
@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ../common/steam.nix
     ../common/desktop.nix
   ];
 
@@ -19,6 +20,27 @@
       PAPERLESS_URL = "https://paperless.beepboop.systems";
     };
   };
+  programs.adb.enable = true;
+  users.users.usr.extraGroups = ["adbusers"];
+
+  environment.etc."nextcloud-admin-pass".text = "aslkfjaslkdfjsalkdfjlKJFLKJDLFKJLSKDJFLSKDJFLSKDJFLSKDFJ";
+  services.nextcloud = {
+    enable = true;
+    hostName = "beepboop.systems";
+    config.adminpassFile = "/etc/nextcloud-admin-pass";
+    package = pkgs.nextcloud27;
+    # Instead of using pkgs.nextcloud27Packages.apps,
+    # we'll reference the package version specified above
+    extraApps = with config.services.nextcloud.package.packages.apps; {
+      inherit news contacts calendar tasks;
+    };
+    extraAppsEnable = true;
+  };
+
+  systemd.targets.sleep.enable = false;
+  systemd.targets.suspend.enable = false;
+  systemd.targets.hibernate.enable = false;
+  systemd.targets.hybrid-sleep.enable = false;
 
   services.getty.greetingLine = "
     welcome to mainsail    |`-:_
@@ -32,6 +54,15 @@
   ";
 
   environment.systemPackages = with pkgs; [
-    vscodium
+    vscodium-fhs
+    libreoffice
+
+    anki
+    youtube-tui
+    kdenlive
+    libreoffice
+    i3
+    gcc
+    gnumake
   ];
 }
diff --git a/builds/utils.nix b/builds/utils.nix
index c82333e..9f070e6 100644
--- a/builds/utils.nix
+++ b/builds/utils.nix
@@ -1,5 +1,6 @@
 { stdenv
 , lib
+, sxhkd
 , bash
 , feh
 , jq
@@ -24,7 +25,7 @@ stdenv.mkDerivation rec {
 
     for i in $(ls $src/sh); do
       cp $src/sh/$i $out/bin
-      wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ bash feh xrandr jq curl ]}
+      wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq curl ]}
     done
   '';
 
diff --git a/builds/utils/sh/mode b/builds/utils/sh/mode
new file mode 100755
index 0000000..86973d2
--- /dev/null
+++ b/builds/utils/sh/mode
@@ -0,0 +1,4 @@
+# mode - change the current effective sxhkd configuration
+
+pkill sxhkd
+sxhkd -c ~/.config/sxhkd/$1 & disown
diff --git a/common/desktop.nix b/common/desktop.nix
index 3f71a54..62efae6 100644
--- a/common/desktop.nix
+++ b/common/desktop.nix
@@ -63,6 +63,7 @@ in {
     pinentry-curses
     magic-wormhole
     xbrightness
+    xdotool
     figlet
 
     unzip
diff --git a/config/sx/sxrc b/config/sx/sxrc
index 5f80a2b..7b564f2 100755
--- a/config/sx/sxrc
+++ b/config/sx/sxrc
@@ -1,6 +1,6 @@
 # adjust some keybindings
 keyboard
-
+#
 # start the wm
 sxhkd &
 bspwm
diff --git a/config/sxhkd/mouse b/config/sxhkd/mouse
new file mode 100644
index 0000000..28aa7ac
--- /dev/null
+++ b/config/sxhkd/mouse
@@ -0,0 +1,20 @@
+q
+	mode sxhkdrc
+
+{ctrl +,shift +,_} h
+	xdotool mousemove_relative -- {-5,-50,-20} 0
+
+{ctrl +,shift +,_} j
+	xdotool mousemove_relative -- 0 {-5,-50,-20}
+
+{ctrl +,shift +,_} k
+	xdotool mousemove_relative -- 0 {5,50,20}
+
+{ctrl +,shift +,_} l
+	xdotool mousemove_relative -- {5,50,20} 0
+
+{ctrl +,_} {a,s,d}
+	xdotool {mousedown,click} {1,2,3}
+
+g
+	xdotool mouseup 1; xdotool mouseup 2; xdotool mouseup 3
diff --git a/config/sxhkd/sxhkdrc b/config/sxhkd/sxhkdrc
index 7a2e4e1..1909839 100644
--- a/config/sxhkd/sxhkdrc
+++ b/config/sxhkd/sxhkdrc
@@ -16,32 +16,17 @@ super + r
   bspc wm -r
 
 super + w
-  disp && wallpaper && statusbar
+  disp && wallpaper && statusbar && keyboard
 
 super + {_,shift + }n
   nws {local,national}
 
-super + ctrl + n
-	net
-
-super + ctrl + t
-	st -e htop
+super + m
+	mode mouse
 
 {XF86AudioRaiseVolume,XF86AudioLowerVolume}
   vol {inc,dec}
 
-super + b
-	fire
-
-super + shift + b
-	fire -P
-
-super + ctrl + b
-	chromium
-
-super + {_,shift + }v
-  vol {inc,dec}
-
 # bspwm
 super + q
   bspc node -c