From 8cc0168d2a251bc911264b67b7e9706857a3f511 Mon Sep 17 00:00:00 2001 From: randomuser Date: Mon, 30 Oct 2023 16:15:31 -0500 Subject: [PATCH] changes --- boxes/inspiron.nix | 12 ------------ boxes/mainsail.nix | 37 +++++++++++++++++++++++++++++++++++++ boxes/netbox.nix | 17 ----------------- builds/utils/sh/disp | 10 +++++++--- 4 files changed, 44 insertions(+), 32 deletions(-) delete mode 100644 boxes/inspiron.nix create mode 100644 boxes/mainsail.nix diff --git a/boxes/inspiron.nix b/boxes/inspiron.nix deleted file mode 100644 index 513d4e6..0000000 --- a/boxes/inspiron.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, config, pkgs, ...}: - -{ - imports = [ - ../common/desktop.nix - ]; - - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/sda"; - - networking.hostName = "mainsail"; -} diff --git a/boxes/mainsail.nix b/boxes/mainsail.nix new file mode 100644 index 0000000..a19aad4 --- /dev/null +++ b/boxes/mainsail.nix @@ -0,0 +1,37 @@ +{ lib, config, pkgs, ...}: + +{ + imports = [ + ../common/desktop.nix + ]; + + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/sda"; + + networking.hostName = "mainsail"; + + services.paperless = { + enable = true; + passwordFile = "/etc/paperless-password"; + port = 3004; + address = "localhost"; + extraConfig = { + PAPERLESS_URL = "https://paperless.beepboop.systems"; + }; + }; + + services.getty.greetingLine = " + welcome to mainsail |`-:_ + ,----....____ | `+. + ( ````----....|___ | + \\ _ ````----....____ + \\ _) ```---.._ + \\ \\ + )`.\\ )`. )`. )`. )`. )`. )`. )`. )`. )`. )`. +-' `-' `-' `-' `-' `-' `-' `-' `-' `-' `-' ` + "; + + environment.systemPackages = with pkgs; [ + vscodium + ]; +} diff --git a/boxes/netbox.nix b/boxes/netbox.nix index c2f9975..5cda31e 100644 --- a/boxes/netbox.nix +++ b/boxes/netbox.nix @@ -122,23 +122,6 @@ ''; }; - services.paperless = { - enable = true; - passwordFile = "/etc/paperless-password"; - port = 3004; - address = "localhost"; - extraConfig = { - PAPERLESS_URL = "https://paperless.beepboop.systems"; - }; - }; - - # services.ntfy-sh = { - # enable = true; - # settings = { - # listen-http = ":3500"; - # }; - # }; - services.vaultwarden.enable = true; # Open ports in the firewall. diff --git a/builds/utils/sh/disp b/builds/utils/sh/disp index 013c511..9453a3e 100755 --- a/builds/utils/sh/disp +++ b/builds/utils/sh/disp @@ -4,7 +4,9 @@ exists() { xrandr | grep ' connected' | grep -c "${1}" } -bspc monitor eDP-1 -d 1 2 3 4 5 6 7 8 9 +if [ ! "$(hostname)" = "mainsail" ]; then + bspc monitor eDP-1 -d 1 2 3 4 5 6 7 8 9 +fi if [ "$(exists "DP-1")" -gt 1 ]; then printf "two" @@ -13,5 +15,7 @@ if [ "$(exists "DP-1")" -gt 1 ]; then exit 0 fi - -# default configuration's fine +if [ "$(exists "HDMI-1")" -gt 1 ] && [ "$(hostname)" = "mainsail" ]; then + printf "mainsail selected\nHDMI-1 detected only, doing that\n" + bspc monitor HDMI-1 -d 1 2 3 4 5 6 7 8 9 +fi