options follow my.schema to avoid conflicts
This commit is contained in:
parent
f1a1656155
commit
36f4b83c82
3
base.nix
3
base.nix
@ -1,5 +1,6 @@
|
||||
{ config, lib, pkgs, options, ... }: {
|
||||
imports = [ ./modules/apps.nix ./modules/dev.nix ];
|
||||
imports =
|
||||
[ ./modules/apps.nix ./modules/dev.nix ./modules/services.nix ./jawz.nix ];
|
||||
system = {
|
||||
copySystemConfiguration = true;
|
||||
stateVersion = "23.11";
|
||||
|
||||
@ -24,7 +24,6 @@ in {
|
||||
''download -u jawz -i "$(cat $LW | fzf --multi --exact -i)"'';
|
||||
cp = "cp -i";
|
||||
mv = "mv -i";
|
||||
mkcd = ''mkdir -pv "$1" && cd "$1" || exit'';
|
||||
mkdir = "mkdir -p";
|
||||
rm = "trash";
|
||||
".." = "cd ..";
|
||||
@ -50,12 +49,12 @@ in {
|
||||
enableVteIntegration = true;
|
||||
initExtra = ''
|
||||
$HOME/.local/bin/pokemon-colorscripts -r --no-title
|
||||
# Lists
|
||||
|
||||
list_root="${config.xdg.configHome}"/jawz/lists/jawz
|
||||
export LW=$list_root/watch.txt
|
||||
export LI=$list_root/instant.txt
|
||||
export LC=$list_root/comic.txt
|
||||
export command_timeout=30
|
||||
export command_timeout=60
|
||||
|
||||
if command -v fzf-share >/dev/null; then
|
||||
source "$(fzf-share)/key-bindings.bash"
|
||||
@ -64,8 +63,9 @@ in {
|
||||
|
||||
nixos-reload () {
|
||||
NIXOSDIR=/home/jawz/Development/NixOS
|
||||
nix-store --add-fixed sha256 $NIXOSDIR/scripts/PureRef-1.11.1_x64.Appimage
|
||||
nixfmt $NIXOSDIR/workstation/*.nix
|
||||
nix-store --add-fixed sha256 \
|
||||
$NIXOSDIR/PureRef-1.11.1_x64.Appimage
|
||||
fd --full-path $NIXOSDIR -e nix -x nixfmt \;
|
||||
sudo unbuffer nixos-rebuild switch -I \
|
||||
nixos-config="$NIXOSDIR/hosts/$HOSTNAME/configuration.nix" \
|
||||
|& nom
|
||||
|
||||
@ -11,16 +11,15 @@ let
|
||||
(builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") {
|
||||
config = config.nixpkgs.config;
|
||||
};
|
||||
jawzManageLibrary = pkgs.writeScriptBin
|
||||
"manage-library" (builtins.readFile ../scripts/manage-library.sh);
|
||||
jawzTasks = pkgs.writeScriptBin
|
||||
"tasks" (builtins.readFile ../scripts/tasks.sh);
|
||||
jawzSubs = pkgs.writeScriptBin
|
||||
"sub-sync" (builtins.readFile ../scripts/sub-sync.sh);
|
||||
jawzStream = pkgs.writeScriptBin
|
||||
"stream-dl" (builtins.readFile ../scripts/stream-dl.sh);
|
||||
in
|
||||
{ # Remember to close this bracket at the end of the document
|
||||
jawzManageLibrary = pkgs.writeScriptBin "manage-library"
|
||||
(builtins.readFile ../scripts/manage-library.sh);
|
||||
jawzTasks =
|
||||
pkgs.writeScriptBin "tasks" (builtins.readFile ../scripts/tasks.sh);
|
||||
jawzSubs =
|
||||
pkgs.writeScriptBin "sub-sync" (builtins.readFile ../scripts/sub-sync.sh);
|
||||
jawzStream =
|
||||
pkgs.writeScriptBin "stream-dl" (builtins.readFile ../scripts/stream-dl.sh);
|
||||
in { # Remember to close this bracket at the end of the document
|
||||
|
||||
imports = [
|
||||
./fstab.nix
|
||||
@ -49,8 +48,7 @@ networking = {
|
||||
2049 # nfs
|
||||
];
|
||||
open_firewall_port_ranges = [ ];
|
||||
in
|
||||
{
|
||||
in {
|
||||
enable = true;
|
||||
allowPing = true;
|
||||
allowedTCPPorts = open_firewall_ports;
|
||||
@ -63,9 +61,7 @@ networking = {
|
||||
time.timeZone = "America/Mexico_City";
|
||||
i18n = {
|
||||
defaultLocale = "en_CA.UTF-8";
|
||||
extraLocaleSettings = {
|
||||
LC_MONETARY = "es_MX.UTF-8";
|
||||
};
|
||||
extraLocaleSettings = { LC_MONETARY = "es_MX.UTF-8"; };
|
||||
};
|
||||
console = {
|
||||
font = "Lat2-Terminus16";
|
||||
@ -77,7 +73,8 @@ system = {
|
||||
copySystemConfiguration = true;
|
||||
stateVersion = "${version}";
|
||||
};
|
||||
nix = let featuresList = [
|
||||
nix = let
|
||||
featuresList = [
|
||||
"nixos-test"
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
@ -85,8 +82,7 @@ nix = let featuresList = [
|
||||
"gccarch-${cpuArchitecture}"
|
||||
"gccarch-znver3"
|
||||
];
|
||||
in
|
||||
{
|
||||
in {
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
@ -142,9 +138,7 @@ nixpkgs = {
|
||||
hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"openssl-1.1.1w"
|
||||
];
|
||||
permittedInsecurePackages = [ "openssl-1.1.1w" ];
|
||||
};
|
||||
# localSystem = {
|
||||
# gcc.arch = cpuArchitecture;
|
||||
@ -171,14 +165,21 @@ users = {
|
||||
};
|
||||
users.users.jawz = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "networkmanager" "docker"
|
||||
"scanner" "lp" "piracy" "kavita"
|
||||
"render" "video"
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"networkmanager"
|
||||
"docker"
|
||||
"scanner"
|
||||
"lp"
|
||||
"piracy"
|
||||
"kavita"
|
||||
"render"
|
||||
"video"
|
||||
];
|
||||
initialPassword = "password";
|
||||
openssh = {
|
||||
authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacero\cdreyes@100CDREYES"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacerocdreyes@100CDREYES"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMkpeIV9G26W2/e9PsjBx3sNwPGoicJ807ExRGh4KjhW jawz@server"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH2wtsaMvfEUm//2YnFHyrc16o+TOXXBfIGPJ9nL8RMp jawz@workstation"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBEblxSDhWPEo33crSjooeUg4W02ruENxHLmmBqCuIo jawz@galaxy"
|
||||
@ -211,12 +212,14 @@ jawzManageLibrary
|
||||
jawzTasks
|
||||
jawzSubs
|
||||
jawzStream
|
||||
(writeScriptBin "ffmpeg4discord" (builtins.readFile ../scripts/ffmpeg4discord.py))
|
||||
(writeScriptBin "ffmpeg4discord"
|
||||
(builtins.readFile ../scripts/ffmpeg4discord.py))
|
||||
(writeScriptBin "ffmpreg" (builtins.readFile ../scripts/ffmpreg.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 "find-dup-episodes" (builtins.readFile ../scripts/find-dup-episodes.sh))
|
||||
(writeScriptBin "find-dup-episodes"
|
||||
(builtins.readFile ../scripts/find-dup-episodes.sh))
|
||||
|
||||
tldr # man for retards
|
||||
|
||||
@ -233,7 +236,8 @@ nixfmt # linting
|
||||
cachix # why spend time compiling?
|
||||
|
||||
# PYTHON.
|
||||
(python3.withPackages (ps: with ps; [
|
||||
(python3.withPackages (ps:
|
||||
with ps; [
|
||||
flake8 # wraper for pyflakes, pycodestyle and mccabe
|
||||
isort # sort Python imports
|
||||
nose # testing and running python scripts
|
||||
@ -252,8 +256,7 @@ cachix # why spend time compiling?
|
||||
src = ../scripts/download/.;
|
||||
doCheck = false;
|
||||
buildInputs = [ setuptools ];
|
||||
propagatedBuildInputs =
|
||||
[ pyyaml types-pyyaml ];
|
||||
propagatedBuildInputs = [ pyyaml types-pyyaml ];
|
||||
})
|
||||
(buildPythonApplication rec {
|
||||
pname = "ffpb";
|
||||
@ -264,8 +267,7 @@ cachix # why spend time compiling?
|
||||
};
|
||||
doCheck = false;
|
||||
buildInputs = [ setuptools ];
|
||||
propagatedBuildInputs =
|
||||
[ tqdm ];
|
||||
propagatedBuildInputs = [ tqdm ];
|
||||
})
|
||||
# (buildPythonApplication rec {
|
||||
# pname = "qbit_manage";
|
||||
@ -292,7 +294,8 @@ cachix # why spend time compiling?
|
||||
prettier # Linter
|
||||
pnpm # Package manager
|
||||
|
||||
]); }; # <--- end of package list
|
||||
]);
|
||||
}; # <--- end of package list
|
||||
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
@ -308,11 +311,12 @@ programs.bash = {
|
||||
hh = "hstr";
|
||||
ls = "eza --icons --group-directories-first";
|
||||
edit = "emacsclient -t";
|
||||
comic = "download -u jawz -i \"$(cat $LC | fzf --multi --exact -i)\"";
|
||||
gallery = "download -u jawz -i \"$(cat $LW | 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)"'';
|
||||
cp = "cp -i";
|
||||
mv = "mv -i";
|
||||
mkcd = "mkdir -pv \"$1\" && cd \"$1\" || exit";
|
||||
mkcd = ''mkdir -pv "$1" && cd "$1" || exit'';
|
||||
mkdir = "mkdir -p";
|
||||
rm = "trash";
|
||||
".." = "cd ..";
|
||||
@ -326,11 +330,13 @@ programs.bash = {
|
||||
f = "fzf --multi --exact -i";
|
||||
sc = "systemctl --user";
|
||||
jc = "journalctl --user -xefu";
|
||||
open-gallery = "cd /mnt/pool/scrapping/JawZ/gallery-dl &&
|
||||
xdg-open $(fd . ./ Husbands -tdirectory -d 1 | fzf -i)\"";
|
||||
unique-extensions = "fd -tf | rev | cut -d. -f1 | rev |
|
||||
open-gallery = ''
|
||||
cd /mnt/pool/scrapping/JawZ/gallery-dl &&
|
||||
xdg-open $(fd . ./ Husbands -tdirectory -d 1 | fzf -i)"'';
|
||||
unique-extensions = ''
|
||||
fd -tf | rev | cut -d. -f1 | rev |
|
||||
tr '[:upper:]' '[:lower:]' | sort |
|
||||
uniq --count | sort -rn";
|
||||
uniq --count | sort -rn'';
|
||||
};
|
||||
enableVteIntegration = true;
|
||||
initExtra = ''
|
||||
@ -369,7 +375,8 @@ xdg = {
|
||||
};
|
||||
configFile = {
|
||||
"wgetrc".source = ../dotfiles/wget/wgetrc;
|
||||
"configstore/update-notifier-npm-check.json".source = ../dotfiles/npm/update-notifier-npm-check.json;
|
||||
"configstore/update-notifier-npm-check.json".source =
|
||||
../dotfiles/npm/update-notifier-npm-check.json;
|
||||
"npm/npmrc".source = ../dotfiles/npm/npmrc;
|
||||
"gallery-dl/config.json".source = ../dotfiles/gallery-dl/config.json;
|
||||
"htop/htoprc".source = ../dotfiles/htop/htoprc;
|
||||
@ -379,9 +386,7 @@ xdg = {
|
||||
};
|
||||
|
||||
programs = {
|
||||
helix = {
|
||||
enable = true;
|
||||
};
|
||||
helix = { enable = true; };
|
||||
hstr.enable = true;
|
||||
emacs.enable = true;
|
||||
direnv = {
|
||||
@ -425,7 +430,8 @@ services = {
|
||||
};
|
||||
};
|
||||
|
||||
}; };
|
||||
};
|
||||
};
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs; [
|
||||
@ -526,10 +532,7 @@ services = {
|
||||
smartd.enable = true;
|
||||
btrfs.autoScrub = {
|
||||
enable = true;
|
||||
fileSystems = [
|
||||
"/"
|
||||
"/mnt/pool"
|
||||
];
|
||||
fileSystems = [ "/" "/mnt/pool" ];
|
||||
};
|
||||
openssh = {
|
||||
enable = true;
|
||||
@ -545,7 +548,8 @@ services = {
|
||||
systemd = {
|
||||
packages = let
|
||||
pkgs = import (builtins.fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs/archive/9957cd48326fe8dbd52fdc50dd2502307f188b0d.tar.gz";
|
||||
url =
|
||||
"https://github.com/NixOS/nixpkgs/archive/9957cd48326fe8dbd52fdc50dd2502307f188b0d.tar.gz";
|
||||
}) { };
|
||||
|
||||
myPkg = pkgs.qbittorrent-nox;
|
||||
@ -557,18 +561,14 @@ in [ myPkg ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
};
|
||||
};
|
||||
timers = {
|
||||
};
|
||||
timers = { };
|
||||
user = {
|
||||
services = {
|
||||
"stream@" = {
|
||||
description = "monitors a stream channel for online streams.";
|
||||
restartIfChanged = true;
|
||||
wantedBy = [ "default.target" ];
|
||||
path = [
|
||||
pkgs.nix
|
||||
jawzStream
|
||||
];
|
||||
path = [ pkgs.nix jawzStream ];
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
RestartSec = 30;
|
||||
@ -591,10 +591,7 @@ in [ myPkg ];
|
||||
restartIfChanged = true;
|
||||
description = "Run the manage library bash script";
|
||||
wantedBy = [ "default.target" ];
|
||||
path = [
|
||||
pkgs.nix
|
||||
jawzManageLibrary
|
||||
];
|
||||
path = [ pkgs.nix jawzManageLibrary ];
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
RestartSec = 30;
|
||||
@ -603,30 +600,27 @@ in [ myPkg ];
|
||||
};
|
||||
tasks = {
|
||||
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" ];
|
||||
path = [
|
||||
pkgs.nix
|
||||
jawzTasks
|
||||
];
|
||||
path = [ pkgs.nix jawzTasks ];
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
RestartSec = 30;
|
||||
ExecStart = "${jawzTasks}/bin/tasks";
|
||||
};
|
||||
};
|
||||
qbit_manage = let qbit_dir = "/home/jawz/Development/Git/qbit_manage"; in {
|
||||
qbit_manage = let qbit_dir = "/home/jawz/Development/Git/qbit_manage";
|
||||
in {
|
||||
restartIfChanged = true;
|
||||
description = "Tidy up my torrents";
|
||||
wantedBy = [ "default.target" ];
|
||||
path = [
|
||||
pkgs.python3
|
||||
pkgs.pipenv
|
||||
];
|
||||
path = [ pkgs.python3 pkgs.pipenv ];
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
RestartSec = 30;
|
||||
ExecStart = "${qbit_dir}/venv/bin/python3 ${qbit_dir}/qbit_manage.py -r -c ${qbit_dir}/config.yml";
|
||||
ExecStart =
|
||||
"${qbit_dir}/venv/bin/python3 ${qbit_dir}/qbit_manage.py -r -c ${qbit_dir}/config.yml";
|
||||
};
|
||||
};
|
||||
};
|
||||
@ -649,27 +643,22 @@ in [ myPkg ];
|
||||
"stream@tomayto\\x20picarto" = streamTimer // { };
|
||||
tasks = {
|
||||
enable = 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 = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnCalendar = "*:0/10";
|
||||
};
|
||||
timerConfig = { OnCalendar = "*:0/10"; };
|
||||
};
|
||||
manage-library = {
|
||||
enable = true;
|
||||
description = "Run the manage library bash script";
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnCalendar = "00:30";
|
||||
};
|
||||
timerConfig = { OnCalendar = "00:30"; };
|
||||
};
|
||||
qbit_manage = {
|
||||
enable = true;
|
||||
description = "Tidy up my torrents";
|
||||
wantedBy = [ "timers.target" ];
|
||||
timerConfig = {
|
||||
OnCalendar = "*:0/10";
|
||||
};
|
||||
timerConfig = { OnCalendar = "*:0/10"; };
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@ -11,16 +11,15 @@ let
|
||||
(builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") {
|
||||
config = config.nixpkgs.config;
|
||||
};
|
||||
jawzManageLibrary = pkgs.writeScriptBin
|
||||
"manage-library" (builtins.readFile ../scripts/manage-library.sh);
|
||||
jawzTasks = pkgs.writeScriptBin
|
||||
"tasks" (builtins.readFile ../scripts/tasks.sh);
|
||||
jawzSubs = pkgs.writeScriptBin
|
||||
"sub-sync" (builtins.readFile ../scripts/sub-sync.sh);
|
||||
jawzStream = pkgs.writeScriptBin
|
||||
"stream-dl" (builtins.readFile ../scripts/stream-dl.sh);
|
||||
in
|
||||
{ # Remember to close this bracket at the end of the document
|
||||
jawzManageLibrary = pkgs.writeScriptBin "manage-library"
|
||||
(builtins.readFile ../scripts/manage-library.sh);
|
||||
jawzTasks =
|
||||
pkgs.writeScriptBin "tasks" (builtins.readFile ../scripts/tasks.sh);
|
||||
jawzSubs =
|
||||
pkgs.writeScriptBin "sub-sync" (builtins.readFile ../scripts/sub-sync.sh);
|
||||
jawzStream =
|
||||
pkgs.writeScriptBin "stream-dl" (builtins.readFile ../scripts/stream-dl.sh);
|
||||
in { # Remember to close this bracket at the end of the document
|
||||
|
||||
imports = [
|
||||
./fstab.nix
|
||||
@ -50,8 +49,7 @@ networking = {
|
||||
2049 # nfs
|
||||
];
|
||||
open_firewall_port_ranges = [ ];
|
||||
in
|
||||
{
|
||||
in {
|
||||
enable = true;
|
||||
allowPing = true;
|
||||
allowedTCPPorts = open_firewall_ports;
|
||||
@ -64,9 +62,7 @@ networking = {
|
||||
time.timeZone = "America/Mexico_City";
|
||||
i18n = {
|
||||
defaultLocale = "en_CA.UTF-8";
|
||||
extraLocaleSettings = {
|
||||
LC_MONETARY = "es_MX.UTF-8";
|
||||
};
|
||||
extraLocaleSettings = { LC_MONETARY = "es_MX.UTF-8"; };
|
||||
};
|
||||
console = {
|
||||
font = "Lat2-Terminus16";
|
||||
@ -78,7 +74,8 @@ system = {
|
||||
copySystemConfiguration = true;
|
||||
stateVersion = "${version}";
|
||||
};
|
||||
nix = let featuresList = [
|
||||
nix = let
|
||||
featuresList = [
|
||||
"nixos-test"
|
||||
"benchmark"
|
||||
"big-parallel"
|
||||
@ -86,8 +83,7 @@ nix = let featuresList = [
|
||||
"gccarch-${cpuArchitecture}"
|
||||
"gccarch-znver3"
|
||||
];
|
||||
in
|
||||
{
|
||||
in {
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
@ -143,9 +139,7 @@ nixpkgs = {
|
||||
hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
config = {
|
||||
allowUnfree = true;
|
||||
permittedInsecurePackages = [
|
||||
"openssl-1.1.1w"
|
||||
];
|
||||
permittedInsecurePackages = [ "openssl-1.1.1w" ];
|
||||
};
|
||||
# localSystem = {
|
||||
# gcc.arch = cpuArchitecture;
|
||||
@ -171,14 +165,21 @@ users = {
|
||||
};
|
||||
users.users.jawz = {
|
||||
isNormalUser = true;
|
||||
extraGroups = [ "wheel" "networkmanager" "docker"
|
||||
"scanner" "lp" "piracy" "kavita"
|
||||
"render" "video"
|
||||
extraGroups = [
|
||||
"wheel"
|
||||
"networkmanager"
|
||||
"docker"
|
||||
"scanner"
|
||||
"lp"
|
||||
"piracy"
|
||||
"kavita"
|
||||
"render"
|
||||
"video"
|
||||
];
|
||||
initialPassword = "password";
|
||||
openssh = {
|
||||
authorizedKeys.keys = [
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacero\cdreyes@100CDREYES"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIB5GaQM4N+yGAByibOFQOBVMV/6TjOfaGIP+NunMiK76 gpodeacerocdreyes@100CDREYES"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH2wtsaMvfEUm//2YnFHyrc16o+TOXXBfIGPJ9nL8RMp jawz@workstation"
|
||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBEblxSDhWPEo33crSjooeUg4W02ruENxHLmmBqCuIo jawz@galaxy"
|
||||
];
|
||||
@ -209,12 +210,14 @@ jawzManageLibrary
|
||||
jawzTasks
|
||||
jawzSubs
|
||||
jawzStream
|
||||
(writeScriptBin "ffmpeg4discord" (builtins.readFile ../scripts/ffmpeg4discord.py))
|
||||
(writeScriptBin "ffmpeg4discord"
|
||||
(builtins.readFile ../scripts/ffmpeg4discord.py))
|
||||
(writeScriptBin "ffmpreg" (builtins.readFile ../scripts/ffmpreg.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 "find-dup-episodes" (builtins.readFile ../scripts/find-dup-episodes.sh))
|
||||
(writeScriptBin "find-dup-episodes"
|
||||
(builtins.readFile ../scripts/find-dup-episodes.sh))
|
||||
|
||||
tldr # man for retards
|
||||
|
||||
@ -231,7 +234,8 @@ nixfmt # linting
|
||||
cachix # why spend time compiling?
|
||||
|
||||
# PYTHON.
|
||||
(python3.withPackages (ps: with ps; [
|
||||
(python3.withPackages (ps:
|
||||
with ps; [
|
||||
flake8 # wraper for pyflakes, pycodestyle and mccabe
|
||||
isort # sort Python imports
|
||||
nose # testing and running python scripts
|
||||
@ -250,8 +254,7 @@ cachix # why spend time compiling?
|
||||
src = ../scripts/download/.;
|
||||
doCheck = false;
|
||||
buildInputs = [ setuptools ];
|
||||
propagatedBuildInputs =
|
||||
[ pyyaml types-pyyaml ];
|
||||
propagatedBuildInputs = [ pyyaml types-pyyaml ];
|
||||
})
|
||||
(buildPythonApplication rec {
|
||||
pname = "ffpb";
|
||||
@ -262,8 +265,7 @@ cachix # why spend time compiling?
|
||||
};
|
||||
doCheck = false;
|
||||
buildInputs = [ setuptools ];
|
||||
propagatedBuildInputs =
|
||||
[ tqdm ];
|
||||
propagatedBuildInputs = [ tqdm ];
|
||||
})
|
||||
# (buildPythonApplication rec {
|
||||
# pname = "qbit_manage";
|
||||
@ -290,7 +292,8 @@ cachix # why spend time compiling?
|
||||
prettier # Linter
|
||||
pnpm # Package manager
|
||||
|
||||
]); }; # <--- end of package list
|
||||
]);
|
||||
}; # <--- end of package list
|
||||
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
@ -306,11 +309,12 @@ programs.bash = {
|
||||
hh = "hstr";
|
||||
ls = "eza --icons --group-directories-first";
|
||||
edit = "emacsclient -t";
|
||||
comic = "download -u jawz -i \"$(cat $LC | fzf --multi --exact -i)\"";
|
||||
gallery = "download -u jawz -i \"$(cat $LW | 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)"'';
|
||||
cp = "cp -i";
|
||||
mv = "mv -i";
|
||||
mkcd = "mkdir -pv \"$1\" && cd \"$1\" || exit";
|
||||
mkcd = ''mkdir -pv "$1" && cd "$1" || exit'';
|
||||
mkdir = "mkdir -p";
|
||||
rm = "trash";
|
||||
".." = "cd ..";
|
||||
@ -324,11 +328,13 @@ programs.bash = {
|
||||
f = "fzf --multi --exact -i";
|
||||
sc = "systemctl --user";
|
||||
jc = "journalctl --user -xefu";
|
||||
open-gallery = "cd /mnt/pool/scrapping/JawZ/gallery-dl &&
|
||||
xdg-open $(fd . ./ Husbands -tdirectory -d 1 | fzf -i)\"";
|
||||
unique-extensions = "fd -tf | rev | cut -d. -f1 | rev |
|
||||
open-gallery = ''
|
||||
cd /mnt/pool/scrapping/JawZ/gallery-dl &&
|
||||
xdg-open $(fd . ./ Husbands -tdirectory -d 1 | fzf -i)"'';
|
||||
unique-extensions = ''
|
||||
fd -tf | rev | cut -d. -f1 | rev |
|
||||
tr '[:upper:]' '[:lower:]' | sort |
|
||||
uniq --count | sort -rn";
|
||||
uniq --count | sort -rn'';
|
||||
};
|
||||
enableVteIntegration = true;
|
||||
initExtra = ''
|
||||
@ -367,7 +373,8 @@ xdg = {
|
||||
};
|
||||
configFile = {
|
||||
"wgetrc".source = ../dotfiles/wget/wgetrc;
|
||||
"configstore/update-notifier-npm-check.json".source = ../dotfiles/npm/update-notifier-npm-check.json;
|
||||
"configstore/update-notifier-npm-check.json".source =
|
||||
../dotfiles/npm/update-notifier-npm-check.json;
|
||||
"npm/npmrc".source = ../dotfiles/npm/npmrc;
|
||||
"gallery-dl/config.json".source = ../dotfiles/gallery-dl/config.json;
|
||||
"htop/htoprc".source = ../dotfiles/htop/htoprc;
|
||||
@ -376,9 +383,7 @@ xdg = {
|
||||
};
|
||||
|
||||
programs = {
|
||||
helix = {
|
||||
enable = true;
|
||||
};
|
||||
helix = { enable = true; };
|
||||
hstr.enable = true;
|
||||
emacs.enable = true;
|
||||
direnv = {
|
||||
@ -422,7 +427,8 @@ services = {
|
||||
};
|
||||
};
|
||||
|
||||
}; };
|
||||
};
|
||||
};
|
||||
|
||||
environment = {
|
||||
systemPackages = with pkgs; [
|
||||
@ -510,9 +516,7 @@ services = {
|
||||
openFirewall = true;
|
||||
settings = {
|
||||
inotify = "yes";
|
||||
media_dir = [
|
||||
"/mnt/pool/glue"
|
||||
];
|
||||
media_dir = [ "/mnt/pool/glue" ];
|
||||
};
|
||||
};
|
||||
avahi = {
|
||||
@ -523,10 +527,7 @@ services = {
|
||||
smartd.enable = true;
|
||||
btrfs.autoScrub = {
|
||||
enable = true;
|
||||
fileSystems = [
|
||||
"/"
|
||||
"/mnt/pool"
|
||||
];
|
||||
fileSystems = [ "/" "/mnt/pool" ];
|
||||
};
|
||||
openssh = {
|
||||
enable = true;
|
||||
@ -542,7 +543,8 @@ services = {
|
||||
systemd = {
|
||||
packages = let
|
||||
pkgs = import (builtins.fetchTarball {
|
||||
url = "https://github.com/NixOS/nixpkgs/archive/9957cd48326fe8dbd52fdc50dd2502307f188b0d.tar.gz";
|
||||
url =
|
||||
"https://github.com/NixOS/nixpkgs/archive/9957cd48326fe8dbd52fdc50dd2502307f188b0d.tar.gz";
|
||||
}) { };
|
||||
|
||||
myPkg = pkgs.qbittorrent-nox;
|
||||
@ -587,10 +589,7 @@ in [ myPkg ];
|
||||
description = "monitors a stream channel for online streams.";
|
||||
restartIfChanged = true;
|
||||
wantedBy = [ "default.target" ];
|
||||
path = [
|
||||
pkgs.nix
|
||||
jawzStream
|
||||
];
|
||||
path = [ pkgs.nix jawzStream ];
|
||||
serviceConfig = {
|
||||
Restart = "on-failure";
|
||||
RestartSec = 30;
|
||||
|
||||
@ -10,17 +10,31 @@ in {
|
||||
./hardware-configuration.nix
|
||||
../../base.nix
|
||||
../../gnome.nix
|
||||
../../jawz.nix
|
||||
../../home-manager/default.nix
|
||||
../../services/network.nix
|
||||
../../services/nvidia.nix
|
||||
../../services/printing.nix
|
||||
../../services/sound.nix
|
||||
../../services/systemd-user/tasks.nix
|
||||
../../modules/apps.nix
|
||||
../../modules/dev.nix
|
||||
# ../../services/systemd-user/tasks.nix
|
||||
];
|
||||
myGaming.enable = true;
|
||||
my = {
|
||||
apps = {
|
||||
art.enable = true;
|
||||
dictionaries.enable = true;
|
||||
fonts.enable = true;
|
||||
gaming.enable = true;
|
||||
internet.enable = true;
|
||||
office.enable = true;
|
||||
};
|
||||
dev = {
|
||||
haskell.enable = true;
|
||||
nix.enable = true;
|
||||
python.enable = true;
|
||||
gameDev.enable = true;
|
||||
};
|
||||
services = {
|
||||
network.enable = true;
|
||||
nvidia.enable = true;
|
||||
printing.enable = true;
|
||||
sound.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
networking = {
|
||||
hostName = "workstation";
|
||||
@ -66,7 +80,6 @@ in {
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.overlays = [ (import ../../overlays/blanket.nix) ];
|
||||
users = {
|
||||
groups.nixremote.gid = 555;
|
||||
users = {
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
{ inputs }:
|
||||
let
|
||||
myLib = (import ./default.nix) { inherit inputs; };
|
||||
outputs = inputs.self.outputs;
|
||||
in rec {
|
||||
pkgsFor = sys: inputs.nixpkgs.legacyPackages.${sys};
|
||||
|
||||
# ========================== Buildables ========================== #
|
||||
|
||||
mkSystem = config:
|
||||
inputs.nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs outputs myLib; };
|
||||
modules = [ config outputs.nixosModules.default ];
|
||||
};
|
||||
|
||||
mkHome = sys: config:
|
||||
inputs.home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = pkgsFor sys;
|
||||
extraSpecialArgs = { inherit inputs myLib outputs; };
|
||||
modules = [ config outputs.homeManagerModules.default ];
|
||||
};
|
||||
|
||||
# =========================== Functions ============================ #
|
||||
|
||||
filesIn = dir:
|
||||
(map (fileName: dir + "/${fileName}")
|
||||
(builtins.attrNames (builtins.readDir dir)));
|
||||
|
||||
dirsIn = dir:
|
||||
inputs.nixpkgs.lib.filterAttrs (name: value: value == "directory")
|
||||
(builtins.readDir dir);
|
||||
|
||||
fileNameOf = path: (builtins.head (builtins.split "\\." (baseNameOf path)));
|
||||
|
||||
# ========================== Extenders =========================== #
|
||||
|
||||
# Evaluates nixos/home-manager module and extends it's options / config
|
||||
extendModule = { path, ... }@args:
|
||||
{ pkgs, ... }@margs:
|
||||
let
|
||||
eval = if (builtins.isString path) || (builtins.isPath path) then
|
||||
import path margs
|
||||
else
|
||||
path margs;
|
||||
evalNoImports = builtins.removeAttrs eval [ "imports" "options" ];
|
||||
|
||||
extra = if (builtins.hasAttr "extraOptions" args)
|
||||
|| (builtins.hasAttr "extraConfig" args) then
|
||||
[
|
||||
({ ... }: {
|
||||
options = args.extraOptions or { };
|
||||
config = args.extraConfig or { };
|
||||
})
|
||||
]
|
||||
else
|
||||
[ ];
|
||||
in {
|
||||
imports = (eval.imports or [ ]) ++ extra;
|
||||
|
||||
options = if builtins.hasAttr "optionsExtension" args then
|
||||
(args.optionsExtension (eval.options or { }))
|
||||
else
|
||||
(eval.options or { });
|
||||
|
||||
config = if builtins.hasAttr "configExtension" args then
|
||||
(args.configExtension (eval.config or evalNoImports))
|
||||
else
|
||||
(eval.config or evalNoImports);
|
||||
};
|
||||
|
||||
# Applies extendModules to all modules
|
||||
# modules can be defined in the same way
|
||||
# as regular imports, or taken from "filesIn"
|
||||
extendModules = extension: modules:
|
||||
map (f:
|
||||
let name = fileNameOf f;
|
||||
in (extendModule ((extension name) // { path = f; }))) modules;
|
||||
|
||||
# ============================ Shell ============================= #
|
||||
forAllSystems = pkgs:
|
||||
inputs.nixpkgs.lib.genAttrs [ "x86_64-linux" ]
|
||||
(system: pkgs inputs.nixpkgs.legacyPackages.${system});
|
||||
}
|
||||
@ -9,11 +9,15 @@
|
||||
./apps/internet.nix
|
||||
./apps/office.nix
|
||||
];
|
||||
myArt.enable = lib.mkDefault false;
|
||||
myGameDev.enable = lib.mkDefault false;
|
||||
# myDictionaries.enable = lib.mkDefault false;
|
||||
# myFonts.enable = lib.mkDefault false;
|
||||
myGaming.enable = lib.mkDefault false;
|
||||
# myInternet.enable = lib.mkDefault false;
|
||||
# myOffice.enable = lib.mkDefault false;
|
||||
my = {
|
||||
dev.gameDev.enable = lib.mkDefault false;
|
||||
apps = {
|
||||
art.enable = lib.mkDefault false;
|
||||
dictionaries.enable = lib.mkDefault false;
|
||||
fonts.enable = lib.mkDefault false;
|
||||
gaming.enable = lib.mkDefault false;
|
||||
internet.enable = lib.mkDefault false;
|
||||
office.enable = lib.mkDefault false;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,11 +1,15 @@
|
||||
{ config, pkgs, lib, unstable, ... }:
|
||||
|
||||
{
|
||||
options = {
|
||||
myArt.enable = lib.mkEnableOption "enable";
|
||||
myGameDev.enable = lib.mkEnableOption "enable";
|
||||
let
|
||||
unstable = import
|
||||
(builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") {
|
||||
config = config.nixpkgs.config;
|
||||
};
|
||||
config = lib.mkIf config.myArt.enable {
|
||||
in {
|
||||
options.my = {
|
||||
apps.art.enable = lib.mkEnableOption "enable";
|
||||
dev.gameDev.enable = lib.mkEnableOption "enable";
|
||||
};
|
||||
config = lib.mkIf config.my.apps.art.enable {
|
||||
users.users.jawz.packages = with pkgs;
|
||||
([
|
||||
gimp # the coolest bestest art program to never exist
|
||||
@ -16,7 +20,7 @@
|
||||
# drawpile # arty party with friends!!
|
||||
pureref # create inspiration/reference boards
|
||||
blender # cgi animation and sculpting
|
||||
]) ++ (if config.myGameDev.enable then [
|
||||
]) ++ (if config.my.dev.gameDev.enable then [
|
||||
godot_4 # game development
|
||||
unstable.gdtoolkit # gdscript language server
|
||||
] else
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ config, pkgs, lib, unstable, ... }:
|
||||
|
||||
{
|
||||
options.my.apps.dictionaries.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.apps.dictionaries.enable {
|
||||
users.users.jawz.packages = with pkgs; ([
|
||||
hunspell
|
||||
hunspellDicts.it_IT
|
||||
@ -8,4 +10,5 @@
|
||||
hunspellDicts.es_ES
|
||||
hunspellDicts.en_CA-large
|
||||
]);
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,10 +1,13 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ config, pkgs, lib, unstable, ... }:
|
||||
|
||||
{
|
||||
options.my.apps.fonts.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.apps.fonts.enable {
|
||||
users.users.jawz.packages = with pkgs; ([
|
||||
(nerdfonts.override {
|
||||
fonts = [ "CascadiaCode" "ComicShannsMono" "Iosevka" ];
|
||||
})
|
||||
symbola
|
||||
]);
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,15 +1,13 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
options = { myGaming.enable = lib.mkEnableOption "enable"; };
|
||||
config = lib.mkIf config.myGaming.enable {
|
||||
programs = {
|
||||
steam = {
|
||||
options.my.apps.gaming.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.apps.gaming.enable {
|
||||
programs.steam = {
|
||||
enable = true;
|
||||
remotePlay.openFirewall = true;
|
||||
dedicatedServer.openFirewall = true;
|
||||
};
|
||||
};
|
||||
users.users.jawz.packages = with pkgs; ([
|
||||
(lutris.override {
|
||||
extraPkgs = pkgs: [
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ config, pkgs, lib, unstable, ... }:
|
||||
|
||||
{
|
||||
options.my.apps.internet.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.apps.internet.enable {
|
||||
programs = {
|
||||
geary.enable = true;
|
||||
firefox = {
|
||||
@ -24,4 +26,5 @@
|
||||
})
|
||||
# hugo # website engine
|
||||
]);
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ config, pkgs, lib, unstable, ... }:
|
||||
|
||||
{
|
||||
options.my.apps.office.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.apps.office.enable {
|
||||
users.users.jawz.packages = with pkgs; ([
|
||||
libreoffice # office, but based
|
||||
calibre # ugly af eBook library manager
|
||||
@ -10,4 +12,5 @@
|
||||
# wike # gtk wikipedia wow!
|
||||
# denaro # manage your finances
|
||||
]);
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,55 +0,0 @@
|
||||
{ lib, config, inputs, outputs, myLib, pkgs, ... }:
|
||||
let cfg = config.myNixOS;
|
||||
in {
|
||||
options.myNixOS.home-users = lib.mkOption {
|
||||
type = lib.types.attrsOf (lib.types.submodule {
|
||||
options = {
|
||||
userConfig = lib.mkOption {
|
||||
default = ./../../home-manager/work.nix;
|
||||
example = "DP-1";
|
||||
};
|
||||
userSettings = lib.mkOption {
|
||||
default = { };
|
||||
example = "{}";
|
||||
};
|
||||
};
|
||||
});
|
||||
default = { };
|
||||
};
|
||||
|
||||
config = {
|
||||
programs.zsh.enable = true;
|
||||
|
||||
programs.hyprland.enable = cfg.sharedSettings.hyprland.enable;
|
||||
|
||||
services.xserver = lib.mkIf cfg.sharedSettings.hyprland.enable {
|
||||
displayManager = { defaultSession = "hyprland"; };
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
useGlobalPkgs = true;
|
||||
useUserPackages = true;
|
||||
|
||||
extraSpecialArgs = {
|
||||
inherit inputs;
|
||||
inherit myLib;
|
||||
outputs = inputs.self.outputs;
|
||||
};
|
||||
|
||||
users = builtins.mapAttrs (name: user:
|
||||
{ ... }: {
|
||||
imports =
|
||||
[ (import user.userConfig) outputs.homeManagerModules.default ];
|
||||
}) (config.myNixOS.home-users);
|
||||
};
|
||||
|
||||
users.users = builtins.mapAttrs (name: user:
|
||||
{
|
||||
isNormalUser = true;
|
||||
initialPassword = "12345";
|
||||
description = "";
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = [ "libvirtd" "networkmanager" "wheel" ];
|
||||
} // user.userSettings) (config.myNixOS.home-users);
|
||||
};
|
||||
}
|
||||
@ -2,7 +2,9 @@
|
||||
|
||||
{
|
||||
imports = [ ./dev/haskell.nix ./dev/nix.nix ./dev/python.nix ];
|
||||
myHaskell.enable = lib.mkDefault false;
|
||||
myNix.enable = lib.mkDefault true;
|
||||
myPython.enable = lib.mkDefault false;
|
||||
my.dev = {
|
||||
haskell.enable = lib.mkDefault false;
|
||||
nix.enable = lib.mkDefault false;
|
||||
python.enable = lib.mkDefault false;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
options = { myHaskell.enable = lib.mkEnableOption "enable"; };
|
||||
config = lib.mkIf config.myHaskell.enable {
|
||||
options.my.dev.haskell.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.dev.haskell.enable {
|
||||
users.users.jawz.packages = with pkgs; ([
|
||||
ghc # compiler
|
||||
haskell-language-server # lsp
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
options = { myNix.enable = lib.mkEnableOption "enable"; };
|
||||
config = lib.mkIf config.myNix.enable {
|
||||
options.my.dev.nix.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.dev.nix.enable {
|
||||
users.users.jawz.packages = with pkgs; ([
|
||||
expect # keep color when nom'ing
|
||||
nix-output-monitor # autistic nix builds
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
options = { myPython.enable = lib.mkEnableOption "enable"; };
|
||||
config = lib.mkIf config.myPython.enable {
|
||||
options.my.dev.python.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.dev.python.enable {
|
||||
users.users.jawz.packages = with pkgs; ([
|
||||
pipenv # python development workflow for humans
|
||||
(python3.withPackages (ps:
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
{
|
||||
nix.settings = {
|
||||
substituters = [
|
||||
"https://nix-gaming.cachix.org"
|
||||
"https://nixpkgs-python.cachix.org"
|
||||
"https://devenv.cachix.org"
|
||||
"https://cuda-maintainers.cachix.org"
|
||||
"https://ai.cachix.org"
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
|
||||
"nixpkgs-python.cachix.org-1:hxjI7pFxTyuTHn2NkvWCrAUcNZLNS3ZAvfYNuYifcEU="
|
||||
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
|
||||
"cuda-maintainers.cachix.org-1:0dq3bujKpuEPMCX6U4WylrUDZ9JyUG0VpVZa7CNfq5E="
|
||||
"ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc="
|
||||
];
|
||||
};
|
||||
}
|
||||
16
modules/services.nix
Normal file
16
modules/services.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./services/network.nix
|
||||
./services/nvidia.nix
|
||||
./services/printing.nix
|
||||
./services/sound.nix
|
||||
];
|
||||
my.services = {
|
||||
network.enable = lib.mkDefault false;
|
||||
nvidia.enable = lib.mkDefault false;
|
||||
printing.enable = lib.mkDefault false;
|
||||
sound.enable = lib.mkDefault false;
|
||||
};
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
with lib; {
|
||||
users.users.satisfactory = {
|
||||
home = "/var/lib/satisfactory";
|
||||
createHome = true;
|
||||
isSystemUser = true;
|
||||
group = "satisfactory";
|
||||
};
|
||||
users.groups.satisfactory = { };
|
||||
|
||||
# boot.kernel.sysctl."net.ipv6.conf.eth0.disable_ipv6" = true;
|
||||
networking.enableIPv6 = false;
|
||||
|
||||
# nixpkgs.config.allowUnfree = true;
|
||||
#
|
||||
networking = {
|
||||
firewall = {
|
||||
allowedUDPPorts = [ 15777 15000 7777 27015 ];
|
||||
allowedUDPPortRanges = [{
|
||||
from = 27031;
|
||||
to = 27036;
|
||||
}];
|
||||
allowedTCPPorts = [ 27015 27036 ];
|
||||
};
|
||||
};
|
||||
|
||||
# -beta experimental \
|
||||
systemd.services.satisfactory = {
|
||||
preStart = ''
|
||||
${pkgs.steamcmd}/bin/steamcmd \
|
||||
+force_install_dir /var/lib/satisfactory/SatisfactoryServer \
|
||||
+login anonymous \
|
||||
+app_update 1690800 \
|
||||
validate \
|
||||
+quit
|
||||
'';
|
||||
script = ''
|
||||
${pkgs.steam-run}/bin/steam-run /var/lib/satisfactory/SatisfactoryServer/FactoryServer.sh -DisablePacketRouting
|
||||
'';
|
||||
serviceConfig = {
|
||||
Nice = "-5";
|
||||
Restart = "always";
|
||||
User = "satisfactory";
|
||||
WorkingDirectory = "/var/lib/satisfactory";
|
||||
};
|
||||
};
|
||||
}
|
||||
18
modules/services/network.nix
Normal file
18
modules/services/network.nix
Normal file
@ -0,0 +1,18 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
options.my.services.network.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.services.network.enable {
|
||||
networking = {
|
||||
useDHCP = lib.mkDefault true;
|
||||
enableIPv6 = false;
|
||||
networkmanager.enable = true;
|
||||
extraHosts = ''
|
||||
192.168.1.64 workstation
|
||||
192.168.1.69 server
|
||||
192.168.1.100 miniserver
|
||||
'';
|
||||
firewall = { enable = true; };
|
||||
};
|
||||
};
|
||||
}
|
||||
25
modules/services/nvidia.nix
Normal file
25
modules/services/nvidia.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
options.my.services.nvidia.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.services.nvidia.enable {
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware = {
|
||||
opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
extraPackages = with pkgs; [
|
||||
nvidia-vaapi-driver
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
];
|
||||
};
|
||||
nvidia = {
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = true;
|
||||
powerManagement.finegrained = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
16
modules/services/printing.nix
Normal file
16
modules/services/printing.nix
Normal file
@ -0,0 +1,16 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let printingDrivers = [ pkgs.hplip pkgs.hplipWithPlugin ];
|
||||
in {
|
||||
options.my.services.printing.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.services.printing.enable {
|
||||
services.printing = {
|
||||
enable = true;
|
||||
drivers = printingDrivers;
|
||||
};
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
extraBackends = printingDrivers;
|
||||
};
|
||||
users.users.jawz.packages = [ pkgs.gnome.simple-scan ];
|
||||
};
|
||||
}
|
||||
27
modules/services/sound.nix
Normal file
27
modules/services/sound.nix
Normal file
@ -0,0 +1,27 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
# let
|
||||
# nixGaming = import (builtins.fetchTarball
|
||||
# "https://github.com/fufexan/nix-gaming/archive/master.tar.gz");
|
||||
# in
|
||||
{
|
||||
imports = [
|
||||
# nixGaming.nixosModules.pipewireLowLatency
|
||||
];
|
||||
options.my.services.sound.enable = lib.mkEnableOption "enable";
|
||||
config = lib.mkIf config.my.services.sound.enable {
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
sound.enable = false;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
# lowLatency = {
|
||||
# enable = true;
|
||||
# quantum = 64;
|
||||
# rate = 48000;
|
||||
# };
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -1,17 +0,0 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
|
||||
{
|
||||
networking = {
|
||||
useDHCP = lib.mkDefault true;
|
||||
enableIPv6 = false;
|
||||
networkmanager.enable = true;
|
||||
extraHosts = ''
|
||||
192.168.1.64 workstation
|
||||
192.168.1.69 server
|
||||
192.168.1.100 miniserver
|
||||
'';
|
||||
firewall = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -1,22 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
services.xserver.videoDrivers = [ "nvidia" ];
|
||||
hardware = {
|
||||
opengl = {
|
||||
enable = true;
|
||||
driSupport = true;
|
||||
driSupport32Bit = true;
|
||||
extraPackages = with pkgs; [
|
||||
nvidia-vaapi-driver
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
];
|
||||
};
|
||||
nvidia = {
|
||||
modesetting.enable = true;
|
||||
powerManagement.enable = true;
|
||||
powerManagement.finegrained = false;
|
||||
};
|
||||
};
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let printingDrivers = [ pkgs.hplip pkgs.hplipWithPlugin ];
|
||||
in {
|
||||
services.printing = {
|
||||
enable = true;
|
||||
drivers = printingDrivers;
|
||||
};
|
||||
hardware.sane = {
|
||||
enable = true;
|
||||
extraBackends = printingDrivers;
|
||||
};
|
||||
users.users.jawz.packages = [ pkgs.gnome.simple-scan ];
|
||||
}
|
||||
@ -1,24 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
# let
|
||||
# nixGaming = import (builtins.fetchTarball
|
||||
# "https://github.com/fufexan/nix-gaming/archive/master.tar.gz");
|
||||
# in
|
||||
{
|
||||
imports = [
|
||||
# nixGaming.nixosModules.pipewireLowLatency
|
||||
];
|
||||
hardware.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
sound.enable = false;
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
# lowLatency = {
|
||||
# enable = true;
|
||||
# quantum = 64;
|
||||
# rate = 48000;
|
||||
# };
|
||||
};
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user