433 current 2024-04-19 17:31:43 24.05.20240419.193037d 6.8.6-zen1 *

env/wayland/default.nix

@@ -1,11 +1,8 @@
-{
+{pkgs, ...}: {
-  pkgs,
+  imports = [../common/fonts.nix];
-  inputs,
-  ...
-}: {
-  imports = [./fonts.nix];
 
   environment.etc."greetd/environments".text = ''
+    bspwm
     Hyprland
   '';
 

env/x11/default.nix

@@ -0,0 +1,19 @@
+{pkgs, ...}: {
+  environment.etc."greetd/environments".text = ''
+    bspwm
+    Hyprland
+  '';
+
+  services = {
+    greetd = {
+      enable = true;
+      settings = rec {
+        initial_session = {
+          command = "bspwm";
+          user = "zack";
+        };
+        default_session = initial_session;
+      };
+    };
+  };
+}

hosts/common/default.nix

@@ -10,7 +10,6 @@
 }: {
   imports = [
     # Include the results of the hardware scan.
-    ../../env/wayland
     ({
       options,
       lib,
@@ -31,6 +30,21 @@
     };
   };
 
+  # specialisation = {
+  #   bspwm.configuration = {
+  #     imports = [
+  #       ../../env/x11
+  #     ];
+  #     environment.etc."specialisation".text = "bspwm";
+  #   };
+  #   hyprland.configuration = {
+  #     imports = [
+  #       ../../env/wayland
+  #     ];
+  #     environment.etc."specialisation".text = "hyprland";
+  #   };
+  # };
+
   nix.gc = {
     automatic = true;
     dates = "weekly";

hosts/earth/configuration.nix

@@ -113,20 +113,20 @@
     package = config.boot.kernelPackages.nvidiaPackages.beta;
   };
 
-  specialisation = {
+  # specialisation = {
-    nvidiaProduction.configuration = {
+  #   nvidiaProduction.configuration = {
-      hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.production;
+  #     hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.production;
-      environment.etc."specialisation".text = "nvidiaProduction";
+  #     environment.etc."specialisation".text = "nvidiaProduction";
-    };
+  #   };
-    nvidiaStable.configuration = {
+  #   nvidiaStable.configuration = {
-      hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
+  #     hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
-      environment.etc."specialisation".text = "nvidiaStable";
+  #     environment.etc."specialisation".text = "nvidiaStable";
-    };
+  #   };
-    nvidiaVulkanBeta.configuration = {
+  #   nvidiaVulkanBeta.configuration = {
-      hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta;
+  #     hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.vulkan_beta;
-      environment.etc."specialisation".text = "nvidiaVulkanBeta";
+  #     environment.etc."specialisation".text = "nvidiaVulkanBeta";
-    };
+  #   };
-  };
+  # };
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.zack = {
@@ -140,8 +140,6 @@
       rio
       telegram-desktop
       kitty
-      mailspring
-      #  thunderbird
     ];
   };
 

modules/rice/hyprland/config.nix

@@ -10,7 +10,7 @@
     general = {
       # gaps
       gaps_in = 6;
-      gaps_out = 11;
+      gaps_out = 12;
 
       # border thiccness
       border_size = 4;
@@ -32,20 +32,20 @@
 
     decoration = {
       # fancy corners
-      rounding = 12;
+      rounding = 10;
       # blur
       blur = {
         enabled = true;
-        size = 3;
+        size = 2;
-        passes = 6;
+        passes = 5;
         ignore_opacity = false;
         new_optimizations = 1;
-        contrast = 0.7;
+        contrast = 0.9;
-        brightness = 0.8;
+        brightness = 0.9;
       };
 
       # shadow config
-      drop_shadow = "no";
+      drop_shadow = "yes";
       shadow_range = 20;
       shadow_render_power = 5;
       "col.shadow" = "rgba(292c3cee)";
@@ -59,10 +59,6 @@
 
       vfr = true;
 
-      # window swallowing
-      enable_swallow = true; # hide windows that spawn other windows
-      swallow_regex = "^(foot)$";
-
       # dpms
       mouse_move_enables_dpms = true; # enable dpms on mouse/touchpad action
       key_press_enables_dpms = true; # enable dpms on keyboard action