Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 wymiller
|
b39ad458a5
|
||
|
wymiller
|
4159d6a724
|
No files matched your search
@@ -1,40 +0,0 @@
|
|||||||
name: Update flake lock
|
|
||||||
|
|
||||||
on:
|
|
||||||
schedule:
|
|
||||||
# Gitea cron schedules use UTC. 07:00 UTC is 03:00 EDT.
|
|
||||||
- cron: "0 7 * * 0"
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
permissions:
|
|
||||||
contents: write
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
update-flake-lock:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Check out repository
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Install upstream Nix
|
|
||||||
uses: cachix/install-nix-action@v31
|
|
||||||
|
|
||||||
- name: Update flake lock
|
|
||||||
run: nix flake update
|
|
||||||
|
|
||||||
- name: Commit and push changes
|
|
||||||
shell: bash
|
|
||||||
run: |
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
if git diff --quiet -- flake.lock; then
|
|
||||||
echo "flake.lock is already up to date"
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
git config user.name "gitea-actions[bot]"
|
|
||||||
git config user.email "gitea-actions[bot]@noreply.localhost"
|
|
||||||
git add flake.lock
|
|
||||||
git commit -m "chore: update flake lock"
|
|
||||||
git push
|
|
||||||
@@ -1,10 +1,85 @@
|
|||||||
|
if true then return {} end -- WARN: REMOVE THIS LINE TO ACTIVATE THIS FILE
|
||||||
|
|
||||||
|
-- You can also add or configure plugins by creating files in this `plugins/` folder
|
||||||
|
-- Here are some examples:
|
||||||
|
|
||||||
---@type LazySpec
|
---@type LazySpec
|
||||||
return {
|
return {
|
||||||
{ "nvim-treesitter/nvim-treesitter" },
|
|
||||||
{ "neovim/nvim-lspconfig" },
|
-- == Examples of Adding Plugins ==
|
||||||
{ "kylechui/nvim-surround" },
|
|
||||||
{ "nvim-neo-tree/neo-tree.nvim" },
|
"andweeb/presence.nvim",
|
||||||
{ "akinsho/toggleterm.nvim" },
|
{
|
||||||
{ "nvimtools/none-ls.nvim" },
|
"ray-x/lsp_signature.nvim",
|
||||||
{ "rebelot/heirline.nvim" },
|
event = "BufRead",
|
||||||
|
config = function() require("lsp_signature").setup() end,
|
||||||
|
},
|
||||||
|
|
||||||
|
-- == Examples of Overriding Plugins ==
|
||||||
|
|
||||||
|
-- customize alpha options
|
||||||
|
{
|
||||||
|
"goolord/alpha-nvim",
|
||||||
|
opts = function(_, opts)
|
||||||
|
-- customize the dashboard header
|
||||||
|
opts.section.header.val = {
|
||||||
|
" █████ ███████ ████████ ██████ ██████",
|
||||||
|
"██ ██ ██ ██ ██ ██ ██ ██",
|
||||||
|
"███████ ███████ ██ ██████ ██ ██",
|
||||||
|
"██ ██ ██ ██ ██ ██ ██ ██",
|
||||||
|
"██ ██ ███████ ██ ██ ██ ██████",
|
||||||
|
" ",
|
||||||
|
" ███ ██ ██ ██ ██ ███ ███",
|
||||||
|
" ████ ██ ██ ██ ██ ████ ████",
|
||||||
|
" ██ ██ ██ ██ ██ ██ ██ ████ ██",
|
||||||
|
" ██ ██ ██ ██ ██ ██ ██ ██ ██",
|
||||||
|
" ██ ████ ████ ██ ██ ██",
|
||||||
|
}
|
||||||
|
return opts
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
|
-- You can disable default plugins as follows:
|
||||||
|
{ "max397574/better-escape.nvim", enabled = false },
|
||||||
|
|
||||||
|
-- You can also easily customize additional setup of plugins that is outside of the plugin's setup call
|
||||||
|
{
|
||||||
|
"L3MON4D3/LuaSnip",
|
||||||
|
config = function(plugin, opts)
|
||||||
|
require "astronvim.plugins.configs.luasnip"(plugin, opts) -- include the default astronvim config that calls the setup call
|
||||||
|
-- add more custom luasnip configuration such as filetype extend or custom snippets
|
||||||
|
local luasnip = require "luasnip"
|
||||||
|
luasnip.filetype_extend("javascript", { "javascriptreact" })
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"windwp/nvim-autopairs",
|
||||||
|
config = function(plugin, opts)
|
||||||
|
require "astronvim.plugins.configs.nvim-autopairs"(plugin, opts) -- include the default astronvim config that calls the setup call
|
||||||
|
-- add more custom autopairs configuration such as custom rules
|
||||||
|
local npairs = require "nvim-autopairs"
|
||||||
|
local Rule = require "nvim-autopairs.rule"
|
||||||
|
local cond = require "nvim-autopairs.conds"
|
||||||
|
npairs.add_rules(
|
||||||
|
{
|
||||||
|
Rule("$", "$", { "tex", "latex" })
|
||||||
|
-- don't add a pair if the next character is %
|
||||||
|
:with_pair(cond.not_after_regex "%%")
|
||||||
|
-- don't add a pair if the previous character is xxx
|
||||||
|
:with_pair(
|
||||||
|
cond.not_before_regex("xxx", 3)
|
||||||
|
)
|
||||||
|
-- don't move right when repeat character
|
||||||
|
:with_move(cond.none())
|
||||||
|
-- don't delete if the next character is xx
|
||||||
|
:with_del(cond.not_after_regex "xx")
|
||||||
|
-- disable adding a newline when you press <cr>
|
||||||
|
:with_cr(cond.none()),
|
||||||
|
},
|
||||||
|
-- disable for .vim files, but it work for another filetypes
|
||||||
|
Rule("a", "a", "-vim")
|
||||||
|
)
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
Generated
+97
-314
@@ -9,11 +9,11 @@
|
|||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792853286,
|
"lastModified": 1783689476,
|
||||||
"narHash": "sha256-l/Oh5k1NQqQuwh4gBF3VcmCF0WGiCT/LqfvY5huhOq4=",
|
"narHash": "sha256-Ac4EGPZr9e+mPUdmavJFSTft4vgoXml40+YOFYKTXPg=",
|
||||||
"owner": "ezKEa",
|
"owner": "ezKEa",
|
||||||
"repo": "aagl-gtk-on-nix",
|
"repo": "aagl-gtk-on-nix",
|
||||||
"rev": "e9a3b8fdb50a7d77a90c02c84e298c286310385b",
|
"rev": "af94408291ad477cae8eed964981ab41f90eb184",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -22,29 +22,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"caitsith": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-schemas": "flake-schemas",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"rust-overlay": "rust-overlay_2"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1792911802,
|
|
||||||
"narHash": "sha256-GdMiAfj8hRDCqrE2AvQJ3atf0y2XVGFx9/Ptr6qiju0=",
|
|
||||||
"ref": "refs/heads/master",
|
|
||||||
"rev": "a355f99a17b9dc38fc626b80340646a94ae7f1c9",
|
|
||||||
"revCount": 30,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://scm.wyattjmiller.com/wymiller/caitsith.git"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"darwin": {
|
"darwin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -52,11 +29,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792800221,
|
"lastModified": 1783744694,
|
||||||
"narHash": "sha256-53jIZEWNh96irEXhsMZFoNhLJgGSU3nYl1i4wFQHAsU=",
|
"narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "d31953cf55f9027a56e9be938daf5db8c5655663",
|
"rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -74,11 +51,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792737899,
|
"lastModified": 1779036909,
|
||||||
"narHash": "sha256-P0/GhewcEQmAbzq3QunNWY2jLJaYH9F6c/5dEM/jQ4M=",
|
"narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "bb0b90dbd54e207100de72b5dcbe3188c98a4b69",
|
"rev": "56c666e108467d87d13508936aade6d567f2a501",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -119,54 +96,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat_3": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1767039857,
|
|
||||||
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NixOS",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat_4": {
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat_5": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1777699697,
|
|
||||||
"narHash": "sha256-Eg9b/rq/ECYwNwEXs5i9wHyhxNI0JrYx2srdI2uZMaQ=",
|
|
||||||
"ref": "refs/heads/main",
|
|
||||||
"rev": "382052b74656a369c5408822af3f2501e9b1af81",
|
|
||||||
"revCount": 94,
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lix.systems/lix-project/flake-compat.git"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "git",
|
|
||||||
"url": "https://git.lix.systems/lix-project/flake-compat.git"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-schemas": {
|
"flake-schemas": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1780327564,
|
"lastModified": 1780327564,
|
||||||
@@ -181,20 +110,6 @@
|
|||||||
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
|
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-schemas_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1780327564,
|
|
||||||
"narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=",
|
|
||||||
"rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6",
|
|
||||||
"revCount": 149,
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
@@ -234,17 +149,18 @@
|
|||||||
"git-hooks": {
|
"git-hooks": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_2",
|
||||||
|
"gitignore": "gitignore",
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"go-overlay",
|
"go-overlay",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1788267358,
|
"lastModified": 1778507602,
|
||||||
"narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
|
"narHash": "sha256-kTwur1wV+01SdqskVMSo6JMEpg71ps3HpbFY2GsflKs=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "27555e2624241fb116b49095df4caaee85a25691",
|
"rev": "61ab0e80d9c7ab14c256b5b453d8b3fb0189ba0a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -253,26 +169,25 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"git-hooks_2": {
|
"gitignore": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_3",
|
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nur",
|
|
||||||
"go-overlay",
|
"go-overlay",
|
||||||
|
"git-hooks",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1788267358,
|
"lastModified": 1709087332,
|
||||||
"narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
|
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
||||||
"owner": "cachix",
|
"owner": "hercules-ci",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "gitignore.nix",
|
||||||
"rev": "27555e2624241fb116b49095df4caaee85a25691",
|
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "cachix",
|
"owner": "hercules-ci",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "gitignore.nix",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -283,34 +198,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792644631,
|
"lastModified": 1783668331,
|
||||||
"narHash": "sha256-3aILZu5bQ+6khPvGCdIbC7wBFZOgPbpP0TBSL9tf89E=",
|
"narHash": "sha256-mMfzU9jvq9XQyyssR9w0Rki8/Ec4Ez+bLkFWc7BaGGg=",
|
||||||
"owner": "purpleclay",
|
"owner": "purpleclay",
|
||||||
"repo": "go-overlay",
|
"repo": "go-overlay",
|
||||||
"rev": "ff2b494b477eb4349dd40f0564cedab552f9804d",
|
"rev": "423eed783363fa154fc7f0c049f7effa910d2440",
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "purpleclay",
|
|
||||||
"repo": "go-overlay",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"go-overlay_2": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils_2",
|
|
||||||
"git-hooks": "git-hooks_2",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1792644631,
|
|
||||||
"narHash": "sha256-3aILZu5bQ+6khPvGCdIbC7wBFZOgPbpP0TBSL9tf89E=",
|
|
||||||
"owner": "purpleclay",
|
|
||||||
"repo": "go-overlay",
|
|
||||||
"rev": "ff2b494b477eb4349dd40f0564cedab552f9804d",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -321,19 +213,16 @@
|
|||||||
},
|
},
|
||||||
"hildibrand": {
|
"hildibrand": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-schemas": "flake-schemas_2",
|
"flake-schemas": "flake-schemas",
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_3",
|
||||||
"nur",
|
"rust-overlay": "rust-overlay_2"
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"rust-overlay": "rust-overlay_3"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792911744,
|
"lastModified": 1785717646,
|
||||||
"narHash": "sha256-iXH6FL8HYaZg0+p9lUv5bEc4k1YpvwKFYtMYbY1phTA=",
|
"narHash": "sha256-j6MlkwaYOLa3bogK4SbOnVI5eMZ9j2GdExSiKMaELPo=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "01ff244467f011033d98286e8f4171a890e9060a",
|
"rev": "9588520925513ed0e47711a5798c6e9958143a0a",
|
||||||
"revCount": 19,
|
"revCount": 5,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
|
"url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
|
||||||
},
|
},
|
||||||
@@ -349,11 +238,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792818383,
|
"lastModified": 1783740085,
|
||||||
"narHash": "sha256-199i7ubVSXTMl+0AAlL7cVCXSjcI+jWByMcimYjeMX0=",
|
"narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "24f2190587513b9c2f73db112a17844ae912d965",
|
"rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -365,17 +254,14 @@
|
|||||||
},
|
},
|
||||||
"home-manager_2": {
|
"home-manager_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_4"
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792896866,
|
"lastModified": 1779507042,
|
||||||
"narHash": "sha256-/0tELNnhdSnP+bHSdWiEe6KpfSwi6WrTnT9cm/jNkjA=",
|
"narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "c216bf5a1f173b0481bd5c8c489ebe5595ecc68c",
|
"rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -384,21 +270,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"mnw": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1784154424,
|
|
||||||
"narHash": "sha256-HRn4O1X2ShYtbq5Egji72/aemyc2cIQicjRZD9hBqM8=",
|
|
||||||
"owner": "Gerg-L",
|
|
||||||
"repo": "mnw",
|
|
||||||
"rev": "0151d9fa87992cbeb67c86616fb9170dcec830b6",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "Gerg-L",
|
|
||||||
"repo": "mnw",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-flatpak": {
|
"nix-flatpak": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1739444422,
|
"lastModified": 1739444422,
|
||||||
@@ -415,36 +286,13 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nix-minecraft": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": "flake-compat_4",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"systems": "systems_3"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1792988509,
|
|
||||||
"narHash": "sha256-1Li/v57ePpV9t6E57w/XTu760H6hYHztwm1RSd6RA8k=",
|
|
||||||
"owner": "Infinidoge",
|
|
||||||
"repo": "nix-minecraft",
|
|
||||||
"rev": "931d87d3811cabc0277be27b94392d19291bd344",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "Infinidoge",
|
|
||||||
"repo": "nix-minecraft",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789286504,
|
"lastModified": 1778869304,
|
||||||
"narHash": "sha256-eiEK7cKZORNEvX0GeF3RtNEF/JXhgf2RqSp3230q13E=",
|
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ef34387ddd751e1ab8857adf4676492d32eb24ec",
|
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -456,11 +304,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792898606,
|
"lastModified": 1783703440,
|
||||||
"narHash": "sha256-Mg3rRjsbMqhSMxop5PYMXos8SwAjejrxSgVThTvP9eg=",
|
"narHash": "sha256-O3/YajjWo001VUIgD8BwaRdSNLUFe7nZ1qV5TwhRBcw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1f607aa79b6356ed45d3cd3c8079c196e79efa2c",
|
"rev": "8f0500b9660505dc3cb647775fe9a978a74b5283",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -472,11 +320,41 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792615934,
|
"lastModified": 1784280462,
|
||||||
"narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=",
|
"narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=",
|
||||||
|
"rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f",
|
||||||
|
"revCount": 1009740,
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009740%2Brev-293d6abedf0478e681a4dfcfcb35b30fc796a32f/019f73de-20f7-7ec2-98c8-65726640dbf9/source.tar.gz"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "tarball",
|
||||||
|
"url": "https://flakehub.com/f/NixOS/nixpkgs/%2A"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_4": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1778443072,
|
||||||
|
"narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36",
|
"rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-unstable",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs_5": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1780902259,
|
||||||
|
"narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -486,20 +364,7 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1790046670,
|
|
||||||
"narHash": "sha256-OJe62m8gZx4xEAQnMcqH1u31/uu4Xf0q2ykAEHZfgrg=",
|
|
||||||
"rev": "6774f7bc253789b113a4f39285dc0fa100abeacc",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1077996.6774f7bc2537/nixexprs.tar.xz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_5": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1744536153,
|
"lastModified": 1744536153,
|
||||||
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
|
||||||
@@ -517,21 +382,18 @@
|
|||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"caitsith": "caitsith",
|
|
||||||
"darwin": "darwin_2",
|
"darwin": "darwin_2",
|
||||||
"go-overlay": "go-overlay_2",
|
"flake-utils": "flake-utils_2",
|
||||||
"hildibrand": "hildibrand",
|
"hildibrand": "hildibrand",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"nix-minecraft": "nix-minecraft",
|
"nixpkgs": "nixpkgs_5"
|
||||||
"nixpkgs": "nixpkgs_3",
|
|
||||||
"rust-overlay": "rust-overlay_4"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1793051642,
|
"lastModified": 1786304454,
|
||||||
"narHash": "sha256-b+CbWZU8sYR9TNBg6KJur680E+5+Zm4S4IVzkzFnJEc=",
|
"narHash": "sha256-2ovOgwFWnKqUMoQfxbobtIWQ+TSN62llX9eJVb9hFoY=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "8ec05b20cea4865f9fd5dd797c6e090f41863db1",
|
"rev": "ea7094e4e33fbb030edf28383de37073fc8b84e0",
|
||||||
"revCount": 121,
|
"revCount": 43,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://scm.wyattjmiller.com/wymiller/nur.git"
|
"url": "https://scm.wyattjmiller.com/wymiller/nur.git"
|
||||||
},
|
},
|
||||||
@@ -540,26 +402,6 @@
|
|||||||
"url": "https://scm.wyattjmiller.com/wymiller/nur.git"
|
"url": "https://scm.wyattjmiller.com/wymiller/nur.git"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nvf": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": "flake-compat_5",
|
|
||||||
"mnw": "mnw",
|
|
||||||
"nixpkgs": "nixpkgs_4"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1793047357,
|
|
||||||
"narHash": "sha256-eY8aBTGSgtx+25254i22jyjbj+JQkEIfb+JyQ2Exnuk=",
|
|
||||||
"owner": "notashelf",
|
|
||||||
"repo": "nvf",
|
|
||||||
"rev": "60b4593979c39e9a1227c9913bd835bb1a59054b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "notashelf",
|
|
||||||
"repo": "nvf",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"aagl": "aagl",
|
"aagl": "aagl",
|
||||||
@@ -569,8 +411,7 @@
|
|||||||
"nix-flatpak": "nix-flatpak",
|
"nix-flatpak": "nix-flatpak",
|
||||||
"nixpkgs": "nixpkgs_2",
|
"nixpkgs": "nixpkgs_2",
|
||||||
"nur": "nur",
|
"nur": "nur",
|
||||||
"nvf": "nvf",
|
"rust-overlay": "rust-overlay_3"
|
||||||
"rust-overlay": "rust-overlay_5"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
@@ -581,11 +422,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1785476452,
|
"lastModified": 1782875958,
|
||||||
"narHash": "sha256-/CXwCFPS41rb/JI2VitKCgVK6V5E6/sfw5ke3B9zyVQ=",
|
"narHash": "sha256-5eqDcnBjb1424HRQdnhuhNOBZguq1Z2tqSa2OMF/m2c=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "6ef009bf4c4873cdc1a621826722bdea7c03e62c",
|
"rev": "13139aefa973f3d96c60c0fbab801de058ae25ca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -598,16 +439,16 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nur",
|
"nur",
|
||||||
"caitsith",
|
"hildibrand",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792825530,
|
"lastModified": 1784438913,
|
||||||
"narHash": "sha256-aphXA2IFNd3q48++TKmfuuvDDjkrgGdJDnDIhij9684=",
|
"narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "5b9f1198b59bcb31c5c3250b332e7d77590e6306",
|
"rev": "afacd6819d3765a05814ee8e3de74c77d42ac799",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -618,57 +459,14 @@
|
|||||||
},
|
},
|
||||||
"rust-overlay_3": {
|
"rust-overlay_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_6"
|
||||||
"nur",
|
|
||||||
"hildibrand",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792825530,
|
"lastModified": 1783834461,
|
||||||
"narHash": "sha256-aphXA2IFNd3q48++TKmfuuvDDjkrgGdJDnDIhij9684=",
|
"narHash": "sha256-FCmrs1StAghJDKfqy56KM96KZtxpYzgeq6zM3QO8wjA=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "5b9f1198b59bcb31c5c3250b332e7d77590e6306",
|
"rev": "a286e5b998e852297a403786f063fb2c9fe7f57a",
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"rust-overlay_4": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1792825530,
|
|
||||||
"narHash": "sha256-aphXA2IFNd3q48++TKmfuuvDDjkrgGdJDnDIhij9684=",
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"rev": "5b9f1198b59bcb31c5c3250b332e7d77590e6306",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"rust-overlay_5": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_5"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1793000331,
|
|
||||||
"narHash": "sha256-6sLQgHX/V/yF8VrhmsJroujeRua1GY3nDTEpnY7tHF4=",
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"rev": "0d0575988e4bb9ebc4cf1afb1cec1ceac0b5914e",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -706,21 +504,6 @@
|
|||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"systems_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"root": "root",
|
"root": "root",
|
||||||
|
|||||||
@@ -17,7 +17,6 @@
|
|||||||
url = "github:ezKEa/aagl-gtk-on-nix";
|
url = "github:ezKEa/aagl-gtk-on-nix";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nvf.url = "github:notashelf/nvf";
|
|
||||||
nur.url = "git+https://scm.wyattjmiller.com/wymiller/nur.git";
|
nur.url = "git+https://scm.wyattjmiller.com/wymiller/nur.git";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -31,13 +30,12 @@
|
|||||||
go-overlay,
|
go-overlay,
|
||||||
aagl,
|
aagl,
|
||||||
nur,
|
nur,
|
||||||
nvf,
|
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
userName = "wyatt";
|
userName = "wyatt";
|
||||||
userEmail = "wyatt@wyattjmiller.com";
|
userEmail = "wyatt@wyattjmiller.com";
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit userName userEmail nur nvf;
|
inherit userName userEmail nur;
|
||||||
};
|
};
|
||||||
|
|
||||||
myOverlays = { ... }: {
|
myOverlays = { ... }: {
|
||||||
@@ -50,10 +48,6 @@
|
|||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
meta = import ./meta;
|
meta = import ./meta;
|
||||||
formatter = nixpkgs.lib.genAttrs [
|
|
||||||
"x86_64-linux"
|
|
||||||
"aarch64-darwin"
|
|
||||||
] (system: nixpkgs.legacyPackages.${system}.nixfmt);
|
|
||||||
|
|
||||||
common = {
|
common = {
|
||||||
overlays = import ./modules/common/overlays.nix;
|
overlays = import ./modules/common/overlays.nix;
|
||||||
@@ -193,37 +187,11 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Vintage story server - for a friend
|
|
||||||
nixosConfigurations."raubahn" = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
inherit userName userEmail nur;
|
|
||||||
hostname = "raubahn";
|
|
||||||
role = "server";
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
myOverlays
|
|
||||||
./modules/common
|
|
||||||
./modules/machine/raubahn
|
|
||||||
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "server"; };
|
|
||||||
home-manager.backupFileExtension = "bak";
|
|
||||||
home-manager.users.${userName}.imports = [
|
|
||||||
./home
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# Matrix and Mastodon server
|
# Matrix and Mastodon server
|
||||||
nixosConfigurations."yshtola" = nixpkgs.lib.nixosSystem {
|
nixosConfigurations."yshtola" = nixpkgs.lib.nixosSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit userName userEmail nur;
|
inherit userName userEmail;
|
||||||
hostname = "yshtola";
|
hostname = "yshtola";
|
||||||
role = "server";
|
role = "server";
|
||||||
};
|
};
|
||||||
@@ -271,30 +239,6 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Homestead 2.0 Minecraft server
|
|
||||||
nixosConfigurations."krile" = nixpkgs.lib.nixosSystem {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
specialArgs = {
|
|
||||||
inherit userName userEmail nur;
|
|
||||||
hostname = "krile";
|
|
||||||
role = "server";
|
|
||||||
};
|
|
||||||
modules = [
|
|
||||||
myOverlays
|
|
||||||
./modules/common
|
|
||||||
./modules/machine/krile
|
|
||||||
|
|
||||||
home-manager.nixosModules.home-manager
|
|
||||||
{
|
|
||||||
home-manager.useGlobalPkgs = true;
|
|
||||||
home-manager.useUserPackages = true;
|
|
||||||
home-manager.extraSpecialArgs = extraSpecialArgs // { isNixOS = true; role = "server"; };
|
|
||||||
home-manager.backupFileExtension = "bak";
|
|
||||||
home-manager.users.${userName}.imports = [./home];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# generic non-NixOS Linux machine
|
# generic non-NixOS Linux machine
|
||||||
homeConfigurations."generic" = let
|
homeConfigurations."generic" = let
|
||||||
hostname = builtins.getEnv "HOSTNAME";
|
hostname = builtins.getEnv "HOSTNAME";
|
||||||
@@ -303,7 +247,7 @@
|
|||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
|
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit userName userEmail hostname nvf;
|
inherit userName userEmail hostname;
|
||||||
isNixOS = false;
|
isNixOS = false;
|
||||||
role = "workstation";
|
role = "workstation";
|
||||||
};
|
};
|
||||||
|
|||||||
+13
-107
@@ -1,112 +1,18 @@
|
|||||||
{ nvf, ... }: {
|
{...}: let
|
||||||
imports = [
|
dirs = {
|
||||||
nvf.homeManagerModules.default
|
defaults = ../defaults;
|
||||||
];
|
};
|
||||||
|
in {
|
||||||
programs.nvf = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
defaultEditor = true;
|
||||||
vim = {
|
vimAlias = true;
|
||||||
viAlias = true;
|
};
|
||||||
vimAlias = true;
|
|
||||||
lsp.enable = true;
|
|
||||||
treesitter.enable = true;
|
|
||||||
autocomplete.nvim-cmp.enable = true;
|
|
||||||
autopairs.nvim-autopairs.enable = true;
|
|
||||||
|
|
||||||
languages = {
|
xdg.configFile = {
|
||||||
nix.enable = true;
|
nvim = {
|
||||||
rust.enable = true;
|
onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall";
|
||||||
go.enable = true;
|
source = dirs.defaults + /nvim;
|
||||||
python.enable = true;
|
|
||||||
markdown.enable = true;
|
|
||||||
css.enable = true;
|
|
||||||
scss.enable = true;
|
|
||||||
tsx.enable = true;
|
|
||||||
typescript = {
|
|
||||||
enable = true;
|
|
||||||
lsp.servers = [ "typescript-language-server" "deno" ];
|
|
||||||
};
|
|
||||||
csharp.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
utility.surround.enable = true;
|
|
||||||
telescope.enable = true;
|
|
||||||
mini.icons.enable = true;
|
|
||||||
notes.obsidian = {
|
|
||||||
enable = true;
|
|
||||||
setupOpts.workspaces = [
|
|
||||||
{
|
|
||||||
name = "personal";
|
|
||||||
path = "~/Documents/Obsidian/notes";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
terminal.toggleterm = {
|
|
||||||
enable = true;
|
|
||||||
lazygit = {
|
|
||||||
enable = true;
|
|
||||||
mappings.open = "<leader>gg";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
filetree.neo-tree.enable = true;
|
|
||||||
binds.whichKey.enable = true;
|
|
||||||
|
|
||||||
clipboard = {
|
|
||||||
enable = true;
|
|
||||||
registers = "unnamedplus";
|
|
||||||
providers = {
|
|
||||||
wl-copy.enable = true;
|
|
||||||
xclip.enable = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
lsp.null-ls = {
|
|
||||||
enable = true;
|
|
||||||
setupOpts = {};
|
|
||||||
};
|
|
||||||
lsp.trouble.enable = true;
|
|
||||||
|
|
||||||
theme = {
|
|
||||||
enable = true;
|
|
||||||
name = "catppuccin";
|
|
||||||
style = "mocha";
|
|
||||||
transparent = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
dashboard.alpha.enable = true;
|
|
||||||
|
|
||||||
statusline.lualine.enable = true;
|
|
||||||
tabline.nvimBufferline.enable = true;
|
|
||||||
|
|
||||||
keymaps = [
|
|
||||||
{
|
|
||||||
key = "<C-s>";
|
|
||||||
mode = "n";
|
|
||||||
action = "<cmd>w<CR>";
|
|
||||||
silent = true;
|
|
||||||
noremap = true;
|
|
||||||
}
|
|
||||||
{ key = "<leader>o"; mode = "n"; action = "<cmd>Neotree toggle<CR>"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>tf"; mode = "n"; action = "<cmd>ToggleTerm direction=float<CR>"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>th"; mode = "n"; action = "<cmd>ToggleTerm direction=horizontal<CR>"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>tv"; mode = "n"; action = "<cmd>ToggleTerm direction=vertical<CR>"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>n"; mode = "n"; action = "<nop>"; desc = "Notes"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>nd"; mode = "n"; action = "<cmd>Obsidian today<CR>"; desc = "Obsidian daily note"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>nf"; mode = "n"; action = "<cmd>Obsidian quick_switch<CR>"; desc = "Obsidian find note"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>ns"; mode = "n"; action = "<cmd>Obsidian search<CR>"; desc = "Obsidian search notes"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>nn"; mode = "n"; action = "<cmd>Obsidian new<CR>"; desc = "Obsidian new note"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>ff"; mode = "n"; action = "<cmd>Telescope find_files<CR>"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>fD"; mode = "n"; action = "<cmd>lua require('telescope.builtin').find_files({ cwd = vim.fn.input('Dir: ', vim.loop.cwd() .. '/', 'dir') })<CR>"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>fg"; mode = "n"; action = "<cmd>Telescope live_grep<CR>"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>/"; mode = "n"; action = "<cmd>Telescope current_buffer_fuzzy_find<CR>"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>gb"; mode = "n"; action = "<cmd>Telescope git_branches<CR>"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>gc"; mode = "n"; action = "<cmd>Telescope git_commits<CR>"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>gl"; mode = "n"; action = "<cmd>Telescope git_bcommits<CR>"; silent = true; noremap = true; }
|
|
||||||
{ key = "<leader>gr"; mode = "n"; action = "<cmd>Telescope git_status<CR>"; silent = true; noremap = true; }
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
+2
-8
@@ -66,14 +66,8 @@
|
|||||||
"The gods themselves will be my meal. Your dear companions my dessert. Upon this world I'll feast, and death shall follow in my wake. All your hate, all your rage, you will render unto me." \
|
"The gods themselves will be my meal. Your dear companions my dessert. Upon this world I'll feast, and death shall follow in my wake. All your hate, all your rage, you will render unto me." \
|
||||||
"Boring, boring, boring" \
|
"Boring, boring, boring" \
|
||||||
"Would you be 'happier' had I a 'good reason'?" \
|
"Would you be 'happier' had I a 'good reason'?" \
|
||||||
"A test of your reflexes!" \
|
"A test of your reflexes!"
|
||||||
"Yer a wizard, Wyatt" \
|
|
||||||
"Yer a lizard, Wyatt" \
|
|
||||||
"Po-Tay-To boil em mash em stick em in a stew" \
|
|
||||||
"Oh look it's the cutie patootie potato!" \
|
|
||||||
"What a charming young man" \
|
|
||||||
"Wyatt, you are smart, kind, and resilient. I believe in you no matter what life throws at you! Kick this project's butt!! - Nico" \
|
|
||||||
"Ganbatte!"
|
|
||||||
|
|
||||||
set choose_meme (random)"%"(count $memes)
|
set choose_meme (random)"%"(count $memes)
|
||||||
set choose_meme $memes[(math $choose_meme"+1")]
|
set choose_meme $memes[(math $choose_meme"+1")]
|
||||||
|
|||||||
+11
-24
@@ -76,16 +76,6 @@ in {
|
|||||||
enable = lib.mkEnableOption "OpenGL/Vulkan overlay tool shown in games presenting FPS, CPU/GPU/memory utilization, load, etc.";
|
enable = lib.mkEnableOption "OpenGL/Vulkan overlay tool shown in games presenting FPS, CPU/GPU/memory utilization, load, etc.";
|
||||||
};
|
};
|
||||||
|
|
||||||
proton = {
|
|
||||||
enable = lib.mkEnableOption "Proton compatibility tool management";
|
|
||||||
|
|
||||||
manager = lib.mkOption {
|
|
||||||
type = lib.types.enum ["protonplus" "protonup-qt"];
|
|
||||||
default = "protonup-qt";
|
|
||||||
description = "Graphical Proton compatibility tool manager to install";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
lutris = {
|
lutris = {
|
||||||
enable = lib.mkEnableOption "Lutris game manager and launcher";
|
enable = lib.mkEnableOption "Lutris game manager and launcher";
|
||||||
package = lib.mkOption {
|
package = lib.mkOption {
|
||||||
@@ -103,7 +93,14 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# Compatibility layers for Lutris
|
||||||
compatibility = {
|
compatibility = {
|
||||||
|
protonSupport = lib.mkOption {
|
||||||
|
type = lib.types.bool;
|
||||||
|
default = true;
|
||||||
|
description = "Enable Proton-like compatibility layers for Lutris";
|
||||||
|
};
|
||||||
|
|
||||||
extraTools = lib.mkOption {
|
extraTools = lib.mkOption {
|
||||||
type = lib.types.listOf lib.types.package;
|
type = lib.types.listOf lib.types.package;
|
||||||
default = [];
|
default = [];
|
||||||
@@ -156,27 +153,14 @@ in {
|
|||||||
archon = {
|
archon = {
|
||||||
enable = lib.mkEnableOption "Archon from NUR";
|
enable = lib.mkEnableOption "Archon from NUR";
|
||||||
};
|
};
|
||||||
|
|
||||||
opengoal = {
|
|
||||||
enable = lib.mkEnableOption "OpenGOAL, a game engine used in a certain PlayStation 2 franchise";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = let
|
config = let
|
||||||
agl = cfg.aagl;
|
agl = cfg.aagl;
|
||||||
nurPkgs = import "${nur.outPath}/pkgs" { inherit pkgs; };
|
nurPkgs = import "${nur.outPath}/pkgs" { inherit pkgs; };
|
||||||
protonManager = {
|
|
||||||
protonplus = pkgs.protonplus;
|
|
||||||
protonup-qt = pkgs.protonup-qt;
|
|
||||||
}.${cfg.proton.manager};
|
|
||||||
in {
|
in {
|
||||||
programs.steam = lib.mkIf cfg.steam.enable {
|
programs.steam = lib.mkIf cfg.steam.enable {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraPackages = with pkgs; [
|
|
||||||
gamescope
|
|
||||||
gamemode
|
|
||||||
];
|
|
||||||
|
|
||||||
remotePlay.openFirewall = cfg.steam.firewall.remotePlay;
|
remotePlay.openFirewall = cfg.steam.firewall.remotePlay;
|
||||||
localNetworkGameTransfers.openFirewall = cfg.steam.firewall.localNetworkGameTransfers;
|
localNetworkGameTransfers.openFirewall = cfg.steam.firewall.localNetworkGameTransfers;
|
||||||
};
|
};
|
||||||
@@ -230,10 +214,13 @@ in {
|
|||||||
cfg.lutris.wine.package
|
cfg.lutris.wine.package
|
||||||
pkgs.winetricks
|
pkgs.winetricks
|
||||||
]) ++
|
]) ++
|
||||||
|
(lib.optionals cfg.lutris.compatibility.protonSupport [
|
||||||
|
pkgs.protonup-ng
|
||||||
|
pkgs.protonup-qt
|
||||||
|
]) ++
|
||||||
cfg.lutris.compatibility.extraTools ++
|
cfg.lutris.compatibility.extraTools ++
|
||||||
cfg.lutris.extraPackages
|
cfg.lutris.extraPackages
|
||||||
)) ++
|
)) ++
|
||||||
(lib.optionals cfg.proton.enable [protonManager]) ++
|
|
||||||
(lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
|
(lib.optionals cfg.minecraft.enable [pkgs.prismlauncher]) ++
|
||||||
(lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++
|
(lib.optionals cfg.ffxiv.enable [pkgs.xivlauncher pkgs.fflogs]) ++
|
||||||
(lib.optionals cfg.vintage-story.enable [nurPkgs.vintage-story]) ++
|
(lib.optionals cfg.vintage-story.enable [nurPkgs.vintage-story]) ++
|
||||||
|
|||||||
@@ -1,105 +0,0 @@
|
|||||||
# Homestead 2.0 on krile
|
|
||||||
|
|
||||||
This module uses the Minecraft NixOS module and Fabric overlay re-exported by
|
|
||||||
the existing `nur` flake input. It pins Minecraft 1.20.1, Fabric 0.19.5, Java 17,
|
|
||||||
and the [official Homestead 2.0 server pack](https://cozystudios.org/homestead/server-pack/).
|
|
||||||
The archive and all eight additional mods listed in its `startserver.sh` are
|
|
||||||
downloaded with fixed SHA-256 hashes during the Nix build. The upstream startup
|
|
||||||
script is not run.
|
|
||||||
|
|
||||||
`modules/machine/krile/configuration.nix` enables the server, accepts the Minecraft
|
|
||||||
EULA, and opens TCP 25565 and UDP 24454 (Simple Voice Chat). Forward those ports
|
|
||||||
to krile on your router if players connect from outside your network. Players
|
|
||||||
need the Homestead 2.0 client pack.
|
|
||||||
|
|
||||||
The default heap is 6 GiB initially and 10 GiB maximum. Give the VM additional
|
|
||||||
RAM for the OS, native libraries, and filesystem cache; 16 GiB total is a
|
|
||||||
reasonable starting point.
|
|
||||||
|
|
||||||
## Deploy
|
|
||||||
|
|
||||||
On krile, from the repository root:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
nix eval --raw path:.#nixosConfigurations.krile.config.system.build.toplevel.drvPath
|
|
||||||
sudo nixos-rebuild switch --flake path:.#krile
|
|
||||||
```
|
|
||||||
|
|
||||||
The `path:.` form includes new files before they have been added to Git. Once the
|
|
||||||
new module and krile files are tracked, `--flake .#krile` works as usual.
|
|
||||||
|
|
||||||
The service starts on boot and restarts after an unexpected exit. Check it with:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
systemctl status minecraft-server-homestead
|
|
||||||
journalctl -u minecraft-server-homestead -f
|
|
||||||
```
|
|
||||||
|
|
||||||
The console uses nix-minecraft's systemd FIFO. For example, run a command with:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
sudo sh -c 'echo list > /run/minecraft/homestead.stdin'
|
|
||||||
```
|
|
||||||
|
|
||||||
Stop the service with `sudo systemctl stop minecraft-server-homestead` so it can
|
|
||||||
save the world cleanly.
|
|
||||||
|
|
||||||
## Configuration and state
|
|
||||||
|
|
||||||
Worlds, player progress, and other runtime state live in
|
|
||||||
`/srv/minecraft/homestead`. Back up that directory, particularly `world/`, before
|
|
||||||
changing pack versions. The module does not provide automatic backups.
|
|
||||||
|
|
||||||
The `mods` directory and server icon are store symlinks. `config`, `defaultconfigs`,
|
|
||||||
`kubejs`, `scripts`, and `patchouli_books` are writable copies of the pinned pack,
|
|
||||||
recreated on each start and removed on stop by nix-minecraft. Edits to those
|
|
||||||
copies do not persist across restarts. World data is not part of those managed
|
|
||||||
directories.
|
|
||||||
|
|
||||||
Change memory in the host configuration:
|
|
||||||
|
|
||||||
```nix
|
|
||||||
services.homestead.jvmOpts = "-Xms6G -Xmx12G -XX:+UseG1GC";
|
|
||||||
```
|
|
||||||
|
|
||||||
Other server settings use the underlying nix-minecraft options:
|
|
||||||
|
|
||||||
```nix
|
|
||||||
services.minecraft-servers.servers.homestead = {
|
|
||||||
serverProperties = {
|
|
||||||
server-port = 25566;
|
|
||||||
max-players = 10;
|
|
||||||
white-list = true;
|
|
||||||
};
|
|
||||||
# Add real player UUIDs here, or manage the whitelist through the console.
|
|
||||||
whitelist = { };
|
|
||||||
};
|
|
||||||
```
|
|
||||||
|
|
||||||
Changing `server-port` also changes the opened TCP port. Voice chat remains on
|
|
||||||
UDP 24454, matching the pack's `config/voicechat/voicechat-server.properties`.
|
|
||||||
|
|
||||||
To use this module on another NixOS host, pass `nur` in `specialArgs`, import
|
|
||||||
`modules/games/homestead`, set `services.homestead.enable = true`, and set
|
|
||||||
`services.minecraft-servers.eula = true` after accepting the EULA. The host must
|
|
||||||
allow unfree packages, as the common modules already do for krile.
|
|
||||||
|
|
||||||
## Pack updates
|
|
||||||
|
|
||||||
For a new release, inspect the official archive and startup script, update the
|
|
||||||
archive URL/hash in `package.nix`, update `required-mods.json` with any separate
|
|
||||||
downloads and their hashes, and match the Minecraft/Fabric versions in
|
|
||||||
`default.nix`. Evaluate and build before switching, then check the startup log.
|
|
||||||
The pack is kept fixed at 2.0 until these declarations change.
|
|
||||||
|
|
||||||
## Validation
|
|
||||||
|
|
||||||
The krile system derivation evaluates, and the pack, Fabric launcher, and
|
|
||||||
nix-minecraft setup/cleanup scripts build successfully. A temporary local server
|
|
||||||
reached `Done`, started Simple Voice Chat, and exited with status 0 after `stop`,
|
|
||||||
saving every dimension. Setup/cleanup was also checked to preserve world data
|
|
||||||
and reset managed configs. Multiplayer gameplay was not tested.
|
|
||||||
|
|
||||||
The upstream 2.0 pack emits some nonfatal mixin/recipe warnings and an optional
|
|
||||||
Falling Trees/Jade integration error during startup; these did not prevent the
|
|
||||||
startup and shutdown check from passing.
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
nur,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
cfg = config.services.homestead;
|
|
||||||
modpack = pkgs.callPackage ./package.nix { };
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [ nur.nixosModules.minecraft-servers ];
|
|
||||||
|
|
||||||
options.services.homestead = {
|
|
||||||
enable = lib.mkEnableOption "the Homestead 2.0 Minecraft server";
|
|
||||||
|
|
||||||
openFirewall = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Open the Minecraft TCP port and Simple Voice Chat UDP port (24454).";
|
|
||||||
};
|
|
||||||
|
|
||||||
jvmOpts = lib.mkOption {
|
|
||||||
type = lib.types.str;
|
|
||||||
default = "-Xms6G -Xmx10G -XX:+UseG1GC";
|
|
||||||
description = "JVM options for Homestead. Leave additional RAM for the OS and native allocations.";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
|
||||||
nixpkgs.overlays = [ nur.overlays.minecraft ];
|
|
||||||
|
|
||||||
services.minecraft-servers = {
|
|
||||||
enable = true;
|
|
||||||
servers.homestead = {
|
|
||||||
enable = true;
|
|
||||||
inherit (cfg) openFirewall jvmOpts;
|
|
||||||
|
|
||||||
package = pkgs.fabricServers.fabric-1_20_1.override {
|
|
||||||
loaderVersion = "0.19.5";
|
|
||||||
jre_headless = pkgs.jdk17_headless;
|
|
||||||
};
|
|
||||||
|
|
||||||
managementSystem = {
|
|
||||||
tmux.enable = false;
|
|
||||||
systemd-socket.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Match the properties generated by the pack's startserver.sh.
|
|
||||||
serverProperties = lib.mapAttrs (_: lib.mkDefault) {
|
|
||||||
motd = "Homestead 2.0";
|
|
||||||
allow-flight = true;
|
|
||||||
max-tick-time = 180000;
|
|
||||||
simulation-distance = 6;
|
|
||||||
view-distance = 10;
|
|
||||||
server-port = 25565;
|
|
||||||
online-mode = true;
|
|
||||||
# keep-inventory = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
symlinks = {
|
|
||||||
mods = "${modpack}/mods";
|
|
||||||
"server-icon.png" = "${modpack}/server-icon.png";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Mods may rewrite their configs or generate files here. nix-minecraft
|
|
||||||
# supplies writable copies on each start and cleans them on stop.
|
|
||||||
files = lib.genAttrs [
|
|
||||||
"config"
|
|
||||||
"defaultconfigs"
|
|
||||||
"kubejs"
|
|
||||||
"scripts"
|
|
||||||
"patchouli_books"
|
|
||||||
] (dir: "${modpack}/${dir}");
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.firewall.allowedUDPPorts = lib.mkIf cfg.openFirewall [ 24454 ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,48 +0,0 @@
|
|||||||
{
|
|
||||||
lib,
|
|
||||||
stdenvNoCC,
|
|
||||||
fetchurl,
|
|
||||||
unzip,
|
|
||||||
}:
|
|
||||||
let
|
|
||||||
# These eight downloads come from startserver.sh in the official 2.0 pack.
|
|
||||||
requiredMods = map fetchurl (lib.importJSON ./required-mods.json);
|
|
||||||
in
|
|
||||||
stdenvNoCC.mkDerivation {
|
|
||||||
pname = "homestead-server-pack";
|
|
||||||
version = "2.0";
|
|
||||||
|
|
||||||
src = fetchurl {
|
|
||||||
name = "Homestead-2.0-Server.zip";
|
|
||||||
url = "https://drive.usercontent.google.com/download?id=1SpJBa80o_Jx_yqLjQ49pz7HP1FY2PCJj&export=download&confirm=t";
|
|
||||||
hash = "sha256-QVenE6dz+lZPHkC1hwL7Yy4lw6vg/Cr/8pnmK3iaK4o=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [ unzip ];
|
|
||||||
dontUnpack = true;
|
|
||||||
dontConfigure = true;
|
|
||||||
dontBuild = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
mkdir -p "$out"
|
|
||||||
unzip -q "$src" \
|
|
||||||
'mods/*' 'config/*' 'defaultconfigs/*' 'kubejs/*' \
|
|
||||||
'scripts/*' 'patchouli_books/*' 'server-icon.png' -d "$out"
|
|
||||||
|
|
||||||
${lib.concatMapStringsSep "\n" (mod: ''
|
|
||||||
install -m644 ${mod} "$out/mods/${mod.name}"
|
|
||||||
'') requiredMods}
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Homestead 2.0 server assets, including the eight separately downloaded mods";
|
|
||||||
homepage = "https://cozystudios.org/homestead/server-pack/";
|
|
||||||
# The pack contains mods with different licenses; do not redistribute it.
|
|
||||||
license = lib.licenses.unfree;
|
|
||||||
platforms = lib.platforms.linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
[
|
|
||||||
{
|
|
||||||
"name": "balm-fabric-1.20.1-7.3.44.jar",
|
|
||||||
"url": "https://edge.forgecdn.net/files/8969/704/balm-fabric-1.20.1-7.3.44.jar",
|
|
||||||
"hash": "sha256-hMoKTCjV9cxwjuEqKQ+U4ixMntDxXZNM0MDCMPClpMY="
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "CraftTweaker-fabric-1.20.1-14.0.60.jar",
|
|
||||||
"url": "https://edge.forgecdn.net/files/7772/872/CraftTweaker-fabric-1.20.1-14.0.60.jar",
|
|
||||||
"hash": "sha256-y4Kl3wHCNr6oY8SxxZtgaS/ARGHWVIK/eW1EZizqiQA="
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "libraryferret-fabric-1.20.1-4.0.0.jar",
|
|
||||||
"url": "https://edge.forgecdn.net/files/4601/231/libraryferret-fabric-1.20.1-4.0.0.jar",
|
|
||||||
"hash": "sha256-d/UX69gN5R+fh62cTZIrNMQNfF+2iu1tl0zu0NthuG0="
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sophisticatedbackpacks-1.20.1-3.23.4.5.110.jar",
|
|
||||||
"url": "https://edge.forgecdn.net/files/7147/929/sophisticatedbackpacks-1.20.1-3.23.4.5.110.jar",
|
|
||||||
"hash": "sha256-Fewy1BGnA4R0OldwrmoitxqEGK9/juu/+se/yKGDbA8="
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sophisticatedcore-1.20.1-1.2.7.15.166.jar",
|
|
||||||
"url": "https://edge.forgecdn.net/files/7341/57/sophisticatedcore-1.20.1-1.2.7.15.166.jar",
|
|
||||||
"hash": "sha256-Fzmsti4i+ZQk8yQkuZYr2S0p4HUvVJWqEW35p8Hdgxo="
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "sophisticatedstorage-1.20.1-1.3.5.11.142.jar",
|
|
||||||
"url": "https://edge.forgecdn.net/files/8032/765/sophisticatedstorage-1.20.1-1.3.5.11.142.jar",
|
|
||||||
"hash": "sha256-VgjSIGpr0TJlhLUrTFp7Mpvpw/izOqOiQGAHiu0Lz4k="
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "trashslot-fabric-1.20.1-15.1.5.jar",
|
|
||||||
"url": "https://edge.forgecdn.net/files/8019/425/trashslot-fabric-1.20.1-15.1.5.jar",
|
|
||||||
"hash": "sha256-u876a68TrhF8ShNtf/ZrYlx1QLncwNQHe08jcIXuRAg="
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "wirelessredstone-fabric-1.20.1-1.1.2.jar",
|
|
||||||
"url": "https://edge.forgecdn.net/files/5175/782/wirelessredstone-fabric-1.20.1-1.1.2.jar",
|
|
||||||
"hash": "sha256-Kw8xy4ngmAgD9kEvwAjTS6KatJEnA6UPkI1X3xnWf48="
|
|
||||||
}
|
|
||||||
]
|
|
||||||
@@ -43,11 +43,6 @@ in {
|
|||||||
vulkan-tools
|
vulkan-tools
|
||||||
mesa-demos
|
mesa-demos
|
||||||
];
|
];
|
||||||
|
|
||||||
hardware.graphics = {
|
|
||||||
enable = true;
|
|
||||||
enable32Bit = true;
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
(mkIf (cfg.gpuVendor == "nvidia") {
|
(mkIf (cfg.gpuVendor == "nvidia") {
|
||||||
@@ -66,6 +61,9 @@ in {
|
|||||||
|
|
||||||
(mkIf (cfg.gpuVendor == "amd") {
|
(mkIf (cfg.gpuVendor == "amd") {
|
||||||
services.xserver.videoDrivers = ["amdgpu"];
|
services.xserver.videoDrivers = ["amdgpu"];
|
||||||
|
# hardware.graphics.extraPackages = with pkgs; [
|
||||||
|
# amdvlk
|
||||||
|
# ];
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
radeontop
|
radeontop
|
||||||
];
|
];
|
||||||
@@ -84,6 +82,7 @@ in {
|
|||||||
environment.sessionVariables = {
|
environment.sessionVariables = {
|
||||||
MOZ_ENABLE_WAYLAND = "1";
|
MOZ_ENABLE_WAYLAND = "1";
|
||||||
QT_QPA_PLATFORM = "wayland";
|
QT_QPA_PLATFORM = "wayland";
|
||||||
|
SDL_VIDEODRIVER = "wayland";
|
||||||
};
|
};
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
userName,
|
userName,
|
||||||
aagl,
|
aagl,
|
||||||
|
nur,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
flatpakPackages = [
|
flatpakPackages = [
|
||||||
@@ -84,6 +85,9 @@ in {
|
|||||||
ollama-rocm
|
ollama-rocm
|
||||||
newelle
|
newelle
|
||||||
vlc
|
vlc
|
||||||
|
mediainfo
|
||||||
|
makemkv
|
||||||
|
ffmpeg
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable Polkit
|
# Enable Polkit
|
||||||
@@ -110,21 +114,21 @@ in {
|
|||||||
gamemode.enable = true;
|
gamemode.enable = true;
|
||||||
gamescope.enable = true;
|
gamescope.enable = true;
|
||||||
mangohud.enable = true;
|
mangohud.enable = true;
|
||||||
proton = {
|
|
||||||
enable = true;
|
|
||||||
manager = "protonplus";
|
|
||||||
};
|
|
||||||
lutris = {
|
lutris = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wine = {
|
wine = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.wine-staging;
|
package = pkgs.wine-staging;
|
||||||
};
|
};
|
||||||
|
compatibility = {
|
||||||
|
protonSupport = true;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
ffxiv.enable = true;
|
ffxiv.enable = true;
|
||||||
archon.enable = true;
|
archon.enable = true;
|
||||||
minecraft.enable = true;
|
minecraft.enable = true;
|
||||||
|
aagl.wavey-launcher.enable = true;
|
||||||
vintage-story.enable = true;
|
vintage-story.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
hildibrand = nur.packages.${pkgs.stdenv.hostPlatform.system}.hildibrand;
|
hildibrand = nur.packages.${pkgs.stdenv.hostPlatform.system}.hildibrand;
|
||||||
|
caitsith = nur.packages.${pkgs.stdenv.hostPlatform.system}.caitsith;
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
../../pwrMgmt
|
../../pwrMgmt
|
||||||
@@ -56,6 +57,7 @@
|
|||||||
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
hildibrand
|
hildibrand
|
||||||
|
caitsith
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd.services.hildibrand = {
|
systemd.services.hildibrand = {
|
||||||
@@ -69,6 +71,22 @@
|
|||||||
ExecStart = "${hildibrand}/bin/hildebrand";
|
ExecStart = "${hildibrand}/bin/hildebrand";
|
||||||
Restart = "on-failure";
|
Restart = "on-failure";
|
||||||
RestartSec = "5s";
|
RestartSec = "5s";
|
||||||
|
EnvironmentFile = "/etc/secrets/hildibrand.env";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.services.caitsith = {
|
||||||
|
description = "Caitsith - a randomizer bot";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
after = [ "network.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "simple";
|
||||||
|
User = userName;
|
||||||
|
WorkingDirectory = "/home/${userName}";
|
||||||
|
ExecStart = "${caitsith}/bin/hildebrand";
|
||||||
|
Restart = "on-failure";
|
||||||
|
RestartSec = "5s";
|
||||||
|
EnvironmentFile = "/etc/secrets/caitsith.env";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,88 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
userName,
|
|
||||||
nur,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
../../pwrMgmt
|
|
||||||
../../networking/core.nix
|
|
||||||
../../virtualization/podman.nix
|
|
||||||
../../games/homestead
|
|
||||||
];
|
|
||||||
|
|
||||||
# Enable flakes for NixOS
|
|
||||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
|
||||||
|
|
||||||
# Custom kernel/boot stuff
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
|
|
||||||
# Set your timezone
|
|
||||||
time.timeZone = "America/Detroit";
|
|
||||||
|
|
||||||
# Enable OpenSSH
|
|
||||||
services.openssh.enable = true;
|
|
||||||
|
|
||||||
# Enable keyring
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
|
||||||
|
|
||||||
# Enable GnuPG
|
|
||||||
programs.gnupg.agent = {
|
|
||||||
enable = true;
|
|
||||||
enableSSHSupport = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable SUID wrappers (some programs need them)
|
|
||||||
programs.mtr.enable = true;
|
|
||||||
|
|
||||||
# Enable Polkit
|
|
||||||
security.polkit.enable = true;
|
|
||||||
|
|
||||||
# Power management (see ../../pwrMgmt/default.nix)
|
|
||||||
pwrMgmt = {
|
|
||||||
enable = true;
|
|
||||||
cpuFreqGovernor = "performance";
|
|
||||||
powertop.enable = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
network = {
|
|
||||||
firewall = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
networkManager.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Add username to groups "wheel" and "video" - more may be added here later
|
|
||||||
users = {
|
|
||||||
users = {
|
|
||||||
${userName} = {
|
|
||||||
extraGroups = [ "wheel" "network" ];
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.fail2ban = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.fail2ban;
|
|
||||||
maxretry = 5;
|
|
||||||
bantime = "3h";
|
|
||||||
bantime-increment = {
|
|
||||||
enable = true;
|
|
||||||
rndtime = "10m";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.homestead = {
|
|
||||||
enable = true;
|
|
||||||
openFirewall = true;
|
|
||||||
};
|
|
||||||
services.minecraft-servers.eula = true;
|
|
||||||
|
|
||||||
system.stateVersion = "26.05";
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
{ ... }: {
|
|
||||||
imports = [
|
|
||||||
./configuration.nix
|
|
||||||
./hardware-configuration.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-uuid/ec4c43ec-efcc-40ea-a4c8-411e60ee7c4e";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/140E-FE19";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/disk/by-uuid/547bbd78-85be-4d17-a519-c4a2a923bdab"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
}
|
|
||||||
@@ -1,105 +0,0 @@
|
|||||||
{
|
|
||||||
pkgs,
|
|
||||||
userName,
|
|
||||||
nur,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
|
||||||
../../pwrMgmt
|
|
||||||
../../networking/core.nix
|
|
||||||
../../virtualization/podman.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
# Enable flakes for NixOS
|
|
||||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
|
||||||
|
|
||||||
# Custom kernel/boot stuff
|
|
||||||
boot.kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
|
||||||
|
|
||||||
# Set your timezone
|
|
||||||
time.timeZone = "America/Detroit";
|
|
||||||
|
|
||||||
# Enable OpenSSH
|
|
||||||
services.openssh.enable = true;
|
|
||||||
|
|
||||||
# Enable keyring
|
|
||||||
services.gnome.gnome-keyring.enable = true;
|
|
||||||
|
|
||||||
# Enable GnuPG
|
|
||||||
programs.gnupg.agent = {
|
|
||||||
enable = true;
|
|
||||||
enableSSHSupport = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable SUID wrappers (some programs need them)
|
|
||||||
programs.mtr.enable = true;
|
|
||||||
|
|
||||||
# Enable Polkit
|
|
||||||
security.polkit.enable = true;
|
|
||||||
|
|
||||||
# Power management (see ../../pwrMgmt/default.nix)
|
|
||||||
pwrMgmt = {
|
|
||||||
enable = true;
|
|
||||||
cpuFreqGovernor = "performance";
|
|
||||||
powertop.enable = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
network = {
|
|
||||||
firewall = {
|
|
||||||
enable = true;
|
|
||||||
tcpPorts = {
|
|
||||||
allowedPorts = [ 42420 ];
|
|
||||||
};
|
|
||||||
udpPorts = {
|
|
||||||
allowedPorts = [ 42420 ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
networkManager.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
environment.systemPackages = [
|
|
||||||
nur.packages.${pkgs.system}.vintage-story
|
|
||||||
];
|
|
||||||
|
|
||||||
systemd.services.vintagestory-server = {
|
|
||||||
description = "Vintage Story Server";
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
after = [ "network.target" ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "simple";
|
|
||||||
User = userName;
|
|
||||||
WorkingDirectory = "/home/${userName}";
|
|
||||||
ExecStart = "${nur.packages.${pkgs.system}.vintage-story}/bin/vintagestory-server";
|
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "5s";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Add username to groups "wheel" and "video" - more may be added here later
|
|
||||||
users = {
|
|
||||||
users = {
|
|
||||||
${userName} = {
|
|
||||||
extraGroups = [ "wheel" "network" ];
|
|
||||||
openssh.authorizedKeys.keys = [
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
services.fail2ban = {
|
|
||||||
enable = true;
|
|
||||||
package = pkgs.fail2ban;
|
|
||||||
maxretry = 5;
|
|
||||||
bantime = "3h";
|
|
||||||
bantime-increment = {
|
|
||||||
enable = true;
|
|
||||||
rndtime = "10m";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
system.stateVersion = "24.11";
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
{ ... }: {
|
|
||||||
imports = [
|
|
||||||
./configuration.nix
|
|
||||||
./hardware-configuration.nix
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{ config, lib, pkgs, modulesPath, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
imports =
|
|
||||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
|
||||||
];
|
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "virtio_scsi" "sr_mod" "virtio_blk" ];
|
|
||||||
boot.initrd.kernelModules = [ ];
|
|
||||||
boot.kernelModules = [ "kvm-intel" ];
|
|
||||||
boot.extraModulePackages = [ ];
|
|
||||||
|
|
||||||
fileSystems."/" =
|
|
||||||
{ device = "/dev/disk/by-uuid/ec4c43ec-efcc-40ea-a4c8-411e60ee7c4e";
|
|
||||||
fsType = "ext4";
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems."/boot" =
|
|
||||||
{ device = "/dev/disk/by-uuid/140E-FE19";
|
|
||||||
fsType = "vfat";
|
|
||||||
options = [ "fmask=0022" "dmask=0022" ];
|
|
||||||
};
|
|
||||||
|
|
||||||
swapDevices =
|
|
||||||
[ { device = "/dev/disk/by-uuid/547bbd78-85be-4d17-a519-c4a2a923bdab"; }
|
|
||||||
];
|
|
||||||
|
|
||||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
|
||||||
}
|
|
||||||
@@ -1,10 +1,8 @@
|
|||||||
{
|
{
|
||||||
nur,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
userName,
|
userName,
|
||||||
...
|
...
|
||||||
}:
|
}: let
|
||||||
let
|
|
||||||
# INFO: set these to your liking
|
# INFO: set these to your liking
|
||||||
matrixFqdn = "chat.wyattjmiller.com";
|
matrixFqdn = "chat.wyattjmiller.com";
|
||||||
rtcFqdn = "rtc.wyattjmiller.com";
|
rtcFqdn = "rtc.wyattjmiller.com";
|
||||||
@@ -12,50 +10,16 @@ let
|
|||||||
supportEmail = "wyatt@wyattjmiller.com";
|
supportEmail = "wyatt@wyattjmiller.com";
|
||||||
livekitKeyFile = "/var/lib/livekit/livekit.key";
|
livekitKeyFile = "/var/lib/livekit/livekit.key";
|
||||||
matrixRegistrationTokenFile = "/var/lib/matrix.key";
|
matrixRegistrationTokenFile = "/var/lib/matrix.key";
|
||||||
|
in {
|
||||||
sableWeb = nur.packages.${pkgs.stdenv.hostPlatform.system}.sable-web;
|
|
||||||
|
|
||||||
sableConfig = pkgs.writeTextDir "config.json" (
|
|
||||||
builtins.toJSON {
|
|
||||||
defaultHomeserver = 0;
|
|
||||||
homeserverList = [ matrixFqdn ];
|
|
||||||
allowCustomHomeservers = false;
|
|
||||||
|
|
||||||
disableAccountSwitcher = false;
|
|
||||||
hideUsernamePasswordFields = false;
|
|
||||||
|
|
||||||
hashRouter = {
|
|
||||||
enabled = false;
|
|
||||||
basename = "/";
|
|
||||||
};
|
|
||||||
|
|
||||||
featuredCommunities = {
|
|
||||||
spaces = [
|
|
||||||
"#seventhdawn:chat.wyattjmiller.com"
|
|
||||||
];
|
|
||||||
rooms = [
|
|
||||||
"#general:chat.wyattjmiller.com"
|
|
||||||
"#gposeglams:chat.wyattjmiller.com"
|
|
||||||
"#lobby-vc:chat.wyattjmiller.com"
|
|
||||||
"#annoucements:chat.wyattjmiller.com"
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
);
|
|
||||||
in
|
|
||||||
{
|
|
||||||
imports = [
|
imports = [
|
||||||
../../pwrMgmt
|
../../pwrMgmt
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enable flakes for NixOS
|
# Enable flakes for NixOS
|
||||||
nix.settings.experimental-features = [
|
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||||
"nix-command"
|
|
||||||
"flakes"
|
|
||||||
];
|
|
||||||
|
|
||||||
nix.settings = {
|
nix.settings = {
|
||||||
download-buffer-size = 134217728; # 128 MiB in bytes
|
download-buffer-size = 134217728; # 128 MiB in bytes
|
||||||
};
|
};
|
||||||
|
|
||||||
# Custom kernel/boot stuff
|
# Custom kernel/boot stuff
|
||||||
@@ -115,13 +79,13 @@ in
|
|||||||
8448
|
8448
|
||||||
];
|
];
|
||||||
|
|
||||||
allowedUDPPortRanges = [
|
allowedUDPPortRanges =[
|
||||||
# TURN UDP relays
|
# TURN UDP relays
|
||||||
{
|
{
|
||||||
from = 49000;
|
from = 49000;
|
||||||
to = 50000;
|
to = 50000;
|
||||||
}
|
}
|
||||||
#
|
#
|
||||||
{
|
{
|
||||||
from = 50100;
|
from = 50100;
|
||||||
to = 50200;
|
to = 50200;
|
||||||
@@ -135,11 +99,7 @@ in
|
|||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFV9eSc9L+aJLoKoexq2f/jb5rpyZnhuGiyhS8YQAbaS wyatt@wyattjmiller.com"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4WKvKnnYpTbzZHFEslOKyfiiMqWxhW3AfX6E7ACmYU wyatt@wyattjmiller.com"
|
||||||
];
|
];
|
||||||
extraGroups = [
|
extraGroups = ["wheel" "video" "network"];
|
||||||
"wheel"
|
|
||||||
"video"
|
|
||||||
"network"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# fail2ban
|
# fail2ban
|
||||||
@@ -184,13 +144,11 @@ in
|
|||||||
server = "${matrixFqdn}:443";
|
server = "${matrixFqdn}:443";
|
||||||
support_email = supportEmail;
|
support_email = supportEmail;
|
||||||
support_mxid = "@wymiller:${matrixFqdn}";
|
support_mxid = "@wymiller:${matrixFqdn}";
|
||||||
|
|
||||||
rtc_transports = [
|
rtc_transports = [{
|
||||||
{
|
type = "livekit";
|
||||||
type = "livekit";
|
livekit_service_url = "https://${rtcFqdn}";
|
||||||
livekit_service_url = "https://${rtcFqdn}";
|
}];
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -218,37 +176,8 @@ in
|
|||||||
virtualHosts = {
|
virtualHosts = {
|
||||||
"${matrixFqdn}" = {
|
"${matrixFqdn}" = {
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
@matrixEndpoints path \
|
encode zstd gzip
|
||||||
/_matrix/* \
|
reverse_proxy localhost:8008
|
||||||
/_tuwunel/* \
|
|
||||||
/.well-known/matrix/*
|
|
||||||
|
|
||||||
handle @matrixEndpoints {
|
|
||||||
reverse_proxy 127.0.0.1:8008
|
|
||||||
}
|
|
||||||
|
|
||||||
@sableConfig path /config.json
|
|
||||||
handle @sableConfig {
|
|
||||||
root * ${sableConfig}
|
|
||||||
header Cache-Control "no-store"
|
|
||||||
file_server
|
|
||||||
}
|
|
||||||
|
|
||||||
handle {
|
|
||||||
root * ${sableWeb}
|
|
||||||
|
|
||||||
encode zstd gzip
|
|
||||||
try_files {path} /index.html
|
|
||||||
|
|
||||||
file_server {
|
|
||||||
precompressed br
|
|
||||||
}
|
|
||||||
|
|
||||||
header /assets/* Cache-Control "public, max-age=31536000, immutable"
|
|
||||||
header /sw.js Cache-Control "no-cache"
|
|
||||||
header /index.html Cache-Control "no-cache"
|
|
||||||
header Document-Policy "js-profiling"
|
|
||||||
}
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
"${matrixFqdn}:8448" = {
|
"${matrixFqdn}:8448" = {
|
||||||
@@ -291,10 +220,7 @@ in
|
|||||||
matrix-registration-token-gen = {
|
matrix-registration-token-gen = {
|
||||||
before = [ "tuwunel.service" ];
|
before = [ "tuwunel.service" ];
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
path = with pkgs; [
|
path = with pkgs; [ coreutils openssl ];
|
||||||
coreutils
|
|
||||||
openssl
|
|
||||||
];
|
|
||||||
script = ''
|
script = ''
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
@@ -316,15 +242,9 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
livekit-key-gen = {
|
livekit-key-gen = {
|
||||||
before = [
|
before = [ "lk-jwt-service.service" "livekit.service" ];
|
||||||
"lk-jwt-service.service"
|
|
||||||
"livekit.service"
|
|
||||||
];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
wantedBy = [ "multi-user.target" ];
|
||||||
path = with pkgs; [
|
path = with pkgs; [ coreutils openssl ];
|
||||||
coreutils
|
|
||||||
openssl
|
|
||||||
];
|
|
||||||
script = ''
|
script = ''
|
||||||
set -eu
|
set -eu
|
||||||
|
|
||||||
|
|||||||
@@ -3,11 +3,6 @@
|
|||||||
services.pipewire = {
|
services.pipewire = {
|
||||||
enable = true;
|
enable = true;
|
||||||
pulse.enable = true;
|
pulse.enable = true;
|
||||||
|
|
||||||
alsa = {
|
|
||||||
enable = true;
|
|
||||||
support32Bit = true;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
|
|||||||
Reference in new issue
Block a user