From 1c442bfcaf571dc36a32f2966254b28bc94ba44f Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 7 Feb 2024 22:23:26 +0100 Subject: [PATCH] some small updates --- flake.lock | 180 +++++++++++++++++++++++++++++++++- flake.nix | 4 + modules/audio/default.nix | 4 +- modules/keyboard/default.nix | 2 +- modules/nix/default.nix | 9 +- systems/hetzner/default.nix | 2 +- systems/kuraokami/default.nix | 2 + 7 files changed, 197 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index fb7b003..1f7488a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,31 @@ { "nodes": { + "clan-core": { + "inputs": { + "disko": "disko_2", + "flake-parts": "flake-parts_2", + "nixos-generators": "nixos-generators", + "nixpkgs": [ + "nether", + "nixpkgs" + ], + "sops-nix": "sops-nix", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1707096904, + "narHash": "sha256-fByoY3t8S+Z7cqUBHOPB57x4XGFI/+HIO7YmlqqltZA=", + "ref": "refs/heads/main", + "rev": "2c00ccaea6714f29f193124dd24dfe7e1f848ff3", + "revCount": 1915, + "type": "git", + "url": "https://git.clan.lol/clan/clan-core" + }, + "original": { + "type": "git", + "url": "https://git.clan.lol/clan/clan-core" + } + }, "disko": { "inputs": { "nixpkgs": [ @@ -20,6 +46,28 @@ "type": "github" } }, + "disko_2": { + "inputs": { + "nixpkgs": [ + "nether", + "clan-core", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706491084, + "narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=", + "owner": "nix-community", + "repo": "disko", + "rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, "firefox-addons": { "inputs": { "flake-utils": [ @@ -97,6 +145,28 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "nether", + "clan-core", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704982712, + "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -256,6 +326,27 @@ "type": "github" } }, + "nether": { + "inputs": { + "clan-core": "clan-core", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1707119821, + "narHash": "sha256-seifaHDFLMmvSsVYdjs6/BJkzPriKiXO8wEAScoZX5Q=", + "owner": "Lassulus", + "repo": "nether", + "rev": "5ed4b8992a9b2424b1903ebb60f39be0045bd99f", + "type": "github" + }, + "original": { + "owner": "Lassulus", + "repo": "nether", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -293,7 +384,45 @@ "type": "github" } }, + "nixlib": { + "locked": { + "lastModified": 1693701915, + "narHash": "sha256-waHPLdDYUOHSEtMKKabcKIMhlUOHPOOPQ9UyFeEoovs=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "f5af57d3ef9947a70ac86e42695231ac1ad00c25", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, "nixos-generators": { + "inputs": { + "nixlib": "nixlib", + "nixpkgs": [ + "nether", + "clan-core", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706085261, + "narHash": "sha256-7PgpHRHyShINcqgevPP1fJ6N8kM5ZSOJnk3QZBrOCQ0=", + "owner": "nix-community", + "repo": "nixos-generators", + "rev": "896f6589db5b25023b812bbb6c1f5d3a499b1132", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-generators", + "type": "github" + } + }, + "nixos-generators_2": { "inputs": { "nixlib": [ "nixpkgs-lib" @@ -501,8 +630,9 @@ "jovian": "jovian", "kde2nix": "kde2nix", "libnbtplusplus": "libnbtplusplus", + "nether": "nether", "nix-systems": "nix-systems", - "nixos-generators": "nixos-generators", + "nixos-generators": "nixos-generators_2", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-lib": "nixpkgs-lib", @@ -512,6 +642,32 @@ "tela-icon-theme": "tela-icon-theme" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "nether", + "clan-core", + "nixpkgs" + ], + "nixpkgs-stable": [ + "nether", + "clan-core" + ] + }, + "locked": { + "lastModified": 1706410821, + "narHash": "sha256-iCfXspqUOPLwRobqQNAQeKzprEyVowLMn17QaRPQc+M=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "73bf36912e31a6b21af6e0f39218e067283c67ef", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -542,6 +698,28 @@ "repo": "Tela-icon-theme", "type": "github" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nether", + "clan-core", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706462057, + "narHash": "sha256-7dG1D4iqqt0bEbBqUWk6lZiSqqwwAO0Hd1L5opVyhNM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "c6153c2a3ff4c38d231e3ae99af29b87f1df5901", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2ee8505..560e85a 100644 --- a/flake.nix +++ b/flake.nix @@ -46,6 +46,10 @@ url = "gitlab:CalcProgrammer1/OpenRGB"; flake = false; }; + nether = { + url = "github:Lassulus/nether"; + inputs.nixpkgs.follows = "nixpkgs"; + }; # Dependencys flake-parts = { diff --git a/modules/audio/default.nix b/modules/audio/default.nix index 8cac093..d131a9d 100644 --- a/modules/audio/default.nix +++ b/modules/audio/default.nix @@ -37,8 +37,8 @@ in { label = "noise_suppressor_mono"; control = { "VAD Threshold (%)" = 50.0; - "VAD Grace Period (ms)" = 200; - "Retroactive VAD Grace (ms)" = 0; + #"VAD Grace Period (ms)" = 0; + "Retroactive VAD Grace (ms)" = 50; }; }]; }; diff --git a/modules/keyboard/default.nix b/modules/keyboard/default.nix index 2149329..8feb2ec 100644 --- a/modules/keyboard/default.nix +++ b/modules/keyboard/default.nix @@ -14,7 +14,7 @@ in { config = lib.mkIf cfg.enable { services = { xserver = { - layout = cfg.layout; + xkb.layout = cfg.layout; }; }; console = { diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 12808a1..58eb529 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -23,7 +23,14 @@ in { max-jobs = "auto"; auto-optimise-store = true; allowed-users = [ "*" ]; - experimental-features = [ "nix-command" "flakes" ]; + experimental-features = [ + "nix-command" + "flakes" + "auto-allocate-uids" + "configurable-impure-env" + "impure-derivations" + "git-hashing" + ]; warn-dirty = true; use-xdg-base-directories = true; keep-going = true; diff --git a/systems/hetzner/default.nix b/systems/hetzner/default.nix index 00ca7f1..8a469cb 100644 --- a/systems/hetzner/default.nix +++ b/systems/hetzner/default.nix @@ -41,7 +41,7 @@ services.openssh.settings.PermitRootLogin = lib.mkForce "yes"; - services.openssh.ports = [ 2222 ]; + services.openssh.ports = [ 2222 22 ]; console = { enable = true; diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index a1f2ea1..5ba8684 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -9,6 +9,8 @@ nixos-hardware.nixosModules.common-pc nixos-hardware.nixosModules.common-hidpi nixos-hardware.nixosModules.common-pc-ssd + self.inputs.nether.nixosModules.hosts + self.inputs.nether.nixosModules.zerotier ]; jopejoe1 = {