Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b39ad458a5
|
||
|
|
4159d6a724
|
@@ -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
+94
-256
@@ -9,11 +9,11 @@
|
|||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1789138122,
|
"lastModified": 1783689476,
|
||||||
"narHash": "sha256-mh+ZiGCtHAo0xIi1yaNjHsftfnlWz9JiYwHCyT16yIE=",
|
"narHash": "sha256-Ac4EGPZr9e+mPUdmavJFSTft4vgoXml40+YOFYKTXPg=",
|
||||||
"owner": "ezKEa",
|
"owner": "ezKEa",
|
||||||
"repo": "aagl-gtk-on-nix",
|
"repo": "aagl-gtk-on-nix",
|
||||||
"rev": "d82d6d6f66caf4b63fb154e62fad83c627874127",
|
"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": 1791702392,
|
|
||||||
"narHash": "sha256-8uWZP3UiJBtYzBzazI18WvlshKYHxPb+8aqm02OxL5M=",
|
|
||||||
"ref": "refs/heads/master",
|
|
||||||
"rev": "ee2a27ad749d6d774e26c2be5de5f3a5ecd4a93f",
|
|
||||||
"revCount": 28,
|
|
||||||
"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": [
|
||||||
@@ -74,11 +51,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1786845137,
|
"lastModified": 1779036909,
|
||||||
"narHash": "sha256-oQFip+v0luP8NIxJzmiW4Wu8bILsbFWom5l0zonl8hQ=",
|
"narHash": "sha256-zXcwYQGCT6pzinK+1dBB2ekTVtfxGZAapb3Evdcu4fY=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "4cff07de74b50e64bdd68cd4e722ab5b6b35ee48",
|
"rev": "56c666e108467d87d13508936aade6d567f2a501",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -119,38 +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": 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,
|
||||||
@@ -165,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"
|
||||||
@@ -218,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": {
|
||||||
@@ -237,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"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -267,34 +198,11 @@
|
|||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792166485,
|
"lastModified": 1783668331,
|
||||||
"narHash": "sha256-TL2RJ56FbBQNi6vsCXAn7QhZECh5DPbvzfiX6v+4r1A=",
|
"narHash": "sha256-mMfzU9jvq9XQyyssR9w0Rki8/Ec4Ez+bLkFWc7BaGGg=",
|
||||||
"owner": "purpleclay",
|
"owner": "purpleclay",
|
||||||
"repo": "go-overlay",
|
"repo": "go-overlay",
|
||||||
"rev": "5971ffb6c5de960d37f3b85c53cb5a30387cd05a",
|
"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": 1792166485,
|
|
||||||
"narHash": "sha256-TL2RJ56FbBQNi6vsCXAn7QhZECh5DPbvzfiX6v+4r1A=",
|
|
||||||
"owner": "purpleclay",
|
|
||||||
"repo": "go-overlay",
|
|
||||||
"rev": "5971ffb6c5de960d37f3b85c53cb5a30387cd05a",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -305,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": 1791702441,
|
"lastModified": 1785717646,
|
||||||
"narHash": "sha256-qHf8tVIYu6OE1PKcthmpBgblg27u3bU7v4TVqy0B3jg=",
|
"narHash": "sha256-j6MlkwaYOLa3bogK4SbOnVI5eMZ9j2GdExSiKMaELPo=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "2c2e99f6347e9be744a72f7df6043015989d6cd7",
|
"rev": "9588520925513ed0e47711a5798c6e9958143a0a",
|
||||||
"revCount": 17,
|
"revCount": 5,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
|
"url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git"
|
||||||
},
|
},
|
||||||
@@ -333,11 +238,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792274446,
|
"lastModified": 1783740085,
|
||||||
"narHash": "sha256-AM1HmBeDnB2B3dSiXuCYeu7Me+lHNpz/P39lVxGJBuQ=",
|
"narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "ab3823b4b24c0c3ca984c1f3ee577fd6d667424c",
|
"rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -349,17 +254,14 @@
|
|||||||
},
|
},
|
||||||
"home-manager_2": {
|
"home-manager_2": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_4"
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792098797,
|
"lastModified": 1779507042,
|
||||||
"narHash": "sha256-u4DIIZgznEGzByxXrxWCXK19VcMtTBmi/M9gZ7Jk9bM=",
|
"narHash": "sha256-7wOwi8B6D0BYsieZCnHZZj2sNUzgJhLoIVSfkwB7lxQ=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "640725978b99076e18e069f6e7d2959124584f8f",
|
"rev": "509ed3c603349a9d43de9e2ae6613baea6bd5b34",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -368,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,
|
||||||
@@ -401,11 +288,11 @@
|
|||||||
},
|
},
|
||||||
"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": {
|
||||||
@@ -417,11 +304,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792030654,
|
"lastModified": 1783703440,
|
||||||
"narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=",
|
"narHash": "sha256-O3/YajjWo001VUIgD8BwaRdSNLUFe7nZ1qV5TwhRBcw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "26f4107e47e3ad0ffd0db220469ba83b6f6d96e8",
|
"rev": "8f0500b9660505dc3cb647775fe9a978a74b5283",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -433,11 +320,41 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792030654,
|
"lastModified": 1784280462,
|
||||||
"narHash": "sha256-OaQwAtPMTjQiY2sT/2/62UbSPhzP/0aDnWzMm/NCiUw=",
|
"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": "26f4107e47e3ad0ffd0db220469ba83b6f6d96e8",
|
"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": {
|
||||||
@@ -447,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=",
|
||||||
@@ -478,20 +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",
|
||||||
"nixpkgs": "nixpkgs_3",
|
"nixpkgs": "nixpkgs_5"
|
||||||
"rust-overlay": "rust-overlay_4"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792344577,
|
"lastModified": 1786304454,
|
||||||
"narHash": "sha256-Sbd2veIdg9iDiwwDeEKIiuk8FYMtjBXWvDlrrM0FjVA=",
|
"narHash": "sha256-2ovOgwFWnKqUMoQfxbobtIWQ+TSN62llX9eJVb9hFoY=",
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
"rev": "2debafc63297a24d2ca5c749b0d3f6bdbf6324cb",
|
"rev": "ea7094e4e33fbb030edf28383de37073fc8b84e0",
|
||||||
"revCount": 113,
|
"revCount": 43,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://scm.wyattjmiller.com/wymiller/nur.git"
|
"url": "https://scm.wyattjmiller.com/wymiller/nur.git"
|
||||||
},
|
},
|
||||||
@@ -500,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_4",
|
|
||||||
"mnw": "mnw",
|
|
||||||
"nixpkgs": "nixpkgs_4"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1792175215,
|
|
||||||
"narHash": "sha256-XD64JVLV8iE4lR+W5gkTweEaT+SBwOrSy0+le2WgITI=",
|
|
||||||
"owner": "notashelf",
|
|
||||||
"repo": "nvf",
|
|
||||||
"rev": "a736b60b1e2019931168979951c94dc46e342957",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "notashelf",
|
|
||||||
"repo": "nvf",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"aagl": "aagl",
|
"aagl": "aagl",
|
||||||
@@ -529,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": {
|
||||||
@@ -541,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": {
|
||||||
@@ -558,16 +439,16 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nur",
|
"nur",
|
||||||
"caitsith",
|
"hildibrand",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1791620365,
|
"lastModified": 1784438913,
|
||||||
"narHash": "sha256-CVZXIDNw7HEwyD8X6q9Ln370Sc0ZqRlTzDRwOZ1hJMY=",
|
"narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "e90fafa71b440fabcd52dd7fb017ab2da81c781a",
|
"rev": "afacd6819d3765a05814ee8e3de74c77d42ac799",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -578,57 +459,14 @@
|
|||||||
},
|
},
|
||||||
"rust-overlay_3": {
|
"rust-overlay_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": "nixpkgs_6"
|
||||||
"nur",
|
|
||||||
"hildibrand",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1791620365,
|
"lastModified": 1783834461,
|
||||||
"narHash": "sha256-CVZXIDNw7HEwyD8X6q9Ln370Sc0ZqRlTzDRwOZ1hJMY=",
|
"narHash": "sha256-FCmrs1StAghJDKfqy56KM96KZtxpYzgeq6zM3QO8wjA=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "e90fafa71b440fabcd52dd7fb017ab2da81c781a",
|
"rev": "a286e5b998e852297a403786f063fb2c9fe7f57a",
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"rust-overlay_4": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nur",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1792219666,
|
|
||||||
"narHash": "sha256-RMO08tKD+hFIL5ryWi85VY4aHE5oIpdV1h4kVFctOkw=",
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"rev": "a110337465cfb76e3806b81b9db3094c3e6e770a",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"rust-overlay_5": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": "nixpkgs_5"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1792307278,
|
|
||||||
"narHash": "sha256-wJgFFtw/vlzsjWrQFmTn40TTkSkqHM4XXN0nh4q4uMk=",
|
|
||||||
"owner": "oxalica",
|
|
||||||
"repo": "rust-overlay",
|
|
||||||
"rev": "42076d1c6a0fb405ed04f9a674e4a8f69de62ba3",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -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";
|
||||||
};
|
};
|
||||||
@@ -279,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";
|
||||||
};
|
};
|
||||||
|
|||||||
+11
-105
@@ -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 = {
|
|
||||||
viAlias = true;
|
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
lsp.enable = true;
|
|
||||||
treesitter.enable = true;
|
|
||||||
autocomplete.nvim-cmp.enable = true;
|
|
||||||
autopairs.nvim-autopairs.enable = true;
|
|
||||||
|
|
||||||
languages = {
|
|
||||||
nix.enable = true;
|
|
||||||
rust.enable = true;
|
|
||||||
go.enable = true;
|
|
||||||
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;
|
xdg.configFile = {
|
||||||
telescope.enable = true;
|
nvim = {
|
||||||
mini.icons.enable = true;
|
onChange = "nvim --headless -c 'if exists(\":LuaCacheClear\") | :LuaCacheClear' +quitall";
|
||||||
notes.obsidian = {
|
source = dirs.defaults + /nvim;
|
||||||
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]) ++
|
||||||
|
|||||||
@@ -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,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,47 +10,13 @@ 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
|
||||||
@@ -115,7 +79,7 @@ in
|
|||||||
8448
|
8448
|
||||||
];
|
];
|
||||||
|
|
||||||
allowedUDPPortRanges = [
|
allowedUDPPortRanges =[
|
||||||
# TURN UDP relays
|
# TURN UDP relays
|
||||||
{
|
{
|
||||||
from = 49000;
|
from = 49000;
|
||||||
@@ -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
|
||||||
@@ -185,12 +145,10 @@ in
|
|||||||
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 \
|
|
||||||
/_matrix/* \
|
|
||||||
/_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
|
encode zstd gzip
|
||||||
try_files {path} /index.html
|
reverse_proxy localhost:8008
|
||||||
|
|
||||||
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