From dbf9e9966aea103c74743ed7cd92d917563425d0 Mon Sep 17 00:00:00 2001 From: 0x76 Date: Sat, 23 Dec 2023 20:42:24 +0100 Subject: [PATCH 1/3] update lucy --- nixos/hosts/hades/lucy/configuration.nix | 24 +++--------------------- 1 file changed, 3 insertions(+), 21 deletions(-) diff --git a/nixos/hosts/hades/lucy/configuration.nix b/nixos/hosts/hades/lucy/configuration.nix index f73a5df8..01ed7b70 100644 --- a/nixos/hosts/hades/lucy/configuration.nix +++ b/nixos/hosts/hades/lucy/configuration.nix @@ -38,14 +38,8 @@ in # Additional packages environment.systemPackages = with pkgs; [ - ffuf - gcc - go jq - nuclei-latest - rustup - trivy - wapiti + jre_minimal ]; boot.loader = { @@ -54,22 +48,10 @@ in efi.efiSysMountPoint = "/boot"; }; - virtualisation.docker.enable = true; - - services.mosquitto = { - enable = true; - listeners = [{ - acl = [ "pattern readwrite #" ]; - omitPasswordAuth = true; - settings.allow_anonymous = true; - }]; - }; - networking.firewall = { enable = true; - allowedTCPPorts = [ 1883 ]; + allowedTCPPorts = [ 25565 ]; }; - users.extraUsers.laura.extraGroups = [ "wheel" "docker" ]; - users.extraUsers.vivian.extraGroups = [ "docker" ]; + users.extraUsers.laura.extraGroups = [ "wheel" ]; } From c52a38b9e59e21830578ff62f8bd32ecc023ab80 Mon Sep 17 00:00:00 2001 From: 0x76 Date: Sat, 23 Dec 2023 21:33:16 +0100 Subject: [PATCH 2/3] add julia to lucy --- nixos/hosts/hades/lucy/configuration.nix | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/nixos/hosts/hades/lucy/configuration.nix b/nixos/hosts/hades/lucy/configuration.nix index 01ed7b70..b1548516 100644 --- a/nixos/hosts/hades/lucy/configuration.nix +++ b/nixos/hosts/hades/lucy/configuration.nix @@ -24,8 +24,7 @@ let doCheck = false; }; -in -{ +in { imports = [ ./hardware-configuration.nix ]; # This value determines the NixOS release from which the default @@ -37,10 +36,7 @@ in system.stateVersion = "23.05"; # Did you read the comment? # Additional packages - environment.systemPackages = with pkgs; [ - jq - jre_minimal - ]; + environment.systemPackages = with pkgs; [ jq wget jre8 ]; boot.loader = { systemd-boot.enable = true; @@ -54,4 +50,16 @@ in }; users.extraUsers.laura.extraGroups = [ "wheel" ]; + users.groups.mc = { }; + + users.extraUsers.julia = { + isNormalUser = true; + shell = pkgs.zsh; + + openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKTvqk+CJG4VwN8wg3H1ZdbUVj1JuX7RYKH1ewRKfCPv julia@juliadijkstraarch" + ]; + + extraGroups = [ "mc" "wheel" ]; + }; } From 6aa675c92ca65a89c84710b342fb262d523aa28a Mon Sep 17 00:00:00 2001 From: 0x76 Date: Sat, 23 Dec 2023 21:34:11 +0100 Subject: [PATCH 3/3] fix unicode --- nixos/hosts/hades/lucy/configuration.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/hosts/hades/lucy/configuration.nix b/nixos/hosts/hades/lucy/configuration.nix index b1548516..0cee71ff 100644 --- a/nixos/hosts/hades/lucy/configuration.nix +++ b/nixos/hosts/hades/lucy/configuration.nix @@ -1,6 +1,6 @@ # Edit this configuration file to define what should be installed on # your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). +# and in the NixOS manual (accessible by running `nixos-help`). { pkgs, ... }: let @@ -29,7 +29,7 @@ in { # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions - # on your system were taken. It‘s perfectly fine and recommended to leave + # on your system were taken. It's perfectly fine and recommended to leave # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).