Compare commits
No commits in common. "f5b52fe2708e85faa01bc5fc213236f89f4de57f" and "7f162f934c49c7138749eb648c600f34167c175f" have entirely different histories.
f5b52fe270
...
7f162f934c
14 changed files with 178 additions and 213 deletions
167
flake.lock
167
flake.lock
|
|
@ -9,11 +9,11 @@
|
|||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730444665,
|
||||
"narHash": "sha256-i3FxeHjsHw4AePx3AWVVywy92EEobx/ZER4ignWxNrE=",
|
||||
"lastModified": 1728852607,
|
||||
"narHash": "sha256-PhJdr8b4nZVHts5KMEsf7vCDXVpFIFCa7VlCt+oYpL4=",
|
||||
"owner": "Kirottu",
|
||||
"repo": "anyrun",
|
||||
"rev": "b3b4f2253d43af3311b3d3fc86973fc3e9559c33",
|
||||
"rev": "6e0385f6945d701545edc5bccfc5f544e1e12663",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -71,27 +71,28 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"comin": {
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"git-fs-monitor",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1724145018,
|
||||
"narHash": "sha256-6R5CeMgr3EGKhqWPkqtteOtix7hBaurfpjHepiq2OrU=",
|
||||
"owner": "nlewo",
|
||||
"repo": "comin",
|
||||
"rev": "84ef9af404b9157eab2c5e3e44d7c29239329901",
|
||||
"lastModified": 1711586303,
|
||||
"narHash": "sha256-iZDHWTqQj6z6ccqTSEOPOxQ8KMFAemInUObN2R9vHSs=",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"rev": "a329cd00398379c62e76fc3b8d4ec2934260d636",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nlewo",
|
||||
"repo": "comin",
|
||||
"owner": "ipetkov",
|
||||
"repo": "crane",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"crane_2": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-utils": [
|
||||
|
|
@ -121,7 +122,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane_2": {
|
||||
"crane_3": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"pamedia",
|
||||
|
|
@ -149,11 +150,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730751873,
|
||||
"narHash": "sha256-sdY29RWz0S7VbaoTwSy6RummdHKf0wUTaBlqPxrtvmQ=",
|
||||
"lastModified": 1729712798,
|
||||
"narHash": "sha256-a+Aakkb+amHw4biOZ0iMo8xYl37uUL48YEXIC5PYJ/8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "856a2902156ba304efebd4c1096dbf7465569454",
|
||||
"rev": "09a776702b004fdf9c41a024e1299d575ee18a7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -164,17 +165,20 @@
|
|||
},
|
||||
"emacs-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730794820,
|
||||
"narHash": "sha256-UJ1D89beMdNVdsOIvhMrQkjNQrxK3dJX2YVC6zWJUgw=",
|
||||
"lastModified": 1729847607,
|
||||
"narHash": "sha256-a5CwSoNGyQAyg13i+WfvVREUouoBKYeqsAZAnxfqeuQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "3a071974344ba47573382596d91bd7a94beeac20",
|
||||
"rev": "8585c0d7f7b5efa704112bbfc6310cebacb94e69",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -297,11 +301,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730504689,
|
||||
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
|
||||
"lastModified": 1727826117,
|
||||
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
|
||||
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -343,6 +347,37 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"git-fs-monitor": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"pre-commit-hooks": [
|
||||
"pre-commit-hooks"
|
||||
],
|
||||
"rust-overlay": [
|
||||
"rust-overlay"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711698730,
|
||||
"narHash": "sha256-/rCvMprkNJHIJUIUB+jjzv1ZSZkcIK5wMn3I/QoAsFk=",
|
||||
"ref": "main",
|
||||
"rev": "5807cf59b93d937b3804e7b73e30221337c598ad",
|
||||
"revCount": 5,
|
||||
"type": "git",
|
||||
"url": "https://git.datarift.nl/erwin/git-fs-monitor.git"
|
||||
},
|
||||
"original": {
|
||||
"ref": "main",
|
||||
"type": "git",
|
||||
"url": "https://git.datarift.nl/erwin/git-fs-monitor.git"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -366,7 +401,7 @@
|
|||
},
|
||||
"ha-now-playing": {
|
||||
"inputs": {
|
||||
"crane": "crane",
|
||||
"crane": "crane_2",
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
|
|
@ -402,11 +437,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730633670,
|
||||
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
|
||||
"lastModified": 1729848063,
|
||||
"narHash": "sha256-1uGIPOSJq4IzoDvgfOF6A3sw5it1WX3ZdYl2+jCkjv8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
|
||||
"rev": "c77c3bb23390a9ba91860e721edde54856fc5f7a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -426,11 +461,11 @@
|
|||
"spectrum": "spectrum"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730499294,
|
||||
"narHash": "sha256-RxV89z3TwhQT0Wue42aSPh3O7hXGbAFYHHNSnW9h6P8=",
|
||||
"lastModified": 1729726792,
|
||||
"narHash": "sha256-ndjFy5kfhn9MoOOSzGnZ7f2FwRUUY1EJYwXGxK8DzsQ=",
|
||||
"owner": "astro",
|
||||
"repo": "microvm.nix",
|
||||
"rev": "93122446d6001f9789d05e565f73bebfa3f53b50",
|
||||
"rev": "ef42cfface9940b9ce9614307670b60cdbda33f6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -487,11 +522,11 @@
|
|||
},
|
||||
"nixos-facter-modules": {
|
||||
"locked": {
|
||||
"lastModified": 1730737399,
|
||||
"narHash": "sha256-PzJrTMhHb9f46uMxmRD4GjnyVuNqxeyEvxaq7OierUQ=",
|
||||
"lastModified": 1728725827,
|
||||
"narHash": "sha256-io1UeGaV2HcmK1zCZPnawJu3CxKHhiZ83NBJ+qshWIo=",
|
||||
"owner": "numtide",
|
||||
"repo": "nixos-facter-modules",
|
||||
"rev": "c22b916f629fee6941a2976c62247b0bec68082b",
|
||||
"rev": "9f2a45b372830d28412160413d1d83f5ee11cc2f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -502,11 +537,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1730537918,
|
||||
"narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
|
||||
"lastModified": 1729742320,
|
||||
"narHash": "sha256-u3Of8xRkN//me8PU+RucKA59/6RNy4B2jcGAF36P4jI=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
|
||||
"rev": "e8a2f6d5513fe7b7d15701b2d05404ffdc3b6dda",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -517,11 +552,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1730531603,
|
||||
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
|
||||
"lastModified": 1729665710,
|
||||
"narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
|
||||
"rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -533,23 +568,23 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1730504152,
|
||||
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=",
|
||||
"lastModified": 1727825735,
|
||||
"narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz"
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1730741070,
|
||||
"narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
|
||||
"lastModified": 1729691686,
|
||||
"narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
|
||||
"rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -577,11 +612,11 @@
|
|||
},
|
||||
"nixpkgs-stable_3": {
|
||||
"locked": {
|
||||
"lastModified": 1730602179,
|
||||
"narHash": "sha256-efgLzQAWSzJuCLiCaQUCDu4NudNlHdg2NzGLX5GYaEY=",
|
||||
"lastModified": 1729357638,
|
||||
"narHash": "sha256-66RHecx+zohbZwJVEPF7uuwHeqf8rykZTMCTqIrOew4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "3c2f1c4ca372622cb2f9de8016c9a0b1cbd0f37c",
|
||||
"rev": "bb8c2cf7ea0dd2e18a52746b2c3a5b0c73b93c22",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -593,7 +628,7 @@
|
|||
},
|
||||
"pamedia": {
|
||||
"inputs": {
|
||||
"crane": "crane_2",
|
||||
"crane": "crane_3",
|
||||
"flake-parts": [
|
||||
"flake-parts"
|
||||
],
|
||||
|
|
@ -629,11 +664,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730302582,
|
||||
"narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
|
||||
"lastModified": 1729104314,
|
||||
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
|
||||
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -647,12 +682,12 @@
|
|||
"anyrun": "anyrun",
|
||||
"caddy-with-plugins": "caddy-with-plugins",
|
||||
"colmena": "colmena",
|
||||
"comin": "comin",
|
||||
"disko": "disko",
|
||||
"emacs-overlay": "emacs-overlay",
|
||||
"eww": "eww",
|
||||
"flake-parts": "flake-parts_2",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"git-fs-monitor": "git-fs-monitor",
|
||||
"ha-now-playing": "ha-now-playing",
|
||||
"home-manager": "home-manager",
|
||||
"microvm": "microvm",
|
||||
|
|
@ -675,11 +710,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730773675,
|
||||
"narHash": "sha256-pULo7GryzLkqGveWvnNWVz1Kk6EJqvq+HQeSkwvr7DA=",
|
||||
"lastModified": 1729823394,
|
||||
"narHash": "sha256-RiinJqorqSLKh1oSpiMHnBe6nQdJzE45lX6fSnAuDnI=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "e19e9d54fac1e53f73411ebe22d19f946b1ba0bd",
|
||||
"rev": "7e52e80f5faa374ad4c607d62c6d362589cb523f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -696,11 +731,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable_3"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730746162,
|
||||
"narHash": "sha256-ZGmI+3AbT8NkDdBQujF+HIxZ+sWXuyT6X8B49etWY2g=",
|
||||
"lastModified": 1729775275,
|
||||
"narHash": "sha256-J2vtHq9sw1wWm0aTMXpEEAzsVCUMZDTEe5kiBYccpLE=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "59d6988329626132eaf107761643f55eb979eef1",
|
||||
"rev": "78a0e634fc8981d6b564f08b6715c69a755c4c7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -712,11 +747,11 @@
|
|||
"spectrum": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1729945407,
|
||||
"narHash": "sha256-iGNMamNOAnVTETnIVqDWd6fl74J8fLEi1ejdZiNjEtY=",
|
||||
"lastModified": 1720264467,
|
||||
"narHash": "sha256-xzM92n3Q9L90faJIJrkrTtTx+JqCGRHMkHWztkV4PuY=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "f1d94ee7029af18637dbd5fdf4749621533693fa",
|
||||
"revCount": 764,
|
||||
"rev": "fb59d42542049f586c84b0f8bb86ff3be338e9d3",
|
||||
"revCount": 674,
|
||||
"type": "git",
|
||||
"url": "https://spectrum-os.org/git/spectrum"
|
||||
},
|
||||
|
|
@ -778,11 +813,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730321837,
|
||||
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
|
||||
"lastModified": 1729613947,
|
||||
"narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=",
|
||||
"owner": "numtide",
|
||||
"repo": "treefmt-nix",
|
||||
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
|
||||
"rev": "aac86347fb5063960eccb19493e0cadcdb4205ca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
|||
15
flake.nix
15
flake.nix
|
|
@ -94,11 +94,6 @@
|
|||
|
||||
nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
|
||||
|
||||
comin = {
|
||||
url = "github:nlewo/comin";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
caddy-with-plugins = {
|
||||
url = "github:eboskma/caddy-with-plugins";
|
||||
inputs = {
|
||||
|
|
@ -126,6 +121,16 @@
|
|||
rust-overlay.follows = "rust-overlay";
|
||||
};
|
||||
};
|
||||
|
||||
git-fs-monitor = {
|
||||
url = "git+https://git.datarift.nl/erwin/git-fs-monitor.git?ref=main";
|
||||
inputs = {
|
||||
nixpkgs.follows = "nixpkgs";
|
||||
flake-parts.follows = "flake-parts";
|
||||
rust-overlay.follows = "rust-overlay";
|
||||
pre-commit-hooks.follows = "pre-commit-hooks";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
outputs =
|
||||
|
|
|
|||
|
|
@ -125,6 +125,11 @@ in
|
|||
editor = "${editor}";
|
||||
pager = "${pkgs.bat}/bin/bat";
|
||||
untrackedCache = true;
|
||||
# fsmonitor =
|
||||
# let
|
||||
# git-fs-monitor = flake-inputs.git-fs-monitor.packages.${pkgs.system}.default;
|
||||
# in
|
||||
# "${git-fs-monitor}/bin/git-fs-monitor";
|
||||
};
|
||||
merge = {
|
||||
ff = "only";
|
||||
|
|
|
|||
|
|
@ -25,20 +25,6 @@
|
|||
'';
|
||||
};
|
||||
|
||||
"factorio.datarift.nl" = {
|
||||
extraConfig = ''
|
||||
root * /var/www/factorio.datarift.nl
|
||||
encode zstd gzip
|
||||
|
||||
header /index.html Cache-Control nocache
|
||||
header /d-*/* Cache-Control "public, immutable, max-age=31536000"
|
||||
header *.js Cache-Control "public, immutable, max-age=31536000"
|
||||
header /thumbnail.png Cache-Control "public, max-age=604800"
|
||||
|
||||
file_server
|
||||
'';
|
||||
};
|
||||
|
||||
"boskma.frl" = {
|
||||
extraConfig = ''
|
||||
header /.well-known/matrix/* Content-Type application/json
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
regreet = {
|
||||
enable = true;
|
||||
wallpaper = ../../wallpapers/river-2560.png;
|
||||
wayvnc = false;
|
||||
wayvnc = true;
|
||||
};
|
||||
tailscale = {
|
||||
enable = true;
|
||||
|
|
@ -375,6 +375,14 @@
|
|||
|
||||
services = {
|
||||
udev = {
|
||||
extraHwdb = ''
|
||||
evdev:name:ELECOM TrackBall Mouse HUGE TrackBall:*
|
||||
ID_INPUT_KEY=1
|
||||
KEYBOARD_KEY_90008=red
|
||||
KEYBOARD_KEY_90007=copy
|
||||
KEYBOARD_KEY_90006=paste
|
||||
'';
|
||||
|
||||
extraRules = ''
|
||||
ACTION=="add", ATTRS{idVendor}=="0951", ATTRS{idProduct}=="1666", NAME=keys
|
||||
ACTION=="add", ATTRS{idVendor}=="0781", ATTRS{idProduct}=="55b1", NAME=vault
|
||||
|
|
|
|||
|
|
@ -1,9 +1,4 @@
|
|||
{
|
||||
self,
|
||||
comin,
|
||||
caddy-with-plugins,
|
||||
...
|
||||
}:
|
||||
{ self, caddy-with-plugins, ... }:
|
||||
{
|
||||
modulesPath,
|
||||
pkgs,
|
||||
|
|
@ -13,9 +8,6 @@
|
|||
{
|
||||
imports = [
|
||||
(modulesPath + "/virtualisation/lxc-container.nix")
|
||||
|
||||
comin.nixosModule
|
||||
|
||||
../../users/root
|
||||
../../users/erwin
|
||||
|
||||
|
|
@ -68,16 +60,6 @@
|
|||
firewall.trustedInterfaces = [ "tailscale0" ];
|
||||
};
|
||||
|
||||
services.comin = {
|
||||
enable = true;
|
||||
remotes = [
|
||||
{
|
||||
name = "origin";
|
||||
url = "https://git.datarift.nl/erwin/nixos-config";
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
systemd = {
|
||||
services.logrotate-checkconf.enable = false;
|
||||
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
./blocky
|
||||
./coredns
|
||||
./promtail
|
||||
# ./unbound
|
||||
./unbound
|
||||
];
|
||||
|
||||
eboskma = {
|
||||
|
|
|
|||
|
|
@ -1,13 +1,10 @@
|
|||
$ORIGIN datarift.nl.
|
||||
$TTL 3600
|
||||
@ IN SOA gabe.ns.cloudflare.com. dns.cloudflare.com. 6 3600 900 86400 1800
|
||||
@ IN SOA gabe.ns.cloudflare.com. dns.cloudflare.com. 5 3600 900 86400 1800
|
||||
|
||||
home IN A 10.0.0.251
|
||||
factorio IN A 159.69.211.175
|
||||
frigate IN A 10.0.0.251
|
||||
garfield IN A 159.69.211.175
|
||||
git IN A 10.0.0.203
|
||||
id IN A 159.69.211.175
|
||||
loki IN A 10.0.0.4
|
||||
minio IN A 10.0.0.251
|
||||
minio-admin IN A 10.0.0.251
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
file /etc/coredns/tailscale.zone datarift.nl {
|
||||
reload 10s
|
||||
}
|
||||
forward . 1.1.1.1
|
||||
forward . 127.0.0.1:5335
|
||||
log
|
||||
debug
|
||||
errors
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
file /etc/coredns/datarift.zone datarift.nl {
|
||||
reload 10s
|
||||
}
|
||||
forward . 1.1.1.1
|
||||
forward . 127.0.0.1:5335
|
||||
log
|
||||
debug
|
||||
errors
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
$TTL 3600
|
||||
@ IN SOA gabe.ns.cloudflare.com. dns.cloudflare.com. 15 3600 900 86400 1800
|
||||
@ IN SOA gabe.ns.cloudflare.com. dns.cloudflare.com. 14 3600 900 86400 1800
|
||||
|
||||
home.datarift.nl. IN CNAME proxy.barn-beaver.ts.net.
|
||||
frigate.datarift.nl. IN CNAME frigate.barn-beaver.ts.net.
|
||||
|
|
@ -17,6 +17,5 @@ meili.datarift.nl. IN CNAME meili.barn-beaver.ts.net.
|
|||
odin.datarift.nl. IN CNAME odin.barn-beaver.ts.net.
|
||||
id.datarift.nl. IN CNAME heimdall.barn-beaver.ts.net.
|
||||
garfield.datarift.nl. IN CNAME heimdall.barn-beaver.ts.net.
|
||||
factorio.datarift.nl. IN CNAME heimdall.barn-beaver.ts.net.
|
||||
|
||||
unifi.datarift.nl. IN A 10.0.0.1
|
||||
|
|
|
|||
|
|
@ -56,18 +56,11 @@
|
|||
# Set cache size. rrset-cache-size should be twice what msg-cache-size is
|
||||
rrset-cache-size = "256m";
|
||||
msg-cache-size = "128m";
|
||||
msg-cache-slabs = 16;
|
||||
rrset-cache-slabs = 16;
|
||||
infra-cache-slabs = 16;
|
||||
key-cache-slabs = 16;
|
||||
msg-cache-slabs = 4;
|
||||
|
||||
# One thread should be sufficient, can be increased on beefy machines. In reality for most users running on
|
||||
# small networks or on a single machine, it should be unnecessary to seek performance enhancement by increasing num-threads above 1.
|
||||
num-threads = 16;
|
||||
|
||||
# Increase number of queries per request and the number of ports
|
||||
outgoing-range = 8192;
|
||||
num-queries-per-thread = 4096;
|
||||
num-threads = 2;
|
||||
|
||||
# Leave sections that are not requested out of the response message
|
||||
# Reduces response message significantly and may prevent TCP fallback
|
||||
|
|
|
|||
|
|
@ -29,28 +29,14 @@ final: prev: {
|
|||
|
||||
python312 = prev.python312.override {
|
||||
packageOverrides = _pyfinal: pyprev: {
|
||||
pyscard = pyprev.pyscard.overrideAttrs (_old: {
|
||||
version = "2.2.0";
|
||||
wxpython = pyprev.wxpython.overrideAttrs (_old: {
|
||||
version = "4.2.2";
|
||||
|
||||
src = final.fetchFromGitHub {
|
||||
owner = "LudovicRousseau";
|
||||
repo = "pyscard";
|
||||
rev = "refs/tags/2.2.0";
|
||||
hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0=";
|
||||
src = final.fetchPypi {
|
||||
pname = "wxPython";
|
||||
version = "4.2.2";
|
||||
hash = "sha256-XbywZQ9n/cLFlleVolX/qj17CfsUmqjaLQ2apE444ro=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]'
|
||||
substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG"
|
||||
substituteInPlace src/smartcard/scard/winscarddll.c \
|
||||
--replace-fail "libpcsclite.so.1" \
|
||||
"${final.lib.getLib final.pcsclite}/lib/libpcsclite${final.stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
'';
|
||||
|
||||
preCheck = null;
|
||||
disabledTests = [ ];
|
||||
|
||||
});
|
||||
};
|
||||
};
|
||||
|
|
@ -58,29 +44,14 @@ final: prev: {
|
|||
|
||||
python311 = prev.python311.override {
|
||||
packageOverrides = _pyfinal: pyprev: {
|
||||
wxpython = pyprev.wxpython.overrideAttrs (_old: {
|
||||
version = "4.2.2";
|
||||
|
||||
pyscard = pyprev.pyscard.overrideAttrs (_old: {
|
||||
version = "2.2.0";
|
||||
|
||||
src = final.fetchFromGitHub {
|
||||
owner = "LudovicRousseau";
|
||||
repo = "pyscard";
|
||||
rev = "refs/tags/2.2.0";
|
||||
hash = "sha256-yZeP4Tcxnwb2My+XOsMtj+H8mNIf6JYf5tpOVUYjev0=";
|
||||
src = final.fetchPypi {
|
||||
pname = "wxPython";
|
||||
version = "4.2.2";
|
||||
hash = "sha256-XbywZQ9n/cLFlleVolX/qj17CfsUmqjaLQ2apE444ro=";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace pyproject.toml \
|
||||
--replace-fail 'requires = ["setuptools","swig"]' 'requires = ["setuptools"]'
|
||||
substituteInPlace setup.py --replace-fail "pkg-config" "$PKG_CONFIG"
|
||||
substituteInPlace src/smartcard/scard/winscarddll.c \
|
||||
--replace-fail "libpcsclite.so.1" \
|
||||
"${final.lib.getLib final.pcsclite}/lib/libpcsclite${final.stdenv.hostPlatform.extensions.sharedLibrary}"
|
||||
'';
|
||||
|
||||
preCheck = null;
|
||||
disabledTests = [ ];
|
||||
|
||||
});
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -3,25 +3,25 @@
|
|||
"alpha": {
|
||||
"experimental": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio_linux_2.0.14.tar.xz"
|
||||
"factorio_linux_2.0.9.tar.xz"
|
||||
],
|
||||
"name": "factorio_alpha_x64-2.0.14.tar.xz",
|
||||
"name": "factorio_alpha_x64-2.0.9.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "8853ce1cdea0c142f78c3ebb3b7d51420f9eb28e9113f2be08a12d4e476dcadc",
|
||||
"sha256": "34c21cd3cbe91b65483786ccb4467b5d4766c748cbbddd2ce3b30d319d163e3b",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.14/alpha/linux64",
|
||||
"version": "2.0.14"
|
||||
"url": "https://factorio.com/get-download/2.0.9/alpha/linux64",
|
||||
"version": "2.0.9"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio_linux_2.0.14.tar.xz"
|
||||
"factorio_linux_2.0.9.tar.xz"
|
||||
],
|
||||
"name": "factorio_alpha_x64-2.0.14.tar.xz",
|
||||
"name": "factorio_alpha_x64-2.0.9.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "8853ce1cdea0c142f78c3ebb3b7d51420f9eb28e9113f2be08a12d4e476dcadc",
|
||||
"sha256": "34c21cd3cbe91b65483786ccb4467b5d4766c748cbbddd2ce3b30d319d163e3b",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.14/alpha/linux64",
|
||||
"version": "2.0.14"
|
||||
"url": "https://factorio.com/get-download/2.0.9/alpha/linux64",
|
||||
"version": "2.0.9"
|
||||
}
|
||||
},
|
||||
"demo": {
|
||||
|
|
@ -51,51 +51,51 @@
|
|||
"expansion": {
|
||||
"experimental": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-space-age_linux_2.0.14.tar.xz"
|
||||
"factorio-space-age_linux_2.0.9.tar.xz"
|
||||
],
|
||||
"name": "factorio_expansion_x64-2.0.14.tar.xz",
|
||||
"name": "factorio_expansion_x64-2.0.9.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "7878444d65dc12815d7ce4d2c941441b8b7e05605e3f0bd69d45d02b3aa8f81a",
|
||||
"sha256": "6369d23550a7a721d3de1d34253e8321ee601fa759d1fb5efac9abc28aa7509d",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.14/expansion/linux64",
|
||||
"version": "2.0.14"
|
||||
"url": "https://factorio.com/get-download/2.0.9/expansion/linux64",
|
||||
"version": "2.0.9"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-space-age_linux_2.0.14.tar.xz"
|
||||
"factorio-space-age_linux_2.0.9.tar.xz"
|
||||
],
|
||||
"name": "factorio_expansion_x64-2.0.14.tar.xz",
|
||||
"name": "factorio_expansion_x64-2.0.9.tar.xz",
|
||||
"needsAuth": true,
|
||||
"sha256": "7878444d65dc12815d7ce4d2c941441b8b7e05605e3f0bd69d45d02b3aa8f81a",
|
||||
"sha256": "6369d23550a7a721d3de1d34253e8321ee601fa759d1fb5efac9abc28aa7509d",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.14/expansion/linux64",
|
||||
"version": "2.0.14"
|
||||
"url": "https://factorio.com/get-download/2.0.9/expansion/linux64",
|
||||
"version": "2.0.9"
|
||||
}
|
||||
},
|
||||
"headless": {
|
||||
"experimental": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-headless_linux_2.0.14.tar.xz",
|
||||
"factorio_headless_x64_2.0.14.tar.xz"
|
||||
"factorio-headless_linux_2.0.9.tar.xz",
|
||||
"factorio_headless_x64_2.0.9.tar.xz"
|
||||
],
|
||||
"name": "factorio_headless_x64-2.0.14.tar.xz",
|
||||
"name": "factorio_headless_x64-2.0.9.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "5a4bc4c3b2a97ed1fc58eb796321e848dcc64435bd91013dd9c78a14a8ce8815",
|
||||
"sha256": "f499077b3e2c1313452c350f1faf17db31cae2a0fa738f69166e97c3caa3c86d",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.14/headless/linux64",
|
||||
"version": "2.0.14"
|
||||
"url": "https://factorio.com/get-download/2.0.9/headless/linux64",
|
||||
"version": "2.0.9"
|
||||
},
|
||||
"stable": {
|
||||
"candidateHashFilenames": [
|
||||
"factorio-headless_linux_2.0.14.tar.xz",
|
||||
"factorio_headless_x64_2.0.14.tar.xz"
|
||||
"factorio-headless_linux_2.0.9.tar.xz",
|
||||
"factorio_headless_x64_2.0.9.tar.xz"
|
||||
],
|
||||
"name": "factorio_headless_x64-2.0.14.tar.xz",
|
||||
"name": "factorio_headless_x64-2.0.9.tar.xz",
|
||||
"needsAuth": false,
|
||||
"sha256": "5a4bc4c3b2a97ed1fc58eb796321e848dcc64435bd91013dd9c78a14a8ce8815",
|
||||
"sha256": "f499077b3e2c1313452c350f1faf17db31cae2a0fa738f69166e97c3caa3c86d",
|
||||
"tarDirectory": "x64",
|
||||
"url": "https://factorio.com/get-download/2.0.14/headless/linux64",
|
||||
"version": "2.0.14"
|
||||
"url": "https://factorio.com/get-download/2.0.9/headless/linux64",
|
||||
"version": "2.0.9"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -178,7 +178,7 @@ in
|
|||
};
|
||||
services = {
|
||||
wayvnc = {
|
||||
enable = false;
|
||||
enable = true;
|
||||
gpuAcceleration = true;
|
||||
};
|
||||
};
|
||||
|
|
@ -233,7 +233,6 @@ in
|
|||
kubernetes-helm
|
||||
libnotify
|
||||
libreoffice-fresh
|
||||
mangohud
|
||||
minio-client
|
||||
mpv
|
||||
nautilus
|
||||
|
|
@ -383,21 +382,6 @@ in
|
|||
programs = {
|
||||
home-manager.enable = true;
|
||||
command-not-found.enable = true;
|
||||
|
||||
mangohud = {
|
||||
enable = true;
|
||||
settings = {
|
||||
time = true;
|
||||
fps = true;
|
||||
frametime = true;
|
||||
fps_metrics = "avg,1,0.1";
|
||||
throttling_status = true;
|
||||
toggle_fps_limit = "Shift_R+F1";
|
||||
toggle_logging = "Shift_R+F2";
|
||||
reload_cfg = "Shift_R+F4";
|
||||
upload_log = "Shift_R+F3";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue