From 66882a8820bb177e756b4bf476e9d6cc2d5ea5d6 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Sun, 14 Apr 2024 23:37:48 +0300 Subject: [PATCH] Home : Remove home dir. --- user/Dasha.nix | 7 +++++-- user/Root.nix | 8 ++++++-- user/Voronind.nix | 7 +++++-- user/{home => }/common/default.nix | 0 user/{home => }/common/editorconfig/default.nix | 0 user/{home => }/common/foot/default.nix | 0 user/{home => }/common/mako/default.nix | 0 user/{home => }/common/template/Android.nix | 0 user/{home => }/common/template/Blank.nix | 0 user/{home => }/common/template/FHSEnv.nix | 0 user/{home => }/common/template/Latex.nix | 0 user/{home => }/common/template/Rust.nix | 0 user/{home => }/common/top/btop/default.nix | 0 user/{home => }/common/top/htop/default.nix | 0 user/home/Dasha.nix | 8 -------- user/home/Root.nix | 8 -------- user/home/Voronind.nix | 8 -------- 17 files changed, 16 insertions(+), 30 deletions(-) rename user/{home => }/common/default.nix (100%) rename user/{home => }/common/editorconfig/default.nix (100%) rename user/{home => }/common/foot/default.nix (100%) rename user/{home => }/common/mako/default.nix (100%) rename user/{home => }/common/template/Android.nix (100%) rename user/{home => }/common/template/Blank.nix (100%) rename user/{home => }/common/template/FHSEnv.nix (100%) rename user/{home => }/common/template/Latex.nix (100%) rename user/{home => }/common/template/Rust.nix (100%) rename user/{home => }/common/top/btop/default.nix (100%) rename user/{home => }/common/top/htop/default.nix (100%) delete mode 100644 user/home/Dasha.nix delete mode 100644 user/home/Root.nix delete mode 100644 user/home/Voronind.nix diff --git a/user/Dasha.nix b/user/Dasha.nix index bf77ab5..94f7bb5 100644 --- a/user/Dasha.nix +++ b/user/Dasha.nix @@ -1,6 +1,9 @@ -{ pkgs, lib, ... }: { +{ const, util, style, pkgs, lib, setting, key, secret, ... } @args: { imports = [ - ./home/Dasha.nix + (import ./common (args // { + username = "dasha"; + homeDir = "/home/dasha"; + })) ]; users.users.dasha = { createHome = true; diff --git a/user/Root.nix b/user/Root.nix index dde7277..2c7d3fa 100644 --- a/user/Root.nix +++ b/user/Root.nix @@ -1,7 +1,11 @@ -{ secret, ... }: { +{ const, util, style, pkgs, setting, key, secret, ... } @args: { imports = [ - ./home/Root.nix + (import ./common (args // { + username = "root"; + homeDir = "/root"; + })) ]; + users.users.root.hashedPassword = secret.hashedPassword; security.sudo = { enable = false; diff --git a/user/Voronind.nix b/user/Voronind.nix index 5d7a925..fe14dbb 100644 --- a/user/Voronind.nix +++ b/user/Voronind.nix @@ -1,6 +1,9 @@ -{ pkgs, lib, secret, ... }: { +{ const, util, style, pkgs, lib, setting, key, secret, ... } @args: { imports = [ - ./home/Voronind.nix + (import ./common (args // { + username = "voronind"; + homeDir = "/home/voronind"; + })) ]; users.users.voronind = { diff --git a/user/home/common/default.nix b/user/common/default.nix similarity index 100% rename from user/home/common/default.nix rename to user/common/default.nix diff --git a/user/home/common/editorconfig/default.nix b/user/common/editorconfig/default.nix similarity index 100% rename from user/home/common/editorconfig/default.nix rename to user/common/editorconfig/default.nix diff --git a/user/home/common/foot/default.nix b/user/common/foot/default.nix similarity index 100% rename from user/home/common/foot/default.nix rename to user/common/foot/default.nix diff --git a/user/home/common/mako/default.nix b/user/common/mako/default.nix similarity index 100% rename from user/home/common/mako/default.nix rename to user/common/mako/default.nix diff --git a/user/home/common/template/Android.nix b/user/common/template/Android.nix similarity index 100% rename from user/home/common/template/Android.nix rename to user/common/template/Android.nix diff --git a/user/home/common/template/Blank.nix b/user/common/template/Blank.nix similarity index 100% rename from user/home/common/template/Blank.nix rename to user/common/template/Blank.nix diff --git a/user/home/common/template/FHSEnv.nix b/user/common/template/FHSEnv.nix similarity index 100% rename from user/home/common/template/FHSEnv.nix rename to user/common/template/FHSEnv.nix diff --git a/user/home/common/template/Latex.nix b/user/common/template/Latex.nix similarity index 100% rename from user/home/common/template/Latex.nix rename to user/common/template/Latex.nix diff --git a/user/home/common/template/Rust.nix b/user/common/template/Rust.nix similarity index 100% rename from user/home/common/template/Rust.nix rename to user/common/template/Rust.nix diff --git a/user/home/common/top/btop/default.nix b/user/common/top/btop/default.nix similarity index 100% rename from user/home/common/top/btop/default.nix rename to user/common/top/btop/default.nix diff --git a/user/home/common/top/htop/default.nix b/user/common/top/htop/default.nix similarity index 100% rename from user/home/common/top/htop/default.nix rename to user/common/top/htop/default.nix diff --git a/user/home/Dasha.nix b/user/home/Dasha.nix deleted file mode 100644 index b0c67b0..0000000 --- a/user/home/Dasha.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ const, util, style, pkgs, setting, key, secret, ... } @args: { - imports = [ - (import ./common (args // { - username = "dasha"; - homeDir = "/home/dasha"; - })) - ]; -} diff --git a/user/home/Root.nix b/user/home/Root.nix deleted file mode 100644 index d2ef197..0000000 --- a/user/home/Root.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ const, util, style, pkgs, setting, key, secret, ... } @args: { - imports = [ - (import ./common (args // { - username = "root"; - homeDir = "/root"; - })) - ]; -} diff --git a/user/home/Voronind.nix b/user/home/Voronind.nix deleted file mode 100644 index 1aefe74..0000000 --- a/user/home/Voronind.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ const, util, style, pkgs, setting, key, secret, ... } @args: { - imports = [ - (import ./common (args // { - username = "voronind"; - homeDir = "/home/voronind"; - })) - ]; -}