server changes
This commit is contained in:
parent
a52010039a
commit
581a9b64a0
251
flake.lock
generated
251
flake.lock
generated
@ -6,11 +6,11 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700088598,
|
||||
"narHash": "sha256-lK66mu2vi2/rXm13+lh/Gwi2asQiEU7a91ZoP4dFdNE=",
|
||||
"lastModified": 1701295343,
|
||||
"narHash": "sha256-SgIudU8ju74krGDa3hZlUfPGim16KHnAKi91TMXwTac=",
|
||||
"owner": "ezKEa",
|
||||
"repo": "aagl-gtk-on-nix",
|
||||
"rev": "ee7b773dd7d028ad1b185cdf72bc16ce69ac0288",
|
||||
"rev": "21a0f2059afbae7267f913ac3727bb1205db2a2b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -22,11 +22,11 @@
|
||||
"arkenfox-userjs": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1699660343,
|
||||
"narHash": "sha256-zLqhuVm7kS0otxL88Mfd+MSKCPuEZSBx0XrskIdSNPo=",
|
||||
"lastModified": 1700833105,
|
||||
"narHash": "sha256-8mxKaA0yGx29X+E0ahCjsGXSc29I1+5timNP6cJHGM0=",
|
||||
"owner": "arkenfox",
|
||||
"repo": "user.js",
|
||||
"rev": "fc251637635cce451067aa448a66f803f8c4d577",
|
||||
"rev": "4a510a4b4ceda8a177831a77309f2faccf7e18d5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -186,11 +186,11 @@
|
||||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700140236,
|
||||
"narHash": "sha256-OpukFO0rRG2hJzD+pCQq+nSWuT9dBL6DSvADQaUlmFg=",
|
||||
"lastModified": 1701187605,
|
||||
"narHash": "sha256-NctguPdUeDVLXFsv6vI1RlEiHLsXkeW3pgZe/mwn1BU=",
|
||||
"owner": "cachix",
|
||||
"repo": "devenv",
|
||||
"rev": "525d60c44de848a6b2dd468f6efddff078eb2af2",
|
||||
"rev": "a7c4dd8f4eb1f98a6b8f04bf08364954e1e73e4f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -206,11 +206,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699781810,
|
||||
"narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=",
|
||||
"lastModified": 1700927249,
|
||||
"narHash": "sha256-iqmIWiEng890/ru7ZBf4nUezFPyRm2fjRTvuwwxqk2o=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df",
|
||||
"rev": "3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -222,17 +222,16 @@
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1673956053,
|
||||
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
@ -365,7 +364,10 @@
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
"nixpkgs-lib": [
|
||||
"nix-direnv",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1698882062,
|
||||
@ -382,6 +384,24 @@
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1698882062,
|
||||
"narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "8c9fa2545007b49a5db5f650ae91f227672c3877",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_3": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib_2"
|
||||
},
|
||||
@ -467,24 +487,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_10": {
|
||||
"inputs": {
|
||||
"systems": "systems_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"locked": {
|
||||
"lastModified": 1644229661,
|
||||
@ -573,24 +575,6 @@
|
||||
"inputs": {
|
||||
"systems": "systems_5"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1694529238,
|
||||
"narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_8": {
|
||||
"inputs": {
|
||||
"systems": "systems_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
@ -605,9 +589,9 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_9": {
|
||||
"flake-utils_8": {
|
||||
"inputs": {
|
||||
"systems": "systems_7"
|
||||
"systems": "systems_6"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685518550,
|
||||
@ -623,6 +607,24 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_9": {
|
||||
"inputs": {
|
||||
"systems": "systems_7"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "cfacdce06f30d2b68473a46042957675eebb3401",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@ -674,11 +676,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700118404,
|
||||
"narHash": "sha256-XkqpZpVoy1FV7UbiLkP+fQxxv/6KnwLYkFEHgE8z2IQ=",
|
||||
"lastModified": 1701433070,
|
||||
"narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "c1a033122df8a3c74fda3780c83a104a7d60873c",
|
||||
"rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -698,11 +700,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700236881,
|
||||
"narHash": "sha256-b4L14G672hPLt3y/ekt08PbgN0lyBvovaGLhWdYUNXU=",
|
||||
"lastModified": 1701528705,
|
||||
"narHash": "sha256-SJENLaYS4hIuvQMgupKlclGZ5Mz40OvUc2Vu8vFBSow=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "db8f13291a4e046e82c9b11c5bfd08f223bd52b1",
|
||||
"rev": "80b9b21f9f24b6e8db2fc6f7705cd124f436ffba",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -743,11 +745,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699969928,
|
||||
"narHash": "sha256-c3ZGon18Cm37iTIe86nLkeNkVj16DvEvzvs6UqbvAd4=",
|
||||
"lastModified": 1701083219,
|
||||
"narHash": "sha256-0j4Poy2OEZ55GWagfj6ookxG6jXdsDHZLh6vU3DBuz4=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprpaper",
|
||||
"rev": "38e18b70777be4e8af45698b8c7bdbf3a04387a0",
|
||||
"rev": "b94f84605d6d6d8d3c17a42a72fc3b01df69ab7f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -911,15 +913,16 @@
|
||||
},
|
||||
"nix-direnv": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_7",
|
||||
"nixpkgs": "nixpkgs_9"
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_9",
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1699716172,
|
||||
"narHash": "sha256-3wv4rnDFlQODoYqFLM2OEFQtAHVDYvMtY4ABnwB1D40=",
|
||||
"lastModified": 1701295404,
|
||||
"narHash": "sha256-06mOq9MP5D3ZSSiZJENsuHEHjLq3GDG6ZgZ/dkDTFgQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-direnv",
|
||||
"rev": "9178f71653285fff85b6a8712821b95273f95582",
|
||||
"rev": "adeced79808f2e8689be55e287cf24a145dc0638",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -930,11 +933,11 @@
|
||||
},
|
||||
"nix-fast-build": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700146408,
|
||||
@ -1001,17 +1004,17 @@
|
||||
"nix-vscode-marketplace": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_7",
|
||||
"flake-utils": "flake-utils_8",
|
||||
"flake-utils": "flake-utils_7",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700183987,
|
||||
"narHash": "sha256-lea3Wog1Lmwj8HQT9znmB3LrYErJkTMJm79AcXRdc4Q=",
|
||||
"lastModified": 1701479904,
|
||||
"narHash": "sha256-uJKkBZIUQkxyNLn806QAuOqwJqhIbsSJQ3kzGFN9qgA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-vscode-extensions",
|
||||
"rev": "4fd6ede6a7f997bab3210856335d7d34fbb70011",
|
||||
"rev": "079f5a9444ad5630772c81652fdfe55544094961",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1078,11 +1081,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1698611440,
|
||||
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
|
||||
"lastModified": 1700794826,
|
||||
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
|
||||
"rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1160,11 +1163,11 @@
|
||||
},
|
||||
"nixpkgs-master": {
|
||||
"locked": {
|
||||
"lastModified": 1700256434,
|
||||
"narHash": "sha256-EmjziR5Ty3po5uVFxvG1Q5+KfXvrCvFyESXuJn7XHi4=",
|
||||
"lastModified": 1701535283,
|
||||
"narHash": "sha256-Z2I64Sg1e3sDuLogi6byWaqBL9VtNPGDprJ8uQvAUlA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "de20681ff7cb84daea4d85630a6a59f2eacf265e",
|
||||
"rev": "044109cfd464a6c520f861917d9ceaf87012a4c8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1256,11 +1259,11 @@
|
||||
},
|
||||
"nixpkgs-stable_3": {
|
||||
"locked": {
|
||||
"lastModified": 1700097215,
|
||||
"narHash": "sha256-ODQ3gBTv1iHd7lG21H+ErVISB5wVeOhd/dEogOqHs/I=",
|
||||
"lastModified": 1701362232,
|
||||
"narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9fb122519e9cd465d532f736a98c1e1eb541ef6f",
|
||||
"rev": "d2332963662edffacfddfad59ff4f709dde80ffe",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1272,11 +1275,11 @@
|
||||
},
|
||||
"nixpkgs-stable_4": {
|
||||
"locked": {
|
||||
"lastModified": 1700342017,
|
||||
"narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=",
|
||||
"lastModified": 1700905716,
|
||||
"narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "decdf666c833a325cb4417041a90681499e06a41",
|
||||
"rev": "dfb95385d21475da10b63da74ae96d89ab352431",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1288,11 +1291,11 @@
|
||||
},
|
||||
"nixpkgs_10": {
|
||||
"locked": {
|
||||
"lastModified": 1699963925,
|
||||
"narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=",
|
||||
"lastModified": 1701253981,
|
||||
"narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "bf744fe90419885eefced41b3e5ae442d732712d",
|
||||
"rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1432,11 +1435,11 @@
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1699343069,
|
||||
"narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=",
|
||||
"lastModified": 1700856099,
|
||||
"narHash": "sha256-RnEA7iJ36Ay9jI0WwP+/y4zjEhmeN6Cjs9VOFBH7eVQ=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "ec750fd01963ab6b20ee1f0cb488754e8036d89d",
|
||||
"rev": "0bd59c54ef06bc34eca01e37d689f5e46b3fe2f1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1448,11 +1451,11 @@
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1700251368,
|
||||
"narHash": "sha256-tQ5g4/0FjR55k5I/YkauHGFNgT2j/ioi0vt8RtypZCo=",
|
||||
"lastModified": 1701528264,
|
||||
"narHash": "sha256-h+U4YBiEBGohPe0//JQhhyRCMs+r1cwRuPY8gjPB/Tk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "a55ba997f3085181d888e08a420cf33ba4e2d744",
|
||||
"rev": "e14b77401d63ba75aa9523f7ad9d327ee5085479",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1495,7 +1498,7 @@
|
||||
"prismlauncher",
|
||||
"flake-compat"
|
||||
],
|
||||
"flake-utils": "flake-utils_9",
|
||||
"flake-utils": "flake-utils_8",
|
||||
"gitignore": "gitignore_2",
|
||||
"nixpkgs": [
|
||||
"prismlauncher",
|
||||
@ -1523,7 +1526,7 @@
|
||||
"prismlauncher": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_8",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"libnbtplusplus": "libnbtplusplus",
|
||||
"nix-filter": "nix-filter_2",
|
||||
"nixpkgs": "nixpkgs_11",
|
||||
@ -1632,11 +1635,11 @@
|
||||
"rycee": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1700176153,
|
||||
"narHash": "sha256-3WoZzgUUsjbXNPTtx6AdYpuRyOFYDwKHBKdhxn1QUlI=",
|
||||
"lastModified": 1701511889,
|
||||
"narHash": "sha256-r1s4LjtiFFZXEs+fXT2n6ULZVtezzv8uHVg5rSW76vo=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "335ab8023497fdc44cc73630ca36dd982093fb07",
|
||||
"rev": "a72f098480eee3dc9609a11a4872d44747ce4cc8",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@ -1678,11 +1681,11 @@
|
||||
"nixpkgs-stable": "nixpkgs-stable_4"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1700362823,
|
||||
"narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=",
|
||||
"lastModified": 1701518298,
|
||||
"narHash": "sha256-5t8yqKe0oVusV4xgfA+wW58hQJXFMmq0mmaR1gKES+Y=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "49a87c6c827ccd21c225531e30745a9a6464775c",
|
||||
"rev": "e19071f9958c8da4f4347d3d78790d97e98ba22f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@ -1796,22 +1799,28 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_8": {
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nix-direnv",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"lastModified": 1699786194,
|
||||
"narHash": "sha256-3h3EH1FXQkIeAuzaWB+nK0XK54uSD46pp+dMD3gAcB4=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "e82f32aa7f06bbbd56d7b12186d555223dc399d1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"treefmt-nix_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nix-fast-build",
|
||||
@ -1879,7 +1888,7 @@
|
||||
},
|
||||
"vscode-server": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_10",
|
||||
"flake-utils": "flake-utils_9",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
@ -1902,18 +1911,18 @@
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"host": "gitlab.freedesktop.org",
|
||||
"lastModified": 1699292815,
|
||||
"narHash": "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I=",
|
||||
"lastModified": 1701368958,
|
||||
"narHash": "sha256-7kvyoA91etzVEl9mkA/EJfB6z/PltxX7Xc4gcr7/xlo=",
|
||||
"owner": "wlroots",
|
||||
"repo": "wlroots",
|
||||
"rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1",
|
||||
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"host": "gitlab.freedesktop.org",
|
||||
"owner": "wlroots",
|
||||
"repo": "wlroots",
|
||||
"rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1",
|
||||
"rev": "5d639394f3e83b01596dcd166a44a9a1a2583350",
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
@ -1933,11 +1942,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1697981233,
|
||||
"narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=",
|
||||
"lastModified": 1700508250,
|
||||
"narHash": "sha256-X4o/mifI7Nhu0UKYlxx53wIC+gYDo3pVM9L2u3PE2bE=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "xdg-desktop-portal-hyprland",
|
||||
"rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2",
|
||||
"rev": "eb120ff25265ecacd0fc13d7dab12131b60d0f47",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@ -157,7 +157,7 @@
|
||||
inputs.vscode-server.nixosModule
|
||||
];
|
||||
specialArgs = { inherit inputs; };
|
||||
channelName = "server";
|
||||
channelName = "unstable";
|
||||
};
|
||||
Suomi-VPS = {
|
||||
system = builtins.readFile (./machines/Suomi-VPS/system);
|
||||
|
||||
@ -42,6 +42,7 @@ in {
|
||||
"!/media/nas/media-stack/configs/qbittorrent/downloads"
|
||||
"!/media/nas/media-stack/configs/recyclarr/repositories"
|
||||
"!/srv/gitea"
|
||||
"!/srv/wiki"
|
||||
];
|
||||
sources = [{
|
||||
source = "/srv /media/nas/containers /media/nas/media-stack/configs";
|
||||
|
||||
@ -17,9 +17,9 @@ in {
|
||||
# customProfiles.firefox-syncserver
|
||||
customProfiles.gitea
|
||||
customProfiles.joplin-server
|
||||
customProfiles.mailserver
|
||||
# customProfiles.mailserver
|
||||
customProfiles.nginx
|
||||
customProfiles.roundcube
|
||||
# customProfiles.roundcube
|
||||
customProfiles.tinyproxy
|
||||
customProfiles.vaultwarden
|
||||
customProfiles.vscode-server
|
||||
@ -148,7 +148,6 @@ in {
|
||||
}];
|
||||
};
|
||||
networking.extraHosts = ''
|
||||
127.0.0.1 mail.ataraxiadev.com
|
||||
127.0.0.1 code.ataraxiadev.com
|
||||
127.0.0.1 cache.ataraxiadev.com
|
||||
'';
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
{ name = "joplin.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
{ name = "kavita.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
{ name = "ldap.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
{ name = "mail.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
# { name = "mail.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
{ name = "matrix.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
{ name = "medusa.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
{ name = "microbin.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
@ -42,7 +42,7 @@
|
||||
{ name = "tools.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
{ name = "turn.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
{ name = "vw.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
{ name = "webmail.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
# { name = "webmail.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
{ name = "wiki.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
|
||||
|
||||
{ name = "ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
@ -68,7 +68,7 @@
|
||||
{ name = "joplin.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
{ name = "kavita.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
{ name = "ldap.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
{ name = "mail.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
# { name = "mail.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
{ name = "matrix.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
{ name = "medusa.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
{ name = "microbin.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
@ -87,7 +87,7 @@
|
||||
{ name = "tools.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
{ name = "turn.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
{ name = "vw.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
{ name = "webmail.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
# { name = "webmail.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
{ name = "wiki.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
|
||||
];
|
||||
}
|
||||
|
||||
@ -1,68 +1,47 @@
|
||||
{
|
||||
dns-mapping = {
|
||||
customDNS = {
|
||||
mapping = {
|
||||
"coturn.pve" = "192.168.0.20";
|
||||
"matrix.pve" = "192.168.0.11";
|
||||
"monero.pve" = "192.168.0.13";
|
||||
"nginx.pve" = "192.168.0.10";
|
||||
"pihole.pve" = "192.168.0.5";
|
||||
"proxmox.pve" = "192.168.0.10";
|
||||
"sd.ataraxiadev.com" = "192.168.0.100";
|
||||
"static.powernet.com.ru" = "10.200.201.167";
|
||||
"tinyproxy.pve" = "192.168.0.9";
|
||||
};
|
||||
};
|
||||
conditional = {
|
||||
mapping = { "pve" = "127.0.0.1"; };
|
||||
rewrite = {
|
||||
"api.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"ataraxiadev.com" = "nginx.pve";
|
||||
"auth.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"bathist.ataraxiadev.com" = "bathist.ataraxiadev.com";
|
||||
"browser.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"cache.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"cal.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"cocalc.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"code.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"docs.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"dimension.ataraxiadev.com" = "matrix.ataraxiadev.com";
|
||||
"element.ataraxiadev.com" = "matrix.ataraxiadev.com";
|
||||
"fb.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"file.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"fsync.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"goneb.ataraxiadev.com" = "matrix.ataraxiadev.com";
|
||||
"home.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"jackett.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"jellyfin.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"jitsi.ataraxiadev.com" = "matrix.ataraxiadev.com";
|
||||
"joplin.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"kavita.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"ldap.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"mail.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"matrix.ataraxiadev.com" = "nginx.pve";
|
||||
"medusa.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"microbin.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"nzbhydra.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"openbooks.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"organizr.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"prowlarr.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"qbit.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"radarr.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"restic.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"shoko.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"sonarr.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"sonarrtv.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"startpage.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"stats.ataraxiadev.com" = "matrix.ataraxiadev.com";
|
||||
"tools.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"turn.ataraxiadev.com" = "coturn.pve";
|
||||
"vw.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"webmail.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"wg.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"wiki.ataraxiadev.com" = "ataraxiadev.com";
|
||||
"www.ataraxiadev.com" = "ataraxiadev.com";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
dns-mapping = [
|
||||
"/api.ataraxiadev.com/192.168.0.10"
|
||||
"/auth.ataraxiadev.com/192.168.0.10"
|
||||
"/bathist.ataraxiadev.com/192.168.0.10"
|
||||
"/browser.ataraxiadev.com/192.168.0.10"
|
||||
"/cache.ataraxiadev.com/192.168.0.10"
|
||||
"/cal.ataraxiadev.com/192.168.0.10"
|
||||
"/cocalc.ataraxiadev.com/192.168.0.10"
|
||||
"/code.ataraxiadev.com/192.168.0.10"
|
||||
"/docs.ataraxiadev.com/192.168.0.10"
|
||||
"/dimension.ataraxiadev.com/192.168.0.10"
|
||||
"/element.ataraxiadev.com/192.168.0.10"
|
||||
"/fb.ataraxiadev.com/192.168.0.10"
|
||||
"/file.ataraxiadev.com/192.168.0.10"
|
||||
"/fsync.ataraxiadev.com/192.168.0.10"
|
||||
"/goneb.ataraxiadev.com/192.168.0.10"
|
||||
"/home.ataraxiadev.com/192.168.0.10"
|
||||
"/jackett.ataraxiadev.com/192.168.0.10"
|
||||
"/jellyfin.ataraxiadev.com/192.168.0.10"
|
||||
"/jitsi.ataraxiadev.com/192.168.0.10"
|
||||
"/joplin.ataraxiadev.com/192.168.0.10"
|
||||
"/kavita.ataraxiadev.com/192.168.0.10"
|
||||
"/ldap.ataraxiadev.com/192.168.0.10"
|
||||
"/matrix.ataraxiadev.com/192.168.0.10"
|
||||
"/medusa.ataraxiadev.com/192.168.0.10"
|
||||
"/microbin.ataraxiadev.com/192.168.0.10"
|
||||
"/nzbhydra.ataraxiadev.com/192.168.0.10"
|
||||
"/openbooks.ataraxiadev.com/192.168.0.10"
|
||||
"/organizr.ataraxiadev.com/192.168.0.10"
|
||||
"/prowlarr.ataraxiadev.com/192.168.0.10"
|
||||
"/qbit.ataraxiadev.com/192.168.0.10"
|
||||
"/radarr.ataraxiadev.com/192.168.0.10"
|
||||
"/restic.ataraxiadev.com/192.168.0.10"
|
||||
"/shoko.ataraxiadev.com/192.168.0.10"
|
||||
"/sonarr.ataraxiadev.com/192.168.0.10"
|
||||
"/sonarrtv.ataraxiadev.com/192.168.0.10"
|
||||
"/startpage.ataraxiadev.com/192.168.0.10"
|
||||
"/stats.ataraxiadev.com/192.168.0.10"
|
||||
"/tools.ataraxiadev.com/192.168.0.10"
|
||||
"/turn.ataraxiadev.com/192.168.0.10"
|
||||
"/vw.ataraxiadev.com/192.168.0.10"
|
||||
"/wg.ataraxiadev.com/192.168.0.10"
|
||||
"/wiki.ataraxiadev.com/192.168.0.10"
|
||||
"/www.ataraxiadev.com/192.168.0.10"
|
||||
];
|
||||
}
|
||||
@ -17,7 +17,8 @@
|
||||
];
|
||||
containers.storage.settings = {
|
||||
storage = {
|
||||
driver = "zfs";
|
||||
driver = "overlay";
|
||||
# driver = "zfs";
|
||||
graphroot = "/var/lib/podman/storage";
|
||||
runroot = "/run/containers/storage";
|
||||
};
|
||||
|
||||
@ -41,9 +41,7 @@
|
||||
enable = true;
|
||||
ensureUsers = [{
|
||||
name = "atticd";
|
||||
ensurePermissions = {
|
||||
"DATABASE atticd" = "ALL PRIVILEGES";
|
||||
};
|
||||
ensureDBOwnership = true;
|
||||
}];
|
||||
ensureDatabases = [ "atticd" ];
|
||||
};
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ config, dns-mapping ? {}, ... }:
|
||||
{ config, dns-mapping ? [], ... }:
|
||||
let
|
||||
nodeAddress = "192.168.0.5";
|
||||
wgAddress = "10.100.0.1";
|
||||
@ -20,12 +20,13 @@ in {
|
||||
config = { config, pkgs, ... }:
|
||||
let
|
||||
grafanaPort = config.services.grafana.settings.server.http_port;
|
||||
blockyPort = config.services.blocky.settings.port;
|
||||
blockyPort = config.services.blocky.settings.ports.dns;
|
||||
blockyHttpPort = config.services.blocky.settings.ports.http;
|
||||
in {
|
||||
networking = {
|
||||
defaultGateway = "192.168.0.1";
|
||||
hostName = "blocky-node";
|
||||
nameservers = [];
|
||||
nameservers = [ wgAddress ];
|
||||
enableIPv6 = false;
|
||||
useHostResolvConf = false;
|
||||
firewall = {
|
||||
@ -33,25 +34,45 @@ in {
|
||||
allowedTCPPorts = [ blockyPort grafanaPort ];
|
||||
allowedUDPPorts = [ blockyPort ];
|
||||
};
|
||||
|
||||
wg-quick.interfaces.wg0.configFile = "/var/secrets/${wgConf}";
|
||||
wg-quick.interfaces.wg0.configFile = wgConf;
|
||||
};
|
||||
services.dnsmasq = {
|
||||
enable = true;
|
||||
alwaysKeepRunning = true;
|
||||
resolveLocalQueries = false;
|
||||
settings = {
|
||||
port = 5353;
|
||||
no-resolv = true;
|
||||
no-hosts = true;
|
||||
listen-address = "127.0.0.1";
|
||||
no-dhcp-interface = "";
|
||||
address = dns-mapping ++ [];
|
||||
};
|
||||
};
|
||||
services.blocky = {
|
||||
enable = true;
|
||||
settings = {
|
||||
upstream.default = [ wgAddress ];
|
||||
upstreamTimeout = "15s";
|
||||
upstreamTimeout = "10s";
|
||||
caching = {
|
||||
minTime = "0m"; # TTL
|
||||
minTime = "0m";
|
||||
maxTime = "12h";
|
||||
cacheTimeNegative = "1m";
|
||||
prefetching = true;
|
||||
};
|
||||
port = 53;
|
||||
httpPort = "127.0.0.1:4000";
|
||||
ports = {
|
||||
dns = 53;
|
||||
http = "127.0.0.1:4000";
|
||||
};
|
||||
prometheus.enable = true;
|
||||
queryLog.type = "console";
|
||||
} // dns-mapping;
|
||||
conditional = {
|
||||
fallbackUpstream = true;
|
||||
mapping = {
|
||||
"ataraxiadev.com" = "127.0.0.1:5353";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
services.prometheus = {
|
||||
enable = true;
|
||||
@ -61,7 +82,7 @@ in {
|
||||
scrapeConfigs = [{
|
||||
job_name = "blocky";
|
||||
static_configs = [{
|
||||
targets = [ config.services.blocky.settings.httpPort ];
|
||||
targets = [ blockyHttpPort ];
|
||||
}];
|
||||
}];
|
||||
};
|
||||
@ -69,7 +90,7 @@ in {
|
||||
enable = true;
|
||||
settings = {
|
||||
analytics.reporting_enabled = false;
|
||||
server = rec {
|
||||
server = {
|
||||
domain = "${nodeAddress}:${toString grafanaPort}";
|
||||
http_addr = nodeAddress;
|
||||
enable_gzip = true;
|
||||
|
||||
@ -39,6 +39,9 @@ in {
|
||||
HTTP_PORT = 6000;
|
||||
ROOT_URL = "https://code.ataraxiadev.com";
|
||||
};
|
||||
actions = {
|
||||
ENABLED = true;
|
||||
};
|
||||
api = {
|
||||
ENABLE_SWAGGER = false;
|
||||
};
|
||||
|
||||
@ -64,7 +64,7 @@ in {
|
||||
"code.ataraxiadev.com"
|
||||
"fb.ataraxiadev.com"
|
||||
"browser.ataraxiadev.com"
|
||||
"webmail.ataraxiadev.com"
|
||||
# "webmail.ataraxiadev.com"
|
||||
"jellyfin.ataraxiadev.com"
|
||||
"medusa.ataraxiadev.com"
|
||||
"qbit.ataraxiadev.com"
|
||||
@ -272,19 +272,20 @@ in {
|
||||
send_timeout 36000s;
|
||||
proxy_send_timeout 36000s;
|
||||
# proxy_buffering off;
|
||||
'' + proxySettings;
|
||||
'';
|
||||
};
|
||||
extraConfig = ''
|
||||
proxy_set_header X-Forwarded-Proto https;
|
||||
proxy_set_header X-Forwarded-For $remote_addr;
|
||||
'';
|
||||
} // default;
|
||||
"webmail.ataraxiadev.com" = {
|
||||
locations."/" = {
|
||||
extraConfig = ''
|
||||
client_max_body_size 30M;
|
||||
'' + proxySettings;
|
||||
};
|
||||
} // default;
|
||||
# "webmail.ataraxiadev.com" = {
|
||||
# locations."/" = {
|
||||
# extraConfig = ''
|
||||
# client_max_body_size 30M;
|
||||
# '' + proxySettings;
|
||||
# };
|
||||
# } // default;
|
||||
"cocalc.ataraxiadev.com" = {
|
||||
locations."/" = {
|
||||
proxyPass = "https://localhost:9099";
|
||||
|
||||
@ -14,6 +14,7 @@
|
||||
outline-utils = default;
|
||||
};
|
||||
services = {
|
||||
# TODO: migrate from s3 to local storage
|
||||
outline = {
|
||||
enable = true;
|
||||
port = 3010;
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
'mail.gmail.com' => 'gmail.com',
|
||||
);
|
||||
$config['x_frame_options'] = false;
|
||||
$config['smtp_host'] = "tls://${config.mailserver.fqdn}:587";
|
||||
$config['smtp_host'] = "tls://mail.ataraxiadev.com:587";
|
||||
$config['smtp_user'] = "%u";
|
||||
$config['smtp_pass'] = "%p";
|
||||
'';
|
||||
|
||||
@ -2,6 +2,10 @@
|
||||
services.kiwix-serve = {
|
||||
enable = true;
|
||||
port = 8190;
|
||||
zimDir = "/media/nas/media-stack/torrents/other";
|
||||
zimDir = "/srv/wiki";
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /srv/wiki 0755 root root -"
|
||||
];
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user