config sync

14 files changed, 116 insertions, 47 deletions

diff --git a/configuration.nix b/configuration.nix
index 8e065ce..c001126 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -28,6 +28,8 @@ in
     enable = true;
   };
 
+  services.udisks2.enable = true;
+
   programs.dconf.enable = true;
 
   # services.borgbackup =
diff --git a/extras/bookmarks b/extras/bookmarks
new file mode 100644
index 0000000..85b6356
--- /dev/null
+++ b/extras/bookmarks
@@ -0,0 +1,4 @@
+https://web.whatsapp.com/
+https://mail.google.com/mail/u/0
+https://mail.google.com/mail/u/1
+https://dashboard.twitch.tv/u/ediblemonad/stream-manager
diff --git a/home.nix b/home.nix
index 02c35f4..dd30325 100644
--- a/home.nix
+++ b/home.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, epkgs, ... }:
+{ config, pkgs, epkgs, lib, ... }:
 let
   localPkgs = import ./packages/default.nix { pkgs = pkgs; };
 in
@@ -7,7 +7,6 @@ in
     ./overlays-home.nix
     ./modules/music.home.nix
     ./modules/git.home.nix
-    ./modules/git.home.nix
     ./modules/xresources.home.nix
   ];
 
@@ -56,7 +55,13 @@ in
 
   services.udiskie = {
     enable = true;
-    tray = "always";
+    automount = true;
+    notify = true;
+    tray = "never";
+  };
+  systemd.user.services.udiskie = {
+    Install.WantedBy = lib.mkForce [ "default.target" ];
+    Unit.After = lib.mkForce [ "udisks2.service" ];
   };
 
   programs.password-store = {
diff --git a/modules/git.home.nix b/modules/git.home.nix
index a8b9b12..66cd793 100644
--- a/modules/git.home.nix
+++ b/modules/git.home.nix
@@ -15,10 +15,10 @@
       ignore = "!gi() { curl -sL https://www.toptal.com/developers/gitignore/api/$@ ;}; gi";
     };
     extraConfig = {
-      "color" = {
-        "ui" = true;
+      color = {
+        ui = true;
       };
-      "init" = {
+      init = {
         defaultBranch = "main";
       };
       "color \"diff-highlight\"" = {
@@ -35,7 +35,7 @@
         new = "green bold";
         whitespace = "red reverse";
       };
-      #"pull" = { rebase = true; };
+      pull = { rebase = false; };
     };
     signing.key = "AAAB13AE8B82A5267C1A35D7E1B701723EA37849";
     signing.signByDefault = true;
diff --git a/modules/work.nix b/modules/work.nix
index 6266e64..a900b65 100644
--- a/modules/work.nix
+++ b/modules/work.nix
@@ -8,7 +8,7 @@ in
   ];
 
   services.vanta = {
-    enable = true;
+    enable = false;
     agentKey = vantaCreds.VANTA_KEY;
     email = vantaCreds.VANTA_OWNER_EMAIL;
   };
diff --git a/modules/xresources.home.nix b/modules/xresources.home.nix
index a570599..20d3ce1 100644
--- a/modules/xresources.home.nix
+++ b/modules/xresources.home.nix
@@ -2,28 +2,20 @@
 {
   xresources.properties =
     let
-      bg = "#0f0c19";
-      fg = "#d8dee9";
-      accent = "#4e3aA3";
-      ##A22F3E
-      ##A1313F
-      ##A82E3D
-      ##AE2E3D
-      ##EB4960
-      ##B22337
-      ##F32929
+      theme = import ./xresources/catcula.nix;
+      # theme = import ./xresources/tealicious.nix;
     in
     {
-      "*.foreground" = fg;
-      "*.background" = bg;
-      "*.cursorColor" = fg;
-      "*.accent" = accent;
+      "*.foreground" = theme.foreground;
+      "*.background" = theme.background;
+      "*.cursorColor" = theme.foreground;
+      "*.accent" = theme.accent;
 
       "*.color0" = "#15121f";
       "*.color8" = "#555555";
 
       "*.color1" = "#e06c75";
-      "*.color9" = "#bf616a";
+      "*.color9" = "#7c162e";
 
       "*.color2" = "#98C379";
       "*.color10" = "#a3be8c";
@@ -43,22 +35,22 @@
       "*.color7" = "#ABB2BF";
       "*.color15" = "#ebdbb2";
 
-      "dmenu.background" = bg;
-      "dmenu.foreground" = fg;
-      "dmenu.selbackground" = accent;
-      "dmenu.selforeground" = fg;
+      "dmenu.background" = theme.background;
+      "dmenu.foreground" = theme.foreground;
+      "dmenu.selbackground" = theme.accent;
+      "dmenu.selforeground" = theme.foreground;
 
-      "dmenu.highlightbg" = bg;
-      "dmenu.highlightfg" = accent;
-      "dmenu.highlightselbg" = accent;
-      "dmenu.highlightselfg" = bg;
+      "dmenu.highlightbg" = theme.background;
+      "dmenu.highlightfg" = theme.accent;
+      "dmenu.highlightselbg" = theme.accent;
+      "dmenu.highlightselfg" = theme.background;
 
-      "dwm.normbordercolor" = bg;
-      "dwm.normbgcolor" = bg;
-      "dwm.normfgcolor" = fg;
+      "dwm.normbordercolor" = theme.background;
+      "dwm.normbgcolor" = theme.background;
+      "dwm.normfgcolor" = theme.foreground;
 
-      "dwm.selbordercolor" = accent;
-      "dwm.selbgcolor" = accent;
-      "dwm.selfgcolor" = fg;
+      "dwm.selbordercolor" = theme.accent;
+      "dwm.selbgcolor" = theme.accent;
+      "dwm.selfgcolor" = theme.foreground;
     };
 }
diff --git a/modules/xresources/catcula.nix b/modules/xresources/catcula.nix
new file mode 100644
index 0000000..b2d5df3
--- /dev/null
+++ b/modules/xresources/catcula.nix
@@ -0,0 +1,5 @@
+{
+  background = "#0f0c19";
+  foreground = "#d8dee9";
+  accent = "#4e3aA3";
+}
diff --git a/modules/xresources/rediculous.nix b/modules/xresources/rediculous.nix
new file mode 100644
index 0000000..2f21130
--- /dev/null
+++ b/modules/xresources/rediculous.nix
@@ -0,0 +1,13 @@
+{
+  background = "#0f0c19";
+  foreground = "#e8ded9";
+  accent = "#7c162e";
+
+  #A22F3E
+  #A1313F
+  #A82E3D
+  #AE2E3D
+  #EB4960
+  #B22337
+  #F32929
+}
diff --git a/modules/xresources/tealicious.nix b/modules/xresources/tealicious.nix
new file mode 100644
index 0000000..782f6c2
--- /dev/null
+++ b/modules/xresources/tealicious.nix
@@ -0,0 +1,5 @@
+{
+  background = "#1c1d1f";
+  foreground = "#ddeeff";
+  accent = "#0597a4";
+}
diff --git a/modules/xresources/yelloutloud.nix b/modules/xresources/yelloutloud.nix
new file mode 100644
index 0000000..0baa950
--- /dev/null
+++ b/modules/xresources/yelloutloud.nix
@@ -0,0 +1,5 @@
+{
+  background = "#0e0e10";
+  foreground = "#d8dee9";
+  accent = "#ffdd59";
+}
diff --git a/packages.nix b/packages.nix
index e763f4f..fc045bd 100644
--- a/packages.nix
+++ b/packages.nix
@@ -11,7 +11,7 @@ let
     st
     dmenu
     anypinentry
-    bslock
+    # bslock
     sidekick
   ];
 
