From de9e79180ef15702ea1a20268f81a406b808474e Mon Sep 17 00:00:00 2001 From: notohh Date: Sun, 26 Mar 2023 06:12:19 -0400 Subject: [PATCH] feat: move modules, init greetd, and sway idle script --- home/wayland/default.nix | 19 +++++-------------- hosts/README.md | 2 +- hosts/hime/default.nix | 2 +- hosts/sutakku/default.nix | 2 +- hosts/tsuki/default.nix | 11 ++++++----- hosts/tsuki/home.nix | 6 +++--- modules/README.md | 5 +---- modules/{services => }/default.nix | 0 modules/greetd.nix | 18 ++++++++++++++++++ modules/{services => }/security.nix | 0 modules/swayidle.nix | 15 +++++++++++++++ modules/{services => }/tailscale.nix | 0 modules/{services => }/udevd.nix | 0 13 files changed, 51 insertions(+), 29 deletions(-) rename modules/{services => }/default.nix (100%) create mode 100644 modules/greetd.nix rename modules/{services => }/security.nix (100%) create mode 100644 modules/swayidle.nix rename modules/{services => }/tailscale.nix (100%) rename modules/{services => }/udevd.nix (100%) diff --git a/home/wayland/default.nix b/home/wayland/default.nix index becc712..e1c3034 100644 --- a/home/wayland/default.nix +++ b/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 ''; diff --git a/hosts/README.md b/hosts/README.md index 9696245..93cb349 100644 --- a/hosts/README.md +++ b/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 \ No newline at end of file diff --git a/hosts/hime/default.nix b/hosts/hime/default.nix index abb0baf..d0c1d0a 100644 --- a/hosts/hime/default.nix +++ b/hosts/hime/default.nix @@ -4,7 +4,7 @@ imports = [ ./hardware-configuration.nix - ../../modules/services + ../../modules ]; boot.loader = { diff --git a/hosts/sutakku/default.nix b/hosts/sutakku/default.nix index 8440582..7d556af 100644 --- a/hosts/sutakku/default.nix +++ b/hosts/sutakku/default.nix @@ -4,7 +4,7 @@ imports = [ ./hardware-configuration.nix - ../../modules/services + ../../modules ]; boot.loader = { diff --git a/hosts/tsuki/default.nix b/hosts/tsuki/default.nix index 722f41e..a824369 100755 --- a/hosts/tsuki/default.nix +++ b/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"; diff --git a/hosts/tsuki/home.nix b/hosts/tsuki/home.nix index 2f87f25..ccb8200 100755 --- a/hosts/tsuki/home.nix +++ b/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 diff --git a/modules/README.md b/modules/README.md index 4af8a7a..9f9f0f6 100644 --- a/modules/README.md +++ b/modules/README.md @@ -1,7 +1,4 @@

:electric_plug: modules

-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 \ No newline at end of file diff --git a/modules/services/default.nix b/modules/default.nix similarity index 100% rename from modules/services/default.nix rename to modules/default.nix diff --git a/modules/greetd.nix b/modules/greetd.nix new file mode 100644 index 0000000..a292857 --- /dev/null +++ b/modules/greetd.nix @@ -0,0 +1,18 @@ +{ + default, + ... +}: { + +services.greetd = { + enable = true; + settings = rec { + initial_session = { + command = "Hyprland"; + user = "notoh"; + }; + default_session = initial_session; + }; + }; +} + + diff --git a/modules/services/security.nix b/modules/security.nix similarity index 100% rename from modules/services/security.nix rename to modules/security.nix diff --git a/modules/swayidle.nix b/modules/swayidle.nix new file mode 100644 index 0000000..0152fb4 --- /dev/null +++ b/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' + ''; + }; +} diff --git a/modules/services/tailscale.nix b/modules/tailscale.nix similarity index 100% rename from modules/services/tailscale.nix rename to modules/tailscale.nix diff --git a/modules/services/udevd.nix b/modules/udevd.nix similarity index 100% rename from modules/services/udevd.nix rename to modules/udevd.nix