Compare commits

..

3 commits

7 changed files with 152 additions and 148 deletions

View file

@ -4,11 +4,7 @@
system.stateVersion = "25.11"; system.stateVersion = "25.11";
custom = custom = {
let
privateDomain = config.custom.networking.overlay.domain;
in
{
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
networking = { networking = {
@ -30,7 +26,7 @@
syncthing = { syncthing = {
enable = true; enable = true;
isServer = true; isServer = true;
gui.domain = "syncthing.${privateDomain}"; gui.domain = "syncthing.${config.custom.networking.overlay.domain}";
doBackups = true; doBackups = true;
}; };
@ -40,40 +36,40 @@
web-services = { web-services = {
atuin = { atuin = {
enable = true; enable = true;
domain = "atuin.${privateDomain}"; domain = "atuin.${config.custom.networking.overlay.domain}";
}; };
filebrowser = { filebrowser = {
enable = true; enable = true;
domain = "files.${privateDomain}"; domain = "files.${config.custom.networking.overlay.domain}";
doBackups = true; doBackups = true;
}; };
radicale = { radicale = {
enable = true; enable = true;
domain = "dav.${privateDomain}"; domain = "dav.${config.custom.networking.overlay.domain}";
doBackups = true; doBackups = true;
}; };
actualbudget = { actualbudget = {
enable = true; enable = true;
domain = "budget.${privateDomain}"; domain = "budget.${config.custom.networking.overlay.domain}";
doBackups = true; doBackups = true;
}; };
karakeep = { karakeep = {
enable = true; enable = true;
domain = "bookmarks.${privateDomain}"; domain = "bookmarks.${config.custom.networking.overlay.domain}";
}; };
grafana = { grafana = {
enable = true; enable = true;
domain = "grafana.${privateDomain}"; domain = "grafana.${config.custom.networking.overlay.domain}";
}; };
gatus = { gatus = {
enable = true; enable = true;
domain = "status.${privateDomain}"; domain = "status.${config.custom.networking.overlay.domain}";
generateDefaultEndpoints = true; generateDefaultEndpoints = true;
}; };
}; };

View file

@ -67,8 +67,6 @@
MAXTEMP=hwmon2/pwm2=100 MAXTEMP=hwmon2/pwm2=100
MINSTART=hwmon2/pwm2=35 MINSTART=hwmon2/pwm2=35
MINSTOP=hwmon2/pwm2=25 MINSTOP=hwmon2/pwm2=25
MINPWM=hwmon2/pwm2=0
MAXPWM=hwmon2/pwm2=255
''; '';
}; };
} }

View file

@ -4,11 +4,7 @@
system.stateVersion = "25.11"; system.stateVersion = "25.11";
custom = custom = {
let
sproutedDomain = "sprouted.cloud";
in
{
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
networking = { networking = {
@ -30,47 +26,43 @@
]; ];
}; };
web-services = web-services = {
let
sstorkDomain = "sstork.dev";
in
{
personal-blog = { personal-blog = {
enable = true; enable = true;
domain = sstorkDomain; domain = "sstork.dev";
}; };
forgejo = { forgejo = {
enable = true; enable = true;
domain = "git.${sstorkDomain}"; domain = "git.sstork.dev";
doBackups = true; doBackups = true;
}; };
outline = { outline = {
enable = true; enable = true;
domain = "wiki.${sproutedDomain}"; domain = "wiki.sprouted.cloud";
doBackups = true; doBackups = true;
}; };
it-tools = { it-tools = {
enable = true; enable = true;
domain = "it-tools.${sproutedDomain}"; domain = "it-tools.sprouted.cloud";
}; };
networking-toolbox = { networking-toolbox = {
enable = true; enable = true;
domain = "net-tools.${sproutedDomain}"; domain = "net-tools.sprouted.cloud";
}; };
privatebin = { privatebin = {
enable = true; enable = true;
domain = "pastebin.${sproutedDomain}"; domain = "pastebin.sprouted.cloud";
branding.name = "SproutedBin"; branding.name = "SproutedBin";
}; };
screego = { screego = {
enable = true; enable = true;
domain = "mirror.${sproutedDomain}"; domain = "mirror.sprouted.cloud";
}; };
}; };
}; };

View file

@ -18,8 +18,11 @@
services = { services = {
wpaperd.enable = true; wpaperd.enable = true;
hypridle.enable = true;
cliphist.enable = true; cliphist.enable = true;
hypridle = {
enable = true;
lockCommand = "pidof hyprlock || hyprlock";
};
}; };
}; };

View file

@ -14,7 +14,13 @@
noctalia-shell.enable = true; noctalia-shell.enable = true;
}; };
services.cliphist.enable = true; services = {
cliphist.enable = true;
hypridle = {
enable = true;
lockCommand = "noctalia-shell ipc call lockScreen lock";
};
};
}; };
home.packages = [ pkgs.grimblast ]; home.packages = [ pkgs.grimblast ];
@ -35,8 +41,8 @@
bind = SUPER, V, exec, $ipc launcher clipboard bind = SUPER, V, exec, $ipc launcher clipboard
# Manage session # Manage session
bindrl = SUPER CONTROL, L, exec, $ipc lockScreen lock bindrl = SUPER CONTROL, L, exec, loginctl lock-session
bindrl = SUPER CONTROL, S, exec, $ipc sessionMenu lockAndSuspend bindrl = SUPER CONTROL, S, exec, systemctl sleep
''; '';
}; };
} }

View file

@ -96,7 +96,7 @@
largeButtonsStyle = false; largeButtonsStyle = false;
countdownDuration = 3000; countdownDuration = 3000;
}; };
idle.enabled = true; idle.enabled = false;
audio.mprisBlacklist = [ "firefox" ]; audio.mprisBlacklist = [ "firefox" ];
network.bluetoothAutoConnect = false; network.bluetoothAutoConnect = false;
location = { location = {

View file

@ -4,17 +4,26 @@
lib, lib,
... ...
}: }:
let
cfg = config.custom.services.hypridle;
in
{ {
options.custom.services.hypridle.enable = lib.mkEnableOption ""; options.custom.services.hypridle = {
enable = lib.mkEnableOption "";
lockCommand = lib.mkOption {
type = lib.types.nonEmptyStr;
default = "";
};
};
config = lib.mkIf config.custom.services.hypridle.enable { config = lib.mkIf cfg.enable {
services.hypridle = { services.hypridle = {
enable = true; enable = true;
package = pkgs-unstable.hypridle; package = pkgs-unstable.hypridle;
settings = { settings = {
general = { general = {
lock_cmd = lib.mkIf config.custom.programs.hyprlock.enable "pidof hyprlock || hyprlock"; lock_cmd = cfg.lockCommand;
before_sleep_cmd = "loginctl lock-session"; before_sleep_cmd = "loginctl lock-session";
after_sleep_cmd = "hyprctl dispatch dpms on"; after_sleep_cmd = "hyprctl dispatch dpms on";
}; };