diff --git a/.gitignore b/.gitignore index 126bc38..763f675 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ devenv.local.nix # tmp tmp +result.diff # direnv .direnv diff --git a/bin/extra/build-remote-nixos b/bin/extra/build-remote-nixos index a397b87..630a950 100755 --- a/bin/extra/build-remote-nixos +++ b/bin/extra/build-remote-nixos @@ -1,11 +1,17 @@ #!/bin/sh +# Bootstrap +set -e +ROOT_FOLDER=$(realpath $0 | xargs dirname) +. $ROOT_FOLDER/common.sh +# Bootstrap + export NIX_SSHOPTS="-o RequestTTY=force" target=${1} target_host=root@$target.lab.internal profile=hl-$target -valid_profiles=$(nix flake show --json | jq -r -c '.nixosConfigurations | keys[]' | grep "hl") +valid_profiles=$(nix flake show --json 2> /dev/null | jq -r -c '.nixosConfigurations | keys[]' | grep "hl") function print_valid_targets { echo "valid targets:" @@ -29,28 +35,16 @@ else fi function run { - cmd=${1} - echo "$cmd on $target_host with $profile through $build_host" - nixos-rebuild \ - --target-host $target_host \ - --use-remote-sudo \ - $cmd \ - --flake \ - .#$profile + remote_cmd=${1} + echo -e "$BOLD$remote_cmd$NC on $YELLOW$target_host with $profile through $build_host$NC" + runcmd="nixos-rebuild --target-host $target_host --use-remote-sudo $remote_cmd --flake .#$profile" + echo -e "$BLUE$runcmd$NC" + $runcmd } -valid_cmds=( build switch test dry-activate ) - cmd=${2} case $cmd in - "test" | "dry-activate" | "run" | "switch") run $cmd;; - "build") - output=$(run $cmd) - echo $output - echo "_" - echo $output | grep "nixos" - echo "_" - ;; + "test" | "dry-activate" | "run" | "switch" | "build") run $cmd;; *) echo "invalid command" exit 1 diff --git a/bin/extra/common.sh b/bin/extra/common.sh new file mode 100644 index 0000000..811a9db --- /dev/null +++ b/bin/extra/common.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +## Colors +YELLOW='\033[0;33m' +BLUE='\033[0;34m' +NC='\033[0m' +BOLD='\033[1m' +BLUE_BOLD='\033[1;34m' +YELLOW_BOLD='\033[1;33m' \ No newline at end of file diff --git a/bin/skyg b/bin/skyg index 6cbf9f9..e90034c 100755 --- a/bin/skyg +++ b/bin/skyg @@ -3,16 +3,9 @@ set -e # Bootstrap -## Folder handlings set -e ROOT_FOLDER=$(realpath $0 | xargs dirname | xargs dirname) -## Colors -YELLOW='\033[0;33m' -BLUE='\033[0;34m' -NC='\033[0m' -BOLD='\033[1m' -BLUE_BOLD='\033[1;34m' -YELLOW_BOLD='\033[1;33m' +. $ROOT_FOLDER/bin/extra/common.sh # Bootstrap MENAME=$(basename $0) @@ -67,8 +60,14 @@ function run-rollback() { function run-update() { : Updates a single flake and runs update : Usage: skyg update {name-of-input} - nix flake lock --update-input ${1} - run-update + input_name=${1} + if [ ! -z $input_name ]; then + cmd="nix flake lock --update-input $input_name" + else + cmd="nix flake update" + fi + echo $cmd + $cmd } function run-diff() { diff --git a/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf b/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf index 3cabd41..868bdb5 100644 --- a/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf +++ b/configs/hyprland/mine/hypr/hyprland.d/special-window-rules.conf @@ -2,6 +2,7 @@ windowrulev2 = float,class:(nwg-.*) windowrulev2 = float,class:(org\.kde\..*) windowrulev2 = float,class:(.*blueman.*) +windowrulev2 = float,class:(firefox) # Vscode windowrulev2 = fakefullscreen,class:(Code) diff --git a/configs/libinput-gestures.conf b/configs/libinput-gestures.conf new file mode 100644 index 0000000..28b67a0 --- /dev/null +++ b/configs/libinput-gestures.conf @@ -0,0 +1,4 @@ +gesture swipe up xdotool key Super+Tab +gesture swipe left xdotool key Super+Right +gesture swipe down xdotool key Super+Escape +gesture swipe right xdotool key Super+Left diff --git a/flake.lock b/flake.lock index f530694..7a827f4 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1726665257, - "narHash": "sha256-rEzEZtd3iyVo5RJ1OGujOlnywNf3gsrOnjAn1NLciD4=", + "lastModified": 1729527199, + "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "752d0fbd141fabb5a1e7f865199b80e6e76f8d8e", + "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", "type": "github" }, "original": { @@ -34,6 +34,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1717312683, @@ -49,25 +65,25 @@ "type": "github" } }, - "flake-parts": { + "gitignore": { "inputs": { - "nixpkgs-lib": [ - "nixos-cosmic", - "nix-update", + "nixpkgs": [ + "hyprland", + "pre-commit-hooks", "nixpkgs" ] }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", "type": "github" }, "original": { "owner": "hercules-ci", - "repo": "flake-parts", + "repo": "gitignore.nix", "type": "github" } }, @@ -78,11 +94,11 @@ ] }, "locked": { - "lastModified": 1725703823, - "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -108,11 +124,11 @@ ] }, "locked": { - "lastModified": 1722623071, - "narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", + "lastModified": 1728669738, + "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "912d56025f03d41b1ad29510c423757b4379eb1c", + "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", "type": "github" }, "original": { @@ -125,23 +141,25 @@ "inputs": { "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", + "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "unstable" ], + "pre-commit-hooks": "pre-commit-hooks", "systems": [ "systems" ], "xdph": "xdph" }, "locked": { - "lastModified": 1727257173, - "narHash": "sha256-J4VU76LLWEILNTZ8osUaUxSny+cTUH/wCKcV+Lqr3Bw=", + "lastModified": 1729989895, + "narHash": "sha256-Bgrkba6KQHw1SOl1GC0Gyjsc58vB2UxdVURDLImE4KY=", "ref": "refs/heads/main", - "rev": "8b86ee8bf08eaf8b57d0a7f12af876216323cc3d", - "revCount": 5257, + "rev": "a3d3b4fd64a51a8c1663b450bd2a408f1f0fa9b3", + "revCount": 5380, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -156,21 +174,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "xdph", "nixpkgs" ], "systems": [ "hyprland", - "xdph", "systems" ] }, "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", "type": "github" }, "original": { @@ -195,11 +211,11 @@ ] }, "locked": { - "lastModified": 1725997860, - "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", + "lastModified": 1728168612, + "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", + "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "type": "github" }, "original": { @@ -220,11 +236,11 @@ ] }, "locked": { - "lastModified": 1727219120, - "narHash": "sha256-wmT+JpnDk6EjgASU2VGfS0nnu6oKA4Cw25o5fzpDD/Q=", + "lastModified": 1728941256, + "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "db956287d3aa194dda91d05c8eb286de2a569edf", + "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", "type": "github" }, "original": { @@ -245,11 +261,11 @@ ] }, "locked": { - "lastModified": 1726840673, - "narHash": "sha256-HIPEXyRRVZoqD6U+lFS1B0tsIU7p83FaB9m7KT/x6mQ=", + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "b68dab23fc922eae99306988133ee80a40b39ca5", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", "type": "github" }, "original": { @@ -265,11 +281,11 @@ ] }, "locked": { - "lastModified": 1726188813, - "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", + "lastModified": 1729982130, + "narHash": "sha256-HmLLQbX07rYD0RXPxbf3kJtUo66XvEIX9Y+N5QHQ9aY=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", + "rev": "2eb472230a5400c81d9008014888b4bff23bcf44", "type": "github" }, "original": { @@ -278,45 +294,21 @@ "type": "github" } }, - "nix-update": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": [ - "nixos-cosmic", - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix" - }, - "locked": { - "lastModified": 1726334963, - "narHash": "sha256-L8ICz9iELkvQl/ufdSWy9lRm8DLNpKDFxoeHQfPu4E8=", - "owner": "Mic92", - "repo": "nix-update", - "rev": "84d7535d076c5e06fba272738448c80698eb3d40", - "type": "github" - }, - "original": { - "owner": "Mic92", - "repo": "nix-update", - "type": "github" - } - }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat", - "nix-update": "nix-update", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1726453173, - "narHash": "sha256-GnFxniWjQYqg9cAqHj7E+EEip1nZdvcUOH/StIod++c=", + "lastModified": 1730079405, + "narHash": "sha256-kvq8Iq1P7Ut/cu0VWn8h+gnHTPWVdPhnaAiIKHY4vJs=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "9907e5b7f5cbe92c97fd922b562dba691d3d8585", + "rev": "965b4d7b838dd4f37293c3b8160c64c2edcfb226", "type": "github" }, "original": { @@ -327,11 +319,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726489388, - "narHash": "sha256-JBHtN+n1HzKawpnOQAz6jdgvrtYV9c/kyzgoIdguQGo=", + "lastModified": 1729742320, + "narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "dc8b0296f68f72f3fe77469c549a6f098555c2e9", + "rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda", "type": "github" }, "original": { @@ -343,11 +335,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726320982, - "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", "type": "github" }, "original": { @@ -359,11 +351,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1726320982, - "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", "type": "github" }, "original": { @@ -373,6 +365,46 @@ "type": "github" } }, + "nixpkgs-stable_2": { + "locked": { + "lastModified": 1729973466, + "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1729104314, + "narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", @@ -394,11 +426,11 @@ ] }, "locked": { - "lastModified": 1726382494, - "narHash": "sha256-T7W+ohiXe1IY0yf/PpS4wQItZ0SyRO+/v8kqNpMXlI4=", + "lastModified": 1729996302, + "narHash": "sha256-QEU1NQq1+7s1na69Chig9K0iDDTKN0O4Zreo9A9rccA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ff13821613ffe5dbfeb4fe353b1f4bf291d831db", + "rev": "a1b337569f334ff0a01b57627f17b201d746d24c", "type": "github" }, "original": { @@ -422,35 +454,13 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixos-cosmic", - "nix-update", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719887753, - "narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "unstable": { "locked": { - "lastModified": 1727275485, - "narHash": "sha256-uoKC6huWVsGrv8YbepyeXgj5L80TEesa7s8S9+mDT4I=", + "lastModified": 1730048550, + "narHash": "sha256-VMt8RaCz0nkMcpAjthTjZZE14hYbQy3Y5FFMKus0XYo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3510b853efd22fd14062785300e171cd0867b7c8", + "rev": "0b2e723efac0720376031252fc500065121945d9", "type": "github" }, "original": { @@ -467,11 +477,11 @@ ] }, "locked": { - "lastModified": 1726440980, - "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", + "lastModified": 1730016908, + "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", + "rev": "e83414058edd339148dc142a8437edb9450574c8", "type": "github" }, "original": { @@ -483,7 +493,10 @@ }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols", + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "hyprland", "hyprlang" @@ -506,11 +519,11 @@ ] }, "locked": { - "lastModified": 1727109343, - "narHash": "sha256-1PFckA8Im7wMSl26okwOKqBZeCFLD3LvZZFaxswDhbY=", + "lastModified": 1728166987, + "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "4adb6c4c41ee5014bfe608123bfeddb26e5f5cea", + "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", "type": "github" }, "original": { diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 3e70d26..c0f2945 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -10,24 +10,34 @@ in { imports = [ ./fwbook.hardware-configuration.nix ]; # Skyg - skyg = { - user.enabled = true; + environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; + skyg = { + user.enable = true; server.admin.enable = true; + core.qemu.enable = true; nixos = { - common.hardware.sound.enable = true; + common.hardware = { + sound.enable = true; + laptop-power-mgr.enable = true; + }; desktop = { - enabled = true; - kde.enabled = true; - cosmic.enabled = false; + enable = true; + kde.enable = true; + cosmic.enable = true; hyprland = { - enabled = true; + enable = false; useNWG = false; }; - crypto.enabled = true; + crypto.enable = true; }; }; + server.arrs = { + enable = false; + rootDataDir = "/mnt/terra1/Data/apps/arrs"; + prowlarr.enable = true; + }; }; - services.displayManager.defaultSession = "hyprland"; + services.displayManager.defaultSession = "plasmax11"; # Firmware updater services.fwupd.enable = true; services.fwupd.package = (import @@ -46,13 +56,12 @@ in hardware.bluetooth.settings.General = { ControllerMode = "bredr"; }; hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; - # services.blueman.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.tmp.useTmpfs = true; # Packages - environment.systemPackages = with pkgs; [ + environment.systemPackages = (with pkgs; [ # Amd GPU Support rocmPackages.rocm-smi rocmPackages.rpp @@ -70,20 +79,17 @@ in dvc-with-remotes google-cloud-sdk awscli - unstable.dbeaver-bin + google-chrome # Photo Editing krita gimp-with-plugins - ]; - # programs.chromium = { - # enable = true; - # enablePlasmaBrowserIntegration = true; - # extensions = [ - # "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin - # "nngceckbapebfimnlniiiahkandclblb" # bitwarden - # ]; - # }; - + # Util + libusb1 + # Web + chromium + ]) ++ (with unstable; [ + dbeaver-bin + ]); # # Opengl hardware.opengl = { driSupport = true; @@ -96,6 +102,16 @@ in enable = true; extest.enable = true; }; + # Chrome + programs.chromium = { + enable = true; + enablePlasmaBrowserIntegration = true; + extensions = [ + "nngceckbapebfimnlniiiahkandclblb" # bitwarden + "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere + "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin + ]; + }; # Ollama services.ollama = { enable = true; @@ -116,67 +132,27 @@ in source ${zshFunctions} ''; environment.localBinInPath = true; - # Advance Power Management - powerManagement.powertop.enable = true; - powerManagement.enable = true; - services.thermald.enable = true; - services.power-profiles-daemon.enable = false; - services.tlp = { - enable = true; - settings = { - TLP_DEFAULT_MODE = "BAT"; - TLP_PERSISTENT_DEFAULT = 1; - - CPU_BOOST_ON_BAT = 0; - RUNTIME_PM_ON_BAT = "auto"; - PLATFORM_PROFILE_ON_AC = "balanced"; - PLATFORM_PROFILE_ON_BAT = "low-power"; - - 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; - - START_CHARGE_THRESH_BAT0 = 40; # and bellow it starts to charge - STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging - }; - }; - services.auto-cpufreq.enable = true; - services.auto-cpufreq.settings = { - battery = { - governor = "powersave"; - turbo = "never"; - }; - charger = { - governor = "performance"; - turbo = "auto"; - }; - }; - # Logind - services.logind = { - lidSwitchExternalPower = "suspend-then-hibernate"; - lidSwitch = "suspend-then-hibernate"; - powerKey = "lock"; - extraConfig = '' - LidSwitchIgnoreInhibited=yes - HandlePowerKey=suspend-then-hibernate - IdleAction=suspend-then-hibernate - IdleActionSec=2m - ''; - }; - systemd.sleep.extraConfig = "HibernateDelaySec=30m"; # Family Storage fileSystems."/mnt/EightTerra/FamilyStorage" = { device = "tnas1.lab.internal:/mnt/EightTerra/FamilyStorage"; fsType = "nfs"; options = [ "x-systemd.automount" "noauto" ]; }; + # Remote Builder + nix.buildMachines = [{ + hostName = "root@bigbox1.lab.internal"; + system = "x86_64-linux"; + protocol = "ssh-ng"; + maxJobs = 1; + speedFactor = 2; + supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ]; + mandatoryFeatures = [ ]; + }]; + nix.distributedBuilds = true; + # optional, useful when the builder has a faster internet connection than yours + nix.extraOptions = '' + builders-use-substitutes = true + ''; # Firewall networking.firewall.allowedUDPPorts = openPorts; networking.firewall.allowedTCPPorts = openPorts; diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index eb43c11..5dfb0fd 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -1,9 +1,9 @@ -{ user }: -{ pkgs, lib, config, ... }: +{}: +{ pkgs, config, ... }: { imports = [ ./hl-bigbox1.hardware-configuration.nix ]; - skyg.user.enabled = true; - skyg.nixos.common.ssh-server.enabled = true; + skyg.user.enable = true; + skyg.nixos.common.ssh-server.enable = true; skyg.nixos.server.services.ai.enable = true; skyg.nixos.server.services.jellyfin.enable = true; skyg.nixos.desktop.kde.enabled = true; diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index 4896790..77dd625 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -1,8 +1,8 @@ { user }: { pkgs, lib, config, ... }: { imports = [ ./hl-minipc1.hardware-configuration.nix ]; - skyg.user.enabled = true; - skyg.nixos.common.ssh-server.enabled = true; + skyg.user.enable = true; + skyg.nixos.common.ssh-server.enable = true; skyg.server.admin.enable = true; # firmware updater diff --git a/hosts/hl-minipc1.nix b/hosts/hl-minipc1.nix index 5da546b..f6c75b7 100644 --- a/hosts/hl-minipc1.nix +++ b/hosts/hl-minipc1.nix @@ -1,5 +1,5 @@ { user }: -{ pkgs, lib, config, ... }: +{ ... }: let openPorts = [ 5000 @@ -10,8 +10,8 @@ let in { imports = [ ./hl-minipc1.hardware-configuration.nix ]; - skyg.user.enabled = true; - skyg.nixos.common.ssh-server.enabled = true; + skyg.user.enable = true; + skyg.nixos.common.ssh-server.enable = true; skyg.server.admin.enable = true; # Nix Stores @@ -52,5 +52,11 @@ in # Firewall networking.firewall.allowedUDPPorts = openPorts; networking.firewall.allowedTCPPorts = openPorts; + # K8s + services.kubernetes.kubelet.hostname = "minipc1.lab.internal"; + skyg.nixos.server.k8s = { + enable = true; + isMaster = false; + }; } diff --git a/hosts/hl-minipc2.nix b/hosts/hl-minipc2.nix index 26926c1..6becfb3 100644 --- a/hosts/hl-minipc2.nix +++ b/hosts/hl-minipc2.nix @@ -1,14 +1,14 @@ { user }: -{ pkgs, lib, config, ... }: { +{ ... }: { imports = [ ./hl-minipc2.hardware-configuration.nix ]; - skyg.user.enabled = true; - skyg.nixos.common.ssh-server.enabled = true; + skyg.user.enable = true; + skyg.nixos.common.ssh-server.enable = true; # firmware updater services.fwupd.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - # Disable firewall + # Disable firewall networking.firewall.enable = false; # Special udev rule for google's coral tpu skyg.nixos.server.udevrules.coraltpu.enable = true; @@ -32,5 +32,11 @@ }; }; }; + # K8s + services.kubernetes.kubelet.hostname = "minipc2.lab.internal"; + skyg.nixos.server.k8s = { + enable = true; + isMaster = false; + }; } diff --git a/hosts/hl-terra1.nix b/hosts/hl-terra1.nix index 94ffb04..3faa0c8 100644 --- a/hosts/hl-terra1.nix +++ b/hosts/hl-terra1.nix @@ -15,8 +15,8 @@ let in { imports = [ ./hl-terra1.hardware-configuration.nix ]; - skyg.user.enabled = true; - skyg.nixos.common.ssh-server.enabled = true; + skyg.user.enable = true; + skyg.nixos.common.ssh-server.enable = true; skyg.server.admin.enable = true; # firmware updater services.fwupd.enable = true; @@ -40,5 +40,11 @@ in /mnt/Data/apps 10.0.0.0/16(rw,wdelay,insecure,no_root_squash,no_subtree_check,sec=sys,rw,insecure,no_root_squash,no_all_squash) ''; }; + # K8s + services.kubernetes.kubelet.hostname = "terra1.lab.internal"; + skyg.nixos.server.k8s = { + enable = true; + isMaster = true; + }; } diff --git a/hosts/scripts/fwbook/functions.sh b/hosts/scripts/fwbook/functions.sh index f75acaa..112aa2b 100755 --- a/hosts/scripts/fwbook/functions.sh +++ b/hosts/scripts/fwbook/functions.sh @@ -2,7 +2,20 @@ function restart-wifi { echo "Removing mod for wifi module..." - sudo rmmod mt7921e + sudo rmmod mt7921e echo "Reloading mod for wifi module..." sudo modprobe mt7921e -} \ No newline at end of file +} + + +function start-windows() { + quickemu --vm /mnt/Data/vms/windows-11.conf --display spice --viewer remote-viewer +} + +function start-windows-app() { + google-chrome-stable --app=https://windows365.microsoft.com/webclient --new-window +} + +# function clean-file() { +# ${@} | grep -v '^\s*#' | grep -v '^$' +# } \ No newline at end of file diff --git a/modules/core/user.nix b/modules/core/user.nix index 3cd8438..31f286a 100644 --- a/modules/core/user.nix +++ b/modules/core/user.nix @@ -14,7 +14,7 @@ in default = [ ]; }; skyg.user = { - enabled = mkEnableOption ""; + enable = mkEnableOption ""; name = mkOption { type = types.str; }; @@ -45,7 +45,7 @@ in stateVersion = cfg.home-manager.version; }); in - mkIf cfg.user.enabled + mkIf cfg.user.enable { programs.zsh.enable = true; home-manager.users.root = diff --git a/modules/home/gitconfigs/alias.conf b/modules/home/gitconfigs/alias.conf index b9825ce..b89b82a 100644 --- a/modules/home/gitconfigs/alias.conf +++ b/modules/home/gitconfigs/alias.conf @@ -30,6 +30,6 @@ sync = "!f() { \ clean-branches = "!f() { \ git for-each-ref --format '%(refname:short)' refs/heads| grep -v 'master\\|main' | xargs git branch -D ; \ }; f"; -# aliases = "!f() { \ -# git config --get-regexp alias | awk '{print $1}' | sed 's/alias\./ - /' \ -# }; f" \ No newline at end of file +aliases = "!f() { \ + git config --get-regexp alias | awk '{print $1}' | sed 's/alias\\./ - /' ; \ +}; f"; \ No newline at end of file diff --git a/modules/main.nix b/modules/main.nix index 3ee15a8..5c68ee0 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -22,8 +22,12 @@ skyg.core.hostName = hostName; skyg.home-manager.version = homeManagerVersion; skyg.core.substituters = localNixCaches; - skyg.networkDrives.enabled = enableNetworkDrives; + skyg.networkDrives.enable = enableNetworkDrives; skyg.nixos.common.containers = (if os.enable then os.containers else { }); + skyg.nixos.server.k8s = { + masterIP = "10.0.10.8"; + masterHostName = "terra1.lab.internal"; + }; system.stateVersion = systemStateVersion; nixpkgs.config.allowUnfree = true; nix = { diff --git a/modules/network-drives.nix b/modules/network-drives.nix index e72d1b7..749f386 100644 --- a/modules/network-drives.nix +++ b/modules/network-drives.nix @@ -9,11 +9,11 @@ in { options = { skyg.networkDrives = { - enabled = mkEnableOption + enable = mkEnableOption "Network Drives"; }; }; - config = mkIf cfg.enabled { + config = mkIf cfg.enable { fileSystems."/torrents" = { device = "tnas1.lab.internal:/mnt/EightTerra/DownloadedTorrents"; fsType = "nfs"; diff --git a/modules/nixos/common/default.nix b/modules/nixos/common/default.nix index d535d37..55a246d 100644 --- a/modules/nixos/common/default.nix +++ b/modules/nixos/common/default.nix @@ -8,5 +8,6 @@ ./user.nix ./fonts.nix ./ssh-server.nix + ./qemu.nix ]; } diff --git a/modules/nixos/common/hardware/default.nix b/modules/nixos/common/hardware/default.nix index de181d9..a7a8a0d 100644 --- a/modules/nixos/common/hardware/default.nix +++ b/modules/nixos/common/hardware/default.nix @@ -4,6 +4,7 @@ ./fan2go.nix ./fancontrol.nix ./sound.nix + ./laptop-power.nix ]; # Firmware Updater services.fwupd.enable = true; diff --git a/modules/nixos/common/hardware/laptop-power.nix b/modules/nixos/common/hardware/laptop-power.nix new file mode 100644 index 0000000..66f8810 --- /dev/null +++ b/modules/nixos/common/hardware/laptop-power.nix @@ -0,0 +1,70 @@ +{ lib +, config +, ... +}: +let + cfg = config.skyg.nixos.common.hardware.laptop-power-mgr; +in +{ + options.skyg.nixos.common.hardware.laptop-power-mgr = with lib; { + enable = mkEnableOption "Settings for laptop power management"; + }; + + config = lib.mkIf cfg.enable { + # Advance Power Management + powerManagement.powertop.enable = true; + powerManagement.enable = true; + services.thermald.enable = true; + services.power-profiles-daemon.enable = false; + services.tlp = { + enable = true; + settings = { + TLP_DEFAULT_MODE = "BAT"; + TLP_PERSISTENT_DEFAULT = 1; + + CPU_BOOST_ON_BAT = 0; + RUNTIME_PM_ON_BAT = "auto"; + PLATFORM_PROFILE_ON_AC = "balanced"; + PLATFORM_PROFILE_ON_BAT = "low-power"; + + 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; + + START_CHARGE_THRESH_BAT0 = 40; # and bellow it starts to charge + STOP_CHARGE_THRESH_BAT0 = 97; # and above it stops charging + }; + }; + services.auto-cpufreq.enable = true; + services.auto-cpufreq.settings = { + battery = { + governor = "powersave"; + turbo = "never"; + }; + charger = { + governor = "performance"; + turbo = "auto"; + }; + }; + systemd.sleep.extraConfig = "HibernateDelaySec=30m"; + # Logind + services.logind = { + lidSwitchExternalPower = "suspend-then-hibernate"; + lidSwitch = "suspend-then-hibernate"; + powerKey = "lock"; + extraConfig = '' + LidSwitchIgnoreInhibited=yes + HandlePowerKey=suspend-then-hibernate + IdleAction=suspend-then-hibernate + IdleActionSec=2m + ''; + }; + }; +} diff --git a/modules/nixos/common/qemu.nix b/modules/nixos/common/qemu.nix new file mode 100644 index 0000000..f3e8d8b --- /dev/null +++ b/modules/nixos/common/qemu.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.skyg.core.qemu; +in +{ + options = { + skyg.core.qemu = { + enable = lib.mkEnableOption + "Enable qemu"; + }; + }; + config = lib.mkIf cfg.enable { + environment = { + systemPackages = with pkgs; [ + qemu + quickemu + win-spice + spice + spice-vdagent + spice-autorandr + virt-viewer + ]; + }; + services.spice-vdagentd.enable = true; + services.spice-autorandr.enable = true; + services.spice-webdavd.enable = true; + virtualisation.spiceUSBRedirection.enable = true; + }; +} diff --git a/modules/nixos/common/ssh-server.nix b/modules/nixos/common/ssh-server.nix index 0e647fb..24653e1 100644 --- a/modules/nixos/common/ssh-server.nix +++ b/modules/nixos/common/ssh-server.nix @@ -7,7 +7,7 @@ in { options = { skyg.nixos.common.ssh-server = { - enabled = mkEnableOption + enable = mkEnableOption "enable ssh server"; masterPubKey = mkOption { type = types.str; @@ -15,7 +15,7 @@ in }; }; }; - config = mkIf cfg.enabled { + config = mkIf cfg.enable { services.openssh = { enable = true; openFirewall = true; diff --git a/modules/nixos/desktop/cosmic.nix b/modules/nixos/desktop/cosmic.nix index ee3ee78..2f4e699 100644 --- a/modules/nixos/desktop/cosmic.nix +++ b/modules/nixos/desktop/cosmic.nix @@ -1,15 +1,18 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: let cfg = config.skyg.nixos.desktop.cosmic; in { options = { skyg.nixos.desktop.cosmic = { - enabled = lib.mkEnableOption + enable = lib.mkEnableOption "Cosmic"; }; }; - config = lib.mkIf cfg.enabled { + config = lib.mkIf cfg.enable { + environment.systemPackages = [ + pkgs.cosmic-icons + ]; services.desktopManager.cosmic.enable = true; # services.displayManager.cosmic-greeter.enable = true; }; diff --git a/modules/nixos/desktop/crypto.nix b/modules/nixos/desktop/crypto.nix index c3b7e60..ca63d8e 100644 --- a/modules/nixos/desktop/crypto.nix +++ b/modules/nixos/desktop/crypto.nix @@ -7,11 +7,11 @@ in { options = { skyg.nixos.desktop.crypto = { - enabled = mkEnableOption + enable = mkEnableOption "Enable crypto wallets"; }; }; - config = mkIf cfg.enabled { + config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ trezor-suite trezord diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index f07c2a2..a17154c 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -15,11 +15,11 @@ in options = { skyg.nixos.desktop = { - enabled = lib.mkEnableOption + enable = lib.mkEnableOption "Enable Desktop"; }; }; - config = lib.mkIf cfg.desktop.enabled { + config = lib.mkIf cfg.desktop.enable { services.displayManager.sddm.enable = false; services.displayManager.sddm.wayland.enable = false; services.xserver.displayManager.gdm.enable = true; diff --git a/modules/nixos/desktop/hyprland/common.nix b/modules/nixos/desktop/hyprland/common.nix index 9b81efb..2271f01 100644 --- a/modules/nixos/desktop/hyprland/common.nix +++ b/modules/nixos/desktop/hyprland/common.nix @@ -10,7 +10,7 @@ in else pkgs ; in - lib.mkIf cfg.enabled { + lib.mkIf cfg.enable { programs.hyprland = { enable = true; package = hyprpkgs.hyprland; diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix index 9681e8b..44d3b17 100644 --- a/modules/nixos/desktop/hyprland/default.nix +++ b/modules/nixos/desktop/hyprland/default.nix @@ -7,7 +7,7 @@ ]; options = { skyg.nixos.desktop.hyprland = with lib; { - enabled = mkEnableOption + enable = mkEnableOption "Hyprland"; useNWG = mkEnableOption "nwg-shell experience"; diff --git a/modules/nixos/desktop/hyprland/mine.nix b/modules/nixos/desktop/hyprland/mine.nix index 11d54a9..c307f02 100644 --- a/modules/nixos/desktop/hyprland/mine.nix +++ b/modules/nixos/desktop/hyprland/mine.nix @@ -3,7 +3,7 @@ let cfg = config.skyg.nixos.desktop.hyprland; in { - config = lib.mkIf (cfg.enabled && !cfg.useNWG) { + config = lib.mkIf (cfg.enable && !cfg.useNWG) { home-manager.users.${config.skyg.user.name}.wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; @@ -32,22 +32,10 @@ in nwg-bar # logout window ]); system.userActivationScripts.hyprlandMineConfig.text = '' - rm -f "$HOME/.config/hypr" - if [[ ! -h "$HOME/.config/hypr" ]]; then - ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr" - fi - rm -f "$HOME/.config/waybar" - if [[ ! -h "$HOME/.config/waybar" ]]; then - ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar" - fi - rm -f "$HOME/.config/nwg-bar" - if [[ ! -h "$HOME/.config/nwg-bar" ]]; then - ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/nwg-bar" "$HOME/.config/nwg-bar" - fi - rm -f "$HOME/.config/dunst" - if [[ ! -h "$HOME/.config/dunst" ]]; then - ln -s "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/dunst" "$HOME/.config/dunst" - fi + ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/hypr" "$HOME/.config/hypr" + ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/waybar" "$HOME/.config/waybar" + ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/nwg-bar" "$HOME/.config/nwg-bar" + ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/hyprland/mine/dunst" "$HOME/.config/dunst" ''; }; } diff --git a/modules/nixos/desktop/hyprland/nwg-shell.nix b/modules/nixos/desktop/hyprland/nwg-shell.nix index 011dc0a..9549468 100644 --- a/modules/nixos/desktop/hyprland/nwg-shell.nix +++ b/modules/nixos/desktop/hyprland/nwg-shell.nix @@ -5,7 +5,7 @@ let cfg = config.skyg.nixos.desktop.hyprland; in { - config = mkIf (cfg.enabled && cfg.useNWG) { + config = mkIf (cfg.enable && cfg.useNWG) { programs.hyprlock.enable = true; environment.systemPackages = with pkgs; [ # general utilities diff --git a/modules/nixos/desktop/kde.nix b/modules/nixos/desktop/kde.nix index ec35184..d42a576 100644 --- a/modules/nixos/desktop/kde.nix +++ b/modules/nixos/desktop/kde.nix @@ -5,11 +5,11 @@ in { options = { skyg.nixos.desktop.kde = { - enabled = lib.mkEnableOption + enable = lib.mkEnableOption "KDE"; }; }; - config = lib.mkIf cfg.enabled { + config = lib.mkIf cfg.enable { services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enableQt5Integration = true; environment.plasma6.excludePackages = with pkgs.kdePackages; [ diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index e55890a..c2cc956 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -3,7 +3,7 @@ let cfg = config.skyg.nixos.desktop; in { - config = lib.mkIf cfg.enabled { + config = lib.mkIf cfg.enable { # Flatpak services.flatpak.enable = true; # Mobile Connect @@ -21,7 +21,7 @@ in xclip # socials - slack + #slack zoom-us betterdiscordctl discord diff --git a/modules/nixos/desktop/wayland.nix b/modules/nixos/desktop/wayland.nix index 4447192..6d6d91d 100644 --- a/modules/nixos/desktop/wayland.nix +++ b/modules/nixos/desktop/wayland.nix @@ -3,7 +3,7 @@ let cfg = config.skyg.nixos.desktop; in { - config = lib.mkIf cfg.enabled { + config = lib.mkIf cfg.enable { # Flatpak environment.systemPackages = with pkgs; [ wayland diff --git a/modules/nixos/desktop/x11.nix b/modules/nixos/desktop/x11.nix index c109026..731d797 100644 --- a/modules/nixos/desktop/x11.nix +++ b/modules/nixos/desktop/x11.nix @@ -1,13 +1,23 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: let cfg = config.skyg.nixos.desktop; in { - config = lib.mkIf cfg.enabled { + config = lib.mkIf cfg.enable { services.xserver = { enable = true; xkb.layout = "us"; xkb.variant = ""; }; + users.users.${config.skyg.user.name}.extraGroups = [ "input" ]; + environment.systemPackages = with pkgs; [ + # These are used to handle touchpad gestures + libinput-gestures + wmctrl + xdotool + ]; + system.userActivationScripts.hyprlandMineConfig.text = '' + ln -sfn "/home/${config.skyg.user.name}/nixos-setup/configs/libinput-gestures.conf" "$HOME/.config/libinput-gestures.conf" + ''; }; } diff --git a/modules/nixos/server/arrs/db.nix b/modules/nixos/server/arrs/db.nix new file mode 100644 index 0000000..b87c6f0 --- /dev/null +++ b/modules/nixos/server/arrs/db.nix @@ -0,0 +1,30 @@ +{ config, lib, ... }: +let + cfg = config.skyg.server.arrs; + ifAdd = cond: add: if cond then [ add ] else [ ]; + mkEnsureUser = name: { + inherit name; + ensureDBOwnership = true; + ensureClauses.login = true; + ensureClauses.createdb = true; + }; +in +{ + config = lib.mkIf cfg.enable { + services.postgresql = { + enable = true; + settings.port = cfg.database.port; + dataDir = "${cfg.rootDataDir}/db"; + ensureDatabases = + (ifAdd cfg.prowlarr.enable cfg.prowlarr.user) ++ + (ifAdd cfg.radarr.enable cfg.radarr.user) ++ + (ifAdd cfg.sonarr.enable cfg.sonarr.user) + ; + ensureUsers = + (ifAdd cfg.prowlarr.enable (mkEnsureUser cfg.prowlarr.user)) ++ + (ifAdd cfg.radarr.enable (mkEnsureUser cfg.radarr.user)) ++ + (ifAdd cfg.sonarr.enable (mkEnsureUser cfg.sonarr.user)) + ; + }; + }; +} diff --git a/modules/nixos/server/arrs/default.nix b/modules/nixos/server/arrs/default.nix new file mode 100644 index 0000000..2098788 --- /dev/null +++ b/modules/nixos/server/arrs/default.nix @@ -0,0 +1,84 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.skyg.server.arrs; + dbPort = 5432; + rootDataDir = "/var/lib/arrs"; + makeConfig = { port, name, uid, gid }: { + enable = lib.mkEnableOption "Enable ${name}"; + + package = lib.mkPackageOption pkgs name { }; + openFirewall = lib.mkEnableOption "Open port for ${name}"; + + user = lib.mkOption { + type = lib.types.str; + default = name; + }; + group = lib.mkOption { + type = lib.types.str; + default = name; + }; + uid = lib.mkOption { + type = lib.types.number; + default = uid; + }; + gid = lib.mkOption { + type = lib.types.number; + default = gid; + }; + port = lib.mkOption { + type = lib.types.int; + default = port; + description = "Port for ${name}"; + }; + }; +in +{ + imports = [ + ./db.nix + ./prowlarr.nix + ]; + options = { + skyg.server.arrs = { + enable = lib.mkEnableOption + "Enable Arr Stack Store"; + openFirewall = lib.mkEnableOption + "Open Firewall ports for services"; + rootDataDir = lib.mkOption { + type = lib.types.str; + default = rootDataDir; + }; + }; + skyg.server.arrs.database = { + port = lib.mkOption { + type = lib.types.int; + default = dbPort; + }; + }; + skyg.server.arrs.prowlarr = makeConfig { + name = "prowlarr"; + port = 9096; + uid = 9000; + gid = 9000; + }; + skyg.server.arrs.sonarr = makeConfig { + name = "sonarr"; + port = 8989; + uid = 9001; + gid = 9001; + }; + skyg.server.arrs.radarr = makeConfig { + name = "radarr"; + port = 7878; + uid = 9002; + gid = 9002; + }; + }; + config = lib.mkIf cfg.enable { + networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ + + ]; + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ + + ]; + }; +} diff --git a/modules/nixos/server/arrs/prowlarr.nix b/modules/nixos/server/arrs/prowlarr.nix new file mode 100644 index 0000000..f92706a --- /dev/null +++ b/modules/nixos/server/arrs/prowlarr.nix @@ -0,0 +1,71 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.skyg.server.arrs.prowlarr; + dataDir = "${config.skyg.server.arrs.rootDataDir}/prowlarr"; + configXMLFile = pkgs.writeTextFile { + name = "config.xml"; + text = '' + + info + False + ${toString(cfg.port)} + + * + BuiltIn + False + main + prowlarr + ${toString(config.skyg.server.arrs.database.port)} + 0.0.0.0 + prowlarr + prowlarr-log + SkyG Prowlarr + External + Enabled + + ''; + }; +in +{ + config = lib.mkIf cfg.enable { + users.users.${cfg.user} = { + uid = cfg.uid; + isSystemUser = true; + group = cfg.group; + }; + users.groups.${cfg.group} = { + gid = cfg.gid; + members = [ + cfg.user + config.skyg.user.name + ]; + }; + users.groups.www-data.members = [ + cfg.user + ]; + systemd.services.prowlarr = { + description = "Prowlarr"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = '' + ln -sfn "${dataDir}/config.xml" "${configXMLFile}" + ''; + serviceConfig = { + User = cfg.user; + Group = cfg.group; + WorkingDirectory = dataDir; + Type = "simple"; + DynamicUser = true; + StateDirectory = "prowlarr"; + ExecStart = "${lib.getExe cfg.package} -nobrowser -data=${dataDir}"; + Restart = "on-failure"; + }; + environment.HOME = "/var/empty"; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.port ]; + }; + }; +} diff --git a/modules/nixos/server/default.nix b/modules/nixos/server/default.nix index f6a6185..74fd8b8 100644 --- a/modules/nixos/server/default.nix +++ b/modules/nixos/server/default.nix @@ -7,5 +7,7 @@ ./ai-services.nix ./jellyfin.nix ./admin.nix + ./arrs + ./k8s ]; } diff --git a/modules/nixos/server/k8s/default.nix b/modules/nixos/server/k8s/default.nix new file mode 100644 index 0000000..fa1ea5b --- /dev/null +++ b/modules/nixos/server/k8s/default.nix @@ -0,0 +1,64 @@ +{ config, pkgs, lib, ... }: +let + cfg = config.skyg.nixos.server.k8s; +in +{ + imports = [ + ./master.nix + ./node.nix + ]; + options = { + skyg.nixos.server.k8s = { + enable = lib.mkEnableOption + "Enable K8s"; + isMaster = lib.mkEnableOption + "Enable as master"; + masterIP = lib.mkOption { + type = lib.types.str; + }; + masterHostName = lib.mkOption { + type = lib.types.str; + }; + masterAPIPort = lib.mkOption { + type = lib.types.number; + default = 6443; + }; + }; + }; + + config = + let + ports = [ + cfg.masterAPIPort # k8s api server + 10250 # kubelet api + 10259 # kubelet scheduler + 10257 # kubelet controller + 8888 # no idea what this is + ]; + portRanges = [ + { from = 2379; to = 2380; } # etcd + ]; + in + lib.mkIf cfg.enable { + # resolve master hostname + networking.extraHosts = "${cfg.masterIP} ${cfg.masterHostName}"; + networking.firewall.allowedUDPPorts = ports; + networking.firewall.allowedUDPPortRanges = portRanges; + networking.firewall.allowedTCPPorts = ports; + networking.firewall.allowedTCPPortRanges = portRanges; + + # packages for administration tasks + environment.systemPackages = with pkgs; [ + kubectl + kubernetes + ]; + services.kubernetes = { + proxy.hostname = cfg.masterHostName; + masterAddress = cfg.masterHostName; + easyCerts = true; + apiserverAddress = "https://${cfg.masterHostName}:${toString cfg.masterAPIPort}"; + addons.dns.enable = true; + kubelet.extraOpts = "--fail-swap-on=false"; + }; + }; +} diff --git a/modules/nixos/server/k8s/master.nix b/modules/nixos/server/k8s/master.nix new file mode 100644 index 0000000..f9e89bc --- /dev/null +++ b/modules/nixos/server/k8s/master.nix @@ -0,0 +1,15 @@ +{ config, lib, ... }: +let + cfg = config.skyg.nixos.server.k8s; +in +{ + config = lib.mkIf (cfg.enable && cfg.isMaster) { + services.kubernetes = { + roles = [ "master" ]; + apiserver = { + securePort = cfg.masterAPIPort; + advertiseAddress = cfg.masterIP; + }; + }; + }; +} diff --git a/modules/nixos/server/k8s/node.nix b/modules/nixos/server/k8s/node.nix new file mode 100644 index 0000000..5500429 --- /dev/null +++ b/modules/nixos/server/k8s/node.nix @@ -0,0 +1,12 @@ +{ config, lib, ... }: +let + cfg = config.skyg.nixos.server.k8s; +in +{ + config = lib.mkIf (cfg.enable && (!cfg.isMaster)) { + services.kubernetes = { + roles = [ "node" ]; + kubelet.kubeconfig.server = "https://${cfg.masterHostName}:${toString cfg.masterAPIPort}"; + }; + }; +}