This commit is contained in:
ari committed 2024-12-25 12:52:05 -05:00
1 parent d055a2972d
commit b18b4a4453
12 files changed
+147 -97

No files matched your search

Generated
+58 -58
View File
@@ -20,11 +20,11 @@
]
},
"locked": {
"lastModified": 1731959031,
"narHash": "sha256-TGcvIjftziC1CjuiHCzrYDwmOoSFYIhdiKmLetzB5L0=",
"lastModified": 1734400729,
"narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "4468981c1c50999f315baa1508f0e53c4ee70c52",
"rev": "a132fa41be7ebe797ad758e84d9df068151a723b",
"type": "github"
},
"original": {
@@ -94,11 +94,11 @@
]
},
"locked": {
"lastModified": 1733572789,
"narHash": "sha256-zjO6m5BqxXIyjrnUziAzk4+T4VleqjstNudSqWcpsHI=",
"lastModified": 1734366194,
"narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c7ffc9727d115e433fd884a62dc164b587ff651d",
"rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
"type": "github"
},
"original": {
@@ -124,11 +124,11 @@
]
},
"locked": {
"lastModified": 1728669738,
"narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
"lastModified": 1734364709,
"narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
"rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a",
"type": "github"
},
"original": {
@@ -153,11 +153,11 @@
]
},
"locked": {
"lastModified": 1733248371,
"narHash": "sha256-FFLJzFTyNhS7tBEEECx0B8Ye/bpmxhFVEKlECgMLc6c=",
"lastModified": 1733684019,
"narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=",
"owner": "hyprwm",
"repo": "hyprgraphics",
"rev": "cc95e5babc6065bc3ab4cd195429a9900836ef13",
"rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d",
"type": "github"
},
"original": {
@@ -186,11 +186,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1733683959,
"narHash": "sha256-hUgv2XxOZu0XFVtwmovS3kplxAt+Jv+CXSxNnSiAtFo=",
"lastModified": 1734573361,
"narHash": "sha256-rlHkYVDjKXABfAxdcsHnbdZa/0EWE3g/XnR/Ln96rPA=",
"ref": "refs/heads/main",
"rev": "0a27af8cd190315c1f13363ebd11e83d30455d48",
"revCount": 5525,
"rev": "5b714f05f87831e3e930af04649f853d5efb9902",
"revCount": 5570,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -242,11 +242,11 @@
]
},
"locked": {
"lastModified": 1733472316,
"narHash": "sha256-PvXiFLIExJEJj+goLbIuXLTN5CSDSAUsAfiYSdbbWg0=",
"lastModified": 1733940128,
"narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"rev": "969427419276c7ee170301ef1ebe0f68eb6eb2e2",
"rev": "3833097e50473a152dd614d4b468886840b4ea78",
"type": "github"
},
"original": {
@@ -271,11 +271,11 @@
]
},
"locked": {
"lastModified": 1728168612,
"narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
"lastModified": 1734364628,
"narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
"rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5",
"type": "github"
},
"original": {
@@ -296,11 +296,11 @@
]
},
"locked": {
"lastModified": 1732288281,
"narHash": "sha256-XTU9B53IjGeJiJ7LstOhuxcRjCOFkQFl01H78sT9Lg4=",
"lastModified": 1734384247,
"narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "b26f33cc1c8a7fd5076e19e2cce3f062dca6351c",
"rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322",
"type": "github"
},
"original": {
@@ -321,11 +321,11 @@
]
},
"locked": {
"lastModified": 1726874836,
"narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=",
"lastModified": 1734384417,
"narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=",
"owner": "hyprwm",
"repo": "hyprwayland-scanner",
"rev": "500c81a9e1a76760371049a8d99e008ea77aa59e",
"rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88",
"type": "github"
},
"original": {
@@ -356,11 +356,11 @@
},
"nix-flatpak": {
"locked": {
"lastModified": 1733345341,
"narHash": "sha256-8S58zrdpzGhax6tmn1i+R3AA0N9DJMu5FQI8JkA0NNU=",
"lastModified": 1734128415,
"narHash": "sha256-HLwdVNxpuTsLlM3tCkpbQU6yCehdgf3kOS1G2SDlkzY=",
"owner": "gmodena",
"repo": "nix-flatpak",
"rev": "ebb0be49fc381112ff37726c6dd6df4df2ef5a1b",
"rev": "8bdc2540da516006d07b04019eb57ae0781a04b3",
"type": "github"
},
"original": {
@@ -380,11 +380,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1733621779,
"narHash": "sha256-oeBPiHmg8T/Qsf4qMkUqOrn6/xkJwREGo1jA+4xDssk=",
"lastModified": 1734620407,
"narHash": "sha256-JarUp0GVny6BwGZaUfIXsSQQcz1w7SGMxgCsJZBdv7U=",
"owner": "lilyinstarlight",
"repo": "nixos-cosmic",
"rev": "b9ec66ed4e1430061ca044e938bb10f3ab629ba3",
"rev": "f6036448ff647e02dcd83f673036ccacbd2922b7",
"type": "github"
},
"original": {
@@ -395,11 +395,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1733481457,
"narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=",
"lastModified": 1734352517,
"narHash": "sha256-mfv+J/vO4nqmIOlq8Y1rRW8hVsGH3M+I2ESMjhuebDs=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "e563803af3526852b6b1d77107a81908c66a9fcf",
"rev": "b12e314726a4226298fe82776b4baeaa7bcf3dcd",
"type": "github"
},
"original": {
@@ -411,11 +411,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1733412085,
"narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
"lastModified": 1734323986,
"narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
"rev": "394571358ce82dff7411395829aa6a3aad45b907",
"type": "github"
},
"original": {
@@ -443,11 +443,11 @@
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1733412085,
"narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
"lastModified": 1734323986,
"narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
"rev": "394571358ce82dff7411395829aa6a3aad45b907",
"type": "github"
},
"original": {
@@ -468,11 +468,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1733318908,
"narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
"lastModified": 1734379367,
"narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
"rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99",
"type": "github"
},
"original": {
@@ -503,11 +503,11 @@
]
},
"locked": {
"lastModified": 1733538766,
"narHash": "sha256-FEDfBpM82XGdHDbLDJC4lV+QXSVN1rERt1MqtBGJZds=",
"lastModified": 1734489114,
"narHash": "sha256-dKBBZr2pw7KDI/7GeiN5qPccqqtvnK2jqAMcMo4rVvU=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "66526479b295ad238843a8a7367d2da7ec102757",
"rev": "b2e385f8e5c1d7c0d9ce738d650955c2e94555ae",
"type": "github"
},
"original": {
@@ -533,11 +533,11 @@
},
"unstable": {
"locked": {
"lastModified": 1733682815,
"narHash": "sha256-8DFHnrHprF8u95VOFgMAgJe2OBD70pd1g0NFtIEElAY=",
"lastModified": 1734622375,
"narHash": "sha256-uZJI4MGeZgRZg97ahCjio72a2g36y88L4SYG5AHvnMg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "73b9f2d20bea97d5bd6c8158f3a388ef40ac97c5",
"rev": "7d907cf58a3a5f9fa046329f6eac4ad708aed128",
"type": "github"
},
"original": {
@@ -554,11 +554,11 @@
]
},
"locked": {
"lastModified": 1733484277,
"narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=",
"lastModified": 1734622158,
"narHash": "sha256-h/fdzqlCqSa2ZCIqtDc9kshCJm6kQIoKuO0MSSmAX4A=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a",
"rev": "832920a60833533eaabcc93ab729801bf586fa0c",
"type": "github"
},
"original": {
@@ -596,11 +596,11 @@
]
},
"locked": {
"lastModified": 1733157064,
"narHash": "sha256-NetqJHAN4bbZDQADvpep+wXk2AbMZ2bN6tINz8Kpz6M=",
"lastModified": 1734422917,
"narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "fd85ef39369f95eed67fdf3f025e86916edeea2f",
"rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87",
"type": "github"
},
"original": {
-2
View File
@@ -69,7 +69,6 @@
system = "x86_64-linux";
user = user;
localNixCaches = localNixCaches;
enableNetworkDrives = true;
homeManagerVersion = homeManagerVersion;
os = {
enable = true;
@@ -167,7 +166,6 @@
localNixCaches = localNixCaches;
localDockerRegistries = localDockerRegistries;
homeManagerVersion = homeManagerVersion;
enableNetworkDrives = true;
desktop = {
enable = true;
user = user;
+7
View File
@@ -32,6 +32,13 @@ in
crypto.enable = true;
};
};
networkDrives = {
enable = true;
options = [
"x-systemd.automount"
"noauto"
];
};
};
services.displayManager.defaultSession = "plasmax11";
# Firmware updater
+1
View File
@@ -18,6 +18,7 @@
jellyfin.enable = false;
};
};
networkDrives.enable = true;
};
users.users.ari.extraGroups = [ "input" ];
# firmware updater
+4
View File
@@ -4,6 +4,10 @@
skyg.user.enable = true;
skyg.nixos.common.ssh-server.enable = true;
skyg.server.admin.enable = true;
skyg.networkDrives.options = [
"x-systemd.automount"
"auto"
];
# firmware updater
services.fwupd.enable = true;
+8 -5
View File
@@ -15,8 +15,11 @@ in
skyg.nixos.common.containers.openMetricsPort = true;
skyg.server.admin.enable = true;
skyg.server.exporters.enable = true;
skyg.networkDrives = {
enable = true;
};
# Nix Stores
# # Nix Stores
services.nix-serve = {
enable = true;
secretKeyFile = "/var/keys/cache-priv-key.pem";
@@ -25,16 +28,16 @@ in
# firmware updater
services.fwupd.enable = true;
# Bootloader.
# # Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Data
# # Data
fileSystems."/mnt/Data" = {
device = "/dev/disk/by-uuid/ee4a60a8-b0d1-4f5c-a554-1d1d84c89e34";
fsType = "ext4";
options = [ "nofail" ];
options = [ "defaults" ];
};
# Services
# # Services
skyg.nixos.server.services.audiobookshelf = {
enable = true;
host = "0.0.0.0";
+3
View File
@@ -6,6 +6,9 @@
skyg.nixos.common.ssh-server.enable = true;
skyg.nixos.common.containers.openMetricsPort = true;
skyg.server.exporters.enable = true;
skyg.networkDrives = {
enable = true;
};
# firmware updater
services.fwupd.enable = true;
+5 -8
View File
@@ -33,17 +33,19 @@
};
zellij = {
enable = true;
enableZshIntegration = true;
enableBashIntegration = true;
settings = {
theme = "nord";
session_serialization = false;
};
};
tmux = {
enable = true;
clock24 = true;
mouse = true;
plugins = with pkgs.tmuxPlugins; [ nord cpu battery sidebar ];
plugins = with pkgs.tmuxPlugins; [ nord cpu sidebar ];
extraConfig = ''
set -g status-right '#{cpu_bg_color} CPU: #{cpu_icon} #{cpu_percentage} | %a %h-%d %H:%M '
'';
};
alacritty = {
enable = true;
@@ -62,11 +64,6 @@
};
terminal.shell = {
program = "/home/${user.name}/.nix-profile/bin/zsh";
args = [
"-l"
"-c"
"zellij"
];
};
};
};
-17
View File
@@ -22,27 +22,10 @@
skyg.core.hostName = hostName;
skyg.home-manager.version = homeManagerVersion;
skyg.core.substituters = localNixCaches;
skyg.networkDrives.enable = enableNetworkDrives;
skyg.nixos.common.containers = (if os.enable then os.containers else { });
skyg.nixos.server.k8s = {
masterIP = "10.0.10.6";
masterHostName = "minipc1.lab.internal";
};
system.stateVersion = systemStateVersion;
nixpkgs.config.allowUnfree = true;
nix = {
optimise.automatic = true;
settings.experimental-features = [ "nix-command" "flakes" ];
};
# System Packages
environment.systemPackages = with pkgs; [
# nix utils
nix-index
nil
cachix
nixpkgs-fmt
nvd
# shell tools
wget
];
}
+10 -7
View File
@@ -2,40 +2,43 @@
, config
, ...
}:
with lib;
let
cfg = config.skyg.networkDrives;
in
{
options = {
skyg.networkDrives = {
enable = mkEnableOption
enable = lib.mkEnableOption
"Network Drives";
options = lib.mkOption {
type = lib.types.listOf lib.types.str;
default = [ "defaults" ];
};
};
};
config = mkIf cfg.enable {
config = lib.mkIf cfg.enable {
fileSystems."/torrents" = {
device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents";
fsType = "nfs";
options = [ "x-systemd.automount" "noauto" ];
options = cfg.options;
};
fileSystems."/mnt/EightTerra/k3s-cluster" = {
device = "tnas1.lab.internal:/mnt/EightTerra/k3s-cluster";
fsType = "nfs";
options = [ "x-systemd.automount" "noauto" ];
options = cfg.options;
};
fileSystems."/mnt/EightTerra/NVR" = {
device = "tnas1.lab.internal:/mnt/EightTerra/NVR";
fsType = "nfs";
options = [ "x-systemd.automount" "noauto" ];
options = cfg.options;
};
fileSystems."/mnt/terra1/Data/apps" = {
device = "terra1.lab.internal:/mnt/Data/apps";
fsType = "nfs";
options = [ "x-systemd.automount" "noauto" ];
options = cfg.options;
};
};
}
+13
View File
@@ -4,6 +4,11 @@
services.hydra.useSubstitutes = true;
programs.dconf.enable = true;
programs.nix-ld.enable = true;
nixpkgs.config.allowUnfree = true;
nix = {
optimise.automatic = true;
settings.experimental-features = [ "nix-command" "flakes" ];
};
environment.systemPackages = with pkgs; [
# nix utils
appimage-run
@@ -26,6 +31,14 @@
# printer
system-config-printer
# nix utils
nix-index
nil
cachix
nixpkgs-fmt
nvd
# shell tools
wget
];
services.xserver.excludePackages = with pkgs; [
xterm
+38
View File
@@ -0,0 +1,38 @@
{ config, lib, ... }:
let cfg = config.skyg.server.timers;
in {
options = {
skyg.server.timers = lib.mkOption {
type = lib.types.attrsOf (lib.types.submodule {
script = lib.mkOption {
type = lib.types.str;
};
timerConfig = lib.mkOption {
type = lib.types.submodule;
};
});
default = { };
};
};
config = lib.mkIf cfg.enable {
systemd.timers."backup-jellyfin" = {
wantedBy = [ "timers.target" ];
timerConfig = {
OnCalendar = "daily";
Persistent = true;
Unit = "backup-jellyfin.service";
};
};
systemd.services."backup-jellyfin" = {
script = ''
set -eu
${pkgs.rsync}/bin/rsync -avpzP --delete /opt/jellyfin /mnt/terra1/Data/apps/
'';
serviceConfig = {
Type = "oneshot";
User = "root";
};
};
};
}