but fixes for snapraid and bottles

This commit is contained in:
Danilo Reyes 2023-08-22 10:46:40 -06:00
parent c25dfd3916
commit 4539a23fd2
2 changed files with 731 additions and 716 deletions

View File

@ -7,36 +7,37 @@ let
25152 # ssh 25152 # ssh
49494 # gerbera 49494 # gerbera
]; ];
open_firewall_port_ranges = [{ open_firewall_port_ranges = [
from = 1714; { from = 1714; to = 1764; } # kdeconnect
to = 1764;
} # kdeconnect
]; ];
VERSION = "23.05"; VERSION = "23.05";
# "https://github.com/nix-community/home-manager/archive/master.tar.gz"; # "https://github.com/nix-community/home-manager/archive/master.tar.gz";
unstable_tarball = unstable_tarball = builtins.fetchTarball
builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master"; https://github.com/nixos/nixpkgs/tarball/master;
unstable = import unstable_tarball { config = config.nixpkgs.config; }; unstable = import unstable_tarball {
nix-gaming = import (builtins.fetchTarball config = config.nixpkgs.config;
"https://github.com/fufexan/nix-gaming/archive/master.tar.gz"); };
jawz_nextcloud_scrapsync = pkgs.writeScriptBin "nextcloud_scrapsync" nix-gaming = import (builtins.fetchTarball "https://github.com/fufexan/nix-gaming/archive/master.tar.gz");
(builtins.readFile ./scripts/nextcloud_scrapsync.sh); jawz_nextcloud_scrapsync = pkgs.writeScriptBin
jawz_manage_library = pkgs.writeScriptBin "manage_library" "nextcloud_scrapsync" (builtins.readFile ./scripts/nextcloud_scrapsync.sh);
(builtins.readFile ./scripts/manage_library.sh); jawz_manage_library = pkgs.writeScriptBin
jawz_ffmpreg = "manage_library" (builtins.readFile ./scripts/manage_library.sh);
pkgs.writeScriptBin "ffmpreg" (builtins.readFile ./scripts/ffmpreg.sh); jawz_ffmpreg = pkgs.writeScriptBin
jawz_ffmpeg4discord = pkgs.writeScriptBin "ffmpeg4discord" "ffmpreg" (builtins.readFile ./scripts/ffmpreg.sh);
(builtins.readFile ./scripts/ffmpeg4discord.py); jawz_ffmpeg4discord = pkgs.writeScriptBin
jawz_chat-dl = "ffmpeg4discord" (builtins.readFile ./scripts/ffmpeg4discord.py);
pkgs.writeScriptBin "chat-dl" (builtins.readFile ./scripts/chat-dl.sh); jawz_chat-dl = pkgs.writeScriptBin
jawz_tasks = "chat-dl" (builtins.readFile ./scripts/chat-dl.sh);
pkgs.writeScriptBin "tasks" (builtins.readFile ./scripts/tasks.sh); jawz_tasks = pkgs.writeScriptBin
jawz_split_dir = "tasks" (builtins.readFile ./scripts/tasks.sh);
pkgs.writeScriptBin "split_dir" (builtins.readFile ./scripts/split_dir.sh); jawz_split_dir = pkgs.writeScriptBin
jawz_pika_list = "split_dir" (builtins.readFile ./scripts/split_dir.sh);
pkgs.writeScriptBin "pika_list" (builtins.readFile ./scripts/pika_list.sh); jawz_pika_list = pkgs.writeScriptBin
jawz_run = pkgs.writeScriptBin "run" (builtins.readFile ./scripts/run.sh); "pika_list" (builtins.readFile ./scripts/pika_list.sh);
in { # Remember to close this bracket at the end of the document jawz_run = pkgs.writeScriptBin
"run" (builtins.readFile ./scripts/run.sh);
in
{ # Remember to close this bracket at the end of the document
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
@ -53,7 +54,9 @@ in { # Remember to close this bracket at the end of the document
i18n = { i18n = {
defaultLocale = "en_CA.UTF-8"; defaultLocale = "en_CA.UTF-8";
extraLocaleSettings = { LC_MONETARY = "es_MX.UTF-8"; }; extraLocaleSettings = {
LC_MONETARY = "es_MX.UTF-8";
};
}; };
console = { console = {
font = "Lat2-Terminus16"; font = "Lat2-Terminus16";
@ -79,7 +82,8 @@ in { # Remember to close this bracket at the end of the document
gnome-connections gnome-connections
# gnome-shell-extensions # gnome-shell-extensions
baobab baobab
]) ++ (with pkgs.gnome; [ ])
++ (with pkgs.gnome; [
# totem # totem
gedit gedit
gnome-music gnome-music
@ -126,16 +130,16 @@ in { # Remember to close this bracket at the end of the document
# noPass = true; # noPass = true;
# }]; # }];
nixpkgs.config = { allowUnfree = true; }; nixpkgs.config = {
allowUnfree = true;
};
users.users.jawz = { users.users.jawz = {
isNormalUser = true; isNormalUser = true;
extraGroups = [ "wheel" "networkmanager" "docker" "scanner" "lp" ]; extraGroups = [ "wheel" "networkmanager" "docker" "scanner" "lp" ];
initialPassword = "password"; initialPassword = "password";
openssh = { openssh = {
authorizedKeys.keys = [ authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacero\cdreyes@100CDREYES" ];
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacerocdreyes@100CDREYES"
];
}; };
packages = (with pkgs; [ packages = (with pkgs; [
@ -193,7 +197,7 @@ in { # Remember to close this bracket at the end of the document
identity # compare images or videos identity # compare images or videos
mousai # poor man shazam mousai # poor man shazam
tagger # tag music files tagger # tag music files
# bottles # wine prefix manager bottles # wine prefix manager
obs-studio # screen recorder & streamer obs-studio # screen recorder & streamer
shortwave # listen to world radio shortwave # listen to world radio
nextcloud-client # self-hosted google-drive alternative nextcloud-client # self-hosted google-drive alternative
@ -292,17 +296,12 @@ in { # Remember to close this bracket at the end of the document
# Fonts # Fonts
(nerdfonts.override { (nerdfonts.override {
fonts = [ fonts = [ "Agave" "CascadiaCode" "SourceCodePro" "Ubuntu" "FiraCode" "Iosevka" ];
"Agave"
"CascadiaCode"
"SourceCodePro"
"Ubuntu"
"FiraCode"
"Iosevka"
];
}) })
symbola symbola
(papirus-icon-theme.override { color = "adwaita"; }) (papirus-icon-theme.override {
color = "adwaita";
})
]) ++ (with pkgs.python3Packages; [ ]) ++ (with pkgs.python3Packages; [
flake8 # wraper for pyflakes, pycodestyle and mccabe flake8 # wraper for pyflakes, pycodestyle and mccabe
@ -320,7 +319,8 @@ in { # Remember to close this bracket at the end of the document
src = ./scripts/download/.; src = ./scripts/download/.;
doCheck = false; doCheck = false;
buildInputs = [ setuptools ]; buildInputs = [ setuptools ];
propagatedBuildInputs = [ pyyaml types-pyyaml ]; propagatedBuildInputs =
[ pyyaml types-pyyaml ];
}) })
(buildPythonApplication rec { (buildPythonApplication rec {
pname = "ffpb"; pname = "ffpb";
@ -331,7 +331,8 @@ in { # Remember to close this bracket at the end of the document
}; };
doCheck = false; doCheck = false;
buildInputs = [ setuptools ]; buildInputs = [ setuptools ];
propagatedBuildInputs = [ tqdm ]; propagatedBuildInputs =
[ tqdm ];
}) })
]) ++ (with pkgs.bat-extras; [ ]) ++ (with pkgs.bat-extras; [
@ -362,8 +363,7 @@ in { # Remember to close this bracket at the end of the document
markdownlint-cli # Linter markdownlint-cli # Linter
prettier # Linter prettier # Linter
pnpm # Package manager pnpm # Package manager
]); ]); }; # <--- end of package list
}; # <--- end of package list
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
@ -379,19 +379,15 @@ in { # Remember to close this bracket at the end of the document
historyFile = "\${XDG_STATE_HOME}/bash/history"; historyFile = "\${XDG_STATE_HOME}/bash/history";
historyControl = [ "erasedups" ]; historyControl = [ "erasedups" ];
shellAliases = { shellAliases = {
ls = ls = "exa --icons --group-directories-first --no-permissions --no-user --no-time";
"exa --icons --group-directories-first --no-permissions --no-user --no-time";
edit = "emacsclient -t"; edit = "emacsclient -t";
comic = "download -u jawz -i $(cat $LC | fzf --multi --exact -i)"; comic = "download -u jawz -i $(cat $LC | fzf --multi --exact -i)";
gallery = "download -u jawz -i $(cat $LW | fzf --multi --exact -i)"; gallery = "download -u jawz -i $(cat $LW | fzf --multi --exact -i)";
open_gallery = '' open_gallery = "cd /mnt/disk2/scrapping/JawZ/gallery-dl && xdg-open $(fd . ./ Husbands -tdirectory -d 1 | fzf -i)";
cd /mnt/disk2/scrapping/JawZ/gallery-dl && nautilus unique_extensions = "fd -tf | rev | cut -d. -f1 | rev | tr '[:upper:]' '[:lower:]' | sort | uniq --count | sort -rn";
"$(fd . ./ Husbands -tdirectory -d 1 | fzf -i)"'';
unique_extensions =
"fd -tf | rev | cut -d. -f1 | rev | tr '[:upper:]' '[:lower:]' | sort | uniq --count | sort -rn";
cp = "cp -i"; cp = "cp -i";
mv = "mv -i"; mv = "mv -i";
mkcd = ''mkdir -pv "$1" && cd "$1" || exit''; mkcd = "mkdir -pv \"$1\" && cd \"$1\" || exit";
mkdir = "mkdir -p"; mkdir = "mkdir -p";
rm = "trash"; rm = "trash";
".." = "cd .."; ".." = "cd ..";
@ -446,8 +442,7 @@ in { # Remember to close this bracket at the end of the document
enable = true; enable = true;
config = { config = {
pager = "less -FR"; pager = "less -FR";
theme = "base16"; theme = "base16"; };
};
}; };
git = { git = {
enable = true; enable = true;
@ -476,8 +471,7 @@ in { # Remember to close this bracket at the end of the document
}; };
configFile = { configFile = {
"wgetrc".source = ./dotfiles/wget/wgetrc; "wgetrc".source = ./dotfiles/wget/wgetrc;
"configstore/update-notifier-npm-check.json".source = "configstore/update-notifier-npm-check.json".source = ./dotfiles/npm/update-notifier-npm-check.json;
./dotfiles/npm/update-notifier-npm-check.json;
"npm/npmrc".source = ./dotfiles/npm/npmrc; "npm/npmrc".source = ./dotfiles/npm/npmrc;
"gallery-dl/config.json".source = ./dotfiles/gallery-dl/config.json; "gallery-dl/config.json".source = ./dotfiles/gallery-dl/config.json;
"htop/htoprc".source = ./dotfiles/htop/htoprc; "htop/htoprc".source = ./dotfiles/htop/htoprc;
@ -566,7 +560,9 @@ in { # Remember to close this bracket at the end of the document
olderThan = 10; olderThan = 10;
interval = "4:00"; interval = "4:00";
}; };
parityFiles = [ "/mnt/parity/snapraid.parity" ]; parityFiles = [
"/mnt/parity/snapraid.parity"
];
extraConfig = '' extraConfig = ''
autosave 5000 autosave 5000
''; '';
@ -577,6 +573,7 @@ in { # Remember to close this bracket at the end of the document
"/scrapping/nextcloud/" "/scrapping/nextcloud/"
"/backups/" "/backups/"
"/glue/Spankbank/____UNORGANIZED/Chaturbate/" "/glue/Spankbank/____UNORGANIZED/Chaturbate/"
"/nextcloud/nextcloud.log"
]; ];
dataDisks = { dataDisks = {
d1 = "/mnt/disk1/"; d1 = "/mnt/disk1/";
@ -600,7 +597,9 @@ in { # Remember to close this bracket at the end of the document
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
}; };
geary = { enable = true; }; geary = {
enable = true;
};
steam = { steam = {
enable = true; enable = true;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
@ -618,7 +617,11 @@ in { # Remember to close this bracket at the end of the document
fstrim.enable = true; fstrim.enable = true;
btrfs.autoScrub = { btrfs.autoScrub = {
enable = true; enable = true;
fileSystems = [ "/" "/mnt/disk1" "/mnt/disk2" ]; fileSystems = [
"/"
"/mnt/disk1"
"/mnt/disk2"
];
}; };
openssh = { openssh = {
enable = true; enable = true;
@ -628,10 +631,12 @@ in { # Remember to close this bracket at the end of the document
KbdInteractiveAuthentication = false; KbdInteractiveAuthentication = false;
}; };
startWhenNeeded = true; startWhenNeeded = true;
listenAddresses = [{ listenAddresses = [
{
addr = "0.0.0.0"; addr = "0.0.0.0";
port = 25152; port = 25152;
}]; }
];
}; };
emacs = { emacs = {
enable = true; enable = true;
@ -651,19 +656,23 @@ in { # Remember to close this bracket at the end of the document
environment = { environment = {
FILE = "/home/jawz/Development/Docker/docker-compose.yml"; FILE = "/home/jawz/Development/Docker/docker-compose.yml";
}; };
path = [ pkgs.docker-compose ]; path = [
pkgs.docker-compose
];
serviceConfig = { serviceConfig = {
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 30; RestartSec = 30;
ExecStart = ExecStart = "${pkgs.docker-compose}/bin/docker-compose -f \${FILE} up --remove-orphans";
"${pkgs.docker-compose}/bin/docker-compose -f \${FILE} up --remove-orphans";
ExecStop = "${pkgs.docker-compose}/bin/docker-compose -f \${FILE} down"; ExecStop = "${pkgs.docker-compose}/bin/docker-compose -f \${FILE} down";
}; };
}; };
"nextcloud_scrapsync" = { "nextcloud_scrapsync" = {
description = "Sync scrapped files with nextcloud"; description = "Sync scrapped files with nextcloud";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
path = [ pkgs.bash jawz_nextcloud_scrapsync ]; path = [
pkgs.bash
jawz_nextcloud_scrapsync
];
serviceConfig = { serviceConfig = {
RestartSec = 30; RestartSec = 30;
ExecStart = "${jawz_nextcloud_scrapsync}/bin/nextcloud_scrapsync"; ExecStart = "${jawz_nextcloud_scrapsync}/bin/nextcloud_scrapsync";
@ -693,7 +702,9 @@ in { # Remember to close this bracket at the end of the document
restartIfChanged = true; restartIfChanged = true;
description = "Run hentai@home server"; description = "Run hentai@home server";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
path = [ pkgs.HentaiAtHome ]; path = [
pkgs.HentaiAtHome
];
serviceConfig = { serviceConfig = {
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 30; RestartSec = 30;
@ -706,7 +717,11 @@ in { # Remember to close this bracket at the end of the document
restartIfChanged = true; restartIfChanged = true;
description = "Run the manage library bash script"; description = "Run the manage library bash script";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
path = [ pkgs.bash pkgs.nix jawz_manage_library ]; path = [
pkgs.bash
pkgs.nix
jawz_manage_library
];
serviceConfig = { serviceConfig = {
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 30; RestartSec = 30;
@ -717,7 +732,11 @@ in { # Remember to close this bracket at the end of the document
restartIfChanged = true; restartIfChanged = true;
description = "Run a tasks script which keeps a lot of things organized"; description = "Run a tasks script which keeps a lot of things organized";
wantedBy = [ "default.target" ]; wantedBy = [ "default.target" ];
path = [ pkgs.bash pkgs.nix jawz_tasks ]; path = [
pkgs.bash
pkgs.nix
jawz_tasks
];
serviceConfig = { serviceConfig = {
Restart = "on-failure"; Restart = "on-failure";
RestartSec = 30; RestartSec = 30;
@ -731,9 +750,7 @@ in { # Remember to close this bracket at the end of the document
description = "Run a tasks script which keeps a lot of things organized"; description = "Run a tasks script which keeps a lot of things organized";
wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
timerConfig = { timerConfig = {
OnBootSec = "1min"; OnCalendar = "*:0/10";
OnUnitActivateSec = "5m";
Persistent = true;
}; };
}; };
}; };

View File

@ -353,7 +353,7 @@ pitivi # video editor
identity # compare images or videos identity # compare images or videos
mousai # poor man shazam mousai # poor man shazam
tagger # tag music files tagger # tag music files
# bottles # wine prefix manager bottles # wine prefix manager
obs-studio # screen recorder & streamer obs-studio # screen recorder & streamer
shortwave # listen to world radio shortwave # listen to world radio
nextcloud-client # self-hosted google-drive alternative nextcloud-client # self-hosted google-drive alternative
@ -607,8 +607,7 @@ programs.bash = {
edit = "emacsclient -t"; edit = "emacsclient -t";
comic = "download -u jawz -i $(cat $LC | fzf --multi --exact -i)"; comic = "download -u jawz -i $(cat $LC | fzf --multi --exact -i)";
gallery = "download -u jawz -i $(cat $LW | fzf --multi --exact -i)"; gallery = "download -u jawz -i $(cat $LW | fzf --multi --exact -i)";
open_gallery = "cd /mnt/disk2/scrapping/JawZ/gallery-dl && nautilus \ open_gallery = "cd /mnt/disk2/scrapping/JawZ/gallery-dl && xdg-open $(fd . ./ Husbands -tdirectory -d 1 | fzf -i)";
\"$(fd . ./ Husbands -tdirectory -d 1 | fzf -i)\"";
unique_extensions = "fd -tf | rev | cut -d. -f1 | rev | tr '[:upper:]' '[:lower:]' | sort | uniq --count | sort -rn"; unique_extensions = "fd -tf | rev | cut -d. -f1 | rev | tr '[:upper:]' '[:lower:]' | sort | uniq --count | sort -rn";
cp = "cp -i"; cp = "cp -i";
mv = "mv -i"; mv = "mv -i";
@ -842,6 +841,7 @@ snapraid = {
"/scrapping/nextcloud/" "/scrapping/nextcloud/"
"/backups/" "/backups/"
"/glue/Spankbank/____UNORGANIZED/Chaturbate/" "/glue/Spankbank/____UNORGANIZED/Chaturbate/"
"/nextcloud/nextcloud.log"
]; ];
dataDisks = { dataDisks = {
d1 = "/mnt/disk1/"; d1 = "/mnt/disk1/";
@ -1030,9 +1030,7 @@ systemd.user.timers = {
description = "Run a tasks script which keeps a lot of things organized"; description = "Run a tasks script which keeps a lot of things organized";
wantedBy = [ "timers.target" ]; wantedBy = [ "timers.target" ];
timerConfig = { timerConfig = {
OnBootSec = "1min"; OnCalendar = "*:0/10";
OnUnitActivateSec = "5m";
Persistent = true;
}; };
}; };
}; };