work on reducing statefulness of the configuration
This commit is contained in:
@@ -294,10 +294,6 @@ in
|
||||
"super, l, movefocus, r"
|
||||
"super, k, movefocus, u"
|
||||
"super, j, movefocus, d"
|
||||
"super, y, exec, /home/pagedmov/splitman-ipc.sh start"
|
||||
"super, u, exec, /home/pagedmov/splitman-ipc.sh split"
|
||||
"super, i, exec, /home/pagedmov/splitman-ipc.sh stop"
|
||||
"super, o, exec, /home/pagedmov/splitman-ipc.sh pause"
|
||||
"super shift, h, movewindow, l"
|
||||
"super shift, l, movewindow, r"
|
||||
"super shift, k, movewindow, u"
|
||||
|
||||
@@ -403,7 +403,7 @@ pkgs.writeText "theme-builder.py" ''
|
||||
print("Sent reload signal to Kitty.")
|
||||
|
||||
nvim_colors = STATE_DIR / "nvim-colors.lua"
|
||||
for sock in Path("/run/user/1000").glob("nvim.*.0"):
|
||||
for sock in Path(os.environ.get("XDG_RUNTIME_DIR", "/run/user/1000")).glob("nvim.*.0"):
|
||||
try:
|
||||
nvim = attach('socket', path=str(sock))
|
||||
nvim.command(f"luafile {nvim_colors}")
|
||||
|
||||
@@ -614,7 +614,7 @@
|
||||
all: unset;
|
||||
}
|
||||
|
||||
@import url("file:///home/pagedmov/.local/state/sysflake/swaync-colors.css");
|
||||
@import url("file://${config.home.homeDirectory}/.local/state/sysflake/swaync-colors.css");
|
||||
'';
|
||||
xdg.configFile."swaync/config.json".text = ''
|
||||
{
|
||||
|
||||
@@ -5,20 +5,6 @@ let
|
||||
in
|
||||
{
|
||||
systemd.user = {
|
||||
timers = {
|
||||
maintenanceCheck = {
|
||||
Unit = {
|
||||
Description = "Timer for package maintenance check";
|
||||
};
|
||||
Timer = {
|
||||
OnCalendar = "hourly";
|
||||
Persistent = true;
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "timers.target" ];
|
||||
};
|
||||
};
|
||||
};
|
||||
services = {
|
||||
swww-daemon = {
|
||||
Unit.Description = "Daemon for swww (sway wayland wallpaper manager)";
|
||||
|
||||
@@ -143,7 +143,7 @@ in
|
||||
};
|
||||
|
||||
"image#nixicon" = {
|
||||
path = "/home/pagedmov/.sysflake/assets/images/nix-snowflake-colours.svg";
|
||||
path = "${self}/assets/images/nix-snowflake-colours.svg";
|
||||
size = 28;
|
||||
};
|
||||
|
||||
@@ -271,7 +271,7 @@ in
|
||||
margin: 6px 10px 6px 4px;
|
||||
}
|
||||
|
||||
@import url("file:///home/pagedmov/.local/state/sysflake/waybar-colors.css");
|
||||
@import url("file://${config.home.homeDirectory}/.local/state/sysflake/waybar-colors.css");
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
};
|
||||
safe = {
|
||||
directory = [
|
||||
"/home/pagedmov/mnt/net"
|
||||
"${config.home.homeDirectory}/mnt/net"
|
||||
];
|
||||
};
|
||||
core.pager = "delta";
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [ ./jellyfin.nix ];
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
options = {
|
||||
movOpts.serverCfg.jellyfinConfig.enable = lib.mkEnableOption "Enables the server's jellyfin config";
|
||||
};
|
||||
config = lib.mkIf config.movOpts.serverCfg.jellyfinConfig.enable {
|
||||
services.jellyfin = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,8 +0,0 @@
|
||||
{ pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./cdn
|
||||
./glasshaus
|
||||
];
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
{
|
||||
lib,
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
options = {
|
||||
movOpts.serverCfg.caddyConfig.enable = lib.mkEnableOption "Enable my caddy config for the glasshaus.info domain name";
|
||||
};
|
||||
config = lib.mkIf config.movOpts.serverCfg.caddyConfig.enable {
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
configFile = pkgs.writeText "Caddyfile" ''
|
||||
glasshaus.info {
|
||||
reverse_proxy localhost:8096
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,10 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
imports = [ ./caddy.nix ];
|
||||
}
|
||||
@@ -51,6 +51,8 @@
|
||||
pavucontrol
|
||||
playerctl
|
||||
usbutils
|
||||
age
|
||||
agenix-cli
|
||||
vim
|
||||
uhk-agent
|
||||
jq
|
||||
|
||||
@@ -9,21 +9,6 @@
|
||||
movOpts.softwareCfg.sysProgs.enable = lib.mkEnableOption "enables default system programs";
|
||||
};
|
||||
config = lib.mkIf config.movOpts.softwareCfg.sysProgs.enable {
|
||||
environment.etc."shells" = {
|
||||
enable = true;
|
||||
text = ''
|
||||
/run/current-system/sw/bin/zsh
|
||||
/run/current-system/sw/bin/bash
|
||||
/run/current-system/sw/bin/zsh
|
||||
/nix/store/m7l6yzmflrf9hjs8707lk9nkhi6f73n1-zsh-5.9/bin/zsh
|
||||
/run/current-system/sw/bin/bash
|
||||
/run/current-system/sw/bin/sh
|
||||
/nix/store/f33kh08pa7pmy4kvsmsibda46sh46s66-bash-interactive-5.2p37/bin/bash
|
||||
/nix/store/f33kh08pa7pmy4kvsmsibda46sh46s66-bash-interactive-5.2p37/bin/sh
|
||||
/bin/sh
|
||||
/home/pagedmov/Coding/projects/rust/rsh/target/debug/rsh
|
||||
'';
|
||||
};
|
||||
programs = {
|
||||
hyprland.enable = lib.mkDefault true;
|
||||
zsh.enable = lib.mkDefault true;
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
self,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -9,6 +10,21 @@
|
||||
movOpts.softwareCfg.sysServices.enable = lib.mkEnableOption "enables default system services";
|
||||
};
|
||||
config = lib.mkIf config.movOpts.softwareCfg.sysServices.enable {
|
||||
age.identityPaths = [ "/home/pagedmov/.ssh/id_ed25519" ];
|
||||
age.secrets = {
|
||||
copyparty-admin = {
|
||||
file = "${self}/secrets/copyparty-admin.age";
|
||||
owner = "copyparty";
|
||||
};
|
||||
copyparty-pagedmov = {
|
||||
file = "${self}/secrets/copyparty-pagedmov.age";
|
||||
owner = "copyparty";
|
||||
};
|
||||
copyparty-testuser = {
|
||||
file = "${self}/secrets/copyparty-testuser.age";
|
||||
owner = "copyparty";
|
||||
};
|
||||
};
|
||||
users.users.pagedmov = {
|
||||
openssh.authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBX/xEA6/zfAkjwaDcl+NnCJLMd7OzRru7IKbn+52fi5 root@nixos"
|
||||
@@ -35,13 +51,13 @@
|
||||
};
|
||||
accounts = {
|
||||
admin = {
|
||||
passwordFile = "${pkgs.writeText "/run/keys/admin" "admin123"}";
|
||||
passwordFile = config.age.secrets.copyparty-admin.path;
|
||||
};
|
||||
pagedmov = {
|
||||
passwordFile = "${pkgs.writeText "/run/keys/pagedmov" "200231980qwertyuiop"}";
|
||||
passwordFile = config.age.secrets.copyparty-pagedmov.path;
|
||||
};
|
||||
testuser = {
|
||||
passwordFile = "${pkgs.writeText "/run/keys/testuser" "testpassword"}";
|
||||
passwordFile = config.age.secrets.copyparty-testuser.path;
|
||||
};
|
||||
};
|
||||
volumes = {
|
||||
|
||||
Reference in New Issue
Block a user