From 4df09b2f99c57bb1a2439a6744c6ac9c5d61d89e Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Sat, 23 Mar 2024 14:50:41 +0300 Subject: [PATCH] Replace multiple etc with direct links. --- flake.nix | 1 - host/home/Backup.nix | 2 +- host/home/Configuration.nix | 5 -- host/home/GnomeRdp.nix | 6 -- host/home/Nextcloud.nix | 2 +- host/home/PhotosProcess.nix | 2 +- host/home/YandexMusic.nix | 2 +- module/Docker.nix | 3 +- module/DockerRootless.nix | 3 +- module/common/Bash.nix | 7 +-- module/common/Dotfiles.nix | 1 + module/common/Gtk.nix | 3 - module/common/Nvim.nix | 3 +- module/common/gtk/gtk-3.0/bookmarks | 5 -- module/common/gtk/gtk-3.0/gtk.css | 78 -------------------------- module/common/gtk/gtk-3.0/gtk.css.bak | 78 -------------------------- module/common/gtk/gtk-3.0/settings.ini | 2 - module/common/gtk/gtk-4.0/gtk.css | 78 -------------------------- module/common/gtk/gtk-4.0/gtk.css.bak | 78 -------------------------- module/common/gtk/gtk-4.0/servers | 6 -- module/common/gtk/gtk-4.0/settings.ini | 2 - 21 files changed, 11 insertions(+), 356 deletions(-) delete mode 100644 host/home/GnomeRdp.nix delete mode 100644 module/common/Gtk.nix delete mode 100644 module/common/gtk/gtk-3.0/bookmarks delete mode 100644 module/common/gtk/gtk-3.0/gtk.css delete mode 100644 module/common/gtk/gtk-3.0/gtk.css.bak delete mode 100644 module/common/gtk/gtk-3.0/settings.ini delete mode 100644 module/common/gtk/gtk-4.0/gtk.css delete mode 100644 module/common/gtk/gtk-4.0/gtk.css.bak delete mode 100644 module/common/gtk/gtk-4.0/servers delete mode 100644 module/common/gtk/gtk-4.0/settings.ini diff --git a/flake.nix b/flake.nix index 9530fb5..756d63c 100644 --- a/flake.nix +++ b/flake.nix @@ -118,7 +118,6 @@ ./module/common/Firewall.nix ./module/common/Font.nix ./module/common/Git.nix - ./module/common/Gtk.nix ./module/common/Kernel.nix ./module/common/Ld.nix ./module/common/Locale.nix diff --git a/host/home/Backup.nix b/host/home/Backup.nix index 3613dc4..01edd3c 100644 --- a/host/home/Backup.nix +++ b/host/home/Backup.nix @@ -4,7 +4,7 @@ description = "Home system backup."; serviceConfig = { Type = "oneshot"; - ExecStart = "/etc/bin/Backup"; + ExecStart = ./bin/Backup; }; path = with pkgs; [ bashInteractive diff --git a/host/home/Configuration.nix b/host/home/Configuration.nix index 931f1d2..24b167e 100644 --- a/host/home/Configuration.nix +++ b/host/home/Configuration.nix @@ -1,7 +1,6 @@ { config, pkgs, lib, ... }: { imports = [ ./Backup.nix - ./GnomeRdp.nix ./Nextcloud.nix ./PhotosProcess.nix ./YandexMusic.nix @@ -16,12 +15,8 @@ 10.1.0.2 git.voronind.com 10.1.0.2 iot.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."/storage/cold_1" = { device = "/dev/storage/cold_1"; diff --git a/host/home/GnomeRdp.nix b/host/home/GnomeRdp.nix deleted file mode 100644 index bc23f5d..0000000 --- a/host/home/GnomeRdp.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ pkgs, ... }: { - environment.systemPackages = with pkgs; [ - openssl - gnome.gnome-remote-desktop - ]; -} diff --git a/host/home/Nextcloud.nix b/host/home/Nextcloud.nix index b987b63..79123a2 100644 --- a/host/home/Nextcloud.nix +++ b/host/home/Nextcloud.nix @@ -4,7 +4,7 @@ description = "Nextcloud worker."; serviceConfig = { Type = "oneshot"; - ExecStart = "/etc/bin/Nextcloud"; + ExecStart = ./bin/Nextcloud; }; path = with pkgs; [ bashInteractive diff --git a/host/home/PhotosProcess.nix b/host/home/PhotosProcess.nix index b631ccf..34aa506 100644 --- a/host/home/PhotosProcess.nix +++ b/host/home/PhotosProcess.nix @@ -4,7 +4,7 @@ description = "Process uploaded photos."; serviceConfig = { Type = "oneshot"; - ExecStart = "/etc/bin/PhotosProcess"; + ExecStart = ./bin/PhotosProcess; }; path = with pkgs; [ bashInteractive diff --git a/host/home/YandexMusic.nix b/host/home/YandexMusic.nix index 0e83f33..3a6f72a 100644 --- a/host/home/YandexMusic.nix +++ b/host/home/YandexMusic.nix @@ -4,7 +4,7 @@ description = "Sync music from Yandex.Music."; serviceConfig = { Type = "oneshot"; - ExecStart = "/etc/bin/YandexMusic"; + ExecStart = ./bin/YandexMusic; }; path = with pkgs; [ bashInteractive diff --git a/module/Docker.nix b/module/Docker.nix index a73c58a..72f50cf 100644 --- a/module/Docker.nix +++ b/module/Docker.nix @@ -1,5 +1,4 @@ { ... }: { - environment.etc.docker.source = ./docker; - environment.variables.DOCKER_CONFIG = "/etc/docker"; + environment.variables.DOCKER_CONFIG = ./docker; virtualisation.docker.enable = true; } diff --git a/module/DockerRootless.nix b/module/DockerRootless.nix index 5071ed1..2b66d5b 100644 --- a/module/DockerRootless.nix +++ b/module/DockerRootless.nix @@ -1,6 +1,5 @@ { ... }: { - environment.etc.docker.source = ./docker; - environment.variables.DOCKER_CONFIG = "/etc/docker"; + environment.variables.DOCKER_CONFIG = ./docker; virtualisation.docker.enable = true; virtualisation.docker.rootless = { enable = true; diff --git a/module/common/Bash.nix b/module/common/Bash.nix index 06f9f25..719a7aa 100644 --- a/module/common/Bash.nix +++ b/module/common/Bash.nix @@ -1,9 +1,8 @@ { lib, ... }: { - programs.bash.interactiveShellInit = "source /etc/bash/Bashrc.sh"; - environment.etc.bash.source = ./bash; - environment.shellAliases = lib.mkForce {}; + programs.bash.interactiveShellInit = "source $BASH_PATH/Bashrc.sh"; + environment.shellAliases = lib.mkForce {}; environment.variables = { - BASH_PATH = "/etc/bash"; + BASH_PATH = ./bash; TERM = "xterm-256color"; }; } diff --git a/module/common/Dotfiles.nix b/module/common/Dotfiles.nix index 38c5747..3436790 100644 --- a/module/common/Dotfiles.nix +++ b/module/common/Dotfiles.nix @@ -1,3 +1,4 @@ { inputs, ... }: { + # Easy to find copy just in case. environment.etc.dotfiles.source = inputs.self; } diff --git a/module/common/Gtk.nix b/module/common/Gtk.nix deleted file mode 100644 index 61ba90e..0000000 --- a/module/common/Gtk.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ ... }: { - environment.etc.gtk.source = ./gtk; -} diff --git a/module/common/Nvim.nix b/module/common/Nvim.nix index f7bbed5..5d466fd 100644 --- a/module/common/Nvim.nix +++ b/module/common/Nvim.nix @@ -9,7 +9,6 @@ in runtimeRc + cfgRc; in { environment = { - etc.nvim.source = ./nvim; variables = { EDITOR = "nvim"; MANPAGER = "nvim +Man!"; @@ -21,7 +20,7 @@ in { vimAlias = true; configure = { customRC = nvimRc { - cfgPath = "/etc/nvim"; + cfgPath = ./nvim; runtimes = [ "~/.cache/nvim" "~/.cache/nvim/treesitter" diff --git a/module/common/gtk/gtk-3.0/bookmarks b/module/common/gtk/gtk-3.0/bookmarks deleted file mode 100644 index 1fbae35..0000000 --- a/module/common/gtk/gtk-3.0/bookmarks +++ /dev/null @@ -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 diff --git a/module/common/gtk/gtk-3.0/gtk.css b/module/common/gtk/gtk-3.0/gtk.css deleted file mode 100644 index 2cb45f6..0000000 --- a/module/common/gtk/gtk-3.0/gtk.css +++ /dev/null @@ -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; diff --git a/module/common/gtk/gtk-3.0/gtk.css.bak b/module/common/gtk/gtk-3.0/gtk.css.bak deleted file mode 100644 index 2cb45f6..0000000 --- a/module/common/gtk/gtk-3.0/gtk.css.bak +++ /dev/null @@ -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; diff --git a/module/common/gtk/gtk-3.0/settings.ini b/module/common/gtk/gtk-3.0/settings.ini deleted file mode 100644 index 7c6461a..0000000 --- a/module/common/gtk/gtk-3.0/settings.ini +++ /dev/null @@ -1,2 +0,0 @@ -[Settings] -gtk-application-prefer-dark-theme=0 diff --git a/module/common/gtk/gtk-4.0/gtk.css b/module/common/gtk/gtk-4.0/gtk.css deleted file mode 100644 index 2cb45f6..0000000 --- a/module/common/gtk/gtk-4.0/gtk.css +++ /dev/null @@ -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; diff --git a/module/common/gtk/gtk-4.0/gtk.css.bak b/module/common/gtk/gtk-4.0/gtk.css.bak deleted file mode 100644 index 2cb45f6..0000000 --- a/module/common/gtk/gtk-4.0/gtk.css.bak +++ /dev/null @@ -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; diff --git a/module/common/gtk/gtk-4.0/servers b/module/common/gtk/gtk-4.0/servers deleted file mode 100644 index 06882ce..0000000 --- a/module/common/gtk/gtk-4.0/servers +++ /dev/null @@ -1,6 +0,0 @@ - - - \ No newline at end of file diff --git a/module/common/gtk/gtk-4.0/settings.ini b/module/common/gtk/gtk-4.0/settings.ini deleted file mode 100644 index 7c6461a..0000000 --- a/module/common/gtk/gtk-4.0/settings.ini +++ /dev/null @@ -1,2 +0,0 @@ -[Settings] -gtk-application-prefer-dark-theme=0