@@ -98,7 +98,6 @@ let
     wget
     killall
     pciutils
-    udiskie
     file
     at
     bc
@@ -132,6 +131,7 @@ in
 
   nixpkgs.config.permittedInsecurePackages = [
     "ffmpeg-3.4.8"
+    "qtwebkit-5.212.0-alpha4"
   ];
 
   programs.adb.enable = true;
@@ -141,11 +141,11 @@ in
   programs.gamemode.enable = true;
 
   # Security wrappers
-  security.wrappers = {
-    bslock = {
-      owner = config.users.users.imsohexy.name;
-      group = "users";
-      source = "${localPkgs.bslock}/bin/bslock";
-    };
-  };
+  # security.wrappers = {
+  #   bslock = {
+  #     owner = config.users.users.imsohexy.name;
+  #     group = "users";
+  #     source = "${localPkgs.bslock}/bin/bslock";
+  #   };
+  # };
 }
diff --git a/packages/xmonad/autostart.sh b/packages/xmonad/autostart.sh
index 5421000..36f0cd7 100755
--- a/packages/xmonad/autostart.sh
+++ b/packages/xmonad/autostart.sh
@@ -48,7 +48,7 @@ run() {
   run "dunst" dunst -config ~/.config/dunst/dunstrc;
 
   # Compositor
-  run "picom" picom --experimental-backends --config ~/.config/picom.conf;
+  run "picom" picom --config ~/.config/picom.conf;
 
   # Cron jobs
   #run "crond" crond -n -f ~/.config/crontab/crontab;
diff --git a/scripts/commands/:netflix b/scripts/commands/:netflix
new file mode 100755
index 0000000..89a3061
--- /dev/null
+++ b/scripts/commands/:netflix
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+brave https://netflix.com & disown
+
diff --git a/scripts/commands/:stream b/scripts/commands/:stream
new file mode 100755
index 0000000..a3b3617
--- /dev/null
+++ b/scripts/commands/:stream
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+stream_manager_url="https://dashboard.twitch.tv/u/ediblemonad/stream-manager"
+
+window_exists() {
+  xdotool search --class $1 > /dev/null;
+}
+
+wait_for_window() {
+  while ! window_exists $1; do sleep 0.3; done;
+}
+
+run_if_not_exists() {
+  if ! window_exists $1; then
+    $1 2>&1 >/dev/null & disown
+  fi
+}
+
+xdotool key super+e;
+sleep 0.3;
+brave "$stream_manager_url" 2>&1 >/dev/null & disown;
+
+wait_for_window brave;
+sleep 0.5;
+xdotool key super+w;
+
+run_if_not_exists easyeffects;
+wait_for_window easyeffects;
+sleep 0.3;
+run_if_not_exists obs;
+
+sleep 0.5;
+xdotool key super+5;
+