From 2942556cbc51bf44187e67c9c694919063d16090 Mon Sep 17 00:00:00 2001
From: Daniel Ziltener <dziltener@lyrion.ch>
Date: Wed, 21 Aug 2024 18:18:08 +0200
Subject: [PATCH] .

---
 Makefile          |  6 +++++-
 configuration.nix | 38 ++++++++++++++++++++++++--------------
 home.nix          |  5 +++--
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index 65edf34..dead957 100644
--- a/Makefile
+++ b/Makefile
@@ -34,9 +34,13 @@ setup-fido:
 
 setup-desktop:
 	bw config server https://vaultwarden.lyrion.ch
+	echo "Bitwarden Login"
+	bw login | grep items | awk '{print $$6}' > ~/.vw-session-key
 
 install:
+	touch ~/.vw-session-key
+	touch ~/.config/hypr/monitors.conf
 	nix-collect-garbage --delete-old
-	env NIXPKGS_ALLOW_BROKEN=1 nixos-rebuild switch --flake .#ziltis-desktop --impure --show-trace
+	sudo env NIXPKGS_ALLOW_BROKEN=1 nixos-rebuild switch --flake .#ziltis-desktop --impure --show-trace
 
 # end
diff --git a/configuration.nix b/configuration.nix
index 01b4a5d..8d73efe 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -54,24 +54,34 @@
 
   # Enable the X11 windowing system.
   # services.xserver.enable = true;
-  services.xserver = {
-    enable = true;
-    xkb.layout = "de";
-    xkb.options = "eurosign;e,caps:escape";
-  };
+  # services.xserver = {
+  #   enable = true;
+  #   xkb.layout = "de";
+  #   xkb.options = "eurosign;e,caps:escape";
+  # };
 
-  services.displayManager = {
-    sddm = {
-      enable = true;
-      wayland.enable = true;
-      settings = {
-        Autologin = {
-          User = "zilti";
-          Session = "hyprland";
-        };
+  services.greetd = {
+    enable = true;
+    settings = {
+      default_session = {
+        command = "Hyprland";
+        user = "zilti";
       };
     };
+    vt = 7;
   };
+  # services.displayManager = {
+  #   sddm = {
+  #     enable = true;
+  #     wayland.enable = true;
+  #     settings = {
+  #       Autologin = {
+  #         User = "zilti";
+  #         Session = "Hyprland";
+  #       };
+  #     };
+  #   };
+  # };
 
   services.libinput.enable = true;
 
diff --git a/home.nix b/home.nix
index 46bfd3c..ae97721 100644
--- a/home.nix
+++ b/home.nix
@@ -92,6 +92,7 @@ args@{ config, pkgs, split-monitor-workspaces, flatpaks, ... }:
     CHICKEN_INSTALL_PREFIX = "/home/zilti/.local";
     RTC_USE_PIPEWIRE = "true";
     XCURSOR_SIZE = 48;
+    BW_SESSION = (builtins.readFile "${config.home.homeDirectory}/.vw-session-key");
   };
 
   accounts = {
@@ -236,8 +237,8 @@ args@{ config, pkgs, split-monitor-workspaces, flatpaks, ... }:
       shopt -s extglob
       shopt -s globstar
       shopt -s checkjobs
-      eval "$(${pkgs.liquidprompt}/bin/liquidprompt)"
-      eval "$(${pkgs.liquidprompt}/share/liquidprompt/themes/alternate_vcs/alternate_vcs.theme)"
+      eval "$(cat ${pkgs.liquidprompt}/bin/liquidprompt)"
+      eval "$(cat ${pkgs.liquidprompt}/share/liquidprompt/themes/alternate_vcs/alternate_vcs.theme)"
     '';
   };