From a119a94925522c96a5f61fc9eb54efc6f38b7a0e Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Sat, 18 Mar 2023 23:38:11 +0300 Subject: [PATCH] refac: restructure home-manager configs --- {users => home}/modules/dev_tools.nix | 0 {users => home}/modules/editor.nix | 0 .../modules/file_manager/default.nix | 0 .../modules/file_manager/vifm_catppuccin.vifm | 0 {users => home}/modules/file_manager/vifmrc | 0 {users => home}/modules/git.nix | 0 {users => home}/modules/mail/colorize | 0 {users => home}/modules/mail/default.nix | 0 .../modules/notifications/default.nix | 0 .../modules/notifications/wired.ron | 0 {users => home}/modules/pass.nix | 0 {users => home}/modules/shell.nix | 0 {users => home}/modules/terminal.nix | 0 .../modules/themes/catppuccin/frappe.nix | 0 {users => home}/modules/themes/default.nix | 0 .../window_manager/betterlockscreen.nix | 0 .../modules/window_manager/default.nix | 0 .../modules/window_manager/polybar.nix | 0 .../window_manager/scripts/exchangerate.sh | 0 .../window_manager/scripts/get_volume.sh | 0 .../modules/window_manager/xmonad.nix | 0 .../modules/window_manager/xmonad_config.hs | 0 {users => home}/modules/work_tools.nix | 0 {users => home/users}/jan/accounts.secret.nix | Bin {users => home/users}/jan/default.nix | 2 +- {users => home/users}/jan/home.nix | 29 +++++++++--------- .../animals_tree_branch_129397_2560x1440.png | Bin ...artist_waves_colorful_129158_2560x1440.png | Bin ...boat_river_loneliness_129582_2560x1440.png | Bin {users => home/users}/jan/wallpapers/build.sh | 0 .../wallpapers/catppuccino_landscape_1.png | Bin .../child_river_dreams_127495_2560x1440.png | Bin ..._people_reflection_sea_92817_2560x1440.png | Bin .../couple_hugs_art_140777_2560x1440.png | Bin ...eer_silhouette_forest_130032_2560x1440.png | Bin .../landscape_art_moon_127187_2560x1440.png | Bin .../landscape_art_road_127350_2560x1440.png | Bin .../wallpapers/nix-magenta-pink-1920x1080.png | Bin .../sea_sunset_art_131736_2560x1440.png | Bin .../sea_waves_art_130915_2560x1440.png | Bin .../torii_art_solitude_129792_2560x1440.png | Bin ...wolf_silhouette_hills_130119_2560x1440.png | Bin {users => home/users}/nas/default.nix | 2 +- {users => home/users}/nas/home.nix | 12 ++++---- nixos/hosts/asus-gl553vd/default.nix | 2 +- nixos/hosts/default.nix | 8 ++--- 46 files changed, 28 insertions(+), 27 deletions(-) rename {users => home}/modules/dev_tools.nix (100%) rename {users => home}/modules/editor.nix (100%) rename {users => home}/modules/file_manager/default.nix (100%) rename {users => home}/modules/file_manager/vifm_catppuccin.vifm (100%) rename {users => home}/modules/file_manager/vifmrc (100%) rename {users => home}/modules/git.nix (100%) rename {users => home}/modules/mail/colorize (100%) rename {users => home}/modules/mail/default.nix (100%) rename {users => home}/modules/notifications/default.nix (100%) rename {users => home}/modules/notifications/wired.ron (100%) rename {users => home}/modules/pass.nix (100%) rename {users => home}/modules/shell.nix (100%) rename {users => home}/modules/terminal.nix (100%) rename {users => home}/modules/themes/catppuccin/frappe.nix (100%) rename {users => home}/modules/themes/default.nix (100%) rename {users => home}/modules/window_manager/betterlockscreen.nix (100%) rename {users => home}/modules/window_manager/default.nix (100%) rename {users => home}/modules/window_manager/polybar.nix (100%) rename {users => home}/modules/window_manager/scripts/exchangerate.sh (100%) rename {users => home}/modules/window_manager/scripts/get_volume.sh (100%) rename {users => home}/modules/window_manager/xmonad.nix (100%) rename {users => home}/modules/window_manager/xmonad_config.hs (100%) rename {users => home}/modules/work_tools.nix (100%) rename {users => home/users}/jan/accounts.secret.nix (100%) rename {users => home/users}/jan/default.nix (92%) rename {users => home/users}/jan/home.nix (65%) rename {users => home/users}/jan/wallpapers/animals_tree_branch_129397_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/artist_waves_colorful_129158_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/boat_river_loneliness_129582_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/build.sh (100%) rename {users => home/users}/jan/wallpapers/catppuccino_landscape_1.png (100%) rename {users => home/users}/jan/wallpapers/child_river_dreams_127495_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/couple_hugs_art_140777_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/deer_silhouette_forest_130032_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/landscape_art_moon_127187_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/landscape_art_road_127350_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/nix-magenta-pink-1920x1080.png (100%) rename {users => home/users}/jan/wallpapers/sea_sunset_art_131736_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/sea_waves_art_130915_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/torii_art_solitude_129792_2560x1440.png (100%) rename {users => home/users}/jan/wallpapers/wolf_silhouette_hills_130119_2560x1440.png (100%) rename {users => home/users}/nas/default.nix (87%) rename {users => home/users}/nas/home.nix (62%) diff --git a/users/modules/dev_tools.nix b/home/modules/dev_tools.nix similarity index 100% rename from users/modules/dev_tools.nix rename to home/modules/dev_tools.nix diff --git a/users/modules/editor.nix b/home/modules/editor.nix similarity index 100% rename from users/modules/editor.nix rename to home/modules/editor.nix diff --git a/users/modules/file_manager/default.nix b/home/modules/file_manager/default.nix similarity index 100% rename from users/modules/file_manager/default.nix rename to home/modules/file_manager/default.nix diff --git a/users/modules/file_manager/vifm_catppuccin.vifm b/home/modules/file_manager/vifm_catppuccin.vifm similarity index 100% rename from users/modules/file_manager/vifm_catppuccin.vifm rename to home/modules/file_manager/vifm_catppuccin.vifm diff --git a/users/modules/file_manager/vifmrc b/home/modules/file_manager/vifmrc similarity index 100% rename from users/modules/file_manager/vifmrc rename to home/modules/file_manager/vifmrc diff --git a/users/modules/git.nix b/home/modules/git.nix similarity index 100% rename from users/modules/git.nix rename to home/modules/git.nix diff --git a/users/modules/mail/colorize b/home/modules/mail/colorize similarity index 100% rename from users/modules/mail/colorize rename to home/modules/mail/colorize diff --git a/users/modules/mail/default.nix b/home/modules/mail/default.nix similarity index 100% rename from users/modules/mail/default.nix rename to home/modules/mail/default.nix diff --git a/users/modules/notifications/default.nix b/home/modules/notifications/default.nix similarity index 100% rename from users/modules/notifications/default.nix rename to home/modules/notifications/default.nix diff --git a/users/modules/notifications/wired.ron b/home/modules/notifications/wired.ron similarity index 100% rename from users/modules/notifications/wired.ron rename to home/modules/notifications/wired.ron diff --git a/users/modules/pass.nix b/home/modules/pass.nix similarity index 100% rename from users/modules/pass.nix rename to home/modules/pass.nix diff --git a/users/modules/shell.nix b/home/modules/shell.nix similarity index 100% rename from users/modules/shell.nix rename to home/modules/shell.nix diff --git a/users/modules/terminal.nix b/home/modules/terminal.nix similarity index 100% rename from users/modules/terminal.nix rename to home/modules/terminal.nix diff --git a/users/modules/themes/catppuccin/frappe.nix b/home/modules/themes/catppuccin/frappe.nix similarity index 100% rename from users/modules/themes/catppuccin/frappe.nix rename to home/modules/themes/catppuccin/frappe.nix diff --git a/users/modules/themes/default.nix b/home/modules/themes/default.nix similarity index 100% rename from users/modules/themes/default.nix rename to home/modules/themes/default.nix diff --git a/users/modules/window_manager/betterlockscreen.nix b/home/modules/window_manager/betterlockscreen.nix similarity index 100% rename from users/modules/window_manager/betterlockscreen.nix rename to home/modules/window_manager/betterlockscreen.nix diff --git a/users/modules/window_manager/default.nix b/home/modules/window_manager/default.nix similarity index 100% rename from users/modules/window_manager/default.nix rename to home/modules/window_manager/default.nix diff --git a/users/modules/window_manager/polybar.nix b/home/modules/window_manager/polybar.nix similarity index 100% rename from users/modules/window_manager/polybar.nix rename to home/modules/window_manager/polybar.nix diff --git a/users/modules/window_manager/scripts/exchangerate.sh b/home/modules/window_manager/scripts/exchangerate.sh similarity index 100% rename from users/modules/window_manager/scripts/exchangerate.sh rename to home/modules/window_manager/scripts/exchangerate.sh diff --git a/users/modules/window_manager/scripts/get_volume.sh b/home/modules/window_manager/scripts/get_volume.sh similarity index 100% rename from users/modules/window_manager/scripts/get_volume.sh rename to home/modules/window_manager/scripts/get_volume.sh diff --git a/users/modules/window_manager/xmonad.nix b/home/modules/window_manager/xmonad.nix similarity index 100% rename from users/modules/window_manager/xmonad.nix rename to home/modules/window_manager/xmonad.nix diff --git a/users/modules/window_manager/xmonad_config.hs b/home/modules/window_manager/xmonad_config.hs similarity index 100% rename from users/modules/window_manager/xmonad_config.hs rename to home/modules/window_manager/xmonad_config.hs diff --git a/users/modules/work_tools.nix b/home/modules/work_tools.nix similarity index 100% rename from users/modules/work_tools.nix rename to home/modules/work_tools.nix diff --git a/users/jan/accounts.secret.nix b/home/users/jan/accounts.secret.nix similarity index 100% rename from users/jan/accounts.secret.nix rename to home/users/jan/accounts.secret.nix diff --git a/users/jan/default.nix b/home/users/jan/default.nix similarity index 92% rename from users/jan/default.nix rename to home/users/jan/default.nix index 0e1f8ef..750fa41 100644 --- a/users/jan/default.nix +++ b/home/users/jan/default.nix @@ -37,5 +37,5 @@ nix.settings.trusted-users = lib.mkAfter [ "jan" ]; - age.secrets.users-jan-passfile.file = ../../secrets/users-jan-passfile.age; + age.secrets.users-jan-passfile.file = ../../../secrets/users-jan-passfile.age; } diff --git a/users/jan/home.nix b/home/users/jan/home.nix similarity index 65% rename from users/jan/home.nix rename to home/users/jan/home.nix index b502e35..b63014a 100644 --- a/users/jan/home.nix +++ b/home/users/jan/home.nix @@ -4,23 +4,23 @@ imports = [ ./accounts.secret.nix - ../modules/window_manager - ../modules/terminal.nix - ../modules/shell.nix + ../../modules/window_manager + ../../modules/terminal.nix + ../../modules/shell.nix - ../modules/notifications - ../modules/file_manager - ../modules/mail - ../modules/pass.nix + ../../modules/notifications + ../../modules/file_manager + ../../modules/mail + ../../modules/pass.nix - ../modules/git.nix - ../modules/dev_tools.nix - ../modules/editor.nix + ../../modules/git.nix + ../../modules/dev_tools.nix + ../../modules/editor.nix - ../modules/work_tools.nix + ../../modules/work_tools.nix - ../modules/themes - ../modules/themes/catppuccin/frappe.nix + ../../modules/themes + ../../modules/themes/catppuccin/frappe.nix ]; xdg.enable = true; @@ -51,7 +51,8 @@ # ungoogled-chromium tor-browser-bundle-bin - (pkgs.callPackage ../../packages/myip.nix { }) + (pkgs.callPackage ../../../packages/myip.nix { }) + (pkgs.callPackage ../../../packages/woodpecker { }).woodpecker-cli ]; local.git = { diff --git a/users/jan/wallpapers/animals_tree_branch_129397_2560x1440.png b/home/users/jan/wallpapers/animals_tree_branch_129397_2560x1440.png similarity index 100% rename from users/jan/wallpapers/animals_tree_branch_129397_2560x1440.png rename to home/users/jan/wallpapers/animals_tree_branch_129397_2560x1440.png diff --git a/users/jan/wallpapers/artist_waves_colorful_129158_2560x1440.png b/home/users/jan/wallpapers/artist_waves_colorful_129158_2560x1440.png similarity index 100% rename from users/jan/wallpapers/artist_waves_colorful_129158_2560x1440.png rename to home/users/jan/wallpapers/artist_waves_colorful_129158_2560x1440.png diff --git a/users/jan/wallpapers/boat_river_loneliness_129582_2560x1440.png b/home/users/jan/wallpapers/boat_river_loneliness_129582_2560x1440.png similarity index 100% rename from users/jan/wallpapers/boat_river_loneliness_129582_2560x1440.png rename to home/users/jan/wallpapers/boat_river_loneliness_129582_2560x1440.png diff --git a/users/jan/wallpapers/build.sh b/home/users/jan/wallpapers/build.sh similarity index 100% rename from users/jan/wallpapers/build.sh rename to home/users/jan/wallpapers/build.sh diff --git a/users/jan/wallpapers/catppuccino_landscape_1.png b/home/users/jan/wallpapers/catppuccino_landscape_1.png similarity index 100% rename from users/jan/wallpapers/catppuccino_landscape_1.png rename to home/users/jan/wallpapers/catppuccino_landscape_1.png diff --git a/users/jan/wallpapers/child_river_dreams_127495_2560x1440.png b/home/users/jan/wallpapers/child_river_dreams_127495_2560x1440.png similarity index 100% rename from users/jan/wallpapers/child_river_dreams_127495_2560x1440.png rename to home/users/jan/wallpapers/child_river_dreams_127495_2560x1440.png diff --git a/users/jan/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png b/home/users/jan/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png similarity index 100% rename from users/jan/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png rename to home/users/jan/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png diff --git a/users/jan/wallpapers/couple_hugs_art_140777_2560x1440.png b/home/users/jan/wallpapers/couple_hugs_art_140777_2560x1440.png similarity index 100% rename from users/jan/wallpapers/couple_hugs_art_140777_2560x1440.png rename to home/users/jan/wallpapers/couple_hugs_art_140777_2560x1440.png diff --git a/users/jan/wallpapers/deer_silhouette_forest_130032_2560x1440.png b/home/users/jan/wallpapers/deer_silhouette_forest_130032_2560x1440.png similarity index 100% rename from users/jan/wallpapers/deer_silhouette_forest_130032_2560x1440.png rename to home/users/jan/wallpapers/deer_silhouette_forest_130032_2560x1440.png diff --git a/users/jan/wallpapers/landscape_art_moon_127187_2560x1440.png b/home/users/jan/wallpapers/landscape_art_moon_127187_2560x1440.png similarity index 100% rename from users/jan/wallpapers/landscape_art_moon_127187_2560x1440.png rename to home/users/jan/wallpapers/landscape_art_moon_127187_2560x1440.png diff --git a/users/jan/wallpapers/landscape_art_road_127350_2560x1440.png b/home/users/jan/wallpapers/landscape_art_road_127350_2560x1440.png similarity index 100% rename from users/jan/wallpapers/landscape_art_road_127350_2560x1440.png rename to home/users/jan/wallpapers/landscape_art_road_127350_2560x1440.png diff --git a/users/jan/wallpapers/nix-magenta-pink-1920x1080.png b/home/users/jan/wallpapers/nix-magenta-pink-1920x1080.png similarity index 100% rename from users/jan/wallpapers/nix-magenta-pink-1920x1080.png rename to home/users/jan/wallpapers/nix-magenta-pink-1920x1080.png diff --git a/users/jan/wallpapers/sea_sunset_art_131736_2560x1440.png b/home/users/jan/wallpapers/sea_sunset_art_131736_2560x1440.png similarity index 100% rename from users/jan/wallpapers/sea_sunset_art_131736_2560x1440.png rename to home/users/jan/wallpapers/sea_sunset_art_131736_2560x1440.png diff --git a/users/jan/wallpapers/sea_waves_art_130915_2560x1440.png b/home/users/jan/wallpapers/sea_waves_art_130915_2560x1440.png similarity index 100% rename from users/jan/wallpapers/sea_waves_art_130915_2560x1440.png rename to home/users/jan/wallpapers/sea_waves_art_130915_2560x1440.png diff --git a/users/jan/wallpapers/torii_art_solitude_129792_2560x1440.png b/home/users/jan/wallpapers/torii_art_solitude_129792_2560x1440.png similarity index 100% rename from users/jan/wallpapers/torii_art_solitude_129792_2560x1440.png rename to home/users/jan/wallpapers/torii_art_solitude_129792_2560x1440.png diff --git a/users/jan/wallpapers/wolf_silhouette_hills_130119_2560x1440.png b/home/users/jan/wallpapers/wolf_silhouette_hills_130119_2560x1440.png similarity index 100% rename from users/jan/wallpapers/wolf_silhouette_hills_130119_2560x1440.png rename to home/users/jan/wallpapers/wolf_silhouette_hills_130119_2560x1440.png diff --git a/users/nas/default.nix b/home/users/nas/default.nix similarity index 87% rename from users/nas/default.nix rename to home/users/nas/default.nix index f36127b..5dde51a 100644 --- a/users/nas/default.nix +++ b/home/users/nas/default.nix @@ -25,5 +25,5 @@ home.stateVersion = config.system.stateVersion; }; - age.secrets.users-nas-passfile.file = ../../secrets/users-nas-passfile.age; + age.secrets.users-nas-passfile.file = ../../../secrets/users-nas-passfile.age; } diff --git a/users/nas/home.nix b/home/users/nas/home.nix similarity index 62% rename from users/nas/home.nix rename to home/users/nas/home.nix index 7b0aacc..8123e59 100644 --- a/users/nas/home.nix +++ b/home/users/nas/home.nix @@ -2,14 +2,14 @@ { imports = [ - ../modules/window_manager - ../modules/terminal.nix - ../modules/shell.nix + ../../modules/window_manager + ../../modules/terminal.nix + ../../modules/shell.nix - ../modules/notifications + ../../modules/notifications - ../modules/themes - ../modules/themes/catppuccin/frappe.nix + ../../modules/themes + ../../modules/themes/catppuccin/frappe.nix ]; xdg.enable = true; diff --git a/nixos/hosts/asus-gl553vd/default.nix b/nixos/hosts/asus-gl553vd/default.nix index e6da7cf..e5ed1e1 100644 --- a/nixos/hosts/asus-gl553vd/default.nix +++ b/nixos/hosts/asus-gl553vd/default.nix @@ -70,7 +70,7 @@ # Wireguard client age.secrets.wireguard-asus-gl553vd-private = { - file = ../../../../secrets/wireguard-asus-gl553vd-private.age; + file = ../../../secrets/wireguard-asus-gl553vd-private.age; mode = "0400"; }; local.wireguard = { diff --git a/nixos/hosts/default.nix b/nixos/hosts/default.nix index 1cc4f72..f8bac7d 100644 --- a/nixos/hosts/default.nix +++ b/nixos/hosts/default.nix @@ -11,8 +11,8 @@ in hardware.common-gpu-amd ../modules/nix.nix ../modules/wireguard-client.nix - ../../users/jan - ../../users/nas + ../../home/users/jan + ../../home/users/nas ]; extraHomeModule = { ... }: { @@ -28,8 +28,8 @@ in hardware.common-cpu-intel ../modules/nix.nix ../modules/wireguard-client.nix - ../../users/jan - ../../users/nas + ../../home/users/jan + ../../home/users/nas ]; extraHomeModule = { ... }: {