why suffer remembering to restart docker?
This commit is contained in:
parent
13f2237e13
commit
1bc1b219d9
@ -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; [
|
||||||
|
|
||||||
@ -289,21 +293,16 @@ in { # Remember to close this bracket at the end of the document
|
|||||||
adw-gtk3
|
adw-gtk3
|
||||||
# gradience # theme customizer, allows you to modify adw-gtk3 themes
|
# gradience # theme customizer, allows you to modify adw-gtk3 themes
|
||||||
gnome.gnome-tweaks # tweaks for the gnome desktop environment
|
gnome.gnome-tweaks # tweaks for the gnome desktop environment
|
||||||
qgnomeplatform-qt6
|
qgnomeplatform
|
||||||
|
|
||||||
# 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
|
||||||
@ -321,7 +320,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";
|
||||||
@ -332,7 +332,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; [
|
||||||
@ -363,8 +364,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;
|
||||||
|
|
||||||
@ -380,18 +380,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 && 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";
|
||||||
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 ..";
|
||||||
@ -430,6 +427,8 @@ in { # Remember to close this bracket at the end of the document
|
|||||||
local hardware_file="$HOME/Development/NixOS/hardware-configuration.nix"
|
local hardware_file="$HOME/Development/NixOS/hardware-configuration.nix"
|
||||||
nixfmt "$nix_file" && nixfmt "$hardware_file"
|
nixfmt "$nix_file" && nixfmt "$hardware_file"
|
||||||
sudo nixos-rebuild switch -I nixos-config="$nix_file"
|
sudo nixos-rebuild switch -I nixos-config="$nix_file"
|
||||||
|
sudo systemctl restart docker
|
||||||
|
sudo systemctl restart docker-compose
|
||||||
}
|
}
|
||||||
|
|
||||||
'';
|
'';
|
||||||
@ -446,8 +445,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 +474,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 +563,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
|
||||||
'';
|
'';
|
||||||
@ -601,7 +600,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;
|
||||||
@ -619,7 +620,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;
|
||||||
@ -629,10 +634,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;
|
||||||
@ -652,19 +659,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";
|
||||||
@ -694,7 +705,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;
|
||||||
@ -707,7 +720,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;
|
||||||
@ -718,7 +735,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,7 +752,9 @@ in { # Remember to close this bracket at the end of the document
|
|||||||
enable = true;
|
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" ];
|
wantedBy = [ "timers.target" ];
|
||||||
timerConfig = { OnCalendar = "*:0/10"; };
|
timerConfig = {
|
||||||
|
OnCalendar = "*:0/10";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -652,6 +652,8 @@ nixos-magic () {
|
|||||||
local hardware_file="$HOME/Development/NixOS/hardware-configuration.nix"
|
local hardware_file="$HOME/Development/NixOS/hardware-configuration.nix"
|
||||||
nixfmt "$nix_file" && nixfmt "$hardware_file"
|
nixfmt "$nix_file" && nixfmt "$hardware_file"
|
||||||
sudo nixos-rebuild switch -I nixos-config="$nix_file"
|
sudo nixos-rebuild switch -I nixos-config="$nix_file"
|
||||||
|
sudo systemctl restart docker
|
||||||
|
sudo systemctl restart docker-compose
|
||||||
}
|
}
|
||||||
#+end_src
|
#+end_src
|
||||||
#+begin_src nix
|
#+begin_src nix
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user