Merge branch 'laptop'

hosts/lolcathost/default.nix

@@ -1,19 +1,24 @@
 {
   lib,
   pkgs,
+  pkgs-unstable,
   inputs,
   config,
   ...
 }: let
   home-manager = builtins.fetchTarball {
     url = "https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz";
-    sha256 = "1kk5qzfb87mkgy6vzm7x8z8akxr3k8k7839yjdy48z034pvidhsr";
+    sha256 = "1y919cqrlmq0k44rgnacaq4zq37jj4rdh6f2swp6y2jiz28xb0iq";
   };
 in {
   imports = [
     ./hardware-configuration.nix
     (import "${home-manager}/nixos")
 
+    ../modules/wm/hyprland.nix
+    # ../modules/wm/river.nix
+    ../modules/wm/crywl.nix
+
     ../modules/steam.nix
     ../modules/obsidian.nix
 
@@ -116,6 +121,12 @@ in {
         );
     };
 
+    dbus = {
+      # NOTE: programs.uwsm.enable sets implementation to dbus-broker,
+      # NOTE: however this seems to break dbus
+      implementation = lib.mkForce "dbus";
+    };
+
     # Multimedia Framework
     # With backwards compatability for alsa/pulseaudio/jack
     pipewire = {
@@ -180,7 +191,7 @@ in {
 
   home-manager = {
     users.me = import ../../homes/me;
-    #extraSpecialArgs = {inherit inputs pkgs;};
+    extraSpecialArgs = {inherit inputs pkgs pkgs-unstable;};
     sharedModules = [
       inputs.ags.homeManagerModules.default
     ];
@@ -198,6 +209,7 @@ in {
   # ---- SYSTEM PACKAGES -----
   environment.systemPackages = with pkgs; [
     # User Environment
+    # crywl
     swww
     helvum
     easyeffects
@@ -214,18 +226,19 @@ in {
 
     # Shell
     bash
-    zsh
     fish
     shellcheck
     grc # colorise command outputs
 
     # Systems Emulation
     qemu # Fellice Bellard's Quick Emulator
-    # Make
+    # GNU Utils
     gnumake
+    binutils
     # C Family
     gcc
     clang
+    clang-tools
     # Rust
     cargo
     rustc
@@ -303,13 +316,13 @@ in {
   ];
 
   programs = {
-    hyprland = {
+    crywl = {
       enable = true;
-      withUWSM = true; # Universal Wayland Session Manager
-      xwayland.enable = true;
+      xwayland.enable = false;
+      defaultSession = false;
+      useUnmodifiedDWL = false;
     };
 
-    zsh.enable = true;
     fish.enable = true;
 
     nix-ld.enable = true;
@@ -318,6 +331,7 @@ in {
     # cause it isn't POSIX compliant, so instead Bash is my login and
     # will just exec fish (^-^)
     bash = {
+      blesh.enable = false; # ble.sh replacement for GNU readline
       completion.enable = true;
 
       interactiveShellInit = ''
@@ -375,10 +389,26 @@ in {
     };
   };
 
+  documentation = {
+    enable = true;
+    doc.enable = true; # install /share/doc packages
+    man.enable = true; # install manpages
+    info.enable = true; # install GNU info
+    dev.enable = true; # install docs intended for developers
+    nixos = {
+      enable = true; # install NixOS documentation (ie man -k nix, & nixos-help)
+      options.splitBuild = true;
+      # includeAllModules = true;
+    };
+  };
+
   virtualisation.docker.enable = true;
 
   hardware = {
-    graphics.enable = true;
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+    };
 
     # opengl = {
     #   enable = true;