changes 09-12-25

This commit is contained in:
2025-09-12 15:51:26 -04:00
parent f3a9f8fe27
commit d10d239e2e
11 changed files with 186 additions and 54 deletions

View File

@@ -1,6 +1,6 @@
{ inputs, pkgs, lib, config, self, host, ... }:
let
desktop = host == "oganesson";
desktop = host == "oganesson" || host == "phosphorous";
screenshot_bind = if desktop then
[
"super, print, exec, grimblast copy area"

View File

@@ -35,6 +35,7 @@ in {
nemo
feh
gtk3
vicut
imagemagick
vlc
lolcat
@@ -72,6 +73,7 @@ in {
discord
cloc
wine
fira-code
nerd-fonts.fira-code
nodejs_latest
] ++ scripts;

View File

@@ -14,7 +14,6 @@
gtp = "playshellsound ${self}/assets/sound/rm.wav; gtrash put";
sr = "source ~/.zshrc && source ~/.zshenv";
".." = "cd ..";
rm = "echo 'use \"gtp\" instead'";
psg = "ps aux | grep -v grep | grep -i -e VSZ -e";
mkdir = "mkdir -p";
pk = "pkill -9 -f";
@@ -36,6 +35,7 @@
shortdate = "date '+%m-%d-%y'";
suvi = "sudoedit";
suvide = "EDITOR=neovide; suvi";
rustdev = "nix develop github:km-clay/devshells#rust";
};
};
};

View File

@@ -21,6 +21,10 @@ in
export RESULT
echo "\$RESULT = $RESULT"
}
escaped() {
# escapes regex chars
sed 's/[^^]/[&]/g; s/\^/\\^/g' <<<"$1"
}
nix-shell() {
NIX_SHELL=true command nix-shell "$@" --run zsh
}

View File

@@ -12,6 +12,7 @@
"192.168.1.201" = [ "oganesson" ];
"192.168.1.202" = [ "mercury" ];
"192.168.1.134" = [ "hosting.localhost" ];
"192.168.1.140" = [ "panel.test" "dnsman.test" ];
};
firewall = {
enable = true;

View File

@@ -42,6 +42,11 @@
vim
uhk-agent
jq
jinja2-cli
python3
python313Packages.jinja2
python313Packages.pillow
ffmpeg
wl-clipboard
cmake
libnotify

View File

@@ -1,9 +1,17 @@
{ lib, config, ... }: {
{ lib, pkgs, config, ... }: {
options = {
movOpts.softwareCfg.sysServices.enable =
lib.mkEnableOption "enables default system services";
};
config = lib.mkIf config.movOpts.softwareCfg.sysServices.enable {
users.users.pagedmov = {
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBX/xEA6/zfAkjwaDcl+NnCJLMd7OzRru7IKbn+52fi5 root@nixos"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6QYwnaxkpeN7c1NH5u5z1lv4VqKKAaty2qJ2BXRcg2 pagedmov@nixos"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAFWGaQKygNvvZ/qtR6QFxAA1HQQgoQPCoQbx/cyhEuC pagedmov@nixos"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICOg895UX4fT+1t7icEq5t9U7Ggd9HeDcgFBkyZ4/ghv root@nixos"
];
};
services = {
keyd = {
enable = true;
@@ -12,6 +20,39 @@
settings.main = { capslock = "esc"; };
};
};
copyparty = {
enable = true;
settings = {
e2dsa = true;
};
accounts = {
admin = {
passwordFile = "${pkgs.writeText "/run/keys/admin" "admin123"}";
};
pagedmov = {
passwordFile = "${pkgs.writeText "/run/keys/pagedmov" "200231980qwertyuiop"}";
};
testuser = {
passwordFile = "${pkgs.writeText "/run/keys/testuser" "testpassword"}";
};
};
volumes = {
"/" = {
path = "/var/lib/copyparty";
access = {
A = [ "admin " ];
rwmd = [ "pagedmov" ];
};
};
"/testvol" = {
path = "/var/lib/copyparty/testvol";
access = {
A = [ "admin " ];
rwmd = [ "testuser" ];
};
};
};
};
pipewire = {
enable = true;
pulse.enable = true;