Replace multiple etc with direct links.

This commit is contained in:
Dmitry Voronin 2024-03-23 14:50:41 +03:00
parent 48b6eece61
commit 4df09b2f99
21 changed files with 11 additions and 356 deletions

View file

@ -118,7 +118,6 @@
./module/common/Firewall.nix ./module/common/Firewall.nix
./module/common/Font.nix ./module/common/Font.nix
./module/common/Git.nix ./module/common/Git.nix
./module/common/Gtk.nix
./module/common/Kernel.nix ./module/common/Kernel.nix
./module/common/Ld.nix ./module/common/Ld.nix
./module/common/Locale.nix ./module/common/Locale.nix

View file

@ -4,7 +4,7 @@
description = "Home system backup."; description = "Home system backup.";
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "/etc/bin/Backup"; ExecStart = ./bin/Backup;
}; };
path = with pkgs; [ path = with pkgs; [
bashInteractive bashInteractive

View file

@ -1,7 +1,6 @@
{ config, pkgs, lib, ... }: { { config, pkgs, lib, ... }: {
imports = [ imports = [
./Backup.nix ./Backup.nix
./GnomeRdp.nix
./Nextcloud.nix ./Nextcloud.nix
./PhotosProcess.nix ./PhotosProcess.nix
./YandexMusic.nix ./YandexMusic.nix
@ -16,12 +15,8 @@
10.1.0.2 git.voronind.com 10.1.0.2 git.voronind.com
10.1.0.2 iot.voronind.com 10.1.0.2 iot.voronind.com
10.1.0.2 pass.voronind.com 10.1.0.2 pass.voronind.com
10.1.0.2 nixcache.voronind.com
''; '';
# Extra binaries.
environment.etc.bin.source = ./bin;
# Filesystems. # Filesystems.
fileSystems."/storage/cold_1" = { fileSystems."/storage/cold_1" = {
device = "/dev/storage/cold_1"; device = "/dev/storage/cold_1";

View file

@ -1,6 +0,0 @@
{ pkgs, ... }: {
environment.systemPackages = with pkgs; [
openssl
gnome.gnome-remote-desktop
];
}

View file

@ -4,7 +4,7 @@
description = "Nextcloud worker."; description = "Nextcloud worker.";
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "/etc/bin/Nextcloud"; ExecStart = ./bin/Nextcloud;
}; };
path = with pkgs; [ path = with pkgs; [
bashInteractive bashInteractive

View file

@ -4,7 +4,7 @@
description = "Process uploaded photos."; description = "Process uploaded photos.";
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "/etc/bin/PhotosProcess"; ExecStart = ./bin/PhotosProcess;
}; };
path = with pkgs; [ path = with pkgs; [
bashInteractive bashInteractive

View file

@ -4,7 +4,7 @@
description = "Sync music from Yandex.Music."; description = "Sync music from Yandex.Music.";
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "/etc/bin/YandexMusic"; ExecStart = ./bin/YandexMusic;
}; };
path = with pkgs; [ path = with pkgs; [
bashInteractive bashInteractive

View file

@ -1,5 +1,4 @@
{ ... }: { { ... }: {
environment.etc.docker.source = ./docker; environment.variables.DOCKER_CONFIG = ./docker;
environment.variables.DOCKER_CONFIG = "/etc/docker";
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
} }

View file

@ -1,6 +1,5 @@
{ ... }: { { ... }: {
environment.etc.docker.source = ./docker; environment.variables.DOCKER_CONFIG = ./docker;
environment.variables.DOCKER_CONFIG = "/etc/docker";
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
virtualisation.docker.rootless = { virtualisation.docker.rootless = {
enable = true; enable = true;

View file

@ -1,9 +1,8 @@
{ lib, ... }: { { lib, ... }: {
programs.bash.interactiveShellInit = "source /etc/bash/Bashrc.sh"; programs.bash.interactiveShellInit = "source $BASH_PATH/Bashrc.sh";
environment.etc.bash.source = ./bash; environment.shellAliases = lib.mkForce {};
environment.shellAliases = lib.mkForce {};
environment.variables = { environment.variables = {
BASH_PATH = "/etc/bash"; BASH_PATH = ./bash;
TERM = "xterm-256color"; TERM = "xterm-256color";
}; };
} }

View file

@ -1,3 +1,4 @@
{ inputs, ... }: { { inputs, ... }: {
# Easy to find copy just in case.
environment.etc.dotfiles.source = inputs.self; environment.etc.dotfiles.source = inputs.self;
} }

View file

@ -1,3 +0,0 @@
{ ... }: {
environment.etc.gtk.source = ./gtk;
}

View file

@ -9,7 +9,6 @@
in runtimeRc + cfgRc; in runtimeRc + cfgRc;
in { in {
environment = { environment = {
etc.nvim.source = ./nvim;
variables = { variables = {
EDITOR = "nvim"; EDITOR = "nvim";
MANPAGER = "nvim +Man!"; MANPAGER = "nvim +Man!";
@ -21,7 +20,7 @@ in {
vimAlias = true; vimAlias = true;
configure = { configure = {
customRC = nvimRc { customRC = nvimRc {
cfgPath = "/etc/nvim"; cfgPath = ./nvim;
runtimes = [ runtimes = [
"~/.cache/nvim" "~/.cache/nvim"
"~/.cache/nvim/treesitter" "~/.cache/nvim/treesitter"

View file

@ -1,5 +0,0 @@
file:///storage
file:///home/voronind/tmp
sftp://192.168.1.2:22143/storage/hot/docker/cloud/data/data/cakee/files/ home cloud
sftp://192.168.1.2:22143/ home sftp
ftp://192.168.1.2/ home ftp

View file

@ -1,78 +0,0 @@
@define-color accent_color #fbf1c7;
@define-color accent_bg_color #ebdbb2;
@define-color accent_fg_color #282828;
@define-color destructive_color #fb4934;
@define-color destructive_bg_color #cc241d;
@define-color destructive_fg_color #ebdbb2;
@define-color success_color #b8bb26;
@define-color success_bg_color #98971a;
@define-color success_fg_color #ebdbb2;
@define-color warning_color #fabd2f;
@define-color warning_bg_color #d79921;
@define-color warning_fg_color #282828;
@define-color error_color #fb4934;
@define-color error_bg_color #cc241d;
@define-color error_fg_color #ffffff;
@define-color window_bg_color #282828;
@define-color window_fg_color #ebdbb2;
@define-color view_bg_color #282828;
@define-color view_fg_color #ebdbb2;
@define-color headerbar_bg_color #3c3836;
@define-color headerbar_fg_color #fbf1c7;
@define-color headerbar_border_color #fbf1c7;
@define-color headerbar_backdrop_color @window_bg_color;
@define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
@define-color card_bg_color #3c3836;
@define-color card_fg_color #ebdbb2;
@define-color card_shade_color rgba(0, 0, 0, 0.36);
@define-color dialog_bg_color #3c3836;
@define-color dialog_fg_color #fbf1c7;
@define-color popover_bg_color #3c3836;
@define-color popover_fg_color #fbf1c7;
@define-color shade_color rgba(0,0,0,0.36);
@define-color scrollbar_outline_color rgba(0,0,0,0.5);
@define-color blue_1 rgb(153,193,241);
@define-color blue_2 rgb(98,160,234);
@define-color blue_3 rgb(53,132,228);
@define-color blue_4 rgb(28,113,216);
@define-color blue_5 rgb(26,95,180);
@define-color green_1 #8ff0a4;
@define-color green_2 #57e389;
@define-color green_3 #33d17a;
@define-color green_4 #2ec27e;
@define-color green_5 #26a269;
@define-color yellow_1 #f9f06b;
@define-color yellow_2 #f8e45c;
@define-color yellow_3 #f6d32d;
@define-color yellow_4 #f5c211;
@define-color yellow_5 #e5a50a;
@define-color orange_1 #ffbe6f;
@define-color orange_2 #ffa348;
@define-color orange_3 #ff7800;
@define-color orange_4 #e66100;
@define-color orange_5 #c64600;
@define-color red_1 #f66151;
@define-color red_2 #ed333b;
@define-color red_3 #e01b24;
@define-color red_4 #c01c28;
@define-color red_5 #a51d2d;
@define-color purple_1 #dc8add;
@define-color purple_2 #c061cb;
@define-color purple_3 #9141ac;
@define-color purple_4 #813d9c;
@define-color purple_5 #613583;
@define-color brown_1 #cdab8f;
@define-color brown_2 #b5835a;
@define-color brown_3 #986a44;
@define-color brown_4 #865e3c;
@define-color brown_5 #63452c;
@define-color light_1 #ffffff;
@define-color light_2 #f6f5f4;
@define-color light_3 #deddda;
@define-color light_4 #c0bfbc;
@define-color light_5 #9a9996;
@define-color dark_1 #77767b;
@define-color dark_2 #5e5c64;
@define-color dark_3 #3d3846;
@define-color dark_4 #241f31;
@define-color dark_5 #000000;

View file

@ -1,78 +0,0 @@
@define-color accent_color #fbf1c7;
@define-color accent_bg_color #ebdbb2;
@define-color accent_fg_color #282828;
@define-color destructive_color #fb4934;
@define-color destructive_bg_color #cc241d;
@define-color destructive_fg_color #ebdbb2;
@define-color success_color #b8bb26;
@define-color success_bg_color #98971a;
@define-color success_fg_color #ebdbb2;
@define-color warning_color #fabd2f;
@define-color warning_bg_color #d79921;
@define-color warning_fg_color #282828;
@define-color error_color #fb4934;
@define-color error_bg_color #cc241d;
@define-color error_fg_color #ffffff;
@define-color window_bg_color #282828;
@define-color window_fg_color #ebdbb2;
@define-color view_bg_color #282828;
@define-color view_fg_color #ebdbb2;
@define-color headerbar_bg_color #3c3836;
@define-color headerbar_fg_color #fbf1c7;
@define-color headerbar_border_color #fbf1c7;
@define-color headerbar_backdrop_color @window_bg_color;
@define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
@define-color card_bg_color #3c3836;
@define-color card_fg_color #ebdbb2;
@define-color card_shade_color rgba(0, 0, 0, 0.36);
@define-color dialog_bg_color #3c3836;
@define-color dialog_fg_color #fbf1c7;
@define-color popover_bg_color #3c3836;
@define-color popover_fg_color #fbf1c7;
@define-color shade_color rgba(0,0,0,0.36);
@define-color scrollbar_outline_color rgba(0,0,0,0.5);
@define-color blue_1 rgb(153,193,241);
@define-color blue_2 rgb(98,160,234);
@define-color blue_3 rgb(53,132,228);
@define-color blue_4 rgb(28,113,216);
@define-color blue_5 rgb(26,95,180);
@define-color green_1 #8ff0a4;
@define-color green_2 #57e389;
@define-color green_3 #33d17a;
@define-color green_4 #2ec27e;
@define-color green_5 #26a269;
@define-color yellow_1 #f9f06b;
@define-color yellow_2 #f8e45c;
@define-color yellow_3 #f6d32d;
@define-color yellow_4 #f5c211;
@define-color yellow_5 #e5a50a;
@define-color orange_1 #ffbe6f;
@define-color orange_2 #ffa348;
@define-color orange_3 #ff7800;
@define-color orange_4 #e66100;
@define-color orange_5 #c64600;
@define-color red_1 #f66151;
@define-color red_2 #ed333b;
@define-color red_3 #e01b24;
@define-color red_4 #c01c28;
@define-color red_5 #a51d2d;
@define-color purple_1 #dc8add;
@define-color purple_2 #c061cb;
@define-color purple_3 #9141ac;
@define-color purple_4 #813d9c;
@define-color purple_5 #613583;
@define-color brown_1 #cdab8f;
@define-color brown_2 #b5835a;
@define-color brown_3 #986a44;
@define-color brown_4 #865e3c;
@define-color brown_5 #63452c;
@define-color light_1 #ffffff;
@define-color light_2 #f6f5f4;
@define-color light_3 #deddda;
@define-color light_4 #c0bfbc;
@define-color light_5 #9a9996;
@define-color dark_1 #77767b;
@define-color dark_2 #5e5c64;
@define-color dark_3 #3d3846;
@define-color dark_4 #241f31;
@define-color dark_5 #000000;

View file

@ -1,2 +0,0 @@
[Settings]
gtk-application-prefer-dark-theme=0

View file

@ -1,78 +0,0 @@
@define-color accent_color #fbf1c7;
@define-color accent_bg_color #ebdbb2;
@define-color accent_fg_color #282828;
@define-color destructive_color #fb4934;
@define-color destructive_bg_color #cc241d;
@define-color destructive_fg_color #ebdbb2;
@define-color success_color #b8bb26;
@define-color success_bg_color #98971a;
@define-color success_fg_color #ebdbb2;
@define-color warning_color #fabd2f;
@define-color warning_bg_color #d79921;
@define-color warning_fg_color #282828;
@define-color error_color #fb4934;
@define-color error_bg_color #cc241d;
@define-color error_fg_color #ffffff;
@define-color window_bg_color #282828;
@define-color window_fg_color #ebdbb2;
@define-color view_bg_color #282828;
@define-color view_fg_color #ebdbb2;
@define-color headerbar_bg_color #3c3836;
@define-color headerbar_fg_color #fbf1c7;
@define-color headerbar_border_color #fbf1c7;
@define-color headerbar_backdrop_color @window_bg_color;
@define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
@define-color card_bg_color #3c3836;
@define-color card_fg_color #ebdbb2;
@define-color card_shade_color rgba(0, 0, 0, 0.36);
@define-color dialog_bg_color #3c3836;
@define-color dialog_fg_color #fbf1c7;
@define-color popover_bg_color #3c3836;
@define-color popover_fg_color #fbf1c7;
@define-color shade_color rgba(0,0,0,0.36);
@define-color scrollbar_outline_color rgba(0,0,0,0.5);
@define-color blue_1 rgb(153,193,241);
@define-color blue_2 rgb(98,160,234);
@define-color blue_3 rgb(53,132,228);
@define-color blue_4 rgb(28,113,216);
@define-color blue_5 rgb(26,95,180);
@define-color green_1 #8ff0a4;
@define-color green_2 #57e389;
@define-color green_3 #33d17a;
@define-color green_4 #2ec27e;
@define-color green_5 #26a269;
@define-color yellow_1 #f9f06b;
@define-color yellow_2 #f8e45c;
@define-color yellow_3 #f6d32d;
@define-color yellow_4 #f5c211;
@define-color yellow_5 #e5a50a;
@define-color orange_1 #ffbe6f;
@define-color orange_2 #ffa348;
@define-color orange_3 #ff7800;
@define-color orange_4 #e66100;
@define-color orange_5 #c64600;
@define-color red_1 #f66151;
@define-color red_2 #ed333b;
@define-color red_3 #e01b24;
@define-color red_4 #c01c28;
@define-color red_5 #a51d2d;
@define-color purple_1 #dc8add;
@define-color purple_2 #c061cb;
@define-color purple_3 #9141ac;
@define-color purple_4 #813d9c;
@define-color purple_5 #613583;
@define-color brown_1 #cdab8f;
@define-color brown_2 #b5835a;
@define-color brown_3 #986a44;
@define-color brown_4 #865e3c;
@define-color brown_5 #63452c;
@define-color light_1 #ffffff;
@define-color light_2 #f6f5f4;
@define-color light_3 #deddda;
@define-color light_4 #c0bfbc;
@define-color light_5 #9a9996;
@define-color dark_1 #77767b;
@define-color dark_2 #5e5c64;
@define-color dark_3 #3d3846;
@define-color dark_4 #241f31;
@define-color dark_5 #000000;

View file

@ -1,78 +0,0 @@
@define-color accent_color #fbf1c7;
@define-color accent_bg_color #ebdbb2;
@define-color accent_fg_color #282828;
@define-color destructive_color #fb4934;
@define-color destructive_bg_color #cc241d;
@define-color destructive_fg_color #ebdbb2;
@define-color success_color #b8bb26;
@define-color success_bg_color #98971a;
@define-color success_fg_color #ebdbb2;
@define-color warning_color #fabd2f;
@define-color warning_bg_color #d79921;
@define-color warning_fg_color #282828;
@define-color error_color #fb4934;
@define-color error_bg_color #cc241d;
@define-color error_fg_color #ffffff;
@define-color window_bg_color #282828;
@define-color window_fg_color #ebdbb2;
@define-color view_bg_color #282828;
@define-color view_fg_color #ebdbb2;
@define-color headerbar_bg_color #3c3836;
@define-color headerbar_fg_color #fbf1c7;
@define-color headerbar_border_color #fbf1c7;
@define-color headerbar_backdrop_color @window_bg_color;
@define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
@define-color card_bg_color #3c3836;
@define-color card_fg_color #ebdbb2;
@define-color card_shade_color rgba(0, 0, 0, 0.36);
@define-color dialog_bg_color #3c3836;
@define-color dialog_fg_color #fbf1c7;
@define-color popover_bg_color #3c3836;
@define-color popover_fg_color #fbf1c7;
@define-color shade_color rgba(0,0,0,0.36);
@define-color scrollbar_outline_color rgba(0,0,0,0.5);
@define-color blue_1 rgb(153,193,241);
@define-color blue_2 rgb(98,160,234);
@define-color blue_3 rgb(53,132,228);
@define-color blue_4 rgb(28,113,216);
@define-color blue_5 rgb(26,95,180);
@define-color green_1 #8ff0a4;
@define-color green_2 #57e389;
@define-color green_3 #33d17a;
@define-color green_4 #2ec27e;
@define-color green_5 #26a269;
@define-color yellow_1 #f9f06b;
@define-color yellow_2 #f8e45c;
@define-color yellow_3 #f6d32d;
@define-color yellow_4 #f5c211;
@define-color yellow_5 #e5a50a;
@define-color orange_1 #ffbe6f;
@define-color orange_2 #ffa348;
@define-color orange_3 #ff7800;
@define-color orange_4 #e66100;
@define-color orange_5 #c64600;
@define-color red_1 #f66151;
@define-color red_2 #ed333b;
@define-color red_3 #e01b24;
@define-color red_4 #c01c28;
@define-color red_5 #a51d2d;
@define-color purple_1 #dc8add;
@define-color purple_2 #c061cb;
@define-color purple_3 #9141ac;
@define-color purple_4 #813d9c;
@define-color purple_5 #613583;
@define-color brown_1 #cdab8f;
@define-color brown_2 #b5835a;
@define-color brown_3 #986a44;
@define-color brown_4 #865e3c;
@define-color brown_5 #63452c;
@define-color light_1 #ffffff;
@define-color light_2 #f6f5f4;
@define-color light_3 #deddda;
@define-color light_4 #c0bfbc;
@define-color light_5 #9a9996;
@define-color dark_1 #77767b;
@define-color dark_2 #5e5c64;
@define-color dark_3 #3d3846;
@define-color dark_4 #241f31;
@define-color dark_5 #000000;

View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<xbel version="1.0"
xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks"
xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info"
>
</xbel>

View file

@ -1,2 +0,0 @@
[Settings]
gtk-application-prefer-dark-theme=0