summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--flake.lock84
-rw-r--r--hm/shell/fish.nix1
-rw-r--r--hm/shell/foot.nix19
-rw-r--r--hm/soft/mpv.nix143
-rw-r--r--hm/soft/nixcord.nix6
-rw-r--r--hosts/desktop/home.nix8
-rw-r--r--os/core/core.nix4
-rw-r--r--os/core/drivers.nix11
-rw-r--r--os/core/networking.nix1
-rw-r--r--os/core/ssh.nix2
-rw-r--r--os/core/storage.nix4
-rw-r--r--os/srv/autoclicker.nix2
-rw-r--r--os/srv/nix-helper.nix2
-rw-r--r--os/srv/srv.nix2
-rw-r--r--os/wm/niri.nix4
15 files changed, 211 insertions, 82 deletions
diff --git a/flake.lock b/flake.lock
index 6b07a86..852b62c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -232,11 +232,11 @@
]
},
"locked": {
- "lastModified": 1766519125,
- "narHash": "sha256-sSMkdlSo56WrEzciLZTm8qpYxBYxeByGryAIAmIt+/g=",
+ "lastModified": 1766980997,
+ "narHash": "sha256-oegDNAvyQwaG3GqSi4U5jpKM7SYHGESGVIuKMRV/lbw=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "9c790e687e2e7645899cb21dec2a416710aa1064",
+ "rev": "7a7b43c7231a439d248179ba8d561dd6cd81799b",
"type": "github"
},
"original": {
@@ -277,11 +277,11 @@
]
},
"locked": {
- "lastModified": 1766448279,
- "narHash": "sha256-7exwtYJfU6NbKYOY/NoTUMBQkrhcpi4m5R7QD251J38=",
+ "lastModified": 1766966701,
+ "narHash": "sha256-3AGsMM+RuiIBcnB0I02YyZ5AMMBPYPsNZYU48Yjyntk=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "809b2b24874a9e92264a0f5dee0e160381165e42",
+ "rev": "c2a582cef5ccd506e2fae438c7506238d38ced30",
"type": "github"
},
"original": {
@@ -293,11 +293,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1766445637,
- "narHash": "sha256-cfQs0hxQO5WuSFjla1+xcC1zyUm+ti+oJ374bVbZrpI=",
+ "lastModified": 1766966205,
+ "narHash": "sha256-0QP+beaZydoVTJT8gKVInyKX4yMPWfvS2feY9hulW5E=",
"owner": "neovim",
"repo": "neovim",
- "rev": "49b1a6540f50675a4313fd1e3a88628b46dbe82d",
+ "rev": "e916f0327728c78945e6353eeeeb88749b077c0b",
"type": "github"
},
"original": {
@@ -318,11 +318,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1766517173,
- "narHash": "sha256-zhb16f8hDVw7rsVNEIZQJOw78VQ4Eu3sjzwznxSzVtk=",
+ "lastModified": 1767006817,
+ "narHash": "sha256-dQwprSLwnGSX9UG6PzTLydPhpAqhtkoWRj0MZiA1h9k=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "ff40739a8a6d1f2890e91b5bedbb8f09e6c43e4f",
+ "rev": "e24815f0bc94b0e7134d8ac31a061f11d1a20524",
"type": "github"
},
"original": {
@@ -351,11 +351,11 @@
"niri-unstable": {
"flake": false,
"locked": {
- "lastModified": 1766483519,
- "narHash": "sha256-LRSUhcm2erq/v/6EkwVP86kdVyRSsZ+AYQgwsKJMwCM=",
+ "lastModified": 1766751930,
+ "narHash": "sha256-83/YSW6c58i/iwGzAFApuMy6MCgoIaROeCcoIGh+ViU=",
"owner": "YaLTeR",
"repo": "niri",
- "rev": "4d295418ce8e8e110060396bb485c4f0c381d37e",
+ "rev": "b5640d5293ad8dca06cb447692ea7cbb21680eb1",
"type": "github"
},
"original": {
@@ -396,11 +396,11 @@
]
},
"locked": {
- "lastModified": 1766505782,
- "narHash": "sha256-XI4qsufB/fXApUjum1Kv6u+NPeHIIIYAumtvnWV4lpM=",
+ "lastModified": 1766917993,
+ "narHash": "sha256-Hf5T3qQX4hgGQITFSCqsIorMo0FxcI4TsygB1iruUeU=",
"owner": "KaylorBen",
"repo": "nixcord",
- "rev": "99c101ff44315acaf49c3b182d2916a0e2899551",
+ "rev": "63871baa87897231803d617eab908261caa5907c",
"type": "github"
},
"original": {
@@ -442,11 +442,11 @@
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1766473571,
- "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
+ "lastModified": 1766885793,
+ "narHash": "sha256-P6RVkrM9JLCW6xBjSwHfgTOQ1JwBUma5xe5LI8xAPC0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
+ "rev": "9ef261221d1e72399f2036786498d78c38185c46",
"type": "github"
},
"original": {
@@ -458,11 +458,11 @@
},
"nixpkgs-stable_2": {
"locked": {
- "lastModified": 1766399428,
- "narHash": "sha256-vS6LSOMDOB3s+L6tqw9IGujxnmUAZQnEG+Vi640LayI=",
+ "lastModified": 1766687554,
+ "narHash": "sha256-DegN7KD/EtFSKXf2jvqL6lvev6GlfAAatYBcRC8goEo=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "a6c3a6141ec1b367c58ead3f7f846c772a25f4e5",
+ "rev": "fd0ca39c92fdb4012ed8d60e1683c26fddadd136",
"type": "github"
},
"original": {
@@ -474,11 +474,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1766309749,
- "narHash": "sha256-3xY8CZ4rSnQ0NqGhMKAy5vgC+2IVK0NoVEzDoOh4DA4=",
+ "lastModified": 1766902085,
+ "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "a6531044f6d0bef691ea18d4d4ce44d0daa6e816",
+ "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4",
"type": "github"
},
"original": {
@@ -513,11 +513,11 @@
"systems": "systems"
},
"locked": {
- "lastModified": 1766443759,
- "narHash": "sha256-iGDhUPOPyY9NOTNHkhNzZKoz3+OlBNGg451qtvPq/Ic=",
+ "lastModified": 1767002962,
+ "narHash": "sha256-HGFRwMRUwt56E+SiVX9YQOzpOwHy0/rtEqMoEbkF8Yg=",
"owner": "nix-community",
"repo": "nixvim",
- "rev": "1787eeda5a2ce35bcd57dbb482718b0d897786ae",
+ "rev": "63c957603751f0a107c4d9c2cbaff1c8749fc9f1",
"type": "github"
},
"original": {
@@ -633,11 +633,11 @@
"rust-overlay": "rust-overlay_3"
},
"locked": {
- "lastModified": 1765264173,
- "narHash": "sha256-s68kLyXobV5GLGJpAoMQaNTaVz3TQD5ZdXSx4Y76cgE=",
+ "lastModified": 1766992512,
+ "narHash": "sha256-fVXtcahDLZ/W8mzGbGAxSOFBMzH9lIVcPiapi8myhTA=",
"owner": "gabm",
"repo": "Satty",
- "rev": "953783251df4d9508fa7b1f07d1d993559a9f62e",
+ "rev": "21624ce6a945edd4ba9431b5b054003aa6b090f1",
"type": "github"
},
"original": {
@@ -654,11 +654,11 @@
"systems": "systems_2"
},
"locked": {
- "lastModified": 1766292025,
- "narHash": "sha256-dZ9SSqRXfb+WU9MLl5c/ktdRWYZ42uxBPB7rQYuDaJs=",
+ "lastModified": 1767031230,
+ "narHash": "sha256-yJhktUZYp7K1TdeAXweNsOwbTJSuBzKZagq1JnSwnVk=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
- "rev": "73031a3c9359c6c0ab82098793573d0c0951e372",
+ "rev": "442accd416df2f85ada73937996a95749f9fdeb3",
"type": "github"
},
"original": {
@@ -720,11 +720,11 @@
]
},
"locked": {
- "lastModified": 1766081478,
- "narHash": "sha256-ITz0qE9+3GWe5r0PPl4XYOga+gD776qRAadte2yJ9zI=",
+ "lastModified": 1766959964,
+ "narHash": "sha256-4wJqxX8VggW+nrXDvES0iHvLsZkyNZ6W6Z03sJXasXw=",
"owner": "Alexays",
"repo": "Waybar",
- "rev": "97eb60677e555221326009e0bc3def67e85d33f4",
+ "rev": "06484547d182057159c4bd58d14871c0b7a7f3dc",
"type": "github"
},
"original": {
@@ -775,11 +775,11 @@
"rust-overlay": "rust-overlay_4"
},
"locked": {
- "lastModified": 1766510118,
- "narHash": "sha256-2r4g5mn/JyqsesNTnwlJBUduAZPohn5TIcW6+vWMIfY=",
+ "lastModified": 1766967703,
+ "narHash": "sha256-xOltBlD5nU8kMzh7GPoTtkDD8sEDAzTtaR3LRPDWRS0=",
"owner": "sxyazi",
"repo": "yazi",
- "rev": "6e3c96289e7f1b5f5657f7a41770177ab8374080",
+ "rev": "f31147d246b8930dd82f2c45b24a230896d3fda4",
"type": "github"
},
"original": {
diff --git a/hm/shell/fish.nix b/hm/shell/fish.nix
index 9fb6a29..88a4493 100644
--- a/hm/shell/fish.nix
+++ b/hm/shell/fish.nix
@@ -30,6 +30,7 @@ in
ff = "fastfetch";
cat = "bat";
ls = "eza";
+ yt = "yt-dlp";
};
plugins = [
diff --git a/hm/shell/foot.nix b/hm/shell/foot.nix
index a9c3eac..c840b5e 100644
--- a/hm/shell/foot.nix
+++ b/hm/shell/foot.nix
@@ -1,11 +1,14 @@
{ pkgs, lib, config, ... }:
+
let
cfg = config.hm.shell.foot;
- footTheme = pkgs.fetchurl {
- url = "https://codeberg.org/dnkl/foot/src/branch/master/themes/gruvbox-dark";
- sha256 = "";
- };
+ footTheme = pkgs.runCommand "gruvbox-dark" { } ''
+ sed 's/\[colors-dark\]/\[colors\]/g' ${pkgs.fetchurl {
+ url = "https://codeberg.org/dnkl/foot/raw/branch/master/themes/gruvbox-dark";
+ sha256 = "sha256-hlmLklG/vAEDy8I+k13+o4ZR6Cq6lTxOconjf9M75eo=";
+ }} > $out
+ '';
in
{
options.hm.shell.foot = {
@@ -16,21 +19,19 @@ in
description = "Font size for the foot terminal";
};
};
+
config = lib.mkIf cfg.enable {
programs.foot = {
enable = true;
settings = {
main = {
font = "JetBrainsMonoNFM-Regular:size=${toString cfg.fontSize}";
- box-drawings-uses-font-glyphs = "yes";
- include = "${footTheme}";
+ box-drawings-uses-font-glyphs = true;
+ include = "${footTheme}";
};
scrollback = {
lines = 10000;
};
- mouse = {
- hide-when-typing = "yes";
- };
};
};
};
diff --git a/hm/soft/mpv.nix b/hm/soft/mpv.nix
index 8df73e7..ec69c33 100644
--- a/hm/soft/mpv.nix
+++ b/hm/soft/mpv.nix
@@ -1,45 +1,160 @@
{ config, lib, pkgs, ... }:
let
cfg = config.hm.soft.mpv;
- shim_dir = "${pkgs.mpv-shim-default-shaders}/share/mpv-shim-default-shaders/shaders";
- anime4k_dir = "${pkgs.anime4k}"
+ s = "~~/shaders/shim";
in
{
options.hm.soft.mpv.enable = lib.mkEnableOption "mpv media player";
+
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
- anime4k
mpv-shim-default-shaders
];
+
+ home.file = {
+ ".config/mpv/shaders/shim".source = "${pkgs.mpv-shim-default-shaders}/share/mpv-shim-default-shaders/shaders";
+ };
+
programs.mpv = {
enable = true;
+
+ bindings = {
+ "CTRL+1" = "apply-profile movie-ultra; show-text \"Movie Ultra Active\"";
+ "CTRL+2" = "apply-profile anime-mode-a; show-text \"Anime4K: Mode A (UL)\"";
+ "CTRL+3" = "apply-profile anime-mode-b; show-text \"Anime4K: Mode B (UL)\"";
+ "CTRL+4" = "apply-profile anime-mode-c; show-text \"Anime4K: Mode C (UL)\"";
+ "CTRL+5" = "apply-profile anime-mode-aa; show-text \"Anime4K: Mode A+A (UL)\"";
+ "CTRL+6" = "apply-profile anime-mode-bb; show-text \"Anime4K: Mode B+B (UL)\"";
+ "CTRL+7" = "apply-profile anime-mode-ca; show-text \"Anime4K: Mode C+A (UL)\"";
+ "CTRL+0" = "apply-profile restore; show-text \"Shaders Cleared / Defaults Restored\"";
+
+ "s" = "screenshot";
+ "WHEEL_UP" = "add volume 2";
+ "WHEEL_DOWN" = "add volume -2";
+ "Q" = "quit-watch-later";
+ };
+
config = {
- # general stuff
- save-position-on-quit = true;
keep-open = "yes";
-
- # video
profile = "gpu-hq";
gpu-api = "vulkan";
vo = "gpu-next";
hwdec = "auto";
- # audio
- ao = "pipewire";
+ scale = "ewa_lanczossharp";
+ cscale = "ewa_lanczos";
+ dscale = "mitchell";
+ scale-antiring = 0.6;
+ cscale-antiring = 0.6;
+
+ deband = "yes";
+ deband-iterations = 2;
+ deband-threshold = 35;
+ dither-depth = "auto";
+ dither = "fruit";
+
sub-auto = "fuzzy";
- volume-max = "200";
+ sub-ass-override = "force";
+ blend-subtitles = "no";
+ slang = "enm,eng,en,enCA,enUS";
- # network streaming
+ ao = "pipewire";
+ volume-max = "200";
demuxer-max-back-bytes = "50Mib";
demuxer-max-bytes = "600Mib";
demuxer-readahead-secs = 300;
force-seekable = "yes";
- # screenshotting
screenshot-format = "png";
- screenshot-directory = "~/${config.hm.conf.xdg-dirs.mediaPath}/pics/ss";
+ screenshot-sw = "no";
+ screenshot-directory = "${toString config.hm.conf.xdg-dirs.mediaPath}/pics/ss";
screenshot-template = "mpv-%f-%wH.%wM.%wS-#%#00n";
};
+
+ profiles = {
+ "movie-ultra" = {
+ glsl-shaders = lib.concatStringsSep ":" [
+ "${s}/KrigBilateral.glsl"
+ "${s}/FSRCNNX_x2_16-0-4-1.glsl"
+ "${s}/SSimDownscaler.glsl"
+ "${s}/CAS-scaled.glsl"
+ ];
+ scale = "ewa_lanczos";
+ linear-upscaling = "yes";
+ sigmoid-upscaling = "yes";
+ };
+
+ "anime-mode-a" = {
+ glsl-shaders = lib.concatStringsSep ":" [
+ "${s}/Anime4K_Clamp_Highlights.glsl"
+ "${s}/Anime4K_Restore_CNN_UL.glsl"
+ "${s}/Anime4K_Upscale_CNN_x2_UL.glsl"
+ "${s}/Anime4K_AutoDownscalePre_x2.glsl"
+ "${s}/Anime4K_AutoDownscalePre_x4.glsl"
+ "${s}/Anime4K_Upscale_CNN_x2_UL.glsl"
+ ];
+ };
+
+ "anime-mode-b" = {
+ glsl-shaders = lib.concatStringsSep ":" [
+ "${s}/Anime4K_Clamp_Highlights.glsl"
+ "${s}/Anime4K_Restore_CNN_Soft_UL.glsl"
+ "${s}/Anime4K_Upscale_CNN_x2_UL.glsl"
+ "${s}/Anime4K_AutoDownscalePre_x2.glsl"
+ "${s}/Anime4K_AutoDownscalePre_x4.glsl"
+ "${s}/Anime4K_Upscale_CNN_x2_UL.glsl"
+ ];
+ };
+
+ "anime-mode-c" = {
+ glsl-shaders = lib.concatStringsSep ":" [
+ "${s}/Anime4K_Clamp_Highlights.glsl"
+ "${s}/Anime4K_Upscale_Denoise_CNN_x2_UL.glsl"
+ "${s}/Anime4K_AutoDownscalePre_x2.glsl"
+ "${s}/Anime4K_AutoDownscalePre_x4.glsl"
+ "${s}/Anime4K_Upscale_CNN_x2_UL.glsl"
+ ];
+ };
+
+ "anime-mode-aa" = {
+ glsl-shaders = lib.concatStringsSep ":" [
+ "${s}/Anime4K_Clamp_Highlights.glsl"
+ "${s}/Anime4K_Restore_CNN_UL.glsl"
+ "${s}/Anime4K_Upscale_CNN_x2_UL.glsl"
+ "${s}/Anime4K_Restore_CNN_UL.glsl"
+ "${s}/Anime4K_Upscale_CNN_x2_UL.glsl"
+ ];
+ };
+
+ "anime-mode-bb" = {
+ glsl-shaders = lib.concatStringsSep ":" [
+ "${s}/Anime4K_Clamp_Highlights.glsl"
+ "${s}/Anime4K_Restore_CNN_Soft_UL.glsl"
+ "${s}/Anime4K_Upscale_CNN_x2_UL.glsl"
+ "${s}/Anime4K_AutoDownscalePre_x2.glsl"
+ "${s}/Anime4K_AutoDownscalePre_x4.glsl"
+ "${s}/Anime4K_Restore_CNN_Soft_UL.glsl"
+ "${s}/Anime4K_Upscale_CNN_x2_UL.glsl"
+ ];
+ };
+
+ "anime-mode-ca" = {
+ glsl-shaders = lib.concatStringsSep ":" [
+ "${s}/Anime4K_Clamp_Highlights.glsl"
+ "${s}/Anime4K_Upscale_Denoise_CNN_x2_UL.glsl"
+ "${s}/Anime4K_AutoDownscalePre_x2.glsl"
+ "${s}/Anime4K_AutoDownscalePre_x4.glsl"
+ "${s}/Anime4K_Restore_CNN_UL.glsl"
+ "${s}/Anime4K_Upscale_CNN_x2_UL.glsl"
+ ];
+ };
+
+ "restore" = {
+ glsl-shaders = "";
+ scale = "ewa_lanczossharp";
+ };
+ };
+
scripts = with pkgs.mpvScripts; [
webtorrent-mpv-hook
visualizer
@@ -53,8 +168,10 @@ in
memo
autosubsync-mpv
autosub
+ sponsorblock
];
};
+
hm.soft = {
media.enable = true;
yt-dlp.enable = true;
diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix
index c948a4d..4d87901 100644
--- a/hm/soft/nixcord.nix
+++ b/hm/soft/nixcord.nix
@@ -28,9 +28,9 @@ in
ClearURLs.enable = true;
CopyUserURLs.enable = true;
NoRPC.enable = true;
- OnePingPerDm.enable = true;
+ OnePingPerDM.enable = true;
PinDMs = { enable = true; canCollapseDmSection = true; };
- SaveFavoriteGiFs.enable = true;
+ SaveFavoriteGIFs.enable = true;
altKrispSwitch.enable = true;
alwaysExpandRoles = { enable = true; hideArrow = true; };
alwaysTrust = { enable = true; domain = false; };
@@ -131,7 +131,7 @@ in
stickerBlocker.enable = true;
streamerModeOnStream.enable = true;
streamingCodecDisabler = { enable = true; disableH264Codec = true; disableH265Codec = true; disableVP8Codec = true; disableVP9Codec = true; };
- superReactionTweaks = { enable = true; superReactionPlayingLimit = 0; };
+ superReactionTweaks = { enable = true; superReactionPlayingLimit = 0.0; };
themeLibrary.enable = true;
typingIndicator.enable = true;
typingTweaks.enable = true;
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index fa38457..8727849 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -1,4 +1,4 @@
-{ username, ... }:
+{ pkgs, username, ... }:
{
imports = [ ../../hm/default.nix ];
@@ -57,4 +57,10 @@
yt-dlp.enable = true;
};
};
+
+ home.packages = with pkgs; [
+ simplex-chat-desktop
+ magic-wormhole
+ gimp
+ ];
}
diff --git a/os/core/core.nix b/os/core/core.nix
index b1753ad..f13396e 100644
--- a/os/core/core.nix
+++ b/os/core/core.nix
@@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
- cfg = config.sys.core;
+ cfg = config.os.core;
in
{
imports = [
@@ -20,7 +20,7 @@ in
./users.nix
];
- options.sys.core = {
+ options.os.core = {
allowUnfree.enable = lib.mkEnableOption "unfree software";
flatpak.enable = lib.mkEnableOption "Flatpak support";
diff --git a/os/core/drivers.nix b/os/core/drivers.nix
index 21e726c..32a848e 100644
--- a/os/core/drivers.nix
+++ b/os/core/drivers.nix
@@ -5,7 +5,7 @@ in
{
options.os.core.drivers = {
enable = lib.mkEnableOption "enables hardware drivers";
- amd.enable = lib.mkEnableOption "AMD specific drivers and microcode";
+ amdgpu.enable = lib.mkEnableOption "AMD specific drivers and microcode";
stability = lib.mkOption {
type = lib.types.enum [ "stable" "unstable" ];
default = "stable";
@@ -23,7 +23,7 @@ in
};
}
- (lib.mkIf cfg.amd.enable {
+ (lib.mkIf cfg.amdgpu.enable {
services.xserver.videoDrivers = [ "amdgpu" ];
hardware.amdgpu = {
initrd.enable = true;
@@ -31,16 +31,17 @@ in
};
})
- (lib.mkIf (cfg.amd.enable && cfg.stability == "unstable") {
+ (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "unstable") {
services.lact.enable = true;
- boot.kernelPackages = pkgs.linuxPackages_cachyos-lto-znver4;
+ # boot.kernelPackages = pkgs.linuxPackages_cachyos-lto-znver4;
+ boot.kernelPackages = pkgs.linuxPackages_latest;
chaotic.mesa-git = {
enable = true;
extraPackages = [ pkgs.mesa_git.opencl ];
};
})
- (lib.mkIf (cfg.amd.enable && cfg.stability == "stable") {
+ (lib.mkIf (cfg.amdgpu.enable && cfg.stability == "stable") {
boot.kernelPackages = pkgs.linuxPackages_latest;
})
]);
diff --git a/os/core/networking.nix b/os/core/networking.nix
index 1f7e268..51b9196 100644
--- a/os/core/networking.nix
+++ b/os/core/networking.nix
@@ -13,6 +13,7 @@ in
};
firewall = {
enable = true;
+ allowedTCPPorts = [ 5222 ]; # SimpleX Chat
};
};
systemd.services."NetworkManager-wait-online".enable = false;
diff --git a/os/core/ssh.nix b/os/core/ssh.nix
index b2cf411..43ea660 100644
--- a/os/core/ssh.nix
+++ b/os/core/ssh.nix
@@ -12,8 +12,6 @@ in
services.openssh = {
enable = true;
- PasswordAuthentication = false;
- KbdInteractiveAuthentication = false;
};
programs.gnupg.agent = {
diff --git a/os/core/storage.nix b/os/core/storage.nix
index e4e282b..fde9399 100644
--- a/os/core/storage.nix
+++ b/os/core/storage.nix
@@ -7,7 +7,7 @@ in
enable = lib.mkEnableOption "enables storage management";
cleanDates = lib.mkOption {
- type = lib.types.int;
+ type = lib.types.str;
default = "weekly";
description = "how often to clean the system of old generations";
};
@@ -20,7 +20,7 @@ in
clean = {
enable = true;
dates = "${toString cfg.cleanDates}";
- clean.extraArgs = "--keep 5";
+ extraArgs = "--keep 5";
};
};
diff --git a/os/srv/autoclicker.nix b/os/srv/autoclicker.nix
index e9a5d0b..6232a45 100644
--- a/os/srv/autoclicker.nix
+++ b/os/srv/autoclicker.nix
@@ -6,7 +6,7 @@ in
options.os.srv.autoclicker.enable = lib.mkEnableOption "enables wl-autoclicker";
config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [
- wl-autoclicker
+ wl-clicker
];
};
}
diff --git a/os/srv/nix-helper.nix b/os/srv/nix-helper.nix
index fede111..4999908 100644
--- a/os/srv/nix-helper.nix
+++ b/os/srv/nix-helper.nix
@@ -12,7 +12,7 @@ in
programs.nh = {
enable = true;
- osFlake = "/etc/nixos";
+ flake = "/etc/nixos";
};
environment.systemPackages = with pkgs; [
diff --git a/os/srv/srv.nix b/os/srv/srv.nix
index 2da7d50..c121bce 100644
--- a/os/srv/srv.nix
+++ b/os/srv/srv.nix
@@ -1,7 +1,7 @@
{ ... }:
{
imports = [
- ./autoclicker
+ ./autoclicker.nix
./compat.nix
./docker.nix
./files.nix
diff --git a/os/wm/niri.nix b/os/wm/niri.nix
index e8f5d79..c876dd1 100644
--- a/os/wm/niri.nix
+++ b/os/wm/niri.nix
@@ -15,6 +15,10 @@ in
package = pkgs.niri-unstable;
};
+ environment.systemPackages = with pkgs; [
+ wl-restart
+ ];
+
os.srv.compat.enable = true;
home-manager.users.${username}.hm.env.niri.enable = true;
};
generated by cgit v1.3 (git 2.53.0) at 2026-08-17 02:24:11 +0000