flake.lock

@@ -247,7 +247,7 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1701680307,
@@ -265,7 +265,7 @@
     },
     "flake-utils_4": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1705309234,
@@ -283,7 +283,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_10"
+        "systems": "systems_9"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -581,7 +581,7 @@
           "xdg-portal-hyprland",
           "nixpkgs"
         ],
-        "systems": "systems_8"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1708681732,
@@ -600,19 +600,19 @@
     "hyprlock": {
       "inputs": {
         "hyprlang": "hyprlang_3",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_6"
-        "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1709759569,
+        "lastModified": 1708432632,
-        "narHash": "sha256-c5DJbWcZYDp/X2ST3+2EHWSPDHLLrFbMeNy+FYWHRdk=",
+        "narHash": "sha256-2ieUdrPwHR7anezVYg8m2cQIEq23u5nMtpFSk2Sn+PM=",
         "owner": "hyprwm",
         "repo": "hyprlock",
-        "rev": "3d6162e06ec2b957df822abe7a61a7aebba842a2",
+        "rev": "2b20e48a37cf436a1bc7119cea29d087ec6c63d5",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
+        "ref": "nix",
         "repo": "hyprlock",
         "type": "github"
       }
@@ -1158,21 +1158,6 @@
         "type": "github"
       }
     },
