mynix/system
1
1
Fork 0
Code Issues 2 Pull requests Activity

refac: restructure home-manager configs

Browse source
This commit is contained in:
Dmitriy Pleshevskiy 2023-03-18 23:38:11 +03:00
parent 36d066f355
commit a119a94925
Signed by: pleshevskiy
GPG key ID: 79C4487B44403985
46 changed files with 28 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
users/modules/dev_tools.nix → home/modules/dev_tools.nix
View file

0
users/modules/editor.nix → home/modules/editor.nix
View file

0
users/modules/file_manager/default.nix → home/modules/file_manager/default.nix
View file

0
users/modules/file_manager/vifm_catppuccin.vifm → home/modules/file_manager/vifm_catppuccin.vifm
View file

0
users/modules/file_manager/vifmrc → home/modules/file_manager/vifmrc
View file

0
users/modules/git.nix → home/modules/git.nix
View file

0
users/modules/mail/colorize → home/modules/mail/colorize
View file

0
users/modules/mail/default.nix → home/modules/mail/default.nix
View file

0
users/modules/notifications/default.nix → home/modules/notifications/default.nix
View file

0
users/modules/notifications/wired.ron → home/modules/notifications/wired.ron
View file

0
users/modules/pass.nix → home/modules/pass.nix
View file

0
users/modules/shell.nix → home/modules/shell.nix
View file

0
users/modules/terminal.nix → home/modules/terminal.nix
View file

0
users/modules/themes/catppuccin/frappe.nix → home/modules/themes/catppuccin/frappe.nix
View file

0
users/modules/themes/default.nix → home/modules/themes/default.nix
View file

0
users/modules/window_manager/betterlockscreen.nix → home/modules/window_manager/betterlockscreen.nix
View file

0
users/modules/window_manager/default.nix → home/modules/window_manager/default.nix
View file

0
users/modules/window_manager/polybar.nix → home/modules/window_manager/polybar.nix
View file

0
users/modules/window_manager/scripts/exchangerate.sh → home/modules/window_manager/scripts/exchangerate.sh
View file

0
users/modules/window_manager/scripts/get_volume.sh → home/modules/window_manager/scripts/get_volume.sh
View file

0
users/modules/window_manager/xmonad.nix → home/modules/window_manager/xmonad.nix
View file

0
users/modules/window_manager/xmonad_config.hs → home/modules/window_manager/xmonad_config.hs
View file

0
users/modules/work_tools.nix → home/modules/work_tools.nix
View file

0
users/jan/accounts.secret.nix → home/users/jan/accounts.secret.nix
View file

2
users/jan/default.nix → home/users/jan/default.nix
View file

@ -37,5 +37,5 @@
nix.settings.trusted-users = lib.mkAfter [ "jan" ]; 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;
} }

29
users/jan/home.nix → home/users/jan/home.nix
View file

