Hyprland up

flake.nix

@@ -8,7 +8,7 @@
 
     sops-nix.url = "github:Mic92/sops-nix";
     sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
-    sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
+    # sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
 
     git-hooks.url = "github:cachix/git-hooks.nix";
     git-hooks.inputs.nixpkgs.follows = "nixpkgs";

modules/home-manager/default.nix

@@ -1118,7 +1118,7 @@
     };
   };
 
-  # hyprland = {};
+  hyprland = import ./hyprland.nix;
 
   iex = {
     home.file.".iex.exs" = {

modules/home-manager/hyprland.nix

@@ -1,17 +1,19 @@
 {
   pkgs,
-  colors,
+  style,
   config,
   lib,
   # font,
   ...
-}: {
+}: let
+  inherit (style) colors;
+in {
   imports = [
     ./ewwbar.nix
-    ./mako.nix
-    ./swaylock.nix
+    # ./mako.nix
+    # ./swaylock.nix
     # TODO: figure out how to import this for this module _and_ for the sway module?
-    ./linux-desktop.nix
+    # ./linux-desktop.nix
   ];
 
   # TODO: Hyprland seems to have issues with resuming from hibernation on my
@@ -117,6 +119,10 @@
         allow_workspace_cycles = true;
       };
 
+      cursor = {
+        no_warps = true;
+      };
+
       general = {
         # See https://wiki.hyprland.org/Configuring/Variables/ for more
         "col.active_border" = "0xff${colors.primary} 0xff${colors.green} 45deg";
@@ -125,7 +131,6 @@
         gaps_in = 3;
         gaps_out = 6;
         border_size = 2;
-        no_cursor_warps = true;
         resize_on_border = true;
         no_focus_fallback = true;
 
@@ -142,10 +147,12 @@
         blur_new_optimizations = on
         */
 
-        drop_shadow = "yes";
-        shadow_range = 4;
-        shadow_render_power = 3;
-        "col.shadow" = "rgba(1a1a1aee)";
+        shadow = {
+          enabled = true;
+          color = "rgba(1a1a1aee)";
+          range = 4;
+          render_power = 3;
+        };
 
         dim_inactive = false;
       };
@@ -259,12 +266,12 @@
         # master switch for pseudotiling. Enabling is bound to mod + P in the keybinds section below
         pseudotile = yes
         preserve_split = 1
-        no_gaps_when_only = true
+        # no_gaps_when_only = true
       }
 
       master {
         # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-        new_is_master = true
+        # new_is_master = true
       }
 
       gestures {

modules/home-manager/wezterm/config.lua

@@ -24,7 +24,7 @@ config.show_new_tab_button_in_tab_bar = true
 
 config.front_end = "WebGpu"
 config.webgpu_power_preference = 'HighPerformance'
-config.enable_wayland = false
+config.enable_wayland = true
 -- config.use_ime = true
 
 local function tab_title(tab_info)

modules/nixos/default.nix

@@ -33,6 +33,12 @@
       package = flakeInputs.hyprland.packages.${pkgs.system}.hyprland;
     };
 
+    home-manager.users.daniel = {
+      imports = with homeManagerModules; [
+        hyprland
+      ];
+    };
+
     # TODO: include the home-manager modules for daniel?
   };
 
@@ -618,7 +624,7 @@
   }: {
     imports = with nixosModules; [
       sway
-      # hyprland
+      hyprland
       enable-flatpaks-and-appimages
       fonts
       development-tools