summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock24
-rw-r--r--flake.nix35
-rw-r--r--home-modules/apps/default.nix2
-rw-r--r--home-modules/apps/desktop/default.nix12
-rw-r--r--home-modules/apps/nvim/default.nix2
-rw-r--r--home-modules/desktop/hyprland.nix95
-rw-r--r--home-modules/desktop/wayland/default.nix11
-rw-r--r--home-modules/desktop/wayland/mako.nix47
-rw-r--r--home-modules/services/vdirsyncer.nix6
-rw-r--r--home-modules/theming.nix8
-rw-r--r--hosts/apocalypse/default.nix13
-rw-r--r--hosts/apocalypse/firewall.nix3
-rw-r--r--hosts/apocalypse/hardware-configuration.nix37
-rw-r--r--modules/default.nix1
-rw-r--r--modules/desktop/akonadi.nix9
-rw-r--r--modules/desktop/default.nix1
-rw-r--r--modules/desktop/wms/cosmic.nix20
-rw-r--r--modules/desktop/wms/default.nix1
-rw-r--r--modules/desktop/wms/hyprland.nix14
-rw-r--r--modules/motd.nix89
-rw-r--r--secrets/secrets.yaml8
21 files changed, 316 insertions, 122 deletions
diff --git a/flake.lock b/flake.lock
index b454977..6c6f7a8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -61,11 +61,11 @@
]
},
"locked": {
- "lastModified": 1770164260,
- "narHash": "sha256-mQgOAYWlVJyuyXjZN6yxqXWyODvQI5P/UZUCU7IOuYo=",
+ "lastModified": 1769289524,
+ "narHash": "sha256-6Cwtvzrw79cOk1lCzN2aKSVrpgSOSQoYhyMmhXXZjTA=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "4fda26500b4539e0a1e3afba9f0e1616bdad4f85",
+ "rev": "2539eba97a6df237d75617c25cd2dbef92df3d5b",
"type": "github"
},
"original": {
@@ -76,11 +76,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1770115704,
- "narHash": "sha256-KHFT9UWOF2yRPlAnSXQJh6uVcgNcWlFqqiAZ7OVlHNc=",
+ "lastModified": 1769170682,
+ "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "e6eae2ee2110f3d31110d5c222cd395303343b08",
+ "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
"type": "github"
},
"original": {
@@ -124,11 +124,11 @@
]
},
"locked": {
- "lastModified": 1770145881,
- "narHash": "sha256-ktjWTq+D5MTXQcL9N6cDZXUf9kX8JBLLBLT0ZyOTSYY=",
+ "lastModified": 1769314333,
+ "narHash": "sha256-+Uvq9h2eGsbhacXpuS7irYO7fFlz514nrhPCSTkASlw=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "17eea6f3816ba6568b8c81db8a4e6ca438b30b7c",
+ "rev": "2eb9eed7ef48908e0f02985919f7eb9d33fa758f",
"type": "github"
},
"original": {
@@ -182,11 +182,11 @@
]
},
"locked": {
- "lastModified": 1769691507,
- "narHash": "sha256-8aAYwyVzSSwIhP2glDhw/G0i5+wOrren3v6WmxkVonM=",
+ "lastModified": 1769353635,
+ "narHash": "sha256-J0G1ACrUK29M0THPAsz429eZX07GmR9Bs/b0pB3N0dQ=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "28b19c5844cc6e2257801d43f2772a4b4c050a1b",
+ "rev": "f46bb205f239b415309f58166f8df6919fa88377",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 439593a..856d15a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,7 +62,7 @@
# for `nix flake check`
checks = (
forAllSystems (pkgs: {
- formatting = treefmtEval.${pkgs.system}.config.build.check self;
+ formatting = treefmtEval.${pkgs.stdenv.hostPlatform.system}.config.build.check self;
})
);
@@ -95,19 +95,6 @@
inputs.sops-nix.nixosModules.sops
];
};
- vm-desktop = nixpkgs.lib.nixosSystem {
- specialArgs = {
- inherit inputs;
- };
- system = "x86_64-linux";
- modules = [
- ./modules
- ./hosts/test_vm
- ./users/live-user.nix
- inputs.home-manager.nixosModules.default
- inputs.sops-nix.nixosModules.sops
- ];
- };
omega-relay = nixpkgs.lib.nixosSystem {
specialArgs = {
inherit inputs;
@@ -123,26 +110,6 @@
];
};
- vm-shell = nixpkgs.lib.nixosSystem {
- specialArgs = {
- inherit inputs;
- };
- system = "x86_64-linux";
- modules = [
- ./modules
- ./hosts/test_vm
- ./users/live-user.nix
- (
- { lib, ... }:
- {
- addons.desktop.hyprland.enable = lib.mkForce false;
- addons.desktop.xfce.enable = lib.mkForce false;
- }
- )
- inputs.home-manager.nixosModules.default
- inputs.sops-nix.nixosModules.sops
- ];
- };
};
};
}
diff --git a/home-modules/apps/default.nix b/home-modules/apps/default.nix
index ece0543..31766ab 100644
--- a/home-modules/apps/default.nix
+++ b/home-modules/apps/default.nix
@@ -103,7 +103,7 @@ in
})
(lib.mkIf cfg.work.enable {
home.packages = with pkgs; [
- inputs.tatuin.packages.${pkgs.system}.default
+ inputs.tatuin.packages.${pkgs.stdenv.hostPlatform.system}.default
todoman
];
})
diff --git a/home-modules/apps/desktop/default.nix b/home-modules/apps/desktop/default.nix
index 9a6f0e4..5472dad 100644
--- a/home-modules/apps/desktop/default.nix
+++ b/home-modules/apps/desktop/default.nix
@@ -67,7 +67,17 @@ in
];
})
(lib.mkIf cfg.note-taking.enable {
- home.packages = with pkgs; [ obsidian ];
+ home.packages =
+ with pkgs;
+ [
+ obsidian
+ kdePackages.kdepim-runtime
+ ]
+ ++ (with pkgs.kdePackages; [
+ zanshin
+ kdepim-runtime
+ akonadi-calendar
+ ]);
# Todo force synthing to be on here
})
(lib.mkIf cfg.art.enable {
diff --git a/home-modules/apps/nvim/default.nix b/home-modules/apps/nvim/default.nix
index c99a343..fc73d2d 100644
--- a/home-modules/apps/nvim/default.nix
+++ b/home-modules/apps/nvim/default.nix
@@ -52,7 +52,7 @@ in
rustup
nil
statix
- nixfmt-rfc-style
+ nixfmt
# phpactor
pyright
nodePackages.intelephense
diff --git a/home-modules/desktop/hyprland.nix b/home-modules/desktop/hyprland.nix
index 1fdc801..164282e 100644
--- a/home-modules/desktop/hyprland.nix
+++ b/home-modules/desktop/hyprland.nix
@@ -15,12 +15,14 @@ with lib;
networkmanagerapplet
wl-clipboard
brightnessctl
+ hyprsunset
];
services.hyprpolkitagent.enable = true;
homeprogs.waybar.enable = true;
homeprogs.mako.enable = true;
+ homeprogs.mako.systemdWantedBy = [ "hyprland-session.target" ];
# Environment variables for hyprland.
# This can be used to configure wayland/hyprland-specific things
home.file.".config/uwsm/env-hyprland".text = ''
@@ -33,12 +35,11 @@ with lib;
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
export QT_AUTO_SCREEN_SCALE_FACTOR=1
export MOZ_ENABLE_WAYLAND=1
- export -n GTK_IM_MODULE
'';
# Hyprland
wayland.windowManager.hyprland = {
- systemd.enable = false;
+ systemd.enable = true;
enable = true;
xwayland.enable = true;
settings = {
@@ -252,15 +253,32 @@ with lib;
};
};
+ systemd.user.services.hyprpaper = {
+ Install.WantedBy = lib.mkForce [ "hyprland-session.target" ];
+ };
+
+ # TODO: Put the default wallpaper somewhere else.
+ home.file.defaultWallpaper = {
+ source = ./wallpaper.png;
+ target = "Pictures/Wallpapers/wallpaper.png";
+ enable = true;
+ };
+
services.hyprpaper = {
enable = true;
settings = {
ipc = "on";
splash = false;
- splash_offset = 2.0;
+ splash_offset = 2;
- preload = [ "${./wallpaper.png}" ];
- wallpaper = [ ",${./wallpaper.png}" ];
+ # preload = [ "${./wallpaper.png}" ];
+ wallpaper = [
+ {
+ monitor = "";
+ path = "${config.home.homeDirectory}/${config.home.file.defaultWallpaper.target}";
+ fit_mode = "cover";
+ }
+ ];
};
};
@@ -299,26 +317,57 @@ with lib;
];
};
};
+ services.hyprsunset = {
+ enable = true;
+ systemdTarget = "hyprland-session.target";
+ settings = {
+ max-gamma = 140;
+ profile = [
+ {
+ # Morning
+ time = "07:00";
+ identity = true;
+ # temperature = 6500;
+ gamme = 1;
+ }
+ {
+ # Evening
+ time = "19:00";
+ temperature = 4000;
+ gamma = 0.6;
+ }
+ {
+ # Night
+ time = "22:00";
+ temperature = 3000;
+ gamma = 0.4;
+ }
+ ];
+ };
+ };
- services.hypridle.enable = true;
- services.hypridle.settings = {
- general = {
- lock_cmd = "pidof hyprlock || hyprlock";
- before_sleep_cmd = "loginctl lock-session";
- ignore_dbus_inhibit = false;
- after_sleep_cmd = "hyprctl_dispatch dpms on";
+ services.hypridle = {
+ enable = true;
+ systemdTarget = "hyprland-session.target";
+ settings = {
+ general = {
+ lock_cmd = "pidof hyprlock || hyprlock";
+ before_sleep_cmd = "loginctl lock-session";
+ ignore_dbus_inhibit = false;
+ after_sleep_cmd = "hyprctl_dispatch dpms on";
+ };
+ listener = [
+ {
+ timeout = 120;
+ on-timeout = "hyprlock";
+ }
+ {
+ timeout = 300;
+ on-timeout = "hyprctl dispatch dpms off";
+ on-resume = "hyprctl dispatch dpms on";
+ }
+ ];
};
- listener = [
- {
- timeout = 120;
- on-timeout = "hyprlock";
- }
- {
- timeout = 300;
- on-timeout = "hyprctl dispatch dpms off";
- on-resume = "hyprctl dispatch dpms on";
- }
- ];
};
};
}
diff --git a/home-modules/desktop/wayland/default.nix b/home-modules/desktop/wayland/default.nix
index 27b1176..97f5fef 100644
--- a/home-modules/desktop/wayland/default.nix
+++ b/home-modules/desktop/wayland/default.nix
@@ -1,12 +1,17 @@
-{ pkgs, ... }:
+{
+ pkgs,
+ lib,
+ hostconfig,
+ ...
+}:
{
imports = [
./waybar.nix
./mako.nix
];
- xdg.portal = {
+ xdg.portal = lib.mkIf hostconfig.addons.desktop.wayland.enable {
enable = true;
- config.common.default = "*";
+
extraPortals = [
pkgs.xdg-desktop-portal-gtk
];
diff --git a/home-modules/desktop/wayland/mako.nix b/home-modules/desktop/wayland/mako.nix
index ddf0a91..99987db 100644
--- a/home-modules/desktop/wayland/mako.nix
+++ b/home-modules/desktop/wayland/mako.nix
@@ -1,16 +1,49 @@
{
+ pkgs,
config,
lib,
...
}:
+let
+ cfg = config.homeprogs.mako;
+in
{
- options.homeprogs.mako.enable = lib.mkEnableOption "Enable Mako notification manager";
- config = lib.mkIf config.homeprogs.mako.enable {
- services.mako = {
- enable = true;
+ options.homeprogs.mako = {
+ enable = lib.mkEnableOption "Enable Mako notification manager";
+ systemdWantedBy = lib.mkOption {
+ description = "SystemD targets where mako should start for.";
+ # TODO: Put a null here, so that we can add a non-persistent default
+ default = [ ];
+ example = [ "hyprland-session.target" ];
+ type = lib.types.listOf lib.types.str;
+ };
+ package = lib.mkOption {
+ description = "mako package to use";
+ default = pkgs.mako;
+ example = pkgs.mako;
+ type = lib.types.package;
};
- xdg.configFile."mako/config".source = ./mako.ini;
-
};
-
+ config = lib.mkIf config.homeprogs.mako.enable ({
+ home.packages = [ pkgs.mako ];
+ xdg.configFile."mako/config" = {
+ onChange = "${pkgs.mako}/bin/makoctl reload || true";
+ source = ./mako.ini;
+ };
+ systemd.user.services.mako = {
+ Install.WantedBy = config.homeprogs.mako.systemdWantedBy;
+ Unit = {
+ Description = "Lightweight Wayland notification daemon";
+ Documentation = "man:mako(1)";
+ After = "graphical-session.target";
+ };
+ Service = {
+ Type = "dbus";
+ BusName = "org.freedesktop.Notifications";
+ ExecCondition = "/bin/sh -c '[ -n \"$WAYLAND_DISPLAY\" ]'";
+ ExecStart = "${cfg.package}/bin/mako";
+ ExecReload = "${cfg.package}/bin/makoctl reload";
+ };
+ };
+ });
}
diff --git a/home-modules/services/vdirsyncer.nix b/home-modules/services/vdirsyncer.nix
index df76bc8..8afe2c8 100644
--- a/home-modules/services/vdirsyncer.nix
+++ b/home-modules/services/vdirsyncer.nix
@@ -10,7 +10,7 @@ in
options.homesv.vdirsyncer = {
enable = lib.mkEnableOption "Enable syncing via vdirsyncer";
user = lib.mkOption { default = config.home.username; };
- server = lib.mkOption { default = "https://webdav.wilkuu.xyz/dav.php"; };
+ server = lib.mkOption { default = "https://mail.wilkuu.xyz/dav/"; };
};
config = lib.mkIf cfg.enable {
sops.secrets.webdav_uname = {
@@ -45,7 +45,7 @@ in
[storage contacts_remote]
type = "carddav"
- auth = "digest"
+ auth = "basic"
url = "${cfg.server}"
username = "${config.sops.placeholder.webdav_uname}"
password = "${config.sops.placeholder.webdav_pass}"
@@ -64,7 +64,7 @@ in
[storage calendar_remote]
type = "caldav"
- auth = "digest"
+ auth = "basic"
url = "${cfg.server}"
username = "${config.sops.placeholder.webdav_uname}"
password = "${config.sops.placeholder.webdav_pass}"
diff --git a/home-modules/theming.nix b/home-modules/theming.nix
index ee6b13b..15b596b 100644
--- a/home-modules/theming.nix
+++ b/home-modules/theming.nix
@@ -36,8 +36,12 @@ in
qt = {
enable = true;
- platformTheme.name = "qtct";
- style.name = "kvantum";
+ kde.settings = {
+
+ };
+ style.package = pkgs.catppuccin-qt5ct;
+
+ # style.name = "kvantum";
};
xdg.configFile."Kvantum/kvantum.kvconfig".source =
diff --git a/hosts/apocalypse/default.nix b/hosts/apocalypse/default.nix
index 09aed91..587daaf 100644
--- a/hosts/apocalypse/default.nix
+++ b/hosts/apocalypse/default.nix
@@ -17,6 +17,7 @@
addons = {
desktop.hyprland.enable = true;
desktop.xfce.enable = true;
+ desktop.cosmic.enable = true;
steam.enable = true;
virtualisation.guest = false;
@@ -27,7 +28,7 @@
gpg.enable = true;
remote_builder = {
- enable = true;
+ enable = false;
allowedKeyFiles = [ ../../secrets/eli.pub ];
openFirewall = true;
};
@@ -78,10 +79,12 @@
services.resolved = {
enable = true;
- dnssec = "false";
- domains = [ "~." ];
- fallbackDns = [ ];
- dnsovertls = "opportunistic";
+ settings.Resolve = {
+ DNSSEC = "false";
+ Domains = [ "~." ];
+ FallbackDns = [ "8.8.8.8" ];
+ DNSOverTLS = "opportunistic";
+ };
};
networking.useDHCP = lib.mkDefault true;
diff --git a/hosts/apocalypse/firewall.nix b/hosts/apocalypse/firewall.nix
index 05feacf..f6220c5 100644
--- a/hosts/apocalypse/firewall.nix
+++ b/hosts/apocalypse/firewall.nix
@@ -42,9 +42,10 @@ let
];
in
{
+ environment.etc.hosts.mode = "0700";
networking.nftables.enable = true;
networking.firewall = {
- enable = true;
+ enable = false;
checkReversePath = false;
allowedTCPPorts = baseTCP;
allowedUDPPorts = baseUDP;
diff --git a/hosts/apocalypse/hardware-configuration.nix b/hosts/apocalypse/hardware-configuration.nix
index 74b1101..d007508 100644
--- a/hosts/apocalypse/hardware-configuration.nix
+++ b/hosts/apocalypse/hardware-configuration.nix
@@ -144,23 +144,24 @@
# Copied from nix wiki to save on battery life.
services.tlp = {
- enable = true;
- settings = {
- CPU_SCALING_GOVERNOR_ON_AC = "performance";
- CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-
- CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
- CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
-
- CPU_MIN_PERF_ON_AC = 0;
- CPU_MAX_PERF_ON_AC = 100;
- CPU_MIN_PERF_ON_BAT = 0;
- CPU_MAX_PERF_ON_BAT = 20;
-
- #Optional helps save long term battery health
- START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge
- STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
-
- };
+ enable = false;
};
+ # settings = {
+ # CPU_SCALING_GOVERNOR_ON_AC = "performance";
+ # CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+ #
+ # CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+ # CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+ #
+ # CPU_MIN_PERF_ON_AC = 0;
+ # CPU_MAX_PERF_ON_AC = 100;
+ # CPU_MIN_PERF_ON_BAT = 0;
+ # CPU_MAX_PERF_ON_BAT = 20;
+ #
+ # #Optional helps save long term battery health
+ # START_CHARGE_THRESH_BAT0 = 40; # 40 and below it starts to charge
+ # STOP_CHARGE_THRESH_BAT0 = 80; # 80 and above it stops charging
+ #
+ # };
+ # };
}
diff --git a/modules/default.nix b/modules/default.nix
index 4b433c8..3c1dc71 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -12,6 +12,7 @@
./vpn.nix
./remote-builder.nix
./nh.nix
+ ./motd.nix
];
nixpkgs.overlays = [
diff --git a/modules/desktop/akonadi.nix b/modules/desktop/akonadi.nix
new file mode 100644
index 0000000..abdb5a2
--- /dev/null
+++ b/modules/desktop/akonadi.nix
@@ -0,0 +1,9 @@
+{ ... }:
+{
+ programs.kde-pim = {
+ enable = true;
+ kmail = true;
+ merkuro = true;
+ kontact = true;
+ };
+}
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 2cfe5bf..de32b42 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -22,6 +22,7 @@ in
./wayland.nix
./wms
./steam.nix
+ ./akonadi.nix
];
options.addons.desktop = with types; {
wmMeta = mkOption {
diff --git a/modules/desktop/wms/cosmic.nix b/modules/desktop/wms/cosmic.nix
new file mode 100644
index 0000000..d2929f1
--- /dev/null
+++ b/modules/desktop/wms/cosmic.nix
@@ -0,0 +1,20 @@
+{ config, lib, ... }:
+let
+ cfg = config.addons.desktop.cosmic;
+in
+{
+ options.addons.desktop.cosmic = {
+ enable = lib.mkEnableOption "Enable Cosmic WM";
+ enableScheduler = lib.mkEnableOption "Enable the special scheduler from system76";
+ };
+
+ config = lib.mkIf cfg.enable (
+ lib.mkMerge [
+ (import ../../../utils/makeWm.nix "Cosmic WM" "wayland")
+ {
+ services.desktopManager.cosmic.enable = true;
+ services.system76-scheduler.enable = cfg.enableScheduler;
+ }
+ ]
+ );
+}
diff --git a/modules/desktop/wms/default.nix b/modules/desktop/wms/default.nix
index 9f7a18d..ea6b61e 100644
--- a/modules/desktop/wms/default.nix
+++ b/modules/desktop/wms/default.nix
@@ -3,5 +3,6 @@
imports = [
./hyprland.nix
./xfce.nix
+ ./cosmic.nix
];
}
diff --git a/modules/desktop/wms/hyprland.nix b/modules/desktop/wms/hyprland.nix
index d339f98..5beda89 100644
--- a/modules/desktop/wms/hyprland.nix
+++ b/modules/desktop/wms/hyprland.nix
@@ -20,13 +20,13 @@ in
programs.hyprland.withUWSM = true;
programs.uwsm = {
enable = true;
- waylandCompositors = {
- hyprland = {
- prettyName = "Hyprland";
- comment = "Hyprland compositor managed by UWSM";
- binPath = "/run/current-system/sw/bin/Hyprland";
- };
- };
+ # waylandCompositors = {
+ # hyprland = {
+ # prettyName = "Hyprland";
+ # comment = "Hyprland compositor managed by UWSM";
+ # # binPath = "/run/current-system/sw/bin/Hyprland";
+ # };
+ # };
};
environment.systemPackages = with pkgs; [
diff --git a/modules/motd.nix b/modules/motd.nix
new file mode 100644
index 0000000..f9f572c
--- /dev/null
+++ b/modules/motd.nix
@@ -0,0 +1,89 @@
+{ pkgs, config, ... }:
+let
+ banner_script = pkgs.writeShellScript "motd_banner.sh" ''
+ echo "This is a nice banner, property of wilkuu (wilkuu.xyz)"
+ echo -e "\n\tTODO: Put a banner here\t\n"
+ echo "Current hostname: ${config.networking.hostName}"
+ '';
+
+ # Code stolen from the nix store so I can finish motd_shell
+ motdConf =
+ pkgs.runCommand "motd.toml"
+ {
+ __structuredAttrs = true;
+ inherit (config.programs.rust-motd) order settings;
+ nativeBuildInputs = [
+ pkgs.remarshal
+ pkgs.jq
+ ];
+ }
+ ''
+ cat "$NIX_ATTRS_JSON_FILE" \
+ | jq '.settings as $settings
+ | .order
+ | map({ key: ., value: $settings."\(.)" })
+ | from_entries' -r \
+ | json2toml /dev/stdin "$out"
+ '';
+
+ motd_shell = pkgs.writeShellScriptBin "motd_shell" ''
+ if [[ -n "$SHOW_MOTD" && -x /run/current-system/sw/bin/rust-motd ]]; then
+ unset SHOW_MOTD
+ ${pkgs.rust-motd}/bin/rust-motd ${motdConf}
+ fi
+ $1
+ '';
+in
+{
+ environment.systemPackages = with pkgs; [
+ rust-motd
+ motd_shell
+ ];
+ programs.rust-motd = {
+ enable = true;
+ order = [
+ "banner"
+ "uptime"
+ "load_avg"
+ "filesystems"
+ "memory"
+ "last_run"
+ "global"
+ ];
+ settings = {
+ banner = {
+ color = "light_magenta";
+ # TODO: Make this nice
+ command = "bash ${banner_script}";
+ };
+ uptime = {
+ prefix = "Uptime: ";
+ };
+ load_avg = {
+ format = ''
+ Load: [1m] [5m] [15m]
+ {one:.02} , {five:.02} , {fifteen:.02}
+ '';
+ };
+ filesystems = {
+ root = "/";
+ store = "/store2";
+ ntfs = "/win_games";
+ };
+ memory = {
+ swap_pos = "beside";
+ };
+ last_run = { };
+ };
+ };
+ security.pam.services.kitty = {
+ showMotd = true;
+ };
+ security.pam.services.kitty-wrapper = {
+ showMotd = true;
+ };
+ security.pam.services.login = {
+ showMotd = true;
+ };
+
+}
diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml
index 18e36d7..fea77a5 100644
--- a/secrets/secrets.yaml
+++ b/secrets/secrets.yaml
@@ -1,7 +1,7 @@
wilkuu:
webdav:
- username: ENC[AES256_GCM,data:NVdz+9U/EvOiHTLL8J9N4A==,iv:jEZCiHUgCPxuwhgBCDwns+QoCKOXX3fjHlQpCDm2Js0=,tag:hPOrHNMQsQ6YKicmucGlag==,type:str]
- password: ENC[AES256_GCM,data:jtf7GGioSTHEaOndQK3SG5tPCpuI4QbhquegcWdQSMIl2lpt6z+lMZnFzA8x0jh3TridOn/J,iv:ZvFDEMY6V4W/ict0V7sLLt/c2oxM5UDCPpgpmkQIT7Q=,tag:AhmZxKGUiCufYVDXp+Mcxw==,type:str]
+ username: ENC[AES256_GCM,data:ejn6BeA=,iv:9tnfRsz+4hyQ3HnlqSjuTz3kXVqhxfLbxtfPTKR3s88=,tag:5s+QcyA+AumpqQxL4pdCOA==,type:str]
+ password: ENC[AES256_GCM,data:1LYRXqp0i86+ycCwNYUOSmb9uh84epVkv6tkUkwBnijvQv4ydsU=,iv:9fRm/s/UlrI6RpPfR9vwIsqJ2U+nF8qyWx4RgyrK6po=,tag:8FdWgIU4PztJTWXqjaMnnA==,type:str]
remote:
ssh:
pub: ENC[AES256_GCM,data:U085pFFBMqd38eRXZKAYo8pjSiK9KUB1a/oXFEn5TKldH5vx3IBT+/c7VxG8O/W08sZlnHZxnjOKco3Klnmzpi+R+pAzTC7qe8hjk69JGbBKRKV0jp8gmNKM2o3cme8dsGuq,iv:gq271TCYh8akbMJTACOrwLuBVb6vUWkMQwQP088XBDI=,tag:9Vya17dym0VJxKRLRuBGAw==,type:str]
@@ -26,7 +26,7 @@ sops:
c1NBbDBUZVRQQ2p2aWp5dXB1eHAxcTQKcON/bYv2tyHr1q7jzgcWHlc8Ikp2/734
IttERY1sS+iwKVWkodqPPQ9s+/0te0BQ5jEc3vJf0Rcn0lDtfzzwsQ==
-----END AGE ENCRYPTED FILE-----
- lastmodified: "2025-11-05T20:11:43Z"
- mac: ENC[AES256_GCM,data:Csq9wzz8XcuwL7z/Pra0iOcDurxC5DyAILBpKyZFRQ6o6HJuRQc/7Xk1PPSwrjzCJJjyJOYNtM0IzjxWoXn+8QE9dzytX+xMTiKXL+gzajeZuNn05ibMZi4/LmRBbW0eQAHB3YI2RZk7zj35aCNeKjETbUERHzgct1zFyuGfV/k=,iv:HvBVBEK/EokkDMgdru20JowiAnM4UHd21qJVhTIYQOw=,tag:MWy8lHOmpUywTFMJmLWP0A==,type:str]
+ lastmodified: "2026-02-05T17:54:41Z"
+ mac: ENC[AES256_GCM,data:LZh6P8DJoow3QWGXJj2qSC8hsKH/LEQ/YDezKCfWSp4FF13TltacsQt7hz6HVBcILEIIkTIcufQsbyWC/s9tiaAUrXNTkScy1P8AZOnum4SRC8fcODM8/XmkFnFiHWda2NnqpfRoP6/zCrMmc//7YH7vxQki3xe3nJj/TIG6kGs=,iv:T3j3ovFb7fhBLmORNh+R3QZvZZeUfFvd7oPplpDSxrY=,tag:LfGXx9rsMHF5eXqFFAh+vw==,type:str]
unencrypted_suffix: _unencrypted
version: 3.11.0