@ -4,23 +4,23 @@
imports = [ imports = [
./accounts.secret.nix ./accounts.secret.nix
../modules/window_manager ../../modules/window_manager
../modules/terminal.nix ../../modules/terminal.nix
../modules/shell.nix ../../modules/shell.nix
../modules/notifications ../../modules/notifications
../modules/file_manager ../../modules/file_manager
../modules/mail ../../modules/mail
../modules/pass.nix ../../modules/pass.nix
../modules/git.nix ../../modules/git.nix
../modules/dev_tools.nix ../../modules/dev_tools.nix
../modules/editor.nix ../../modules/editor.nix
../modules/work_tools.nix ../../modules/work_tools.nix
../modules/themes ../../modules/themes
../modules/themes/catppuccin/frappe.nix ../../modules/themes/catppuccin/frappe.nix
]; ];
xdg.enable = true; xdg.enable = true;
@ -51,7 +51,8 @@
# ungoogled-chromium # ungoogled-chromium
tor-browser-bundle-bin tor-browser-bundle-bin
(pkgs.callPackage ../../packages/myip.nix { }) (pkgs.callPackage ../../../packages/myip.nix { })
(pkgs.callPackage ../../../packages/woodpecker { }).woodpecker-cli
]; ];
local.git = { local.git = {

0
users/jan/wallpapers/animals_tree_branch_129397_2560x1440.png → home/users/jan/wallpapers/animals_tree_branch_129397_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 MiB

After

Width:  |  Height:  |  Size: 5.4 MiB

0
users/jan/wallpapers/artist_waves_colorful_129158_2560x1440.png → home/users/jan/wallpapers/artist_waves_colorful_129158_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 MiB

After

Width:  |  Height:  |  Size: 2.6 MiB

0
users/jan/wallpapers/boat_river_loneliness_129582_2560x1440.png → home/users/jan/wallpapers/boat_river_loneliness_129582_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.7 MiB

After

Width:  |  Height:  |  Size: 4.7 MiB

0
users/jan/wallpapers/build.sh → home/users/jan/wallpapers/build.sh
View file

0
users/jan/wallpapers/catppuccino_landscape_1.png → home/users/jan/wallpapers/catppuccino_landscape_1.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 MiB

After

Width:  |  Height:  |  Size: 1.9 MiB

0
users/jan/wallpapers/child_river_dreams_127495_2560x1440.png → home/users/jan/wallpapers/child_river_dreams_127495_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 MiB

After

Width:  |  Height:  |  Size: 4.5 MiB

0
users/jan/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png → home/users/jan/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB

0
users/jan/wallpapers/couple_hugs_art_140777_2560x1440.png → home/users/jan/wallpapers/couple_hugs_art_140777_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.9 MiB

After

Width:  |  Height:  |  Size: 4.9 MiB

0
users/jan/wallpapers/deer_silhouette_forest_130032_2560x1440.png → home/users/jan/wallpapers/deer_silhouette_forest_130032_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.5 MiB

After

Width:  |  Height:  |  Size: 3.5 MiB

0
users/jan/wallpapers/landscape_art_moon_127187_2560x1440.png → home/users/jan/wallpapers/landscape_art_moon_127187_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.5 MiB

After

Width:  |  Height:  |  Size: 4.5 MiB

0
users/jan/wallpapers/landscape_art_road_127350_2560x1440.png → home/users/jan/wallpapers/landscape_art_road_127350_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 MiB

After

Width:  |  Height:  |  Size: 2.7 MiB

0
users/jan/wallpapers/nix-magenta-pink-1920x1080.png → home/users/jan/wallpapers/nix-magenta-pink-1920x1080.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 47 KiB

0
users/jan/wallpapers/sea_sunset_art_131736_2560x1440.png → home/users/jan/wallpapers/sea_sunset_art_131736_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 MiB

After

Width:  |  Height:  |  Size: 2.7 MiB

0
users/jan/wallpapers/sea_waves_art_130915_2560x1440.png → home/users/jan/wallpapers/sea_waves_art_130915_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.3 MiB

After

Width:  |  Height:  |  Size: 4.3 MiB

0
users/jan/wallpapers/torii_art_solitude_129792_2560x1440.png → home/users/jan/wallpapers/torii_art_solitude_129792_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 MiB

After

Width:  |  Height:  |  Size: 3.3 MiB

0
users/jan/wallpapers/wolf_silhouette_hills_130119_2560x1440.png → home/users/jan/wallpapers/wolf_silhouette_hills_130119_2560x1440.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 MiB

After

Width:  |  Height:  |  Size: 2.6 MiB

2
users/nas/default.nix → home/users/nas/default.nix
View file

@ -25,5 +25,5 @@
home.stateVersion = config.system.stateVersion; 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;
} }

12
users/nas/home.nix → home/users/nas/home.nix
View file

@ -2,14 +2,14 @@
{ {
imports = [ imports = [
../modules/window_manager ../../modules/window_manager
../modules/terminal.nix ../../modules/terminal.nix
../modules/shell.nix ../../modules/shell.nix
../modules/notifications ../../modules/notifications
../modules/themes ../../modules/themes
../modules/themes/catppuccin/frappe.nix ../../modules/themes/catppuccin/frappe.nix
]; ];
xdg.enable = true; xdg.enable = true;

2
nixos/hosts/asus-gl553vd/default.nix
View file

@ -70,7 +70,7 @@
# Wireguard client # Wireguard client
age.secrets.wireguard-asus-gl553vd-private = { age.secrets.wireguard-asus-gl553vd-private = {
file = ../../../../secrets/wireguard-asus-gl553vd-private.age; file = ../../../secrets/wireguard-asus-gl553vd-private.age;
mode = "0400"; mode = "0400";
}; };
local.wireguard = { local.wireguard = {

8
nixos/hosts/default.nix
View file

@ -11,8 +11,8 @@ in
hardware.common-gpu-amd hardware.common-gpu-amd
../modules/nix.nix ../modules/nix.nix
../modules/wireguard-client.nix ../modules/wireguard-client.nix
../../users/jan ../../home/users/jan
../../users/nas ../../home/users/nas
]; ];
extraHomeModule = { ... }: { extraHomeModule = { ... }: {
@ -28,8 +28,8 @@ in
hardware.common-cpu-intel hardware.common-cpu-intel
../modules/nix.nix ../modules/nix.nix
../modules/wireguard-client.nix ../modules/wireguard-client.nix
../../users/jan ../../home/users/jan
../../users/nas ../../home/users/nas
]; ];
extraHomeModule = { ... }: { extraHomeModule = { ... }: {