From b2a0b301003967cab9bc68719791fd5d3c629d7d Mon Sep 17 00:00:00 2001 From: dish Date: Sat, 20 Jun 2026 13:39:53 -0400 Subject: [PATCH] [skye] more fixes --- hosts/dialga/services/grafana.nix | 4 ---- hosts/dialga/services/victorialogs.nix | 4 ---- hosts/dialga/services/victoriametrics.nix | 4 ---- hosts/ninetails/default.nix | 1 - hosts/skye-hosts.nix | 3 +++ nixosModules/default.nix | 1 + nixosModules/homes/skye/desktop.nix | 20 +++++++++---------- nixosModules/skye/base/default.nix | 1 - nixosModules/skye/base/server/checks.nix | 2 +- .../default.nix} | 0 10 files changed, 15 insertions(+), 25 deletions(-) rename nixosModules/skye/{base/misc/tailscale-serve.nix => tailscale-serve/default.nix} (100%) diff --git a/hosts/dialga/services/grafana.nix b/hosts/dialga/services/grafana.nix index 46f995ca..ec9db9a0 100644 --- a/hosts/dialga/services/grafana.nix +++ b/hosts/dialga/services/grafana.nix @@ -2,10 +2,6 @@ ... }: { - imports = [ - ../../../nixosModules/base/misc/tailscale-serve.nix - ]; - services.grafana = { enable = true; settings = { diff --git a/hosts/dialga/services/victorialogs.nix b/hosts/dialga/services/victorialogs.nix index feaf0803..ecf80edd 100644 --- a/hosts/dialga/services/victorialogs.nix +++ b/hosts/dialga/services/victorialogs.nix @@ -2,10 +2,6 @@ ... }: { - imports = [ - ../../../nixosModules/base/misc/tailscale-serve.nix - ]; - services.victorialogs = { enable = true; }; diff --git a/hosts/dialga/services/victoriametrics.nix b/hosts/dialga/services/victoriametrics.nix index 2a3808d7..8643bc6b 100644 --- a/hosts/dialga/services/victoriametrics.nix +++ b/hosts/dialga/services/victoriametrics.nix @@ -2,10 +2,6 @@ ... }: { - imports = [ - ../../../nixosModules/base/misc/tailscale-serve.nix - ]; - services.victoriametrics = { enable = true; }; diff --git a/hosts/ninetails/default.nix b/hosts/ninetails/default.nix index 57a8f247..c9bd8a17 100644 --- a/hosts/ninetails/default.nix +++ b/hosts/ninetails/default.nix @@ -59,7 +59,6 @@ services.hardware.openrgb = { enable = true; - package = pkgs.callPackage ../../pkgs/openrgb/default.nix { }; motherboard = "amd"; }; programs.steam = { diff --git a/hosts/skye-hosts.nix b/hosts/skye-hosts.nix index 37bf9fc7..5a5df893 100644 --- a/hosts/skye-hosts.nix +++ b/hosts/skye-hosts.nix @@ -5,6 +5,9 @@ deployable = true; tags = [ "skye" ]; specialArgs.hostType = "server"; + modules = [ + inputs.self.nixosModules.skye-tailscale-serve + ]; }; mareep = { deployable = true; diff --git a/nixosModules/default.nix b/nixosModules/default.nix index 62b453ca..bc6df772 100644 --- a/nixosModules/default.nix +++ b/nixosModules/default.nix @@ -11,6 +11,7 @@ _: { skye-base = import ./skye/base; skye-server-checks = import ./skye/server-checks; skye-lastfm-rpc = import ./skye/lastfm-rpc; + skye-tailscale-serve = import ./skye/tailscale-serve; # Programs chromium = import ./programs/chromium; diff --git a/nixosModules/homes/skye/desktop.nix b/nixosModules/homes/skye/desktop.nix index 7d39b307..2271405c 100644 --- a/nixosModules/homes/skye/desktop.nix +++ b/nixosModules/homes/skye/desktop.nix @@ -5,7 +5,7 @@ inputs.noctalia.homeModules.default ]; - programs.noctalia-shell = { + programs.noctalia = { enable = true; }; @@ -22,7 +22,7 @@ }; xdg.configFile."niri/config.kdl".text = '' - spawn-at-startup "noctalia-shell" + spawn-at-startup "noctalia" spawn-at-startup "playerctld" spawn-at-startup "cider-2" spawn-at-startup "discord" @@ -83,7 +83,7 @@ } layer-rule { - match namespace="^noctalia-(background|launcher-overlay|dock)-.*$" + match namespace="^noctalia-(background|panel|dock)-.*$" background-effect { xray false } @@ -97,9 +97,9 @@ binds { Ctrl+Alt+T { spawn "kitty"; } - Mod+Space { spawn "noctalia-shell" "ipc" "call" "launcher" "toggle"; } - Mod+V { spawn "noctalia-shell" "ipc" "call" "launcher" "clipboard"; } - Mod+L { spawn "noctalia-shell" "ipc" "call" "lockScreen" "lock"; } + Mod+Space { spawn "noctalia" "msg" "panel-toggle" "launcher"; } + Mod+V { spawn "noctalia" "msg" "panel-toggle" "clipboard"; } + Mod+L { spawn "noctalia" "msg" "session" "lock"; } Mod+Alt+O repeat=false { toggle-overview; } @@ -118,10 +118,10 @@ Mod+Shift+S repeat=false { screenshot; } Print repeat=false { screenshot-screen; } - XF86AudioRaiseVolume allow-when-locked=true { spawn "sh" "-c" "playerctl status 2>/dev/null | grep -q Playing && playerctl volume 0.05+ || noctalia-shell ipc call volume increase"; } - XF86AudioLowerVolume allow-when-locked=true { spawn "sh" "-c" "playerctl status 2>/dev/null | grep -q Playing && playerctl volume 0.05- || noctalia-shell ipc call volume decrease"; } - XF86AudioMute allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "muteOutput"; } - XF86AudioMicMute allow-when-locked=true { spawn "noctalia-shell" "ipc" "call" "volume" "muteInput"; } + XF86AudioRaiseVolume allow-when-locked=true { spawn "sh" "-c" "playerctl status 2>/dev/null | grep -q Playing && playerctl volume 0.05+ || noctalia msg volume-up"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "sh" "-c" "playerctl status 2>/dev/null | grep -q Playing && playerctl volume 0.05- || noctalia msg volume-down"; } + XF86AudioMute allow-when-locked=true { spawn "noctalia" "msg" "volume-mute"; } + XF86AudioMicMute allow-when-locked=true { spawn "noctalia" "msg" "mic-mute"; } XF86AudioPlay allow-when-locked=true { spawn "playerctl" "play-pause"; } XF86AudioNext allow-when-locked=true { spawn "playerctl" "next"; } XF86AudioPrev allow-when-locked=true { spawn "playerctl" "previous"; } diff --git a/nixosModules/skye/base/default.nix b/nixosModules/skye/base/default.nix index d68c33e3..7f2032f9 100644 --- a/nixosModules/skye/base/default.nix +++ b/nixosModules/skye/base/default.nix @@ -42,7 +42,6 @@ nixpkgs.flake = inputs.nixpkgs; }; }; - nixpkgs.config.allowUnfree = true; services.openssh = { enable = true; diff --git a/nixosModules/skye/base/server/checks.nix b/nixosModules/skye/base/server/checks.nix index 975660aa..30f9a1bd 100644 --- a/nixosModules/skye/base/server/checks.nix +++ b/nixosModules/skye/base/server/checks.nix @@ -8,7 +8,7 @@ imports = [ self.nixosModules.skye-server-checks ]; age.secrets = { - "server-checks-env".file = ./secrets/server-checks/${config.networking.hostName}.age; + "server-checks-env".file = ../secrets/server-checks/${config.networking.hostName}.age; }; serverChecks = [ diff --git a/nixosModules/skye/base/misc/tailscale-serve.nix b/nixosModules/skye/tailscale-serve/default.nix similarity index 100% rename from nixosModules/skye/base/misc/tailscale-serve.nix rename to nixosModules/skye/tailscale-serve/default.nix -- 2.51.2