mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nas remote deployments

Browse Source
This commit is contained in:
mjallen18
2024-06-15 13:54:21 -05:00
parent 7adfefae12
commit a1d184a76e
6 changed files with 80 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

473
flake.lock generated
View File

@@ -1,64 +1,21 @@
{
"nodes": {
"attic": {
"inputs": {
"crane": [
"chaotic",
"crane"
],
"flake-compat": [
"chaotic",
"flake-compat"
],
"flake-utils": [
"chaotic",
"flake-utils"
],
"nixpkgs": [
"chaotic",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1717279440,
"narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "717cc95983cdc357bc347d70be20ced21f935843",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"repo": "attic",
"type": "github"
}
},
"chaotic": {
"inputs": {
"attic": "attic",
"compare-to": "compare-to",
"conduit": "conduit",
"crane": "crane",
"fenix": "fenix",
"flake-compat": "flake-compat",
"flake-schemas": "flake-schemas",
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"jovian": "jovian",
"jujutsu": "jujutsu",
"niri": "niri",
"nix-filter": "nix-filter",
"nixpkgs": "nixpkgs",
"systems": "systems",
"yafas": "yafas"
},
"locked": {
"lastModified": 1717953002,
"narHash": "sha256-OCpjed4js5dY/RW3YQ9pYbkkrxcNvLKWdGY6IwCOIeY=",
"lastModified": 1718291710,
"narHash": "sha256-yp3pQStGFCd0qSAULA7RaI9evMRZHPuN4dUuNNOhH80=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "3d67be77d769965d3b9f1f77011c87676271dc67",
"rev": "edbd85ef842fad14b8fe26cad2067868674dcf8d",
"type": "github"
},
"original": {
@@ -82,93 +39,7 @@
"url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz"
}
},
"complement": {
"flake": false,
"locked": {
"lastModified": 1715700731,
"narHash": "sha256-cie+b5N/TQAFD8vF/XbqfyFJkFU0qUPDbtJQDm/TfQc=",
"owner": "matrix-org",
"repo": "complement",
"rev": "8587fb3cbe746754b2c883ff6c818ca4d987d0a5",
"type": "github"
},
"original": {
"owner": "matrix-org",
"ref": "main",
"repo": "complement",
"type": "github"
}
},
"conduit": {
"inputs": {
"attic": [
"chaotic",
"attic"
],
"complement": "complement",
"crane": [
"chaotic",
"crane"
],
"fenix": [
"chaotic",
"fenix"
],
"flake-compat": [
"chaotic",
"flake-compat"
],
"flake-utils": [
"chaotic",
"flake-utils"
],
"liburing": "liburing",
"nix-filter": [
"chaotic",
"nix-filter"
],
"nixpkgs": [
"chaotic",
"nixpkgs"
],
"rocksdb": "rocksdb"
},
"locked": {
"lastModified": 1717882324,
"narHash": "sha256-SmvVanZ14PDtZvVUz9os+jGhtnrINqB/eaLv/WRURP8=",
"owner": "girlbossceo",
"repo": "conduwuit",
"rev": "0524e6ed52fbc0f95d378c231460ae9544440bd2",
"type": "github"
},
"original": {
"owner": "girlbossceo",
"repo": "conduwuit",
"type": "github"
}
},
"crane": {
"inputs": {
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717895724,
"narHash": "sha256-dHwxCMe/Ki1xOAnbF9jQTXSFAMujpTnwWMbXvxcb5Uo=",
"owner": "ipetkov",
"repo": "crane",
"rev": "a21d14679fb306ab8fa6ae0255eb9dc185039367",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"crane_2": {
"inputs": {
"flake-compat": [
"lanzaboote",
@@ -201,7 +72,7 @@
"type": "github"
}
},
"crane_3": {
"crane_2": {
"flake": false,
"locked": {
"lastModified": 1699217310,
@@ -242,45 +113,7 @@
"type": "github"
}
},
"fenix": {
"inputs": {
"nixpkgs": [
"chaotic",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1717827974,
"narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=",
"owner": "nix-community",
"repo": "fenix",
"rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "fenix",
"type": "github"
}
},
"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": 1673956053,
@@ -296,7 +129,7 @@
"type": "github"
}
},
"flake-compat_3": {
"flake-compat_2": {
"locked": {
"lastModified": 1688025799,
"narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=",
@@ -347,27 +180,6 @@
}
},
"flake-utils": {
"inputs": {
"systems": [
"chaotic",
"systems"
]
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
@@ -415,11 +227,11 @@
]
},
"locked": {
"lastModified": 1717931644,
"narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
"lastModified": 1718243258,
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
"type": "github"
},
"original": {
@@ -456,11 +268,11 @@
]
},
"locked": {
"lastModified": 1717931644,
"narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
"lastModified": 1718243258,
"narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
"rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
"type": "github"
},
"original": {
@@ -493,11 +305,11 @@
]
},
"locked": {
"lastModified": 1717685136,
"narHash": "sha256-S+C/DX5HOhlhJAmcGxbB+Tv6oqZOkr3z/WzPuydXI14=",
"lastModified": 1718173451,
"narHash": "sha256-ySzjpSDAmecKsoSqgqjKfEsgzRMiI87pLLJgY8haP+s=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "fd13986ede9b94c50e84aecb2c88863e297bbb52",
"rev": "326c1ab2b816f520d298b7a4319a0b50cde01c48",
"type": "github"
},
"original": {
@@ -506,43 +318,17 @@
"type": "github"
}
},
"jujutsu": {
"inputs": {
"flake-utils": [
"chaotic",
"flake-utils"
],
"nixpkgs": [
"chaotic",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1717914060,
"narHash": "sha256-TBCTI/T2YAJhR3cd/79xgRNGdXW1Lk1aco5eM72H97o=",
"owner": "martinvonz",
"repo": "jj",
"rev": "5d57cf1977ef05d6b632693e7b227a53214a89f4",
"type": "github"
},
"original": {
"owner": "martinvonz",
"repo": "jj",
"type": "github"
}
},
"lanzaboote": {
"inputs": {
"crane": "crane_2",
"flake-compat": "flake-compat_2",
"crane": "crane",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs-unstable"
],
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay_2"
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1682802423,
@@ -559,23 +345,6 @@
"type": "github"
}
},
"liburing": {
"flake": false,
"locked": {
"lastModified": 1716565485,
"narHash": "sha256-4R19aJNQYs6vb0/Hz4bWT56YN1P1DkFL/sxdE4Yj0CE=",
"owner": "axboe",
"repo": "liburing",
"rev": "b90c0e670a93caabbebe2d9e24ff85cece4cfe0e",
"type": "github"
},
"original": {
"owner": "axboe",
"ref": "master",
"repo": "liburing",
"type": "github"
}
},
"mk-naked-shell": {
"flake": false,
"locked": {
@@ -594,7 +363,7 @@
},
"nci": {
"inputs": {
"crane": "crane_3",
"crane": "crane_2",
"dream2nix": "dream2nix",
"mk-naked-shell": "mk-naked-shell",
"nixpkgs": [
@@ -602,7 +371,7 @@
"nixpkgs"
],
"parts": "parts",
"rust-overlay": "rust-overlay_3",
"rust-overlay": "rust-overlay_2",
"treefmt": "treefmt"
},
"locked": {
@@ -619,53 +388,16 @@
"type": "github"
}
},
"niri": {
"inputs": {
"crane": [
"chaotic",
"crane"
],
"fenix": [
"chaotic",
"fenix"
],
"flake-utils": [
"chaotic",
"flake-utils"
],
"nix-filter": [
"chaotic",
"nix-filter"
],
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717931691,
"narHash": "sha256-e4I/fAKlMlOdSTH8ySYhi+C9XVprDtWqn3ZirQUZrzg=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "a55e385b12f27e3e700ae759d620b401f910288f",
"type": "github"
},
"original": {
"owner": "YaLTeR",
"repo": "niri",
"type": "github"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1716993688,
"narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
"lastModified": 1718440858,
"narHash": "sha256-iMVwdob8F6P6Ib+pnhMZqyvYI10ZxmvA885jjnEaO54=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
"rev": "58b905ea87674592aa84c37873e6c07bc3807aba",
"type": "github"
},
"original": {
@@ -674,21 +406,6 @@
"type": "github"
}
},
"nix-filter": {
"locked": {
"lastModified": 1710156097,
"narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "3342559a24e85fc164b295c3444e8a139924675b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-flatpak": {
"locked": {
"lastModified": 1711997375,
@@ -749,31 +466,31 @@
},
"nixos-apple-silicon": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-compat": "flake-compat_2",
"nixpkgs": "nixpkgs_4",
"rust-overlay": "rust-overlay_4"
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1717703766,
"narHash": "sha256-YkTttYusihnwdtxu8Vg2QciGJKFjE+AgnSvBfMkHJbg=",
"ref": "refs/heads/main",
"rev": "23fa9c7739ebd5a132e68e16491dc348f9b63d9e",
"revCount": 457,
"type": "git",
"url": "file:///home/matt/nixos-apple-silicon"
"lastModified": 1717784003,
"narHash": "sha256-EDhb+3uFVCnfsF8DSPd1F2Arza84vQvlzh/OPSUHUjc=",
"owner": "mjallen18",
"repo": "nixos-apple-silicon",
"rev": "06fb62dd84841d1664a3a144d8877a956618401d",
"type": "github"
},
"original": {
"type": "git",
"url": "file:///home/matt/nixos-apple-silicon"
"owner": "mjallen18",
"repo": "nixos-apple-silicon",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1717828156,
"narHash": "sha256-YvstO0lobf3JWQuAfZCLYRTROC2ZDEgtWeQtWbO49p4=",
"lastModified": 1718459188,
"narHash": "sha256-umwY+ivE98n/6EwEtobOlqf1t9VddhPIIZ6rVmFXlHg=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "057a7996d012f342a38a26261ee529cebb1755ef",
"rev": "0cd562157274df3783840bdcb0ce6d9c4cf4aa29",
"type": "github"
},
"original": {
@@ -785,11 +502,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1717786204,
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"lastModified": 1718160348,
"narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"rev": "57d6973abba7ea108bac64ae7629e7431e0199b6",
"type": "github"
},
"original": {
@@ -800,22 +517,6 @@
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1711460390,
"narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1678872516,
"narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
@@ -831,13 +532,13 @@
"type": "github"
}
},
"nixpkgs-stable_3": {
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1717696253,
"narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=",
"lastModified": 1718208800,
"narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b",
"rev": "cc54fb41d13736e92229c21627ea4f22199fee6b",
"type": "github"
},
"original": {
@@ -849,11 +550,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1717786204,
"narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
"lastModified": 1718318537,
"narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
"rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420",
"type": "github"
},
"original": {
@@ -865,11 +566,12 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1687274257,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
"path": "/nix/store/22qgs3skscd9bmrxv9xv4q5d4wwm5ppx-source",
"rev": "2c9ecd1f0400076a4d6b2193ad468ff0a7e7fdc5",
"type": "path"
"lastModified": 1718149104,
"narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16",
"type": "github"
},
"original": {
"id": "nixpkgs",
@@ -966,7 +668,7 @@
"lanzaboote",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable_2"
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1681413034,
@@ -1023,23 +725,6 @@
"type": "github"
}
},
"rocksdb": {
"flake": false,
"locked": {
"lastModified": 1716773462,
"narHash": "sha256-5kUH+XK+2lbFfUgbxuNy3YMLHbp6scfWPdtc8za1wDM=",
"owner": "girlbossceo",
"repo": "rocksdb",
"rev": "c8a1450231e9c608edf535538dbe8ca1a8d2f3bc",
"type": "github"
},
"original": {
"owner": "girlbossceo",
"ref": "v9.2.1",
"repo": "rocksdb",
"type": "github"
}
},
"root": {
"inputs": {
"chaotic": "chaotic",
@@ -1052,55 +737,11 @@
"nix-inspect": "nix-inspect",
"nixos-apple-silicon": "nixos-apple-silicon",
"nixos-hardware": "nixos-hardware",
"nixpkgs-stable": "nixpkgs-stable_3",
"nixpkgs-stable": "nixpkgs-stable_2",
"nixpkgs-unstable": "nixpkgs-unstable"
}
},
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1717583671,
"narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "48bbdd6a74f3176987d5c809894ac33957000d19",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"chaotic",
"jujutsu",
"flake-utils"
],
"nixpkgs": [
"chaotic",
"jujutsu",
"nixpkgs"
]
},
"locked": {
"lastModified": 1714961776,
"narHash": "sha256-LiIxWRKbm1DZ+7l1a6FMmIO8leQx5yrRLIApCMai1DY=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "f3b20ea4131408ea585bddb1f41f91c4de9499cf",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"inputs": {
"flake-utils": [
"lanzaboote",
@@ -1125,7 +766,7 @@
"type": "github"
}
},
"rust-overlay_3": {
"rust-overlay_2": {
"flake": false,
"locked": {
"lastModified": 1710123130,
@@ -1141,7 +782,7 @@
"type": "github"
}
},
"rust-overlay_4": {
"rust-overlay_3": {
"flake": false,
"locked": {
"lastModified": 1686795910,

4
flake.nix
View File

@@ -35,7 +35,7 @@
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
#Apple
nixos-apple-silicon.url = "git+file:///home/matt/nixos-apple-silicon";
nixos-apple-silicon.url = "github:mjallen18/nixos-apple-silicon";
nix-darwin.url = "github:LnL7/nix-darwin";
};
@@ -108,7 +108,7 @@
nixos-hardware.nixosModules.common-pc
nixos-hardware.nixosModules.common-cpu-amd
nixos-hardware.nixosModules.common-hidpi
nixos-hardware.nixosModules.common-gpu-nvidia
# nixos-hardware.nixosModules.common-gpu-nvidia
];
};

1
hosts/desktop/home.nix
View File

@@ -51,6 +51,7 @@
lm_sensors
lutris
mangohud
morph
neofetch
nixfmt-rfc-style
orca-slicer

37
hosts/nas/configuration.nix
View File

@@ -42,28 +42,23 @@ in
};
};
nix.settings.trusted-users = [ "@wheel" ];
powerManagement.cpuFreqGovernor = "powersave";
hardware.nvidia-container-toolkit.enable = true;
nas-apps = {
jackett.enable = true;
collabora.enable = true;
jellyfin.enable = true;
jellyseerr.enable = true;
deluge.enable = true;
homarr.enable = true;
homepage.enable = false;
sabnzbd.enable = true;
jackett.enable = true;
radarr.enable = true;
jellyfin.enable = true;
sonarr.enable = true;
collabora.enable = true;
jellyseerr.enable = true;
mariadb.enable = true;
@@ -73,19 +68,21 @@ in
httpsPort = "9443";
};
open-webui.enable = true;
ollama.enable = true;
open-webui.enable = true;
orca-slicer.enable = true;
puter.enable = true;
radarr.enable = true;
vscode.enable = true;
sabnzbd.enable = true;
sonarr.enable = true;
swag.enable = true;
deluge.enable = true;
vscode.enable = true;
};
nas-samba = {
@@ -366,9 +363,9 @@ in
# Configure environment
environment = {
etc."nut/upsd.conf".source = /root/upsd.conf;
etc."nut/upsd.users".source = /root/upsd.users;
etc."nut/upsmon.conf".source = /root/upsmon.conf;
etc."nut/upsd.conf".source = /home/matt/upsd.conf;
etc."nut/upsd.users".source = /home/matt/upsd.users;
etc."nut/upsmon.conf".source = /home/matt/upsmon.conf;
# List packages installed in system profile. To search, run:
# $ nix search wget
@@ -438,7 +435,7 @@ in
actions = [ "SET" ];
instcmds = [ "ALL" ];
upsmon = "primary";
passwordFile = "/root/ups.conf";
passwordFile = "/home/matt/ups.conf";
};
};

1
scripts/deploy-nas Executable file
View File

@@ -0,0 +1 @@
nixos-rebuild switch --use-remote-sudo --target-host admin@jallen-nas.local --build-host localhost --flake .#jallen-nas

2
share/nvidia/default.nix
View File

@@ -61,5 +61,7 @@ in
# Virtualisation
virtualisation.docker.enableNvidia = cfg.enableNvidiaDocker;
hardware.nvidia-container-toolkit.enable = cfg.enableNvidiaDocker;
};
}