From 1f4d042c389527850d9f6ed014bb6d3c063cab1f Mon Sep 17 00:00:00 2001 From: Jade Date: Wed, 8 Feb 2023 08:13:28 +0100 Subject: [PATCH] meow --- flake.lock | 105 +++++++++++++++++++++++++++++--- flake.nix | 1 + schrottserver/configuration.nix | 11 ++++ schrottserver/mumble.nix | 8 +++ 4 files changed, 115 insertions(+), 10 deletions(-) create mode 100644 schrottserver/mumble.nix diff --git a/flake.lock b/flake.lock index 642ab5a..200953f 100644 --- a/flake.lock +++ b/flake.lock @@ -57,11 +57,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1675637696, - "narHash": "sha256-tilJS8zCS3PaDfVOfsBZ4zspuam8tc7IMZxtGa/K/uo=", + "lastModified": 1675811720, + "narHash": "sha256-WXWChFo1DAUK+/YkeLwzZQDsH43y7c1JWozRuVNQYg8=", "owner": "nix-community", "repo": "home-manager", - "rev": "c43d4a3d6d9ef8ddbe2438362f5c775b4186000b", + "rev": "6d95d98b6b4876c9ab589327331196b2893581c5", "type": "github" }, "original": { @@ -73,9 +73,9 @@ "mac-brcm-fw": { "flake": false, "locked": { - "lastModified": 1668279146, - "narHash": "sha256-KP2cgNVty0t+8laUc8nxefOk8O60fw/mBt7qStSyPNA=", - "path": "/home/jade/mac-brcm-fw", + "lastModified": 1, + "narHash": "sha256-ewzM8IBKNFCx73ah5rflcdx605ukRF3oTWwih2CTsvs=", + "path": "./mac-brcm-fw", "type": "path" }, "original": { @@ -120,6 +120,25 @@ "type": "github" } }, + "naersk_2": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1671096816, + "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=", + "owner": "nix-community", + "repo": "naersk", + "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "master", + "repo": "naersk", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1674413574, @@ -181,11 +200,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1675545634, - "narHash": "sha256-TbQeQcM5TA/wIho6xtzG+inUfiGzUXi8ewwttiQWYJE=", + "lastModified": 1675673983, + "narHash": "sha256-8hzNh1jtiPxL5r3ICNzSmpSzV7kGb3KwX+FS5BWJUTo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0591d6b57bfeb55dfeec99a671843337bc2c3323", + "rev": "5a350a8f31bb7ef0c6e79aea3795a890cf7743d4", "type": "github" }, "original": { @@ -195,6 +214,36 @@ "type": "github" } }, + "nixpkgs_5": { + "locked": { + "lastModified": 1675614288, + "narHash": "sha256-i3Rc/ENnz62BcrSloeVmAyPicEh4WsrEEYR+INs9TYw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d25de6654a34d99dceb02e71e6db516b3b545be6", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1675614288, + "narHash": "sha256-i3Rc/ENnz62BcrSloeVmAyPicEh4WsrEEYR+INs9TYw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d25de6654a34d99dceb02e71e6db516b3b545be6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "easymacros": "easymacros", @@ -202,7 +251,8 @@ "mac-brcm-fw": "mac-brcm-fw", "meowsite": "meowsite", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_4", + "wordsofgod": "wordsofgod" } }, "utils": { @@ -219,6 +269,41 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_2": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "wordsofgod": { + "inputs": { + "naersk": "naersk_2", + "nixpkgs": "nixpkgs_6", + "utils": "utils_2" + }, + "locked": { + "lastModified": 1675771376, + "narHash": "sha256-zL6xpyDpPJnTs2N1g9i/gnMaNVoscZvzaj7MOlKJ848=", + "ref": "refs/heads/master", + "rev": "2d2e1a16474da16cb8ec65947c2fe2b2d188c687", + "revCount": 7, + "type": "git", + "url": "https://gitlab.com/obsidianical/wordsofgod.git" + }, + "original": { + "type": "git", + "url": "https://gitlab.com/obsidianical/wordsofgod.git" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 6f07685..47e72e3 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,7 @@ #mms.url = "github:mkaito/nixos-modded-minecraft-servers"; easymacros.url = "git+https://gitlab.com/obsidianical/easymacros.git"; meowsite.url = "git+https://gitlab.com/obsidianical/meowsite.git"; + wordsofgod.url = "git+https://gitlab.com/obsidianical/wordsofgod.git"; }; outputs = { self, nixpkgs, home-manager, nixos-hardware, mac-brcm-fw, ... }@inputs: { diff --git a/schrottserver/configuration.nix b/schrottserver/configuration.nix index 2dcb81e..537f18c 100644 --- a/schrottserver/configuration.nix +++ b/schrottserver/configuration.nix @@ -12,8 +12,17 @@ ./proxy.nix ./vaultwarden.nix ./nextcloud.nix + ./mumble.nix ]; + #systemd.services.wordsofgod-bot.enable = true; + + systemd.services.wordsofgod-bot = { + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${inputs.wordsofgod.packages."x86_64-linux".default}/bin/wordsofgod"; + serviceConfig.EnvironmentFile = "/etc/wordsofgod-bot/wordsofgod.env"; + }; + jade = { neovim.enable = true; zsh.enable = true; @@ -24,6 +33,8 @@ boot.loader.grub.version = 2; boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only + environment.systemPackages = [ inputs.wordsofgod ]; + networking.hostName = "schrottserver"; # Define your hostname. networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. diff --git a/schrottserver/mumble.nix b/schrottserver/mumble.nix new file mode 100644 index 0000000..53b05ea --- /dev/null +++ b/schrottserver/mumble.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ murmur ]; + services.murmur = { + enable = true; + registerHostname = "mumble.schrottkatze.de"; + }; +}