From 24f375dd4ab14a26bb662ad5f5da5980fbb32493 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Fri, 16 Dec 2022 16:19:29 -0600
Subject: [PATCH] edits on greetd

---
 README.org                       | 18 ++++++++++++++++--
 alacritty/alacritty.yml          |  2 +-
 hypr/hyprland.conf               |  5 ++++-
 scripts/startup.sh               | 21 +++++++++++++--------
 system/kaladin/configuration.nix | 18 ++++++++++++++++--
 system/syl/configuration.nix     | 18 ++++++++++++++++--
 6 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/README.org b/README.org
index ed134bf..8ecb91c 100644
--- a/README.org
+++ b/README.org
@@ -211,14 +211,28 @@ services.greetd = {
       command = "/home/chris/bin/hyprland";
       user = "chris";
     };
-    default_session = initial_session;
+    default_session = {
+      command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd /home/chris/bin/hyprland";
+      user = "greeter";
+    };
+    plasma_session = {
+      command = "dbus-run-session startplasma-wayland";
+      user = "chris";
+    };
     hyprland_session = {
-      command = "${pkgs.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed ${pkgs.plasma-workspace}/bin/startplasma-wayland";
+      command = "/home/chris/bin/hyprland";
       user = "chris";
     };
   };
 };
 
+environment.etc."greetd/environments".text = ''
+    /home/chris/bin/hyprland
+    fish
+    bash
+    dbus-run-session startplasma-wayland
+'';
+
 programs.hyprland = {
   enable = true;
 };
diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
index a2558c4..36472c5 100644
--- a/alacritty/alacritty.yml
+++ b/alacritty/alacritty.yml
@@ -141,7 +141,7 @@ font:
     #style: Bold Italic
 
   # Point size
-  size: 11.0
+  size: 12.0
 
   # Offset is the extra space around each character. `offset.y` can be thought of
   # as modifying the line spacing, and `offset.x` as modifying the letter spacing.
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 5d40170..cacb4d4 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -166,9 +166,12 @@ bind=SUPER,i,movewindow,left
 bind=SUPERSHIFT,p,pin
 bind=SUPER,n,movetoworkspace,special
 
+binde=, XF86AudioMute, exec, pamixer -t
 binde=, XF86AudioRaiseVolume, exec, /home/chris/bin/volup
 binde=, XF86AudioLowerVolume, exec, /home/chris/bin/voldown
-binde=, XF86AudioMute, exec, pamixer -t
+binde=,F1, exec, pamixer -t
+binde=,F3, exec, /home/chris/bin/volup
+binde=,F2, exec, /home/chris/bin/voldown
 
 binde=, XF86MonBrightnessUp, exec, brightnessctl s +10%
 binde=, XF86MonBrightnessDown, exec, brightnessctl s 10%-
diff --git a/scripts/startup.sh b/scripts/startup.sh
index 410afaa..50b060c 100755
--- a/scripts/startup.sh
+++ b/scripts/startup.sh
@@ -1,5 +1,18 @@
 #!/bin/sh
 
+rbw-agent &
+systemctl --user stop jellyfin-mpv-shim.service &
+systemctl --user stop nextcloud-client.service &
+systemctl --user stop emacs.service &
+/usr/lib/kdeconnectd &
+nm-applet &
+greenclip daemon &
+emacs --daemon &
+nextcloud --background &
+jellyfin-mpv-shim &
+
+killall eww
+
 if [ $(hostname) = "syl" ]; then
     style="laptop"
     eww open bar0 &
@@ -11,11 +24,3 @@ else
 fi
 eww open notifications &
 eww open sidebar &
-
-rbw-agent &
-systemctl --user restart jellyfin-mpv-shim.service &
-systemctl --user restart nextcloud-client.service &
-systemctl --user restart emacs.service &
-/usr/lib/kdeconnectd &
-nm-applet &
-greenclip daemon &
diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index e3aae7b..620afad 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -123,14 +123,28 @@
         command = "/home/chris/bin/hyprland";
         user = "chris";
       };
-      default_session = initial_session;
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd /home/chris/bin/hyprland";
+        user = "greeter";
+      };
+      plasma_session = {
+        command = "dbus-run-session startplasma-wayland";
+        user = "chris";
+      };
       hyprland_session = {
-        command = "${pkgs.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed ${pkgs.plasma-workspace}/bin/startplasma-wayland";
+        command = "/home/chris/bin/hyprland";
         user = "chris";
       };
     };
   };
   
+  environment.etc."greetd/environments".text = ''
+      /home/chris/bin/hyprland
+      fish
+      bash
+      dbus-run-session startplasma-wayland
+  '';
+  
   programs.hyprland = {
     enable = true;
   };
diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix
index cd563fd..db6ba45 100644
--- a/system/syl/configuration.nix
+++ b/system/syl/configuration.nix
@@ -116,14 +116,28 @@
         command = "/home/chris/bin/hyprland";
         user = "chris";
       };
-      default_session = initial_session;
+      default_session = {
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd /home/chris/bin/hyprland";
+        user = "greeter";
+      };
+      plasma_session = {
+        command = "dbus-run-session startplasma-wayland";
+        user = "chris";
+      };
       hyprland_session = {
-        command = "${pkgs.plasma-workspace}/libexec/plasma-dbus-run-session-if-needed ${pkgs.plasma-workspace}/bin/startplasma-wayland";
+        command = "/home/chris/bin/hyprland";
         user = "chris";
       };
     };
   };
   
+  environment.etc."greetd/environments".text = ''
+      /home/chris/bin/hyprland
+      fish
+      bash
+      dbus-run-session startplasma-wayland
+  '';
+  
   programs.hyprland = {
     enable = true;
   };