From 57966ebdb037b808370d7ef7469469f38de3c3ec Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Mon, 18 Dec 2023 08:34:16 +0000
Subject: [PATCH] Fixed some issues

Back to lightdm as sddm didn't work for some reason, cba to debug

Fix some broken config with rofi, zellij

Actually set hyprland colours since I forgot...
---
 flake.nix                                |  1 +
 home/default.nix                         |  8 +++-----
 home/hyprland/config.nix                 |  8 ++++----
 home/hyprland/rofi/catppuccin-mocha.rasi |  4 ++--
 home/hyprland/rofi/default.nix           |  1 -
 home/hyprland/waybar/style.css           | 12 ++++++------
 system/desktop.nix                       | 15 +++++++++------
 7 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/flake.nix b/flake.nix
index 76a77d05..f32eb913 100644
--- a/flake.nix
+++ b/flake.nix
@@ -108,6 +108,7 @@
                   chromium.enable = true;
                   console.enable = true;
                   fish.enable = true;
+                  lightdm.enable = true;
                 };
                 image = ./wallpapers/tokyo-space.png;
                 base16Scheme =
diff --git a/home/default.nix b/home/default.nix
index d7434e03..a8f09a2a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,10 +1,11 @@
 { config, lib, pkgs, ... }: {
   stylix.targets = {
     avizo.enable = true;
-    firefox.enable = true;
     fzf.enable = true;
     mako.enable = true;
+    rofi.enable = true;
     xresources.enable = true;
+    zellij.enable = true;
   };
   xdg.configFile = {
     "style.css".text = with config.lib.stylix.colors.withHashtag; ''
@@ -30,6 +31,7 @@
   programs = rec {
     bash.enable = true;
     fish.enable = true;
+    zellij.enable = true;
     zsh.initExtra = ''
       xdg-query-program () {
         FILETYPE=$(xdg-mime query filetype $@)
@@ -259,9 +261,5 @@
         };
       };
     };
-    zellij = {
-      enable = true;
-      theme = "catppuccin-mocha";
-    };
   };
 }
diff --git a/home/hyprland/config.nix b/home/hyprland/config.nix
index 1ddf9e30..89f055ce 100644
--- a/home/hyprland/config.nix
+++ b/home/hyprland/config.nix
@@ -25,7 +25,7 @@ in ''
   exec-once = systemctl --user import-environment WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME
   exec-once = systemctl --user restart xdg-desktop-portal.service xdg-desktop-portal-hyprland.service avizo.service
 
-  misc:background_color=rgb(1a1b26)
+  misc:background_color=rgb(1e1e2e)
   gestures:workspace_swipe = true
 
   input {
@@ -37,8 +37,8 @@ in ''
 
   dwindle:force_split = 2
   general {
-      col.active_border=rgb(bb9af7)
-      col.inactive_border=rgb(414868)
+      col.active_border=rgb(b4befe)
+      col.inactive_border=rgb(313244)
       gaps_in = 5
       gaps_out = 10
       border_size = 1
@@ -48,7 +48,7 @@ in ''
 
   decoration {
       rounding = 10
-      col.shadow=rgba(1a1b2699)
+      col.shadow=rgba(1e1e2e99)
       drop_shadow = yes
       shadow_ignore_window = true
       shadow_range = 4
diff --git a/home/hyprland/rofi/catppuccin-mocha.rasi b/home/hyprland/rofi/catppuccin-mocha.rasi
index 6107a6bb..966c527f 100644
--- a/home/hyprland/rofi/catppuccin-mocha.rasi
+++ b/home/hyprland/rofi/catppuccin-mocha.rasi
@@ -1,6 +1,6 @@
 * {
-    bg-col: alpha(#1e1e2e, 0.5);
-    bg-col-light: alpha(#1e1e2e, 0.5);
+    bg-col: #1e1e2e;
+    bg-col-light: #1e1e2e;
     border-col: #b4befe;
     selected-col: #1e1e2e;
     blue: #89b4fa;
diff --git a/home/hyprland/rofi/default.nix b/home/hyprland/rofi/default.nix
index 33fe5036..e93c1b09 100644
--- a/home/hyprland/rofi/default.nix
+++ b/home/hyprland/rofi/default.nix
@@ -16,7 +16,6 @@ in {
       '';
     };
     plugins = with pkgs; [ rofi-calc ];
-    theme = ./catppuccin-mocha.rasi;
     extraConfig = {
       modi = "window,run,drun,ssh,calc,${power-menu},combi";
       combi-modi = "window,drun,ssh,calc";
diff --git a/home/hyprland/waybar/style.css b/home/hyprland/waybar/style.css
index 9f208bba..17d18fa7 100644
--- a/home/hyprland/waybar/style.css
+++ b/home/hyprland/waybar/style.css
@@ -112,9 +112,12 @@ tooltip {
 	color: @red;
 }
 
-#pulseaudio {
+#battery {
 	color: @red;
 }
+#pulseaudio {
+	color: @peach;
+}
 #disk {
 	color: @yellow;
 }
@@ -122,11 +125,8 @@ tooltip {
 	color: @green;
 }
 #memory {
-	color: @teal;
-}
-#battery {
-	color: @blue;
+	color: @sapphire;
 }
 #clock {
-	color: @lavender;
+	color: @mauve;
 }
diff --git a/system/desktop.nix b/system/desktop.nix
index 519d3828..a110e193 100644
--- a/system/desktop.nix
+++ b/system/desktop.nix
@@ -1,7 +1,8 @@
-{ pkgs, ... }: {
+{ config, pkgs, user, ... }:
+
+{
   imports = [ ./default.nix ./chromium.nix ];
   environment.systemPackages = with pkgs; [
-    catppuccin-sddm-corners
     dex
     mesa
     libnotify
@@ -40,11 +41,13 @@
       layout = "gb";
       xkbVariant = "";
       xkbOptions = "ctrl:nocaps";
-      displayManager.sddm = {
+      displayManager.lightdm = {
         enable = true;
-        theme = "catppuccin-sddm-corners";
-        autoNumlock = true;
-        settings = { General = { InputMethod = ""; }; };
+        greeters.gtk = {
+          inherit (config.home-manager.users.${user}.gtk)
+            cursorTheme iconTheme theme;
+          enable = true;
+        };
       };
     };
   };