-    "systems_10": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "systems_2": {
       "locked": {
         "lastModified": 1681028828,
@@ -1220,16 +1205,16 @@
     },
     "systems_5": {
       "locked": {
-        "lastModified": 1689347949,
+        "lastModified": 1681028828,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
@@ -1250,16 +1235,16 @@
     },
     "systems_7": {
       "locked": {
-        "lastModified": 1681028828,
+        "lastModified": 1689347949,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
         "type": "github"
       }
     },
@@ -1280,16 +1265,16 @@
     },
     "systems_9": {
       "locked": {
-        "lastModified": 1689347949,
+        "lastModified": 1681028828,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
@@ -1362,7 +1347,7 @@
         "hyprland-protocols": "hyprland-protocols_2",
         "hyprlang": "hyprlang_4",
         "nixpkgs": "nixpkgs_12",
-        "systems": "systems_9"
+        "systems": "systems_8"
       },
       "locked": {
         "lastModified": 1709299639,

flake.nix

@@ -13,7 +13,7 @@
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
     wezterm.url = "github:notohh/wezterm?dir=nix&ref=nix-add-overlay";
     hypridle.url = "github:hyprwm/hypridle";
-    hyprlock.url = "github:hyprwm/hyprlock";
+    hyprlock.url = "github:hyprwm/hyprlock?ref=nix";
     hyprpicker.url = "github:hyprwm/hyprpicker";
     xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland";
     hyprland-plugins = {

home/wayland/default.nix

@@ -14,7 +14,7 @@
     '';
   };
 in {
-  imports = [./services/greetd.nix];
+  imports = [./greetd.nix];
   environment = {
     systemPackages = with pkgs; [
       dbus-hyprland-environment
@@ -25,6 +25,8 @@ in {
       satty
       wl-clipboard
       wlr-randr
+      swayidle
+      swaylock-effects
       hyprpicker
       swww
     ];
@@ -58,7 +60,7 @@ in {
     enable = true;
     extraPortals = with pkgs; [
       xdg-desktop-portal-gtk
-      inputs.xdg-portal-hyprland.packages.${pkgs.system}.default
+      inputs.hyprland.packages.${system}.xdg-desktop-portal-hyprland
     ];
     config = {
       common.default = "*";

home/wayland/hyprland/config/rules.nix

@@ -13,12 +13,7 @@ _: {
       "move 850 360, title:^(RuneLite)$"
       "size 830 600, title:^(RuneLite)$"
       "size 1200 600, title:^(satty)$"
-      "idleinhibit focus, class:^(mpv)$"
+      " fullscreen, title:^(cs2)$"
-      "idleinhibit always, class:^(firefox)$, title:^(.*YouTube.*|.*Twitch.*)$"
-      "idleinhibit fullscreen, class:^(firefox)$"
-    ];
-    layerrule = [
-      "blur, ^(gtk-layer-shell|anyrun)$"
     ];
   };
 }

home/wayland/programs/hyprlock.nix

@@ -1,70 +0,0 @@
-_: {
-  programs.hyprlock = {
-    enable = true;
-    backgrounds = let
-      wallpaperPath = "/home/notoh/Pictures/wallpapers/cweam.png";
-    in [
-      {
-        monitor = "DP-1";
-        path = wallpaperPath;
-      }
-      {
-        monitor = "DP-2";
-        path = wallpaperPath;
-      }
-      {
-        monitor = "DP-3";
-        path = wallpaperPath;
-      }
-      {
-        monitor = "HDMI-A-1";
-        path = wallpaperPath;
-      }
-    ];
-    general = {
-      disable_loading_bar = false;
-      hide_cursor = false;
-      no_fade_in = false;
-    };
-    input-fields = [
-      {
-        monitor = "DP-2";
-        size = {
-          width = 300;
-          height = 50;
-        };
-        outline_thickness = 2;
-
-        outer_color = "rgb(1e1e2e)";
-        inner_color = "rgb(1e1e2e)";
-        font_color = "rgb(cdd6f4)";
-        placeholder_text = ''
-          <span foreground="##cdd6f4">Password...</span>
-        '';
-        fade_on_empty = false;
-        dots_spacing = 0.3;
-        dots_center = true;
-      }
-    ];
-    labels = [
-      {
-        monitor = "DP-2";
-        text = "Hi, $USER";
-        color = "rgb(1e1e2e)";
-        valign = "center";
-        halign = "center";
-      }
-      {
-        monitor = "DP-2";
-        text = "$TIME";
-        color = "rgb(1e1e2e)";
-        position = {
-          x = 0;
-          y = 120;
-        };
-        valign = "center";
-        halign = "center";
-      }
-    ];
-  };
-}

home/wayland/services/hypridle.nix

@@ -1,24 +0,0 @@
-{
-  pkgs,
-  config,
-  lib,
-  ...
-}: {
-  services.hypridle = {
-    enable = true;
-    ignoreDbusInhibit = false;
-    lockCmd = lib.getExe config.programs.hyprlock.package;
-    beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session";
-    listeners = [
-      {
-        timeout = 500;
-        onTimeout = "${lib.getExe config.programs.hyprlock.package}";
-      }
-      {
-        timeout = 560;
-        onTimeout = "${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off";
-        onResume = "${config.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms on";
-      }
-    ];
-  };
-}

hosts/default.nix

@@ -8,8 +8,6 @@ inputs: let
   agsModule = inputs.ags.homeManagerModules.default;
   atticModule = inputs.attic.nixosModules.atticd;
   nurModule = inputs.nur.nixosModules.nur;
-  hypridleModule = inputs.hypridle.homeManagerModules.default;
-  hyprlockModule = inputs.hyprlock.homeManagerModules.default;
   inherit (inputs.nixpkgs.lib) nixosSystem;
 in {
   tsuki = nixosSystem {
@@ -33,8 +31,6 @@ in {
               nix-index-Module
               anyrunModule
               agsModule
-              hypridleModule
-              hyprlockModule
             ];
           };
         };

hosts/tsuki/default.nix

@@ -20,7 +20,6 @@
 
   services = {
     pcscd.enable = true;
-    flatpak.enable = true;
     pipewire = {
       enable = true;
       alsa.enable = true;
@@ -28,7 +27,7 @@
       pulse.enable = true;
       wireplumber.enable = true;
       lowLatency = {
-        enable = false; # disabled due to upstream issue
+        enable = true;
         quantum = 64;
         rate = 48000;
       };
@@ -46,8 +45,10 @@
   security = {
     rtkit.enable = true;
     polkit.enable = true;
-    pam = {
+    pam.services.swaylock = {
-      services.hyprlock = {};
+      text = ''
+        auth include login
+      '';
     };
   };
 

hosts/tsuki/home.nix

@@ -4,6 +4,7 @@
   ...
 }: {
   imports = [
+    ./services/swayidle.nix
     ../../home
     ../../home/firefox
     ../../home/ags
@@ -16,8 +17,6 @@
     ../../home/zellij
     ../../home/spotify-player
     ../../home/wayland/hyprland
-    ../../home/wayland/services/hypridle.nix
-    ../../home/wayland/programs/hyprlock.nix
   ];
 
   systemd.user.startServices = "sd-switch";
@@ -33,15 +32,15 @@
       thunderbird
       obs-studio
       pavucontrol
+      rustdesk
       anki
       tomato-c
       distrobox
-      gpg-tui
       vscode-fhs
       obsidian-wayland
-      #     jellyfin-mpv-shim
+      jellyfin-mpv-shim
       virt-manager
-      #   imv
+      imv
       mpv
       ffmpeg
       rustypaste-cli
@@ -52,6 +51,7 @@
       lutris
       mangohud
       bottles
+      runelite
       prismlauncher
       yuzu
       inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin
@@ -108,10 +108,6 @@
         Hostname 100.92.145.147
         User notoh
         IdentityFile ~/.ssh/rpi4
-      Host rennypaste
-        Hostname 5.78.112.206
-        User notohh
-        IdentityFile ~/.ssh/renny-key
       Host pve
         Hostname 100.115.234.69
         User root

hosts/tsuki/services/swayidle.nix

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

hosts/yuki/services/wallos.nix

@@ -1,6 +1,6 @@
 _: {
   virtualisation.oci-containers.containers.wallos = {
-    image = "bellamy/wallos@sha256:1211a7e859bc295ace4aec1e26317ae442b893168aa32bf587f5066f06f0a436"; #v 1.12.1
+    image = "bellamy/wallos@sha256:18f77ed070788052fb7fb2417a398f96cdd1dbb1ac7c2907531544082090bd66"; #v 1.6.0
     ports = ["8282:80"];
     volumes = [
       "/home/notoh/docker/wallos/db:/var/www/html/db"

pkgs/overlays.nix

@@ -7,17 +7,17 @@
       (final: prev: {
         spotify-player = prev.spotify-player.overrideAttrs (old: rec {
           pname = "spotify-player";
-          version = "0.17.0";
+          version = "0.16.3";
           src = prev.fetchFromGitHub {
             owner = "aome510";
             repo = pname;
             rev = "refs/tags/v${version}";
-            hash = "sha256-fGDIlkTaRg+J6YcP9iBcJFuYm9F0UOA+v/26hhdg9/o=";
+            hash = "sha256-8naLLHAVGB8ow88XjU3BpnNzY3SFC2F5uYin67hMc0E=";
           };
           cargoDeps = old.cargoDeps.overrideAttrs (lib.const {
             name = "spotify-player.tar.gz";
             inherit src;
-            outputHash = "sha256-6AdIU4Q5nxsZW9cRoRI/Zn7EQ3ZJ/EYSFfXIeatT8sY=";
+            outputHash = "sha256-KiqQH356tOEz+Hjhh5XZa3/R+Jw/dH9Ys4KPyZZSTec=";
           });
         });
       })

secrets/secrets.yaml

@@ -29,8 +29,8 @@ sops:
             YWNQcURKMSs2U0pOa3E0cTdCZ3RnalkKGayA7DBUQS+kn+6OYVBc6oTunF0qeZdt
             5b9DLHgh0HRWFm09XGSOog8K315d93Wzblw1My1/dXeEQX/ryinqUQ==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-02-23T02:37:45Z"
+    lastmodified: "2024-02-02T17:39:19Z"
-    mac: ENC[AES256_GCM,data:jP//WalZ3v4IsmrvYKp/6Y/ByPlN2s4TXdAVUZo+RL0GWI0g/F+yuqXCITqIF3csNlQFZXYHIbzOUpKhvjt/O1AB9JmA6Sym5SWAtHQ8v8U04bIOfq5Avr4VfpazQ/G86oSOFoZGwt21eySRTrYsSnw0a3h+3I01OmtR6jFVgR8=,iv:NP7wrwoNkEgwAW6hvJdFA22vHzVvwvp+F5bVUSzHgXg=,tag:jRZapuQ0vpMYNzHUZq5GFQ==,type:str]
+    mac: ENC[AES256_GCM,data:k81uu9ZKkVVrsRMHdXl5sXg9F5mGgqUi41U/1bzgw6A53lqOcKq80YjUnqPM5wKuQQPiGmt6/07GLX3y6ht1lJjHfoCLi75gfhcuoelmEAB3vJY2OC8zPzrwXgdEl6jdRM++5nov38Xq/d/C5qVpZP1aFHpaGZJMyvR+XVRes7I=,iv:CFuXQzDYbaUaQfYEygwBBU/BSYGmLmAi4TeLOy1qW50=,tag:G5tF5qTqy/CZXWfb4M8DMg==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1