feat: move modules, init greetd, and sway idle script

home/wayland/default.nix

@@ -1,8 +1,5 @@
 {
-  config,
   pkgs,
-  lib,
-  inputs,
   ...
 }:
 
@@ -20,6 +17,11 @@ let
   };
   in
 {
+
+  imports = [
+   ../../modules/greetd.nix 
+  ];
+  
   environment.systemPackages = with pkgs; [
     dbus-hyprland-environment
     wayland
@@ -64,17 +66,6 @@ let
     ];
   };
 
-  services.greetd = {
-    enable = true;
-    settings = rec {
-      initial_session = {
-        command = "Hyprland";
-        user = "notoh";
-      };
-      default_session = initial_session;
-    };
-  };
-
   environment.etc."greetd/environments".text = ''
     Hyprland
   '';

hosts/README.md

@@ -5,5 +5,5 @@ my different hosts, each with their own unique configurations and purposes.
 Name            | Description
 --------------- | -----------
 `hime`          | portainer vm, hosting a ton of docker services
-`sutakku`       | (currently) my *arr stack vm
+`sutakku`       | (currently) my *arr stack / seedbox vm
 `tsuki`         | my main machine running hyprland

hosts/hime/default.nix

@@ -4,7 +4,7 @@
   imports =
     [
     ./hardware-configuration.nix
-    ../../modules/services
+    ../../modules
     ];
 
   boot.loader = {

hosts/sutakku/default.nix

@@ -4,7 +4,7 @@
   imports =
     [ 
     ./hardware-configuration.nix
-    ../../modules/services
+    ../../modules
     ];
 
   boot.loader = {

hosts/tsuki/default.nix

@@ -5,7 +5,7 @@
     [ 
     ./hardware-configuration.nix
     ../../home/wayland
-    ../../modules/services
+    ../../modules
     ];
 
   # bootloader 
@@ -21,8 +21,7 @@
   };
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.extraModulePackages = with config.boot.kernelPackages;
-  [ v4l2loopback.out ];
+  boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback.out ];
   boot.kernelModules = [ "v4l2loopback" "kvm-intel" ];
 
   virtualisation.libvirtd.enable = true;
@@ -147,9 +146,11 @@
    sumneko-lua-language-server
    marksman
    texlab
+   jre8
+   jdk17
+   jdk8
    nodePackages_latest.yaml-language-server
    python310Packages.python-lsp-server
-  
  ];
 
   fonts = {
@@ -171,7 +172,7 @@
       enable = true;
       allowBitmaps = true;
       defaultFonts = {
-        monospace = ["JetBrainsMono Nerd Font Regular"];
+        monospace = ["JetBrainsMono Nerd Font"];
         sansSerif = ["Google Sans Text"];
       };
       hinting.style = "hintfull";

hosts/tsuki/home.nix

@@ -13,6 +13,7 @@ imports = [
   ../../home/mpv
   ../../home/waybar
   ../../home/wayland/hyprland
+  ../../modules/swayidle.nix
 ];
 
  systemd.user.startServices = "sd-switch";
@@ -23,6 +24,7 @@ imports = [
     homeDirectory = "/home/notoh";
     packages = with pkgs; [
       firefox
+      chromium
       bitwarden
       discord
       spotify-player
@@ -36,10 +38,8 @@ imports = [
       appimage-run
       qbittorrent
       gdu
-      nb
+      eww-wayland
       cryptomator
-      jetbrains.pycharm-community
-      chromium
       ventoy-bin-full
       yt-dlp
       plex-media-player

modules/README.md

@@ -1,7 +1,4 @@
 <h1 align="center">:electric_plug: modules</h1>
 
-not doing much here yet, but this currently hosts some common services / security tweaks used on all hosts.
+not doing much here yet, but this currently hosts some common services / security tweaks used on (most) hosts.
 
-Name            | Description
---------------- | -----------
-`services`      | inits security tweaks, and tailscale to all systems

modules/greetd.nix

@@ -0,0 +1,18 @@
+{
+  default,
+  ...
+}: {
+  
+services.greetd = {
+    enable = true;
+    settings = rec {
+      initial_session = {
+        command = "Hyprland";
+        user = "notoh";
+      };
+      default_session = initial_session;
+    };
+  };
+}
+
+

modules/swayidle.nix

@@ -0,0 +1,15 @@
+{
+  pkgs,
+  ...
+}: {
+  home.file.".local/bin/lock" = {
+    executable = true;
+    text = ''
+     swayidle -w \
+        timeout 600 'swaylock -f --image ~/Pictures/wallpapers/anny.jpg --clock --grace 5 --ring-color f5c2e7 --inside-color 1e1e2e --line-color 11111b' \
+        timeout 800 'hyprctl dispatch dpms off' \
+            resume 'hyprctl dispatch dpms on' \
+        before-sleep 'swaylock -f --image ~/Picture/wallpapers/anny.jpg --clock --ring-color f5c2e7 --inside-color 1e1e2e --line-color 11111b'
+    '';
+  };
+}