feat: tidying up some stuff

home/default.nix

@@ -37,6 +37,13 @@ in
           ;
       };
     };
+    laptop = {
+      imports = builtins.attrValues {
+        inherit (modules)
+          apps
+          ;
+      };
+    };
     server = {
       imports = builtins.attrValues {
         inherit (modules)

home/modules/cli/files/fileRoller/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      file-roller
+      ;
+  };
+}

home/modules/cli/files/unzip/default.nix

@@ -0,0 +1,11 @@
+{
+  pkgs,
+  ...
+}:
+{
+  home.packages = builtins.attrValues {
+    inherit (pkgs)
+      unzip
+      ;
+  };
+}

home/modules/gui/apps/code/zed/config/userSettings/default.nix

@@ -31,7 +31,12 @@ let
       ;
   };
   gitPath = import (configPath + /git);
-  miscPath = import (configPath + /misc) { inherit lib pkgs; };
+  miscPath = import (configPath + /misc) {
+    inherit
+      lib
+      pkgs
+      ;
+  };
 in
 {
   git = gitPath;

home/modules/gui/desktop/hypridle/config/settings.nix

@@ -1,23 +1,23 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  ...
+}:
 {
   general = {
-    lock_cmd = "pidof swaylock || swaylock";
+    after_sleep_cmd = "hyprctl dispatch dpms on";
-    before_sleep_cmd = "loginctl lock-session";
+    ignore_dbus_inhibit = false;
+    lock_cmd = "swaylock";
   };
+
   listener = [
     {
-      timeout = 150;
+      timeout = 900;
-      on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -s set 0";
+      on-timeout = "swaylock";
-      on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -r";
     }
     {
-      timeout = 150;
+      timeout = 1800;
-      on-timeout = "${pkgs.brightnessctl}/bin/brightnessctl -sd rgb:kbd_backlight set 0";
+      on-timeout = "hyprctl dispatch dpms off";
-      on-resume = "${pkgs.brightnessctl}/bin/brightnessctl -rd rgb:kbd_backlight";
+      on-resume = "hyprctl dispatch dpms on";
-    }
-    {
-      timeout = 300;
-      on-timeout = "systemctl suspend";
     }
   ];
 }

home/modules/gui/desktop/hyprland/config/exec-once.nix

@@ -6,6 +6,7 @@ let
 in
 [
   "swaylock"
+  "hypridle"
   "wl-clipboard"
   "wpaperd"
   "gammastep"
@@ -14,10 +15,11 @@ in
   "waybar"
   "nm-applet"
   "blueman-applet"
+  "blueman-manager"
   "easyeffects -r"
   "emote"
   "flameshot"
-  "pactl set-default-sink alsa_output.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Line1__sink"
+  "pactl set-default-sink bluez_output.00_16_94_35_0D_5F.1"
   "pactl set-default-source alsa_input.usb-Focusrite_Scarlett_2i2_USB_Y818KFJ0C671CE-00.HiFi__Mic1__source"
   "gsettings set org.gnome.desktop.interface cursor-theme 'catppuccin-mocha-dark-cursors'"
   "gsettings set org.gnome.desktop.interface cursor-size ${builtins.toString cursor.size}"

home/modules/gui/desktop/swaylock/config/settings.nix

@@ -10,6 +10,7 @@ let
 in
 {
   font = font.name;
+  font-size = font.size.desktop;
   indicator-idle-visible = true;
   indicator-radius = 100;
   indicator-thickness = 20;

home/modules/gui/desktop/waybar/config/settings.nix

@@ -29,7 +29,7 @@ in
       "memory"
       "disk"
       "pulseaudio"
-      # "network"
+      "network"
       "clock"
     ];
 
@@ -56,7 +56,7 @@ in
         "3" = "◉";
         "4" = "◉";
         urgent = "";
-        default = "";
+        default = "◉";
         sort-by-number = true;
       };
       persistent-workspaces = {
@@ -85,13 +85,13 @@ in
       interval = 60;
     };
 
-    # network = {
+    network = {
-    #   format-wifi = "  {signalStrength}%";
+      format-wifi = "  {signalStrength}%";
-    #   format-ethernet = "󰀂 ";
+      format-ethernet = "󰀂 ";
-    #   tooltip-format = "Connected to {essid} {ifname} via {gwaddr}";
+      tooltip-format = "Connected to {essid} {ifname} via {gwaddr}";
-    #   format-linked = "{ifname} (No IP)";
+      format-linked = "{ifname} (No IP)";
-    #   format-disconnected = "󰖪 ";
+      format-disconnected = "󰖪 ";
-    # };
+    };
 
     tray = {
       icon-size = 12;
@@ -151,7 +151,7 @@ in
     };
 
     "custom/weather" = {
-      exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/waybar/config/scripts/get_weather.sh Winnipeg";
+      exec = "/home/${user0}/Files/Projects/dotfiles/home/modules/gui/desktop/waybar/config/scripts/get_weather.sh Winnipeg";
       return-type = "json";
       format = "{}";
       tooltip = true;

nixos/default.nix

@@ -60,7 +60,7 @@ in
         inherit (modules)
           syncthing
           ollama
-          hledger
+          # hledger
           # plasma
           # sddm
           ;

nixos/modules/hyprland/default.nix

@@ -5,7 +5,6 @@
     "network"
     "hypridle"
     "hyprland"
-    "hyprlock"
     "regreet"
     "swaylock"
     "thunar"

nixos/modules/hyprland/hyprlock.nix

@@ -1,10 +0,0 @@
-{
-  flake,
-  pkgs,
-  ...
-}: {
-  programs.hyprlock = {
-    enable = true;
-    package = flake.inputs.hyprlock.packages.${pkgs.system}.hyprlock;
-  };
-}

systems/desktop/config/boot.nix

@@ -2,7 +2,8 @@
   pkgs,
   config,
   ...
-}: {
+}:
+{
   boot = {
     extraModulePackages = [
       config.boot.kernelPackages.v4l2loopback.out