more segmentation changes workstation

asdasd
This commit is contained in:
2023-09-11 09:24:07 -06:00
parent 807abf1122
commit 47acc81969
4 changed files with 30 additions and 51 deletions

View File

@@ -55,9 +55,9 @@ let
config = config.nixpkgs.config; config = config.nixpkgs.config;
}; };
jawzManageLibrary = pkgs.writeScriptBin jawzManageLibrary = pkgs.writeScriptBin
"manage-library" (builtins.readFile ./scripts/manage-library.sh); "manage-library" (builtins.readFile ../scripts/manage-library.sh);
jawzTasks = pkgs.writeScriptBin jawzTasks = pkgs.writeScriptBin
"tasks" (builtins.readFile ./scripts/tasks.sh); "tasks" (builtins.readFile ../scripts/tasks.sh);
in in
{ # Remember to close this bracket at the end of the document { # Remember to close this bracket at the end of the document
#+end_src #+end_src
@@ -149,8 +149,11 @@ undesirable packages from installing.
services = { services = {
xserver = { xserver = {
enable = true; enable = true;
# displayManager.gdm.enable = true; displayManager.defaultSession = "xfce";
# desktopManager.gnome.enable = true; desktopManager = {
xfce.enable = true;
xterm.enable = false;
};
layout = "us"; layout = "us";
libinput.enable = true; # Wacom required? libinput.enable = true; # Wacom required?
}; };
@@ -165,17 +168,12 @@ latency will require expanding these settings.
#+begin_src nix #+begin_src nix
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
sound.enable = false; sound.enable = false;
# services.pipewire = { services.pipewire = {
# enable = true; enable = true;
# alsa.enable = true; alsa.enable = true;
# alsa.support32Bit = true; alsa.support32Bit = true;
# pulse.enable = true; pulse.enable = true;
# lowLatency = { };
# enable = true;
# quantum = 64;
# rate = 48000;
# };
# };
#+end_src #+end_src
* SECURITY * SECURITY
@@ -219,7 +217,9 @@ users.users.jawz = {
]; ];
initialPassword = "password"; initialPassword = "password";
openssh = { 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 #+end_src
@@ -257,12 +257,12 @@ Here I compile my own scripts into binaries
#+begin_src nix #+begin_src nix
jawzManageLibrary jawzManageLibrary
jawzTasks jawzTasks
(writeScriptBin "ffmpeg4discord" (builtins.readFile ./scripts/ffmpeg4discord.py)) (writeScriptBin "ffmpeg4discord" (builtins.readFile ../scripts/ffmpeg4discord.py))
(writeScriptBin "ffmpreg" (builtins.readFile ./scripts/ffmpreg.sh)) (writeScriptBin "ffmpreg" (builtins.readFile ../scripts/ffmpreg.sh))
(writeScriptBin "chat-dl" (builtins.readFile ./scripts/chat-dl.sh)) (writeScriptBin "chat-dl" (builtins.readFile ../scripts/chat-dl.sh))
(writeScriptBin "split-dir" (builtins.readFile ./scripts/split-dir.sh)) (writeScriptBin "split-dir" (builtins.readFile ../scripts/split-dir.sh))
# (writeScriptBin "pika-list" (builtins.readFile ./scripts/pika-list.sh)) (writeScriptBin "pika-list" (builtins.readFile ../scripts/pika-list.sh))
# (writeScriptBin "run" (builtins.readFile ./scripts/run.sh)) (writeScriptBin "run" (builtins.readFile ../scripts/run.sh))
#+end_src #+end_src
** DEVELOPMENT PACKAGES ** DEVELOPMENT PACKAGES
@@ -279,9 +279,6 @@ tetex
xorg.xwininfo xorg.xwininfo
xdotool xdotool
# development environment
exercism # learn to code
# SH # SH
bats # testing system, required by Exercism bats # testing system, required by Exercism
bashdb # autocomplete bashdb # autocomplete
@@ -297,15 +294,8 @@ python3 # base language
# pipenv # python development workflow for humans # pipenv # python development workflow for humans
# poetry # dependency management made easy # poetry # dependency management made easy
# C# & Rust
# omnisharp-roslyn # c# linter and code formatter
# HASKELL
# cabal-install # haskell interface
# JS # JS
nodejs # not as bad as I thought nodejs # not as bad as I thought
# jq # linting
#+end_src #+end_src
** HUNSPELL ** HUNSPELL
@@ -350,7 +340,7 @@ symbola
(buildPythonApplication rec { (buildPythonApplication rec {
pname = "download"; pname = "download";
version = "1.5"; version = "1.5";
src = ./scripts/download/.; src = ../scripts/download/.;
doCheck = false; doCheck = false;
buildInputs = [ setuptools ]; buildInputs = [ setuptools ];
propagatedBuildInputs = propagatedBuildInputs =
@@ -614,8 +604,6 @@ environment.variables = rec {
# Themes # Themes
# GTK_THEME = "Adwaita:light"; # GTK_THEME = "Adwaita:light";
# QT_QPA_PLATFORMTHEME = "adwaita";
# QT_STYLE_OVERRIDE = "adwaita";
CALIBRE_USE_SYSTEM_THEME = "1"; CALIBRE_USE_SYSTEM_THEME = "1";
PATH = [ PATH = [
@@ -718,10 +706,6 @@ services = {
]; ];
}; };
}; };
printing = {
enable = true;
drivers = [ pkgs.hplip pkgs.hplipWithPlugin ];
};
avahi.enable = true; avahi.enable = true;
avahi.nssmdns = true; avahi.nssmdns = true;
fstrim.enable = true; fstrim.enable = true;
@@ -737,8 +721,8 @@ services = {
enable = true; enable = true;
ports = [ 25152 ]; ports = [ 25152 ];
settings = { settings = {
PasswordAuthentication = true; PasswordAuthentication = false;
KbdInteractiveAuthentication = true; KbdInteractiveAuthentication = false;
}; };
startWhenNeeded = true; startWhenNeeded = true;
listenAddresses = [ listenAddresses = [

View File

@@ -177,11 +177,6 @@ in {
}; };
cpu.intel.updateMicrocode = lib.mkDefault true; cpu.intel.updateMicrocode = lib.mkDefault true;
bluetooth.enable = true; bluetooth.enable = true;
# opentabletdriver = {
# enable = true;
# package = unstable.opentabletdriver;
# daemon.enable = false;
# };
opengl = { opengl = {
enable = true; enable = true;
driSupport = true; driSupport = true;

View File

@@ -12,13 +12,13 @@ let
nextcloudPort = 80; nextcloudPort = 80;
searxPort = 8080; searxPort = 8080;
newflixPort = 8897; newflixPort = 8897;
shioriPort = 9001;
flamePort = 5005; flamePort = 5005;
secretFlamePort = 5007; secretFlamePort = 5007;
lidarrPort = 8686; lidarrPort = 8686;
sonarrPort = 8989; sonarrPort = 8989;
prowlarrPort = 9696; prowlarrPort = 9696;
radarrPort = 7878; radarrPort = 7878;
shioriPort = config.services.shiori.port;
bazarrPort = config.services.bazarr.listenPort; bazarrPort = config.services.bazarr.listenPort;
kavitaPort = config.services.kavita.port; kavitaPort = config.services.kavita.port;
vaultPort = config.services.vaultwarden.config.ROCKET_PORT; vaultPort = config.services.vaultwarden.config.ROCKET_PORT;

View File

@@ -16,7 +16,6 @@ in {
users.users = let base = { isSystemUser = true; }; users.users = let base = { isSystemUser = true; };
in { in {
prowlarr = base // { group = "piracy"; }; prowlarr = base // { group = "piracy"; };
paperless = base // { };
nextcloud = base // { nextcloud = base // {
extraGroups = [ "render" ]; extraGroups = [ "render" ];
packages = (with pkgs; [ packages = (with pkgs; [
@@ -46,6 +45,7 @@ in {
prowlarr.enable = true; prowlarr.enable = true;
paperless = { paperless = {
enable = true; enable = true;
address = "0.0.0.0";
consumptionDirIsPublic = true; consumptionDirIsPublic = true;
extraConfig = { extraConfig = {
PAPERLESS_DBENGINE = "postgress"; PAPERLESS_DBENGINE = "postgress";
@@ -203,7 +203,7 @@ in {
}; };
nextcloud-cronjob = let nextcloud-cronjob = let
jawzNextcloudCronjob = pkgs.writeScriptBin "nextcloud-cronjob" jawzNextcloudCronjob = pkgs.writeScriptBin "nextcloud-cronjob"
(builtins.readFile ./scripts/nextcloud-cronjob.sh); (builtins.readFile ../scripts/nextcloud-cronjob.sh);
in { in {
description = "Runs various nextcloud-related cronjobs"; description = "Runs various nextcloud-related cronjobs";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
@@ -227,7 +227,7 @@ in {
user.services = { user.services = {
update-dns = let update-dns = let
jawzUpdateDns = pkgs.writeScriptBin "update-dns" jawzUpdateDns = pkgs.writeScriptBin "update-dns"
(builtins.readFile ./scripts/update-dns.sh); (builtins.readFile ../scripts/update-dns.sh);
in { in {
restartIfChanged = true; restartIfChanged = true;
description = "update DNS of my websites"; description = "update DNS of my websites";