From 6ce423adeaf52cf4d14abac63908f3f31e59e51b Mon Sep 17 00:00:00 2001
From: sioodmy <hello@sioodmy.dev>
Date: Tue, 12 Nov 2024 14:41:33 +0100
Subject: [PATCH] fix: user shell

---
 system/users/default.nix   |  4 ++--
 system/wayland/default.nix |  2 +-
 user/default.nix           | 24 +++++++++++-------------
 user/foot/default.nix      |  2 +-
 user/hyprland/default.nix  |  6 ++++++
 5 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 user/hyprland/default.nix

diff --git a/system/users/default.nix b/system/users/default.nix
index 33b89eed..f358a118 100644
--- a/system/users/default.nix
+++ b/system/users/default.nix
@@ -10,7 +10,7 @@
       sioodmy = {
         isNormalUser = true;
         homix = true;
-        # shell = flake.packages.${pkgs.system}.cli.zsh;
+        shell = flake.packages.${pkgs.system}.zsh;
 
         hashedPasswordFile = "/persist/secrets/sioodmy";
         extraGroups = [
@@ -56,7 +56,7 @@
           fprintAuth = true;
         };
         sudo.fprintAuth = true;
-        swaylock.fprintAuth = true;
+        hyprlock.fprintAuth = true;
       };
 
       loginLimits = [
diff --git a/system/wayland/default.nix b/system/wayland/default.nix
index 29908664..9f36565b 100644
--- a/system/wayland/default.nix
+++ b/system/wayland/default.nix
@@ -20,7 +20,7 @@
       enable = true;
       settings = rec {
         initial_session = {
-          command = "river";
+          command = "Hyprland";
           user = "sioodmy";
         };
         default_session = initial_session;
diff --git a/user/default.nix b/user/default.nix
index 7e668dd4..9f076c99 100644
--- a/user/default.nix
+++ b/user/default.nix
@@ -1,33 +1,31 @@
-theme: rec {
+theme: rec
+{
   packages = pkgs: let
     inherit (pkgs) callPackage;
-  in {
-    cli =
-      {
-        nvim = callPackage ./nvim {inherit theme;};
-        zsh = callPackage ./zsh {};
-      }
-      // (import ./misc-scripts {inherit pkgs;});
-    desktop = {
+  in
+    {
+      nvim = callPackage ./nvim {inherit theme;};
+      zsh = callPackage ./zsh {};
       river = callPackage ./river {inherit theme;};
       foot = callPackage ./foot {inherit theme;};
       tofi = callPackage ./tofi {inherit theme;};
       mako = callPackage ./mako {inherit theme;};
       swaylock = callPackage ./swaylock {inherit theme;};
-    };
-  };
+    }
+    // (import ./misc-scripts {inherit pkgs;});
 
   shell = pkgs:
     pkgs.mkShell {
       name = "sioodmy-devshell";
-      buildInputs = builtins.attrValues (packages pkgs).cli;
+      buildInputs = builtins.attrValues (packages pkgs);
     };
   module = {pkgs, ...}: {
     config = {
-      environment.systemPackages = builtins.concatLists (map (x: builtins.attrValues x) (builtins.attrValues (packages pkgs)));
+      environment.systemPackages = builtins.attrValues (packages pkgs);
     };
     imports = [
       ./packages.nix
+      ./hyprland
       ./git
       ./gtk
     ];
diff --git a/user/foot/default.nix b/user/foot/default.nix
index 9797e2dd..bfda23bf 100644
--- a/user/foot/default.nix
+++ b/user/foot/default.nix
@@ -15,7 +15,7 @@
       title = "foot";
       locked-title = "no";
 
-      font = "monospace:size=14";
+      font = "monospace:size=13";
       line-height = 20;
       letter-spacing = 0;
       horizontal-letter-offset = 0;
diff --git a/user/hyprland/default.nix b/user/hyprland/default.nix
new file mode 100644
index 00000000..702316de
--- /dev/null
+++ b/user/hyprland/default.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  programs.hyprland = {
+    enable = true;
+    # TODO
+  };
+}