Compare commits
29 Commits
e4fe0e1127
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
3e718fadfc
|
|||
|
763ee6312a
|
|||
|
5704ebe712
|
|||
|
70b5d5fd4d
|
|||
|
c29acb0902
|
|||
|
a545b4a45c
|
|||
|
c839811b9f
|
|||
|
2812e85976
|
|||
|
3835c3a1a6
|
|||
|
a277e8f3ed
|
|||
|
eb8c857940
|
|||
|
b3e6222cac
|
|||
|
575452512a
|
|||
|
5cc4c6479c
|
|||
|
724fe6767e
|
|||
|
b74e5aab62
|
|||
|
be02be6bf2
|
|||
|
d614495a2c
|
|||
|
1f2ea2d5fa
|
|||
|
969a1e75bf
|
|||
|
fe01334a85
|
|||
|
e986f337bd
|
|||
|
96d57d34c1
|
|||
|
dcad8f12b9
|
|||
|
1595e260d5
|
|||
|
de53426fa5
|
|||
|
fc89c377e8
|
|||
|
53329b8d1c
|
|||
|
2b020958ed
|
@ -17,8 +17,6 @@ My NixOS configurations with dotfiles for my systems.
|
||||
| Runner | Rofi |
|
||||
| Fetch | Fastfetch |
|
||||
|
||||
Requires Nix-channel with [NixOS 24.11](https://nixos.org/)
|
||||
|
||||
## Commands
|
||||
|
||||
First time run, will create a shell with the minimum dependencies in order to download the rest
|
||||
|
||||
252
flake.lock
generated
252
flake.lock
generated
@ -9,11 +9,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1736090999,
|
||||
"narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=",
|
||||
"lastModified": 1744557573,
|
||||
"narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=",
|
||||
"owner": "aylur",
|
||||
"repo": "ags",
|
||||
"rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c",
|
||||
"rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -31,11 +31,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1735172721,
|
||||
"narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=",
|
||||
"lastModified": 1742571008,
|
||||
"narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",
|
||||
"owner": "aylur",
|
||||
"repo": "astal",
|
||||
"rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2",
|
||||
"rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -44,16 +44,53 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"astal_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"hyprpanel",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1748416910,
|
||||
"narHash": "sha256-FEQcs58HL8Fe4i7XlqVEUwthjxwvRvgX15gTTfW17sU=",
|
||||
"owner": "aylur",
|
||||
"repo": "astal",
|
||||
"rev": "c1bd89a47c81c66ab5fc6872db5a916c0433fb89",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "aylur",
|
||||
"repo": "astal",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"blobs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1604995301,
|
||||
"narHash": "sha256-wcLzgLec6SGJA8fx1OEN1yV/Py5b+U5iyYpksUY/yLw=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "blobs",
|
||||
"rev": "2cccdf1ca48316f2cfd1c9a0017e8de5a7156265",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "blobs",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"catppuccin": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746650299,
|
||||
"narHash": "sha256-4+pxk1KcSH8ww3tgN808nNJ3E7Q8gNWI+U0sesW7mBQ=",
|
||||
"lastModified": 1748080874,
|
||||
"narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=",
|
||||
"owner": "catppuccin",
|
||||
"repo": "nix",
|
||||
"rev": "f746600f15b69df05c84e3037749a3be5b1276d1",
|
||||
"rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -62,16 +99,80 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747046372,
|
||||
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"git-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"simple-nixos-mailserver",
|
||||
"flake-compat"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"simple-nixos-mailserver",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742649964,
|
||||
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"simple-nixos-mailserver",
|
||||
"git-hooks",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709087332,
|
||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "gitignore.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"grayjay": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745469639,
|
||||
"narHash": "sha256-LNIzSWQ+xoVpanW4NKdN7Np8z9CtoU2+yXaztH1Upt4=",
|
||||
"lastModified": 1748772835,
|
||||
"narHash": "sha256-p/hGSN1DOU/pELQi5PTds8eL+czjmb/0RvwvLm7nGC8=",
|
||||
"owner": "rishabh5321",
|
||||
"repo": "grayjay-flake",
|
||||
"rev": "da25d4ae2cd44954d6655ceb4781e766c2b1cccb",
|
||||
"rev": "998cbc285d936a45daf07414d03db3f60c133caa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -87,16 +188,16 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746171682,
|
||||
"narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=",
|
||||
"lastModified": 1748665073,
|
||||
"narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "50eee705bbdbac942074a8c120e8194185633675",
|
||||
"rev": "282e1e029cb6ab4811114fc85110613d72771dea",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-24.11",
|
||||
"ref": "release-25.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@ -125,14 +226,15 @@
|
||||
"hyprpanel": {
|
||||
"inputs": {
|
||||
"ags": "ags",
|
||||
"astal": "astal_2",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745885816,
|
||||
"narHash": "sha256-yuIb6/gGcII+2YgtTLcYdga0pcL63B18xQ/oitOhg7k=",
|
||||
"lastModified": 1748962037,
|
||||
"narHash": "sha256-MkrOyZ6CqTzzmlfmvkPiezy51hG96xqucrR38xQpK/0=",
|
||||
"owner": "Jas-SinghFSU",
|
||||
"repo": "HyprPanel",
|
||||
"rev": "0c82ce9704c8063be8d8f60443071c91943eb68c",
|
||||
"rev": "8422c6b80526f8289a30b93cb5b354d9f007141d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -157,29 +259,45 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"nixpkgs-25_05": {
|
||||
"locked": {
|
||||
"lastModified": 1746557022,
|
||||
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
|
||||
"lastModified": 1747610100,
|
||||
"narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
|
||||
"rev": "ca49c4304acf0973078db0a9d200fd2bae75676d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.11",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1748889542,
|
||||
"narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1746663147,
|
||||
"narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=",
|
||||
"lastModified": 1748693115,
|
||||
"narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54",
|
||||
"rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -191,11 +309,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1745234285,
|
||||
"narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=",
|
||||
"lastModified": 1748693115,
|
||||
"narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c11863f1e964833214b767f4a369c6e6a7aba141",
|
||||
"rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -207,11 +325,11 @@
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1736344531,
|
||||
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
|
||||
"lastModified": 1748370509,
|
||||
"narHash": "sha256-QlL8slIgc16W5UaI3w7xHQEP+Qmv/6vSNTpoZrrSlbk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
|
||||
"rev": "4faa5f5321320e49a78ae7848582f684d64783e9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -223,21 +341,37 @@
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1746557022,
|
||||
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=",
|
||||
"lastModified": 1748889542,
|
||||
"narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860",
|
||||
"rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-24.11",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_5": {
|
||||
"locked": {
|
||||
"lastModified": 1747179050,
|
||||
"narHash": "sha256-qhFMmDkeJX9KJwr5H32f1r7Prs7XbQWtO0h3V0a0rFY=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "adaa24fbf46737f3f1b5497bf64bae750f82942e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_6": {
|
||||
"locked": {
|
||||
"lastModified": 1743448293,
|
||||
"narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
|
||||
@ -262,11 +396,35 @@
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixpkgs-stable": "nixpkgs-stable",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"simple-nixos-mailserver": "simple-nixos-mailserver",
|
||||
"sops-nix": "sops-nix",
|
||||
"spicetify-nix": "spicetify-nix",
|
||||
"zen-browser": "zen-browser"
|
||||
}
|
||||
},
|
||||
"simple-nixos-mailserver": {
|
||||
"inputs": {
|
||||
"blobs": "blobs",
|
||||
"flake-compat": "flake-compat",
|
||||
"git-hooks": "git-hooks",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
"nixpkgs-25_05": "nixpkgs-25_05"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747965231,
|
||||
"narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=",
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"repo": "nixos-mailserver",
|
||||
"rev": "53007af63fade28853408370c4c600a63dd97f41",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"owner": "simple-nixos-mailserver",
|
||||
"ref": "nixos-25.05",
|
||||
"repo": "nixos-mailserver",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"sops-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -274,11 +432,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746485181,
|
||||
"narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=",
|
||||
"lastModified": 1747603214,
|
||||
"narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
|
||||
"owner": "mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "e93ee1d900ad264d65e9701a5c6f895683433386",
|
||||
"rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -295,11 +453,11 @@
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746738008,
|
||||
"narHash": "sha256-bIMysaVhNyjuFgt8QpnGZv0T4YMao26Vz5R/xfYAJO0=",
|
||||
"lastModified": 1748752728,
|
||||
"narHash": "sha256-en008ncPUQjVx2i3PbM4RWeZkD9DNbJwIy0epppXe2o=",
|
||||
"owner": "Gerg-L",
|
||||
"repo": "spicetify-nix",
|
||||
"rev": "a43fae27f33f8d3e793a6ca2946190cb24a00b03",
|
||||
"rev": "0e03de40d5128eb2ad600c98f57cf5db2cdf3240",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -326,14 +484,14 @@
|
||||
"zen-browser": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": "nixpkgs_5"
|
||||
"nixpkgs": "nixpkgs_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1746846243,
|
||||
"narHash": "sha256-AV7zvbi1SVbGxODW7SKw3MhMkS1SQNNwp+XEky14rR4=",
|
||||
"lastModified": 1748920570,
|
||||
"narHash": "sha256-m7EshkqPxa3IxN/qwxP1LlMlRdn37aiK0hghDieho8A=",
|
||||
"owner": "0xc000022070",
|
||||
"repo": "zen-browser-flake",
|
||||
"rev": "efa32c933ca9f6341bbf57ede9a674d45ebe72e2",
|
||||
"rev": "ff5bf0bcf588e8c1d0f5fcd635b0c8e1cce8aee5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
30
flake.nix
30
flake.nix
@ -5,17 +5,17 @@
|
||||
#
|
||||
# ========= Official NixOS and HM Package Sources =========
|
||||
#
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||
# The next two are for pinning to stable vs unstable regardless of what the above is set to
|
||||
# This is particularly useful when an upcoming stable release is in beta because you can effectively
|
||||
# keep 'nixpkgs-stable' set to stable for critical packages while setting 'nixpkgs' to the beta branch to
|
||||
# get a jump start on deprecation changes.
|
||||
# See also 'stable-packages' and 'unstable-packages' overlays at 'overlays/default.nix"
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
|
||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-24.11";
|
||||
url = "github:nix-community/home-manager/release-25.05";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
catppuccin.url = "github:catppuccin/nix";
|
||||
# Bar
|
||||
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
|
||||
simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-25.05";
|
||||
# Spotify
|
||||
spicetify-nix = {
|
||||
url = "github:Gerg-L/spicetify-nix";
|
||||
@ -47,6 +48,7 @@
|
||||
self,
|
||||
nixpkgs,
|
||||
home-manager,
|
||||
simple-nixos-mailserver,
|
||||
...
|
||||
}@inputs:
|
||||
let
|
||||
@ -72,13 +74,11 @@
|
||||
systems = builtins.map (config: defaultAttrs // config) [
|
||||
{
|
||||
hostName = "desktop";
|
||||
system = "x86_64-linux";
|
||||
nvidia.enable = true;
|
||||
ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSzXyTuQyTrWsfORQbvgrqt/33+hfSUDXeMg6D1T2wz";
|
||||
}
|
||||
{
|
||||
hostName = "thinkpad";
|
||||
system = "x86_64-linux";
|
||||
ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILNlHKE/BD8kKfhJD7GBk1A3whZf3gTjk9VEgGAj3qsH";
|
||||
}
|
||||
{
|
||||
@ -86,22 +86,39 @@
|
||||
system = "aarch64-linux";
|
||||
wayland.enable = false;
|
||||
ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJE9m7YiITe1sDqSZ7Pa8luIw3WToLsypixZEqE4wCQE";
|
||||
address.private = common.localIpAddr 188;
|
||||
}
|
||||
{
|
||||
hostName = "homelab";
|
||||
system = "x86_64-linux";
|
||||
wayland.enable = false;
|
||||
ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIARDv5nRlfPDXdV+Db4FaqeSJZ3/3MO0frYGzuVeqYAl";
|
||||
address.private = common.localIpAddr 231;
|
||||
address.tailnet = common.tailnetAddr "admin";
|
||||
}
|
||||
];
|
||||
|
||||
defaultAttrs = {
|
||||
hostName = builtins.abort "hostName is required";
|
||||
system = "x86_64-linux";
|
||||
username = common.username;
|
||||
version = common.system.version;
|
||||
wayland.enable = true;
|
||||
nvidia.enable = false;
|
||||
};
|
||||
|
||||
knownSystems = [
|
||||
{
|
||||
# Samsung S23 FE
|
||||
hostName = "localhost-y4maoyqm";
|
||||
ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII7SSjiqnjif1Kko60iXVTKJ7a1/lRlR8TFNtoclNcnQ";
|
||||
}
|
||||
{
|
||||
# OnePlus 8
|
||||
hostName = "localhost-4izgka9k";
|
||||
ssh.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALtulVgLrUEpKnpfPFQTHjaEXTxs2Q818NC18eLx0bj";
|
||||
}
|
||||
];
|
||||
|
||||
in
|
||||
{
|
||||
#
|
||||
@ -135,6 +152,7 @@
|
||||
lib
|
||||
systemConfig
|
||||
systems
|
||||
knownSystems
|
||||
;
|
||||
isDarwin = false;
|
||||
};
|
||||
|
||||
@ -11,5 +11,5 @@
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||
boot.kernelPackages = pkgs.linuxPackages_6_14;
|
||||
}
|
||||
|
||||
42
hosts/pi4/actual.nix
Normal file
42
hosts/pi4/actual.nix
Normal file
@ -0,0 +1,42 @@
|
||||
{ config, common, ... }:
|
||||
let
|
||||
domain = "beta.budget.${common.domain}";
|
||||
in
|
||||
{
|
||||
networking.nat = {
|
||||
enable = true;
|
||||
internalInterfaces = [ "ve-*" ];
|
||||
externalInterface = "wlan0";
|
||||
# Lazy IPv6 connectivity for the container
|
||||
enableIPv6 = true;
|
||||
};
|
||||
|
||||
containers.actual = {
|
||||
autoStart = true;
|
||||
privateNetwork = true;
|
||||
hostAddress = "192.168.10.188";
|
||||
localAddress = "192.168.10.11";
|
||||
config =
|
||||
{ ... }:
|
||||
{
|
||||
services = {
|
||||
actual = {
|
||||
enable = true;
|
||||
settings = {
|
||||
port = 8084;
|
||||
loginMethod = "password";
|
||||
};
|
||||
};
|
||||
};
|
||||
system.stateVersion = common.system.version;
|
||||
};
|
||||
};
|
||||
services.nginx.virtualHosts.${domain} = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://${config.containers.actual.localAddress}:8084";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -4,11 +4,13 @@ let
|
||||
in
|
||||
{
|
||||
services.caddy = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
email = "cert@${domain}";
|
||||
virtualHosts =
|
||||
let
|
||||
reverseProxy = port: "reverse_proxy localhost:${builtins.toString port}";
|
||||
localProxy = proxyTo "localhost";
|
||||
homelabProxy = proxyTo "192.168.10.231";
|
||||
proxyTo = ip: port: "reverse_proxy ${ip}:${builtins.toString port}";
|
||||
redirect = subdomain: "redir https://${subdomain}.${domain}{uri}";
|
||||
in
|
||||
{
|
||||
@ -23,62 +25,66 @@ in
|
||||
'';
|
||||
# Gitea
|
||||
"code.${domain}".extraConfig = ''
|
||||
${reverseProxy 3000}
|
||||
${homelabProxy 3000}
|
||||
'';
|
||||
# Forgejo
|
||||
"beta.code.${domain}".extraConfig = ''
|
||||
${localProxy 8001}
|
||||
'';
|
||||
# Nextcloud
|
||||
"nextcloud.${domain}".extraConfig = ''
|
||||
redir /.well-known/carddav /remote.php/dav 301
|
||||
redir /.well-known/caldav /remote.php/dav 301
|
||||
${reverseProxy 11000}
|
||||
${homelabProxy 11000}
|
||||
'';
|
||||
# Kitchenowl
|
||||
"grocery.${domain}".extraConfig = ''
|
||||
${reverseProxy 800}
|
||||
${homelabProxy 800}
|
||||
'';
|
||||
# Actual Budget
|
||||
"budget.${domain}".extraConfig = ''
|
||||
${reverseProxy 5006}
|
||||
${homelabProxy 5006}
|
||||
'';
|
||||
# Uptime Kuma
|
||||
"status.${domain}".extraConfig = ''
|
||||
${reverseProxy 3001}
|
||||
${homelabProxy 3001}
|
||||
'';
|
||||
# Headscale
|
||||
"vpn.${domain}".extraConfig = ''
|
||||
reverse_proxy /web* localhost:8084
|
||||
reverse_proxy * localhost:8082
|
||||
reverse_proxy /web* 192.168.10.231:8084
|
||||
reverse_proxy * 192.168.10.231:8082
|
||||
'';
|
||||
# Headscale SmartDNS
|
||||
"dns.${domain}".extraConfig = ''
|
||||
${reverseProxy 8082}
|
||||
${homelabProxy 8082}
|
||||
'';
|
||||
# FreshRSS
|
||||
"rss.${domain}".extraConfig = ''
|
||||
${reverseProxy 8085}
|
||||
${homelabProxy 8085}
|
||||
'';
|
||||
# Ente backend
|
||||
"api.ente.${domain}".extraConfig = ''
|
||||
${reverseProxy 8083}
|
||||
${homelabProxy 8083}
|
||||
'';
|
||||
# Ente Photos frontend
|
||||
"ente.${domain}".extraConfig = ''
|
||||
${reverseProxy 3003}
|
||||
${homelabProxy 3003}
|
||||
'';
|
||||
# Ente Auth frontend
|
||||
"mfa.${domain}".extraConfig = ''
|
||||
${reverseProxy 3004}
|
||||
${homelabProxy 3004}
|
||||
'';
|
||||
# Homepage / portfolio
|
||||
"${domain}".extraconfig = ''
|
||||
${reverseProxy 4321}
|
||||
"${domain}".extraConfig = ''
|
||||
${homelabProxy 4321}
|
||||
'';
|
||||
# Yamtrack
|
||||
"track.${domain}".extraConfig = ''
|
||||
${reverseProxy 8090}
|
||||
${homelabProxy 8090}
|
||||
'';
|
||||
# Postal
|
||||
"mail.${domain}".extraConfig = ''
|
||||
${reverseProxy 5000}
|
||||
# Donetick
|
||||
"chore.${domain}".extraConfig = ''
|
||||
${homelabProxy 2021}
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
@ -1,16 +1,19 @@
|
||||
{
|
||||
lib,
|
||||
systemConfig,
|
||||
...
|
||||
}:
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
imports = with lib.custom; [
|
||||
(relativeToBase "modules")
|
||||
./actual.nix
|
||||
./boot.nix
|
||||
./caddy.nix
|
||||
./forgejo.nix
|
||||
./hardware.nix
|
||||
./headscale.nix
|
||||
./mailserver.nix
|
||||
./nextcloud.nix
|
||||
./nginx.nix
|
||||
./podman.nix
|
||||
./postgres.nix
|
||||
./security
|
||||
];
|
||||
|
||||
system.stateVersion = systemConfig.version;
|
||||
}
|
||||
|
||||
94
hosts/pi4/forgejo.nix
Normal file
94
hosts/pi4/forgejo.nix
Normal file
@ -0,0 +1,94 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
systemConfig,
|
||||
common,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.forgejo;
|
||||
srv = cfg.settings.server;
|
||||
domain = "beta.code.${common.domain}";
|
||||
passwordKey = "forgejo/admin-pass";
|
||||
runnerTokenKey = "forgejo/runner-token";
|
||||
in
|
||||
{
|
||||
services = {
|
||||
nginx.virtualHosts.${domain} = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/".proxyPass = "http://127.0.0.1:${builtins.toString srv.HTTP_PORT}";
|
||||
serverAliases = [ "beta.git.${common.domain}" ];
|
||||
};
|
||||
|
||||
forgejo = {
|
||||
enable = true;
|
||||
database.type = "postgres";
|
||||
# Enable support for Git Large File Storage
|
||||
lfs.enable = true;
|
||||
|
||||
secrets.mailer.PASSWD = config.sops.secrets."mailserver/password-hash".path;
|
||||
|
||||
settings = {
|
||||
server = {
|
||||
DOMAIN = domain;
|
||||
# You need to specify this to remove the port from URLs in the web UI.
|
||||
ROOT_URL = "https://${domain}/";
|
||||
HTTP_PORT = 8002;
|
||||
};
|
||||
# You can temporarily allow registration to create an admin user.
|
||||
service.DISABLE_REGISTRATION = true;
|
||||
# Add support for actions, based on act: https://github.com/nektos/act
|
||||
actions = {
|
||||
ENABLED = true;
|
||||
DEFAULT_ACTIONS_URL = "github";
|
||||
};
|
||||
# Sending emails is completely optional
|
||||
# You can send a test email from the web UI at:
|
||||
# Profile Picture > Site Administration > Configuration > Mailer Configuration
|
||||
mailer = lib.mkIf config.mailserver.enable {
|
||||
ENABLED = true;
|
||||
PROTOCOL = "smtps";
|
||||
SMTP_ADDR = config.mailserver.fqdn;
|
||||
FROM = "noreply-forgejo@${common.domain}";
|
||||
USER = "${systemConfig.username}@${common.domain}";
|
||||
};
|
||||
};
|
||||
};
|
||||
gitea-actions-runner = {
|
||||
package = pkgs.forgejo-actions-runner;
|
||||
instances.default = {
|
||||
enable = true;
|
||||
name = "monolith";
|
||||
url = "https://${domain}";
|
||||
# Obtaining the path to the runner token file may differ
|
||||
# tokenFile should be in format TOKEN=<secret>, since it's EnvironmentFile for systemd
|
||||
tokenFile = config.sops.secrets.${runnerTokenKey}.path;
|
||||
labels = [
|
||||
"docker:docker://node:20-bullseye"
|
||||
"native:host"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
sops.secrets = {
|
||||
${passwordKey}.owner = "forgejo";
|
||||
${runnerTokenKey}.owner = "forgejo";
|
||||
};
|
||||
|
||||
# Create a single admin user / update password if exists
|
||||
systemd.services.forgejo.preStart =
|
||||
let
|
||||
adminCmd = "${lib.getExe config.services.forgejo.package} admin user";
|
||||
pwd = config.sops.secrets.${passwordKey};
|
||||
user = "martin"; # Note, Forgejo doesn't allow creation of an account named "admin"
|
||||
email = "git@${common.domain}";
|
||||
in
|
||||
''
|
||||
${adminCmd} create --admin --email "${email}" --username ${user} --password "$(tr -d '\n' < ${pwd.path})" || true
|
||||
## Alter an existing user. Will prompt new password on login
|
||||
# ${adminCmd} change-password --username ${user} --password "$(tr -d '\n' < ${pwd.path})" || true
|
||||
'';
|
||||
}
|
||||
66
hosts/pi4/headscale.nix
Normal file
66
hosts/pi4/headscale.nix
Normal file
@ -0,0 +1,66 @@
|
||||
{
|
||||
config,
|
||||
common,
|
||||
...
|
||||
}:
|
||||
let
|
||||
cfg = config.services.headscale;
|
||||
|
||||
domain = "beta.vpn.${common.domain}";
|
||||
dnsDomain = "secure.${common.domain}";
|
||||
in
|
||||
{
|
||||
networking.firewall = {
|
||||
trustedInterfaces = [ config.services.tailscale.interfaceName ];
|
||||
allowedUDPPorts = [ config.services.tailscale.port ];
|
||||
};
|
||||
|
||||
services = {
|
||||
headscale = {
|
||||
enable = true;
|
||||
address = "0.0.0.0";
|
||||
port = 8083;
|
||||
settings = {
|
||||
database = {
|
||||
postgres = {
|
||||
host = "/run/postgresql";
|
||||
name = "headscale";
|
||||
port = config.services.postgresql.settings.port;
|
||||
user = cfg.user;
|
||||
};
|
||||
type = "postgres";
|
||||
};
|
||||
dns = {
|
||||
base_domain = dnsDomain;
|
||||
magic_dns = true;
|
||||
};
|
||||
logtail.enabled = false;
|
||||
server_url = "https://${domain}";
|
||||
};
|
||||
};
|
||||
|
||||
nginx.virtualHosts.${domain} = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://localhost:${toString config.services.headscale.port}";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
|
||||
postgresql =
|
||||
let
|
||||
psql = cfg.settings.database.postgres;
|
||||
in
|
||||
{
|
||||
ensureDatabases = [ psql.name ];
|
||||
ensureUsers = [
|
||||
{
|
||||
name = psql.user;
|
||||
ensureDBOwnership = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
@ -1,33 +1,9 @@
|
||||
{
|
||||
lib,
|
||||
inputs,
|
||||
outputs,
|
||||
systemConfig,
|
||||
...
|
||||
}:
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
(lib.custom.relativeToRoot "shared/desktop/home-manager/development/git.nix")
|
||||
(lib.custom.relativeToRoot "shared/desktop/home-manager/development/helix.nix")
|
||||
(lib.custom.relativeToRoot "shared/desktop/home-manager/shell/btop.nix")
|
||||
(lib.custom.relativeToRoot "shared/desktop/home-manager/shell/eza.nix")
|
||||
(lib.custom.relativeToRoot "shared/desktop/home-manager/shell/fastfetch.nix")
|
||||
(lib.custom.relativeToRoot "shared/desktop/home-manager/shell/fish.nix")
|
||||
(lib.custom.relativeToRoot "shared/desktop/home-manager/shell/zoxide.nix")
|
||||
(lib.custom.relativeToRoot "shared/desktop/home-manager/gpg.nix")
|
||||
imports = with lib.custom; [
|
||||
(relativeToBase "home-manager")
|
||||
];
|
||||
|
||||
home.stateVersion = systemConfig.version;
|
||||
|
||||
# Adds pkgs.unstable in order to fetch packages from unstable repositories
|
||||
nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
|
||||
|
||||
programs = {
|
||||
git.signing.key = "E3FA0E995C0D0E5E";
|
||||
# Let Home Manager install and manage itself.
|
||||
home-manager.enable = true;
|
||||
};
|
||||
|
||||
programs.git.signing.key = "E3FA0E995C0D0E5E";
|
||||
}
|
||||
|
||||
44
hosts/pi4/mailserver.nix
Normal file
44
hosts/pi4/mailserver.nix
Normal file
@ -0,0 +1,44 @@
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
common,
|
||||
systemConfig,
|
||||
...
|
||||
}:
|
||||
let
|
||||
passwordHashKey = "mailserver/password-hash";
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
inputs.simple-nixos-mailserver.nixosModule
|
||||
];
|
||||
|
||||
mailserver = {
|
||||
enable = true;
|
||||
# stateVersion = 1; TODO uncomment on 25.11
|
||||
fqdn = "mail.${common.domain}";
|
||||
domains = [
|
||||
common.domain
|
||||
];
|
||||
|
||||
# A list of all login accounts. To create the password hashes, use
|
||||
# nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
|
||||
loginAccounts = {
|
||||
"${systemConfig.username}@${common.domain}" = {
|
||||
hashedPasswordFile = config.sops.secrets.${passwordHashKey}.path;
|
||||
};
|
||||
};
|
||||
|
||||
# Use Let's Encrypt certificates. Note that this needs to set up a stripped
|
||||
# down nginx and opens port 80.
|
||||
certificateScheme = "acme-nginx";
|
||||
};
|
||||
|
||||
networking.firewall.allowedTCPPorts = [
|
||||
25
|
||||
465
|
||||
587
|
||||
];
|
||||
|
||||
sops.secrets.${passwordHashKey}.neededForUsers = true;
|
||||
}
|
||||
90
hosts/pi4/nextcloud.nix
Normal file
90
hosts/pi4/nextcloud.nix
Normal file
@ -0,0 +1,90 @@
|
||||
# https://mich-murphy.com/configure-nextcloud-nixos/
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
common,
|
||||
...
|
||||
}:
|
||||
let
|
||||
adminPassKey = "nextcloud/admin-pass";
|
||||
domain = "beta.nextcloud.${common.domain}";
|
||||
dbname = "nextcloud";
|
||||
dbuser = dbname;
|
||||
in
|
||||
{
|
||||
security.acme = {
|
||||
acceptTerms = true;
|
||||
certs.${config.services.nextcloud.hostName}.email = "acme@${common.domain}";
|
||||
};
|
||||
|
||||
services = {
|
||||
nextcloud = {
|
||||
enable = true;
|
||||
|
||||
autoUpdateApps.enable = true;
|
||||
|
||||
config = {
|
||||
adminpassFile = config.sops.secrets.${adminPassKey}.path;
|
||||
dbtype = "pgsql";
|
||||
dbname = dbname;
|
||||
dbuser = dbuser;
|
||||
# default directory for postgresql, ensures automatic setup of db
|
||||
dbhost = "/run/postgresql";
|
||||
adminuser = "admin";
|
||||
};
|
||||
|
||||
extraApps = {
|
||||
inherit (config.services.nextcloud.package.packages.apps)
|
||||
contacts
|
||||
deck
|
||||
notes
|
||||
tasks
|
||||
;
|
||||
};
|
||||
extraAppsEnable = true;
|
||||
|
||||
hostName = domain;
|
||||
https = true;
|
||||
|
||||
maxUploadSize = "0"; # No max limit
|
||||
package = pkgs.nextcloud31;
|
||||
|
||||
settings = {
|
||||
default_phone_region = "NO";
|
||||
trusted_domains = [
|
||||
domain
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
nginx.virtualHosts.${config.services.nextcloud.hostName} = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
};
|
||||
|
||||
postgresql = {
|
||||
ensureDatabases = [ dbname ];
|
||||
ensureUsers = [
|
||||
{
|
||||
name = dbuser;
|
||||
ensureDBOwnership = true;
|
||||
}
|
||||
];
|
||||
};
|
||||
postgresqlBackup = {
|
||||
enable = true;
|
||||
location = "/data/backup/nextclouddb";
|
||||
databases = [ dbname ];
|
||||
# time to start backup in systemd.time format
|
||||
startAt = "*-*-* 23:15:00";
|
||||
};
|
||||
};
|
||||
|
||||
sops.secrets.${adminPassKey}.neededForUsers = true;
|
||||
|
||||
# ensure postgresql db is started with nextcloud
|
||||
systemd.services."nextcloud-setup" = {
|
||||
requires = [ "postgresql.service" ];
|
||||
after = [ "postgresql.service" ];
|
||||
};
|
||||
}
|
||||
93
hosts/pi4/nginx.nix
Normal file
93
hosts/pi4/nginx.nix
Normal file
@ -0,0 +1,93 @@
|
||||
{
|
||||
common,
|
||||
...
|
||||
}:
|
||||
let
|
||||
domain = common.domain;
|
||||
proxyTo = address: port: {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/".proxyPass = "${address}:${builtins.toString port}";
|
||||
};
|
||||
proxyLocations = locations: {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
inherit locations;
|
||||
};
|
||||
homelab = "http://${common.localIpAddr 231}";
|
||||
homelabProxy = proxyTo homelab; # TODO get homelab local ip from systems
|
||||
redirect = subdomain: {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
globalRedirect = if subdomain == "" then domain else "${subdomain}.${domain}";
|
||||
};
|
||||
in
|
||||
{
|
||||
services.nginx = {
|
||||
enable = true;
|
||||
enableReload = true;
|
||||
recommendedProxySettings = true;
|
||||
recommendedTlsSettings = true;
|
||||
|
||||
virtualHosts = {
|
||||
# Beta is currently stable
|
||||
"www.${domain}" = redirect "";
|
||||
"beta.${domain}" = redirect "";
|
||||
"git.${domain}" = redirect "code";
|
||||
"kitchenowl.${domain}" = redirect "grocery";
|
||||
# Gitea
|
||||
"code.${domain}" = homelabProxy 3000;
|
||||
# Nextcloud
|
||||
"nextcloud.${domain}" = proxyLocations {
|
||||
"/".proxyPass = "${homelab}:11000";
|
||||
"/.well-known/carddav".return = "301 /remote.php/dav";
|
||||
"/.well-known/caldav".return = "301 /remote.php/dav";
|
||||
};
|
||||
# Kitchenowl
|
||||
"grocery.${domain}" = homelabProxy 800;
|
||||
# Actual budget
|
||||
"budget.${domain}" = homelabProxy 5006;
|
||||
# Uptime Kuma
|
||||
"status.${domain}" = homelabProxy 3001;
|
||||
# Headscale
|
||||
"vpn.${domain}" = proxyLocations {
|
||||
"/web".proxyPass = "${homelab}:8084";
|
||||
"/" = {
|
||||
proxyPass = "${homelab}:8082";
|
||||
extraConfig = ''
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection $connection_upgrade;
|
||||
proxy_redirect http:// https://;
|
||||
proxy_buffering off;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always;
|
||||
'';
|
||||
};
|
||||
};
|
||||
# Headscale SmartDNS
|
||||
"dns.${domain}" = homelabProxy 8082;
|
||||
# FreshRSS
|
||||
"rss.${domain}" = homelabProxy 8085;
|
||||
# Ente backend
|
||||
"api.ente.${domain}" = homelabProxy 8083;
|
||||
# Ente Photos frontend
|
||||
"ente.${domain}" = homelabProxy 3003;
|
||||
# Ente Auth frontend
|
||||
"mfa.${domain}" = homelabProxy 3004;
|
||||
# Homepage / portfolio
|
||||
"${domain}" = homelabProxy 4321;
|
||||
# Yamtrack
|
||||
"track.${domain}" = homelabProxy 8090;
|
||||
# Donetick
|
||||
"chore.${domain}" = homelabProxy 2021;
|
||||
};
|
||||
};
|
||||
|
||||
security.acme = {
|
||||
acceptTerms = true;
|
||||
defaults.email = "acme@${domain}";
|
||||
};
|
||||
}
|
||||
23
hosts/pi4/podman.nix
Normal file
23
hosts/pi4/podman.nix
Normal file
@ -0,0 +1,23 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
virtualisation = {
|
||||
# Enable common container config files in /etc/containers
|
||||
containers.enable = true;
|
||||
podman = {
|
||||
enable = true;
|
||||
|
||||
# Create a `docker` alias for podman, to use it as a drop-in replacement
|
||||
dockerCompat = true;
|
||||
|
||||
# Required for containers under podman-compose to be able to talk to each other.
|
||||
defaultNetwork.settings.dns_enabled = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Useful other development tools
|
||||
environment.systemPackages = with pkgs; [
|
||||
podman-tui # status of containers in the terminal
|
||||
podman-compose # start group of containers for dev
|
||||
];
|
||||
}
|
||||
11
hosts/pi4/postgres.nix
Normal file
11
hosts/pi4/postgres.nix
Normal file
@ -0,0 +1,11 @@
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
services.postgresql = {
|
||||
enable = true;
|
||||
authentication = pkgs.lib.mkOverride 10 ''
|
||||
#type database DBuser auth-method
|
||||
local all all trust
|
||||
'';
|
||||
};
|
||||
}
|
||||
@ -1,17 +1,7 @@
|
||||
{ lib, ... }:
|
||||
|
||||
{
|
||||
imports = with lib.custom; [
|
||||
(relativeToRoot "shared/modules/security/ssh.nix")
|
||||
imports = [
|
||||
./firewall.nix
|
||||
];
|
||||
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
services = {
|
||||
pcscd.enable = true;
|
||||
gnome.gnome-keyring.enable = true;
|
||||
};
|
||||
services.pcscd.enable = true;
|
||||
}
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
{ common, ... }:
|
||||
|
||||
{
|
||||
networking = {
|
||||
firewall = {
|
||||
@ -6,15 +8,9 @@
|
||||
80
|
||||
443
|
||||
];
|
||||
trustedInterfaces = [ "tailscale0" ];
|
||||
extraInputRules =
|
||||
let
|
||||
localIPv4Range = "192.168.10.0/24";
|
||||
in
|
||||
''
|
||||
ip saddr ${localIPv4Range} tcp dport 22 accept
|
||||
ip saddr ${localIPv4Range} udp dport 22 accept
|
||||
'';
|
||||
extraInputRules = ''
|
||||
ip saddr ${common.localIpRange} accept
|
||||
'';
|
||||
};
|
||||
nftables.enable = true;
|
||||
};
|
||||
|
||||
6
justfile
6
justfile
@ -34,11 +34,9 @@ switch *FLAGS:
|
||||
switch-now *FLAGS:
|
||||
nh os switch . {{FLAGS}}
|
||||
|
||||
update-all:
|
||||
nix-channel --update
|
||||
update-all *FLAGS:
|
||||
nix flake update
|
||||
|
||||
just switch
|
||||
just switch {{FLAGS}}
|
||||
|
||||
update PKG:
|
||||
nix flake update {{PKG}}
|
||||
|
||||
@ -1,3 +1,12 @@
|
||||
{ inputs, ... }:
|
||||
|
||||
{
|
||||
imports = [ ./ssh.nix ];
|
||||
imports = [
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
./development
|
||||
./shell
|
||||
./gpg.nix
|
||||
./home-manager.nix
|
||||
./ssh.nix
|
||||
];
|
||||
}
|
||||
|
||||
6
shared/base/home-manager/development/default.nix
Normal file
6
shared/base/home-manager/development/default.nix
Normal file
@ -0,0 +1,6 @@
|
||||
{
|
||||
imports = [
|
||||
./git.nix
|
||||
./helix.nix
|
||||
];
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, ... }:
|
||||
{ pkgs, common, ... }:
|
||||
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
@ -14,7 +14,7 @@
|
||||
enable = true;
|
||||
package = package;
|
||||
userName = "Martin Berg Alstad";
|
||||
userEmail = "git@martials.no";
|
||||
userEmail = "git@${common.domain}";
|
||||
|
||||
aliases = {
|
||||
amend = "commit --amend";
|
||||
@ -5,6 +5,6 @@
|
||||
services.gpg-agent = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
pinentryPackage = pkgs.pinentry-curses;
|
||||
pinentry.package = pkgs.pinentry-curses;
|
||||
};
|
||||
}
|
||||
16
shared/base/home-manager/home-manager.nix
Normal file
16
shared/base/home-manager/home-manager.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{
|
||||
systemConfig,
|
||||
common,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
home = {
|
||||
username = systemConfig.username;
|
||||
homeDirectory = common.dir.home;
|
||||
stateVersion = systemConfig.version;
|
||||
};
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
}
|
||||
13
shared/base/home-manager/shell/bat.nix
Normal file
13
shared/base/home-manager/shell/bat.nix
Normal file
@ -0,0 +1,13 @@
|
||||
{ theme, ... }:
|
||||
|
||||
{
|
||||
catppuccin.bat = {
|
||||
enable = true;
|
||||
flavor = theme.flavor;
|
||||
};
|
||||
|
||||
programs = {
|
||||
bat.enable = true;
|
||||
fish.shellAliases.cat = "bat";
|
||||
};
|
||||
}
|
||||
11
shared/base/home-manager/shell/default.nix
Normal file
11
shared/base/home-manager/shell/default.nix
Normal file
@ -0,0 +1,11 @@
|
||||
{
|
||||
imports = [
|
||||
./bat.nix
|
||||
./btop.nix
|
||||
./eza.nix
|
||||
./fastfetch.nix
|
||||
./fish.nix
|
||||
./fzf.nix
|
||||
./zoxide.nix
|
||||
];
|
||||
}
|
||||
@ -15,13 +15,16 @@ with builtins;
|
||||
name = system.hostName;
|
||||
value =
|
||||
let
|
||||
# TODO rename desktop to homelab
|
||||
hostName = if system.hostName == "homelab" then "admin" else system.hostName;
|
||||
hostName =
|
||||
if (system ? address && system.address ? tailnet) then
|
||||
system.address.tailnet
|
||||
else
|
||||
common.tailnetAddr system.hostName;
|
||||
in
|
||||
{
|
||||
port = 22;
|
||||
user = systemConfig.username;
|
||||
hostname = "${hostName}.dns.${common.domain}";
|
||||
hostname = hostName;
|
||||
};
|
||||
}) systems
|
||||
);
|
||||
|
||||
@ -21,5 +21,8 @@
|
||||
overlays = [ outputs.overlays.unstable-packages ];
|
||||
};
|
||||
|
||||
system.stateVersion = systemConfig.version;
|
||||
system = {
|
||||
rebuild.enableNg = true;
|
||||
stateVersion = systemConfig.version;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
{
|
||||
imports = [
|
||||
./keyring.nix
|
||||
./sops.nix
|
||||
./ssh.nix
|
||||
];
|
||||
|
||||
3
shared/base/modules/security/keyring.nix
Normal file
3
shared/base/modules/security/keyring.nix
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
services.gnome.gnome-keyring.enable = true;
|
||||
}
|
||||
@ -2,12 +2,13 @@
|
||||
{
|
||||
systemConfig,
|
||||
systems,
|
||||
knownSystems,
|
||||
common,
|
||||
...
|
||||
}:
|
||||
with builtins;
|
||||
let
|
||||
domain = "dns.${common.domain}";
|
||||
allSystems = knownSystems ++ systems;
|
||||
in
|
||||
{
|
||||
programs.ssh.knownHosts = listToAttrs (
|
||||
@ -15,13 +16,18 @@ in
|
||||
name = system.hostName;
|
||||
value = {
|
||||
extraHostNames = [
|
||||
"${system.hostName}.${domain}"
|
||||
(
|
||||
if (system ? address && system.address ? tailnet) then
|
||||
system.address.tailnet
|
||||
else
|
||||
common.tailnetAddr system.hostName
|
||||
)
|
||||
];
|
||||
publicKey = system.ssh.publicKey;
|
||||
};
|
||||
}) systems
|
||||
}) allSystems
|
||||
);
|
||||
users.users.${systemConfig.username}.openssh.authorizedKeys.keys = (
|
||||
map (system: system.ssh.publicKey) systems
|
||||
map (system: system.ssh.publicKey) allSystems
|
||||
);
|
||||
}
|
||||
|
||||
@ -14,6 +14,11 @@ rec {
|
||||
};
|
||||
|
||||
domain = "martials.no";
|
||||
tailnetDomain = "dns.${domain}";
|
||||
localIpPrefix = "192.168.10.";
|
||||
localIpRange = "${localIpPrefix}0/24";
|
||||
localIpAddr = subAddr: "${localIpPrefix}${builtins.toString subAddr}";
|
||||
tailnetAddr = host: "${host}.${tailnetDomain}";
|
||||
|
||||
keymaps = {
|
||||
layout = "gb,no";
|
||||
@ -30,5 +35,5 @@ rec {
|
||||
# this value at the release version of the first install of this system.
|
||||
# Before changing this value read the documentation for this option
|
||||
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
|
||||
system.version = "24.11";
|
||||
system.version = "25.05";
|
||||
}
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
{
|
||||
inputs,
|
||||
outputs,
|
||||
lib,
|
||||
common,
|
||||
systemConfig,
|
||||
...
|
||||
}:
|
||||
let
|
||||
@ -12,41 +9,23 @@ in
|
||||
{
|
||||
imports = [
|
||||
(lib.custom.relativeToBase "home-manager")
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
./development
|
||||
./hyprland
|
||||
./media
|
||||
./rofi
|
||||
./shell
|
||||
./zen
|
||||
./cursors.nix
|
||||
./default-applications.nix
|
||||
./development
|
||||
./freetube.nix
|
||||
./gtk.nix
|
||||
./gpg.nix
|
||||
./kitty.nix
|
||||
./media
|
||||
./nextcloud.nix
|
||||
./rofi
|
||||
./hyprland
|
||||
./shell
|
||||
./sioyek.nix
|
||||
./spicetify.nix
|
||||
./zen
|
||||
];
|
||||
|
||||
home = {
|
||||
username = systemConfig.username;
|
||||
homeDirectory = dir.home;
|
||||
|
||||
sessionVariables = {
|
||||
XDG_PICTURES_DIR = dir.pictures; # Define the default dir for pictures
|
||||
};
|
||||
|
||||
# You can update Home Manager without changing this value. See
|
||||
# the Home Manager release notes for a list of state version
|
||||
# changes in each release.
|
||||
stateVersion = systemConfig.version;
|
||||
home.sessionVariables = {
|
||||
XDG_PICTURES_DIR = dir.pictures; # Define the default dir for pictures
|
||||
};
|
||||
|
||||
# Adds pkgs.unstable in order to fetch packages from unstable repositories
|
||||
nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
}
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
{
|
||||
imports = [
|
||||
./git.nix
|
||||
./helix.nix
|
||||
./zed.nix
|
||||
];
|
||||
# TODO set Wayland vmOptions in Jetbrains products, Requires current installed version in path
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
fontSize = 14;
|
||||
in
|
||||
{
|
||||
assistant = {
|
||||
agent = {
|
||||
default_model = {
|
||||
provider = "ollama";
|
||||
model = "deepseek-r1:8b";
|
||||
|
||||
@ -78,7 +78,7 @@
|
||||
fail_color = "${theme.redRgb}";
|
||||
fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
|
||||
capslock_color = "${theme.yellowRgb}";
|
||||
position = "0, -47"; # TODO change to use % at 25.05
|
||||
position = "0, -5%";
|
||||
halign = "center";
|
||||
valign = "center";
|
||||
};
|
||||
|
||||
@ -9,6 +9,11 @@ let
|
||||
in
|
||||
{
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
ecosystem = {
|
||||
no_update_news = true;
|
||||
no_donation_nag = true;
|
||||
};
|
||||
|
||||
monitor = [
|
||||
", preferred, auto, 1"
|
||||
];
|
||||
|
||||
@ -1,12 +1,6 @@
|
||||
{
|
||||
imports = [
|
||||
./btop.nix
|
||||
./cava
|
||||
./eza.nix
|
||||
./fastfetch.nix
|
||||
./fish.nix
|
||||
./fzf.nix
|
||||
./yazi
|
||||
./zoxide.nix
|
||||
];
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
keymap = {
|
||||
manager.prepend_keymap = [
|
||||
mgr.prepend_keymap = [
|
||||
{
|
||||
run = "hidden toggle";
|
||||
on = [ "<C-h>" ];
|
||||
@ -23,7 +23,7 @@
|
||||
];
|
||||
};
|
||||
settings = {
|
||||
manager = {
|
||||
mgr = {
|
||||
ratio = [
|
||||
2
|
||||
4
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ pkgs, theme, ... }:
|
||||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
@ -8,10 +8,7 @@
|
||||
fonts = {
|
||||
fontconfig.enable = true;
|
||||
packages = with pkgs; [
|
||||
(nerdfonts.override { fonts = [ theme.nerdFont ]; })
|
||||
jetbrains-mono
|
||||
# The line below will replace the lines above in 25.05
|
||||
# nerd-fonts.jetbrains-mono
|
||||
nerd-fonts.jetbrains-mono
|
||||
font-awesome
|
||||
];
|
||||
};
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
programs.dconf.enable = true; # Required for some gnome applications
|
||||
|
||||
services = {
|
||||
gnome.gnome-keyring.enable = true;
|
||||
gvfs.enable = true; # Gnome Virtual File-system. Required for various things in nautilus
|
||||
udev.packages = with pkgs; [ gnome-settings-daemon ];
|
||||
};
|
||||
|
||||
@ -13,8 +13,6 @@
|
||||
spotify
|
||||
];
|
||||
|
||||
hardware.pulseaudio.enable = false; # Will be moved to services in 25.05
|
||||
|
||||
security.rtkit.enable = true; # Enable RealtimeKit for audio purposes
|
||||
|
||||
services = {
|
||||
@ -28,6 +26,6 @@
|
||||
# Uncomment the following line if you want to use JACK applications
|
||||
# jack.enable = true;
|
||||
};
|
||||
# pulseaudio.enable = false; # TODO uncommenct at 25.05
|
||||
pulseaudio.enable = false; # Will be moved to services in 25.05
|
||||
};
|
||||
}
|
||||
|
||||
@ -30,20 +30,7 @@ lib.mkIf systemConfig.nvidia.enable {
|
||||
finegrained = false;
|
||||
};
|
||||
|
||||
# https://discourse.nixos.org/t/nvidia-dgpu-prime-offload-mode-amd-igpu-wayland/63194/3
|
||||
package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
|
||||
version = "570.133.07";
|
||||
# this is the third one it will complain is wrong
|
||||
sha256_64bit = "sha256-LUPmTFgb5e9VTemIixqpADfvbUX1QoTT2dztwI3E3CY=";
|
||||
# unused
|
||||
sha256_aarch64 = "sha256-2l8N83Spj0MccA8+8R1uqiXBS0Ag4JrLPjrU3TaXHnM=";
|
||||
# this is the second one it will complain is wrong
|
||||
openSha256 = "sha256-9l8N83Spj0MccA8+8R1uqiXBS0Ag4JrLPjrU3TaXHnM=";
|
||||
# this is the first one it will complain is wrong
|
||||
settingsSha256 = "sha256-XMk+FvTlGpMquM8aE8kgYK2PIEszUZD2+Zmj2OpYrzU=";
|
||||
# unused
|
||||
persistencedSha256 = "sha256-4l8N83Spj0MccA8+8R1uqiXBS0Ag4JrLPjrU3TaXHnM=";
|
||||
};
|
||||
package = config.boot.kernelPackages.nvidiaPackages.latest;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ in
|
||||
# Select internationalisation properties.
|
||||
i18n = {
|
||||
defaultLocale = en;
|
||||
supportedLocales = [
|
||||
extraLocales = [
|
||||
"${en}/${utf-8}"
|
||||
"${nb}/${utf-8}"
|
||||
];
|
||||
|
||||
@ -3,6 +3,6 @@
|
||||
{
|
||||
environment.systemPackages = with pkgs; [
|
||||
onlyoffice-desktopeditors
|
||||
planify
|
||||
# planify
|
||||
];
|
||||
}
|
||||
|
||||
@ -1,4 +1,9 @@
|
||||
{ pkgs, theme, ... }:
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
theme,
|
||||
...
|
||||
}:
|
||||
let
|
||||
flavor = theme.flavor;
|
||||
in
|
||||
@ -8,7 +13,7 @@ in
|
||||
flavor = flavor;
|
||||
font = theme.nerdFont;
|
||||
fontSize = "9";
|
||||
background = builtins.toString ../assets/catppuccin_high.png;
|
||||
background = builtins.toString (lib.custom.relativeToRoot "shared/assets/catppuccin_high.png");
|
||||
loginBackground = true;
|
||||
})
|
||||
];
|
||||
|
||||
@ -1,9 +1,13 @@
|
||||
forgejo:
|
||||
admin-pass: ENC[AES256_GCM,data:RGTOw0Yo5rJGEVLGsQgyk9Wc,iv:SuN770eAgFIVd4pJ6vmPIvVCMqTW/2sBUYUbqym2cHo=,tag:YlyNR/fFchdBwzCuIsWGMA==,type:str]
|
||||
#ENC[AES256_GCM,data:oMpYBQ30sdCTtgxEZvYxTd9oi9QM0bYp5NisMdQHYT/nF2k=,iv:H9/g7XttJScVXV38+yHdbgWNFDhBYyudjK5BKHTt5wo=,tag:FNfkKfkKWDBUAXiGXkDchw==,type:comment]
|
||||
runner-token: ENC[AES256_GCM,data:xbULBWrqosktW7XHViLH7Sk76upH31RFQNsBcXWWN7bpRadF3tpBA/hksMyEdg==,iv:v3vzUb5wsWeKWRYWT+ks4ZWGXQRhZ+td3N3bpuwoVc8=,tag:rEVoEw/QOSs8puujsRBxXQ==,type:str]
|
||||
password-hash: ENC[AES256_GCM,data:FsGHBAw/z4tcBRObVlo//UotWHyHns0+vdJVgt2lfGiIfQG+1I60g2Tzgv/O+gz3oz41NIwAYf61SR9AfXhpnc1AxiZRlCBwMQ==,iv:oiJndSVZQ+00UPz0TuJXV+T8x9mtecrNDUaablOGffU=,tag:wQuow7C8KqelJOE9KqCxMA==,type:str]
|
||||
mailserver:
|
||||
password-hash: ENC[AES256_GCM,data:H5PlCVuwUxIjtWbNsxb/ROkY2KiNhSwvWDvTLBfR596ijRTkaH0xtltsvHiiNHmfKERfcAXKO9EyGNHc,iv:qev1fs0PPydz8cm9D7hLp6ULgUEQJm+E0Pg86bor1to=,tag:zFnJ23NDCXeur+kvNSQV6w==,type:str]
|
||||
nextcloud:
|
||||
admin-pass: ENC[AES256_GCM,data:RBuuNc7J/CCJXG8n73B5cw==,iv:uKNj40SdJn6LbZoV1i9fq+5TGmRDPYVhCxAUghV4vqs=,tag:wUHBPo5T+2tyjsQFlUXDEQ==,type:str]
|
||||
sops:
|
||||
kms: []
|
||||
gcp_kms: []
|
||||
azure_kv: []
|
||||
hc_vault: []
|
||||
age:
|
||||
- recipient: age1j66v6z6hlsgqjfv5fz7fldm5q9jay4j5v5du6ymfda6hv40nsqesg89g7p
|
||||
enc: |
|
||||
@ -32,8 +36,7 @@ sops:
|
||||
SGdNMnVlQlNEeVJkWmZEM1FRT2JJMGMKbZ/znJM6tFhzhHariRXMLgH/4CRZZKrb
|
||||
YtmSdeL/Pd5YIecCpjDHDn4vQ0TBAmLaX+zVbNbRKmMZoY7777ywfA==
|
||||
-----END AGE ENCRYPTED FILE-----
|
||||
lastmodified: "2025-05-15T16:57:17Z"
|
||||
mac: ENC[AES256_GCM,data:HE/liIsb/7RazR671Keo5nH9+qp3BMPGxJcm97fzXkeO8TnCk/lNy43InKu7ON316G375F2oTeiuz90JthUYV2wBQFZTVWR6pROhRSewT7T3pp3lRPtIIwmvOmvJd537OVN1iz2p+1EgW4+gERrgQ9wPHWyyeFB7a9SkTeLmmGA=,iv:bvL1WyUHnnXB7gWZyVdru+j8oAFD11lbQkMvgWkgm24=,tag:CKFt/UlRRImKYakUI44fWw==,type:str]
|
||||
pgp: []
|
||||
lastmodified: "2025-06-23T17:39:10Z"
|
||||
mac: ENC[AES256_GCM,data:+6X13vyCteJKZFo6RMI4rCo/gizcJO828xTL/gspgZemHcnqaf1P6nIntE5flin7IsfkxqoH8k25Xqzp6TLddsw8oYGA7fyDX7l28wFoxASTaZu2KChqGeRsEuVjuQGIAHKbB/4aI003NPT48l+uePOMNwUzlBrRnRYE5MMgQRI=,iv:UefKr2KL0+py7soUGjS0Onql/cAO+mXpvzJKJjtRppU=,tag:qcvB7rrdDRC3EfgjonM6uw==,type:str]
|
||||
unencrypted_suffix: _unencrypted
|
||||
version: 3.9.4
|
||||
version: 3.10.2
|
||||
|
||||
Reference in New Issue
Block a user