From 409f228586b7c612648ff838f1574570d83546ad Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 22 Mar 2024 23:55:15 -0500
Subject: [PATCH] add oil and nu shells, work in hyprland updates

---
 modules/home-manager/hyprland.nix   | 10 +++++++---
 modules/home-manager/mako.nix       |  3 ++-
 modules/nixos/development-tools.nix |  2 ++
 modules/nixos/sway.nix              |  2 +-
 nixos/dragon.nix                    |  8 ++++++--
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix
index 978da26..87509ea 100644
--- a/modules/home-manager/hyprland.nix
+++ b/modules/home-manager/hyprland.nix
@@ -6,7 +6,13 @@
   # font,
   ...
 }: {
-  imports = [outputs.homeManagerModules.ewwbar];
+  imports = with outputs.homeManagerModules; [
+    ewwbar
+    mako
+    swaylock
+    # TODO: figure out how to import this for this module _and_ for the sway module?
+    # linux-desktop
+  ];
 
   home.file."${config.xdg.configHome}/hypr/hyprpaper.conf" = {
     enable = true;
@@ -23,8 +29,6 @@
       monitor = [
         # See https://wiki.hyprland.org/Configuring/Monitors/
         ",preferred,auto,auto"
-        "desc:LG Display 0x0521,3840x2160@120,0x0,1"
-        "desc:Dell Inc. DELL U2720Q D3TM623,3840x2160@60,3840x0,1.5,transform,3"
       ];
 
       xwayland = {
diff --git a/modules/home-manager/mako.nix b/modules/home-manager/mako.nix
index cb84317..63d8f42 100644
--- a/modules/home-manager/mako.nix
+++ b/modules/home-manager/mako.nix
@@ -4,7 +4,8 @@
   ...
 }: {
   services.mako = with colors.withHashPrefix; {
-    enable = false; # mako is launched alongside the wm/de instead
+    enable = true; # TODO: launch mako alongside the wm/de instead so that I can use the plasma notification daemon if I choose to use plasma
+
     borderSize = 1;
     maxVisible = 5;
     defaultTimeout = 15000;
diff --git a/modules/nixos/development-tools.nix b/modules/nixos/development-tools.nix
index 1b1eb3f..85e8a96 100644
--- a/modules/nixos/development-tools.nix
+++ b/modules/nixos/development-tools.nix
@@ -9,6 +9,8 @@
 
   environment.systemPackages = with pkgs; [
     taplo # toml language server for editing helix configs per repo
+    oil
+    nushell
     watchexec
     android-tools
     kubectl
diff --git a/modules/nixos/sway.nix b/modules/nixos/sway.nix
index e6368cd..4c43045 100644
--- a/modules/nixos/sway.nix
+++ b/modules/nixos/sway.nix
@@ -61,7 +61,7 @@
       libinput
       libinput-gestures
       libnotify
-      # mako
+      mako
       # lutris
       # nil
       # nixpkgs-fmt
diff --git a/nixos/dragon.nix b/nixos/dragon.nix
index 28e9751..2ef2c37 100644
--- a/nixos/dragon.nix
+++ b/nixos/dragon.nix
@@ -59,7 +59,7 @@
       firefox-no-tabs
       # wallpaper-manager
       melee
-      # hyprland
+      hyprland
     ];
 
     # ssbm = {
@@ -75,7 +75,11 @@
         ];
         # See https://wiki.hyprland.org/Configuring/Keywords/ for more
         monitor = [
-          "DP-3,3840x2160@120,0x0,1"
+          # "DP-2,3840x2160@60,-2160x0,1,transform,3"
+          "DP-3,3840x2160@120,0x0,1,bitdepth,10"
+          # "desc:LG Display 0x0521,3840x2160@120,0x0,1"
+          # "desc:Dell Inc. DELL U2720Q D3TM623,3840x2160@60,3840x0,1.5,transform,1"
+          "DP-2,3840x2160@60,-${toString (builtins.ceil (2160 / 1.5))}x0,1.5,transform,1"
         ];
         input = {
           force_no_accel = true;