From 47acc8196984212a6646ba73add87bbc0f4ac7fb Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Mon, 11 Sep 2023 09:24:07 -0600 Subject: [PATCH] more segmentation changes workstation asdasd --- workstation/configuration.org | 68 ++++++++++---------------- workstation/hardware-configuration.nix | 5 -- workstation/nginx.nix | 2 +- workstation/servers.nix | 6 +-- 4 files changed, 30 insertions(+), 51 deletions(-) diff --git a/workstation/configuration.org b/workstation/configuration.org index 6f9afad..d58345f 100755 --- a/workstation/configuration.org +++ b/workstation/configuration.org @@ -55,9 +55,9 @@ let config = config.nixpkgs.config; }; jawzManageLibrary = pkgs.writeScriptBin - "manage-library" (builtins.readFile ./scripts/manage-library.sh); + "manage-library" (builtins.readFile ../scripts/manage-library.sh); jawzTasks = pkgs.writeScriptBin - "tasks" (builtins.readFile ./scripts/tasks.sh); + "tasks" (builtins.readFile ../scripts/tasks.sh); in { # Remember to close this bracket at the end of the document #+end_src @@ -149,8 +149,11 @@ undesirable packages from installing. services = { xserver = { enable = true; - # displayManager.gdm.enable = true; - # desktopManager.gnome.enable = true; + displayManager.defaultSession = "xfce"; + desktopManager = { + xfce.enable = true; + xterm.enable = false; + }; layout = "us"; libinput.enable = true; # Wacom required? }; @@ -165,17 +168,12 @@ latency will require expanding these settings. #+begin_src nix hardware.pulseaudio.enable = false; sound.enable = false; -# services.pipewire = { -# enable = true; -# alsa.enable = true; -# alsa.support32Bit = true; -# pulse.enable = true; -# lowLatency = { -# enable = true; -# quantum = 64; -# rate = 48000; -# }; -# }; +services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; +}; #+end_src * SECURITY @@ -219,8 +217,10 @@ users.users.jawz = { ]; initialPassword = "password"; openssh = { - authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacero\cdreyes@100CDREYES" ]; - }; + authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacero\cdreyes@100CDREYES" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKDXxfFRSgII4w/S1mrekPQdfXNifqRxwJa0wpQo72wB jawz@battlestation" + ]; + }; #+end_src This section of the document categorizes and organizes all he packages that I @@ -257,12 +257,12 @@ Here I compile my own scripts into binaries #+begin_src nix jawzManageLibrary jawzTasks -(writeScriptBin "ffmpeg4discord" (builtins.readFile ./scripts/ffmpeg4discord.py)) -(writeScriptBin "ffmpreg" (builtins.readFile ./scripts/ffmpreg.sh)) -(writeScriptBin "chat-dl" (builtins.readFile ./scripts/chat-dl.sh)) -(writeScriptBin "split-dir" (builtins.readFile ./scripts/split-dir.sh)) -# (writeScriptBin "pika-list" (builtins.readFile ./scripts/pika-list.sh)) -# (writeScriptBin "run" (builtins.readFile ./scripts/run.sh)) +(writeScriptBin "ffmpeg4discord" (builtins.readFile ../scripts/ffmpeg4discord.py)) +(writeScriptBin "ffmpreg" (builtins.readFile ../scripts/ffmpreg.sh)) +(writeScriptBin "chat-dl" (builtins.readFile ../scripts/chat-dl.sh)) +(writeScriptBin "split-dir" (builtins.readFile ../scripts/split-dir.sh)) +(writeScriptBin "pika-list" (builtins.readFile ../scripts/pika-list.sh)) +(writeScriptBin "run" (builtins.readFile ../scripts/run.sh)) #+end_src ** DEVELOPMENT PACKAGES @@ -279,9 +279,6 @@ tetex xorg.xwininfo xdotool -# development environment -exercism # learn to code - # SH bats # testing system, required by Exercism bashdb # autocomplete @@ -297,15 +294,8 @@ python3 # base language # pipenv # python development workflow for humans # poetry # dependency management made easy -# C# & Rust -# omnisharp-roslyn # c# linter and code formatter - -# HASKELL -# cabal-install # haskell interface - # JS nodejs # not as bad as I thought -# jq # linting #+end_src ** HUNSPELL @@ -350,7 +340,7 @@ symbola (buildPythonApplication rec { pname = "download"; version = "1.5"; - src = ./scripts/download/.; + src = ../scripts/download/.; doCheck = false; buildInputs = [ setuptools ]; propagatedBuildInputs = @@ -614,8 +604,6 @@ environment.variables = rec { # Themes # GTK_THEME = "Adwaita:light"; - # QT_QPA_PLATFORMTHEME = "adwaita"; - # QT_STYLE_OVERRIDE = "adwaita"; CALIBRE_USE_SYSTEM_THEME = "1"; PATH = [ @@ -718,10 +706,6 @@ services = { ]; }; }; - printing = { - enable = true; - drivers = [ pkgs.hplip pkgs.hplipWithPlugin ]; - }; avahi.enable = true; avahi.nssmdns = true; fstrim.enable = true; @@ -737,8 +721,8 @@ services = { enable = true; ports = [ 25152 ]; settings = { - PasswordAuthentication = true; - KbdInteractiveAuthentication = true; + PasswordAuthentication = false; + KbdInteractiveAuthentication = false; }; startWhenNeeded = true; listenAddresses = [ diff --git a/workstation/hardware-configuration.nix b/workstation/hardware-configuration.nix index bd39a17..8151e9a 100755 --- a/workstation/hardware-configuration.nix +++ b/workstation/hardware-configuration.nix @@ -177,11 +177,6 @@ in { }; cpu.intel.updateMicrocode = lib.mkDefault true; bluetooth.enable = true; - # opentabletdriver = { - # enable = true; - # package = unstable.opentabletdriver; - # daemon.enable = false; - # }; opengl = { enable = true; driSupport = true; diff --git a/workstation/nginx.nix b/workstation/nginx.nix index 16ef56c..e6ab38c 100755 --- a/workstation/nginx.nix +++ b/workstation/nginx.nix @@ -12,13 +12,13 @@ let nextcloudPort = 80; searxPort = 8080; newflixPort = 8897; - shioriPort = 9001; flamePort = 5005; secretFlamePort = 5007; lidarrPort = 8686; sonarrPort = 8989; prowlarrPort = 9696; radarrPort = 7878; + shioriPort = config.services.shiori.port; bazarrPort = config.services.bazarr.listenPort; kavitaPort = config.services.kavita.port; vaultPort = config.services.vaultwarden.config.ROCKET_PORT; diff --git a/workstation/servers.nix b/workstation/servers.nix index 6f0f28b..798e3a4 100644 --- a/workstation/servers.nix +++ b/workstation/servers.nix @@ -16,7 +16,6 @@ in { users.users = let base = { isSystemUser = true; }; in { prowlarr = base // { group = "piracy"; }; - paperless = base // { }; nextcloud = base // { extraGroups = [ "render" ]; packages = (with pkgs; [ @@ -46,6 +45,7 @@ in { prowlarr.enable = true; paperless = { enable = true; + address = "0.0.0.0"; consumptionDirIsPublic = true; extraConfig = { PAPERLESS_DBENGINE = "postgress"; @@ -203,7 +203,7 @@ in { }; nextcloud-cronjob = let jawzNextcloudCronjob = pkgs.writeScriptBin "nextcloud-cronjob" - (builtins.readFile ./scripts/nextcloud-cronjob.sh); + (builtins.readFile ../scripts/nextcloud-cronjob.sh); in { description = "Runs various nextcloud-related cronjobs"; wantedBy = [ "default.target" ]; @@ -227,7 +227,7 @@ in { user.services = { update-dns = let jawzUpdateDns = pkgs.writeScriptBin "update-dns" - (builtins.readFile ./scripts/update-dns.sh); + (builtins.readFile ../scripts/update-dns.sh); in { restartIfChanged = true; description = "update DNS of my websites";