From 1e2ff5b882568c0a41ed96d33a96b707dc4b886d Mon Sep 17 00:00:00 2001 From: janabhumi Date: Sat, 8 Oct 2022 13:22:46 +0300 Subject: [PATCH] refac: restructure users --- .gitattributes | 2 +- makefile | 8 ++++---- outputs/home.nix | 8 ++++---- secrets.nix | Bin 1794 -> 296 bytes system/configuration.nix | 6 +++--- {home => users/jan}/home.nix | 8 ++++---- {home => users/jan}/progs/aerc/colorize | 0 {home => users/jan}/progs/aerc/default.nix | 0 {home => users/jan}/progs/alacritty/config.nix | 0 .../jan}/progs/alacritty/default.nix | 0 {home => users/jan}/progs/default.nix | 0 {home => users/jan}/progs/exa.nix | 0 {home => users/jan}/progs/git.nix | 0 {home => users/jan}/progs/himalaya.nix | 0 {home => users/jan}/progs/hledger.nix | 0 {home => users/jan}/progs/nvim.nix | 0 {home => users/jan}/progs/pass.nix | 0 {home => users/jan}/progs/vifm/default.nix | 0 {home => users/jan}/progs/vifm/vifmrc | 0 {home => users/jan}/progs/zoxide.nix | 0 {scripts => users/jan/scripts}/exchangerate.sh | 0 {scripts => users/jan/scripts}/get_volume.sh | 0 {scripts => users/jan/scripts}/himz | 0 {scripts => users/jan/scripts}/slugify.ts | 0 users/jan/secrets.nix | Bin 0 -> 1627 bytes {home => users/jan}/shell/default.nix | 0 {home => users/jan}/shell/prompt/default.nix | 0 .../jan}/shell/prompt/starship/config.nix | 0 .../jan}/shell/prompt/starship/default.nix | 0 {home => users/jan}/shell/zsh.nix | 0 {home => users/jan}/ui/betterlockscreen.nix | 0 {home => users/jan}/ui/default.nix | 0 {home => users/jan}/ui/polybar/config.nix | 0 {home => users/jan}/ui/polybar/default.nix | 0 {home => users/jan}/ui/xmonad/config.hs | 0 {home => users/jan}/ui/xmonad/default.nix | 0 .../animals_tree_branch_129397_2560x1440.png | Bin .../artist_waves_colorful_129158_2560x1440.png | Bin .../boat_river_loneliness_129582_2560x1440.png | Bin {wallpapers => users/jan/wallpapers}/build.sh | 0 .../child_river_dreams_127495_2560x1440.png | Bin ...e_people_reflection_sea_92817_2560x1440.png | Bin .../couple_hugs_art_140777_2560x1440.png | Bin ...deer_silhouette_forest_130032_2560x1440.png | Bin .../landscape_art_moon_127187_2560x1440.png | Bin .../landscape_art_road_127350_2560x1440.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 {home => users/jan}/wired.ron | 0 51 files changed, 16 insertions(+), 16 deletions(-) rename {home => users/jan}/home.nix (95%) rename {home => users/jan}/progs/aerc/colorize (100%) rename {home => users/jan}/progs/aerc/default.nix (100%) rename {home => users/jan}/progs/alacritty/config.nix (100%) rename {home => users/jan}/progs/alacritty/default.nix (100%) rename {home => users/jan}/progs/default.nix (100%) rename {home => users/jan}/progs/exa.nix (100%) rename {home => users/jan}/progs/git.nix (100%) rename {home => users/jan}/progs/himalaya.nix (100%) rename {home => users/jan}/progs/hledger.nix (100%) rename {home => users/jan}/progs/nvim.nix (100%) rename {home => users/jan}/progs/pass.nix (100%) rename {home => users/jan}/progs/vifm/default.nix (100%) rename {home => users/jan}/progs/vifm/vifmrc (100%) rename {home => users/jan}/progs/zoxide.nix (100%) rename {scripts => users/jan/scripts}/exchangerate.sh (100%) rename {scripts => users/jan/scripts}/get_volume.sh (100%) rename {scripts => users/jan/scripts}/himz (100%) rename {scripts => users/jan/scripts}/slugify.ts (100%) create mode 100644 users/jan/secrets.nix rename {home => users/jan}/shell/default.nix (100%) rename {home => users/jan}/shell/prompt/default.nix (100%) rename {home => users/jan}/shell/prompt/starship/config.nix (100%) rename {home => users/jan}/shell/prompt/starship/default.nix (100%) rename {home => users/jan}/shell/zsh.nix (100%) rename {home => users/jan}/ui/betterlockscreen.nix (100%) rename {home => users/jan}/ui/default.nix (100%) rename {home => users/jan}/ui/polybar/config.nix (100%) rename {home => users/jan}/ui/polybar/default.nix (100%) rename {home => users/jan}/ui/xmonad/config.hs (100%) rename {home => users/jan}/ui/xmonad/default.nix (100%) rename {wallpapers => users/jan/wallpapers}/animals_tree_branch_129397_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/artist_waves_colorful_129158_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/boat_river_loneliness_129582_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/build.sh (100%) rename {wallpapers => users/jan/wallpapers}/child_river_dreams_127495_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/couple_hugs_art_140777_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/deer_silhouette_forest_130032_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/landscape_art_moon_127187_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/landscape_art_road_127350_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/sea_sunset_art_131736_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/sea_waves_art_130915_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/torii_art_solitude_129792_2560x1440.png (100%) rename {wallpapers => users/jan/wallpapers}/wolf_silhouette_hills_130119_2560x1440.png (100%) rename {home => users/jan}/wired.ron (100%) diff --git a/.gitattributes b/.gitattributes index f0bd4f3..1b4ca31 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -secrets.nix filter=git-crypt diff=git-crypt +**/secrets.nix filter=git-crypt diff=git-crypt diff --git a/makefile b/makefile index 1a7c2bb..49ab12f 100644 --- a/makefile +++ b/makefile @@ -1,11 +1,11 @@ switchHm = home-manager switch --flake switchSys = nixos-rebuild switch --flake -home-me: fix-systemd - ${switchHm} .#home-me +users-jan: fix-systemd + ${switchHm} .#users-jan -home-laptop-me: fix-systemd - ${switchHm} .#home-laptop-me +users-laptop-jan: fix-systemd + ${switchHm} .#users-laptop-jan sys-home: sudo ${switchSys} .#system-home diff --git a/outputs/home.nix b/outputs/home.nix index de9d623..087664a 100644 --- a/outputs/home.nix +++ b/outputs/home.nix @@ -14,18 +14,18 @@ let ]; }; - mkHome = mods: home-manager.lib.homeManagerConfiguration { + mkUsersJan = mods: home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ inputs.wired.homeManagerModules.default - ../home/home.nix + ../users/jan/home.nix ] ++ mods; }; in { - home-me = mkHome [ ]; - home-laptop-me = mkHome [ + users-jan = mkUsersJan [ ]; + users-laptop-jan = mkUsersJan [ ({ config, ... }: { progs.alacritty.fontSize = 6.0; }) diff --git a/secrets.nix b/secrets.nix index cc5c7eb87ca97017f3a4710ba46cb8e50e44c2b9..e9525d2ca4aad613681fce0fe569880032612990 100644 GIT binary patch literal 296 zcmV+@0oVQjM@dveQdv+`0NypH(hSvRZlG<}te!es7P`VMff)NpLxf7VZ`aO*xQ>=% zVEW^B8KyIJQuV=&UISZibqzf`Ch3&B+7W?v)f?I<5O-D3ete9#bTeyKd;igBbl#PJpG{JX;iYkGNm^&=D_ER3myvjBcrb( zqZhJbB&b_KDLb0#BDBjFrPvE{z%>s2Vdt6UWBm+cUfsfH$%H2*=|TI(`-BjzuZg@8+Vo0BUQPx|1uZWXT1CL7bDwTHp?5kFM>9=+j z!eUVU-zP2jtq`JIXx!;>=b@Ly#UL9!=~I6h1q}wLp(&I7(nu%F#01-KQ5)US^kLax zJbKDgbmX#X7zjt085qK~x9J>F`7D22JJHV(j`}7*J{rZ51G|`aX96311Hgni2);~my;{P1XWnr~BwujP zC-Do#Xp{?+)SQQ^kD2XsZ?Po^cZ#pVZrAdP@`f_fhU6 z=o~I^RsoaeJ0n=m-9pwe;Czz$g3{YCyN?1?q;sxZE+t~SK&YL&?97Msi~M#V4|Rq% z-l9YgA!_@bOe9YfIPfC0Fo4bP7&5Nzzk^w9Q#-i|v$@op&F8(3lLx zE(dS!OY}KS*9v@T09L&++cd;LK1f4@$9+s0s%LP?xPO2{<81#myU|8xhIO$bKxAJT zNPm-a7hMfToNpGxLIBE$QJHlpP$1B_;|wT_cDaW_-h>BCU^-zd2i%p>q`{>n==y&e zV0^If9c2HYS1arud_;Myu<3yCIkg)>gUY^m9PepdR%$r5ol5EdaaBO)I!V{$9kHom zUoqb{R`m`Esq7i~|ipxY--;7b886~=LN<|Ez!_uRm&Ne_V=#2nEv5g5X8^9 z!a)S>f~ATrmDJST8JP00qC2a z_Y5%vPpCXTl)9)Pre#7zSxRPN`|j2N@0IXxh|x6n7cgp*0l=9AtJcV$K+^uB4RmT# zr8=h$N`oECJxjg|ru#lqfGhfo5ml(Q{1SuXK8|V4FCmXJIyvD!rxMJq0z%WN84JX8 z8{e0Z=}};PO@XT%VQ`VZxZmb*7jc|SATkAMo<&mUp^dyF@<|a_ z;Yt!Ee5obw>KuQ@ZeQMihtC+`zLtcn&D8jfy+NAmdix(4b0l_t3q1l~9Yer@#^vEs znjOEWnK6X$zjRTQRrJEm2APODaw50CShGrYicnIi`N672h)p*`AFKNtmv#WmzaZCW z?%k=a66}Mn=PZ+u^)9a$sBVc_FNEo!Me06 z9Sa-Vd>;Z@|eQ@pQ1*m}XrfK=G_ui^sH{%@DTG&KS3n#ram8@n*S|Ag!)0pUldgV30jEecCB#r^9L!?ZlR&0s} z2Eu2EBD!JUvl&GyOQt8wps|)~otfU2HRK>h@$V-NIlqwC{-}V|pdxfBCF;^S(Ze9l kN8-m*XgHAiTbDda@E3DcvE=sz6k)L!vWk;y^Fv74n5rUs`~Uy| diff --git a/system/configuration.nix b/system/configuration.nix index 5bb5528..d40e254 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -97,8 +97,8 @@ in # Define a user account. Don't forget to set a password with ‘passwd’. users.users.me = { isNormalUser = true; - name = secrets.userName; - home = secrets.userDir; + name = secrets.mainUser.userName; + home = secrets.mainUser.userDir; extraGroups = [ "wheel" # Enable ‘sudo’ for the user. "networkmanager" @@ -131,7 +131,7 @@ in settings = { auto-optimise-store = true; - trusted-users = [ "root" secrets.userName ]; + trusted-users = [ "root" secrets.mainUser.userName ]; experimental-features = [ "nix-command" "flakes" ]; diff --git a/home/home.nix b/users/jan/home.nix similarity index 95% rename from home/home.nix rename to users/jan/home.nix index 3f0d274..d891101 100644 --- a/home/home.nix +++ b/users/jan/home.nix @@ -1,12 +1,12 @@ { config, pkgs, ... }: let - secrets = import ../secrets.nix; + secrets = import ./secrets.nix; in { imports = (import ./ui) ++ (import ./shell) ++ (import ./progs); - nixpkgs.overlays = import ../overlays; + nixpkgs.overlays = import ../../overlays; # Home Manager needs a bit of information about you and the # paths it should manage. @@ -120,12 +120,12 @@ in home.file = { "scripts" = { - source = ../scripts; + source = ./scripts; recursive = true; }; "pictures/wallpapers" = { - source = ../wallpapers; + source = ./wallpapers; recursive = true; }; }; diff --git a/home/progs/aerc/colorize b/users/jan/progs/aerc/colorize similarity index 100% rename from home/progs/aerc/colorize rename to users/jan/progs/aerc/colorize diff --git a/home/progs/aerc/default.nix b/users/jan/progs/aerc/default.nix similarity index 100% rename from home/progs/aerc/default.nix rename to users/jan/progs/aerc/default.nix diff --git a/home/progs/alacritty/config.nix b/users/jan/progs/alacritty/config.nix similarity index 100% rename from home/progs/alacritty/config.nix rename to users/jan/progs/alacritty/config.nix diff --git a/home/progs/alacritty/default.nix b/users/jan/progs/alacritty/default.nix similarity index 100% rename from home/progs/alacritty/default.nix rename to users/jan/progs/alacritty/default.nix diff --git a/home/progs/default.nix b/users/jan/progs/default.nix similarity index 100% rename from home/progs/default.nix rename to users/jan/progs/default.nix diff --git a/home/progs/exa.nix b/users/jan/progs/exa.nix similarity index 100% rename from home/progs/exa.nix rename to users/jan/progs/exa.nix diff --git a/home/progs/git.nix b/users/jan/progs/git.nix similarity index 100% rename from home/progs/git.nix rename to users/jan/progs/git.nix diff --git a/home/progs/himalaya.nix b/users/jan/progs/himalaya.nix similarity index 100% rename from home/progs/himalaya.nix rename to users/jan/progs/himalaya.nix diff --git a/home/progs/hledger.nix b/users/jan/progs/hledger.nix similarity index 100% rename from home/progs/hledger.nix rename to users/jan/progs/hledger.nix diff --git a/home/progs/nvim.nix b/users/jan/progs/nvim.nix similarity index 100% rename from home/progs/nvim.nix rename to users/jan/progs/nvim.nix diff --git a/home/progs/pass.nix b/users/jan/progs/pass.nix similarity index 100% rename from home/progs/pass.nix rename to users/jan/progs/pass.nix diff --git a/home/progs/vifm/default.nix b/users/jan/progs/vifm/default.nix similarity index 100% rename from home/progs/vifm/default.nix rename to users/jan/progs/vifm/default.nix diff --git a/home/progs/vifm/vifmrc b/users/jan/progs/vifm/vifmrc similarity index 100% rename from home/progs/vifm/vifmrc rename to users/jan/progs/vifm/vifmrc diff --git a/home/progs/zoxide.nix b/users/jan/progs/zoxide.nix similarity index 100% rename from home/progs/zoxide.nix rename to users/jan/progs/zoxide.nix diff --git a/scripts/exchangerate.sh b/users/jan/scripts/exchangerate.sh similarity index 100% rename from scripts/exchangerate.sh rename to users/jan/scripts/exchangerate.sh diff --git a/scripts/get_volume.sh b/users/jan/scripts/get_volume.sh similarity index 100% rename from scripts/get_volume.sh rename to users/jan/scripts/get_volume.sh diff --git a/scripts/himz b/users/jan/scripts/himz similarity index 100% rename from scripts/himz rename to users/jan/scripts/himz diff --git a/scripts/slugify.ts b/users/jan/scripts/slugify.ts similarity index 100% rename from scripts/slugify.ts rename to users/jan/scripts/slugify.ts diff --git a/users/jan/secrets.nix b/users/jan/secrets.nix new file mode 100644 index 0000000000000000000000000000000000000000..41eed1ddfa5d7fed5c70d3c28ef67ebafdf26c57 GIT binary patch literal 1627 zcmV-h2Bi4_M@dveQdv+`0DX6C!{TA&n_Xg9w?+ zj2jwgoPex~0`sR`Xq^mBmr6xkiWHC@Q4+cWD>X47UAq`6*L_Xi!3EQmFnI(< zOzq*%YtB+<5T`E)sqB1^p0RX>cby%@BoV&XmG2iKaZ?~RLUp#6|HufUM}_O15=pWc z>(@b0!EHTDVNotU3H~jPrQtnLyatb?=sK5wji0^q1t(eEmSzZ@2SS#LMXV5>uatO6 z_%gFL3S|)t4t~uMt7Po2jGoK^Fr>8>@)M=cV1-dCoK$FjU)hBT*r^?7MP#)zZ|!N* zk8OvZAk?Gb z{g6mtar(}5o!tSwV1b5ibl#{ICx!aZJ%wJ>e^bEYxlJ(v6i9Y^sa%R3 z{&R_8Gk$n?_?|ikpOj`qOgr;Iumw#3%_HR2wmQ%)De`+GjQiVzXUjssmL_spj~^N& zuZx|*h=wANt*x|GR7ohjdfeD7nT56=0RlhUfB`8klIqbJIE6e1Lz82(CiIy78EQr`XnaS z-~PQUd54YP+IOpf(_sBo-cwjAJ{9Z$$?Drrf{D83^+SJMJ22boz?`n2U*tWPg82`K z?eNtiT()4_nGz=Mrg7`eqTVpr7m)Sh!{7*;i6=FJZ-$;TB$ruX#6JV6RCCi^5SgvX z5P!FQ*cYa1Z@iKM{PuTKh*))r2J=gq?6Vky*TY}j4Y{c>3AW}v%6(?-bXuMXreIQa z@ct|A2T#p;Zkb!JcuyrXEfndiLDvcy^8b zfJHiyB zhE*1<|7ARjsNG0X=2{h&praxhq?&M8WPVOSnJt!Wk4d*6EynS#H+<`FRGp^Tc81>`_j8_XgG Zi=qB>?#Mgbb<&dLeX5jP)xr?XPT$+cBv$|c literal 0 HcmV?d00001 diff --git a/home/shell/default.nix b/users/jan/shell/default.nix similarity index 100% rename from home/shell/default.nix rename to users/jan/shell/default.nix diff --git a/home/shell/prompt/default.nix b/users/jan/shell/prompt/default.nix similarity index 100% rename from home/shell/prompt/default.nix rename to users/jan/shell/prompt/default.nix diff --git a/home/shell/prompt/starship/config.nix b/users/jan/shell/prompt/starship/config.nix similarity index 100% rename from home/shell/prompt/starship/config.nix rename to users/jan/shell/prompt/starship/config.nix diff --git a/home/shell/prompt/starship/default.nix b/users/jan/shell/prompt/starship/default.nix similarity index 100% rename from home/shell/prompt/starship/default.nix rename to users/jan/shell/prompt/starship/default.nix diff --git a/home/shell/zsh.nix b/users/jan/shell/zsh.nix similarity index 100% rename from home/shell/zsh.nix rename to users/jan/shell/zsh.nix diff --git a/home/ui/betterlockscreen.nix b/users/jan/ui/betterlockscreen.nix similarity index 100% rename from home/ui/betterlockscreen.nix rename to users/jan/ui/betterlockscreen.nix diff --git a/home/ui/default.nix b/users/jan/ui/default.nix similarity index 100% rename from home/ui/default.nix rename to users/jan/ui/default.nix diff --git a/home/ui/polybar/config.nix b/users/jan/ui/polybar/config.nix similarity index 100% rename from home/ui/polybar/config.nix rename to users/jan/ui/polybar/config.nix diff --git a/home/ui/polybar/default.nix b/users/jan/ui/polybar/default.nix similarity index 100% rename from home/ui/polybar/default.nix rename to users/jan/ui/polybar/default.nix diff --git a/home/ui/xmonad/config.hs b/users/jan/ui/xmonad/config.hs similarity index 100% rename from home/ui/xmonad/config.hs rename to users/jan/ui/xmonad/config.hs diff --git a/home/ui/xmonad/default.nix b/users/jan/ui/xmonad/default.nix similarity index 100% rename from home/ui/xmonad/default.nix rename to users/jan/ui/xmonad/default.nix diff --git a/wallpapers/animals_tree_branch_129397_2560x1440.png b/users/jan/wallpapers/animals_tree_branch_129397_2560x1440.png similarity index 100% rename from wallpapers/animals_tree_branch_129397_2560x1440.png rename to users/jan/wallpapers/animals_tree_branch_129397_2560x1440.png diff --git a/wallpapers/artist_waves_colorful_129158_2560x1440.png b/users/jan/wallpapers/artist_waves_colorful_129158_2560x1440.png similarity index 100% rename from wallpapers/artist_waves_colorful_129158_2560x1440.png rename to users/jan/wallpapers/artist_waves_colorful_129158_2560x1440.png diff --git a/wallpapers/boat_river_loneliness_129582_2560x1440.png b/users/jan/wallpapers/boat_river_loneliness_129582_2560x1440.png similarity index 100% rename from wallpapers/boat_river_loneliness_129582_2560x1440.png rename to users/jan/wallpapers/boat_river_loneliness_129582_2560x1440.png diff --git a/wallpapers/build.sh b/users/jan/wallpapers/build.sh similarity index 100% rename from wallpapers/build.sh rename to users/jan/wallpapers/build.sh diff --git a/wallpapers/child_river_dreams_127495_2560x1440.png b/users/jan/wallpapers/child_river_dreams_127495_2560x1440.png similarity index 100% rename from wallpapers/child_river_dreams_127495_2560x1440.png rename to users/jan/wallpapers/child_river_dreams_127495_2560x1440.png diff --git a/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png b/users/jan/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png similarity index 100% rename from wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png rename to users/jan/wallpapers/clouds_sky_bridge_people_reflection_sea_92817_2560x1440.png diff --git a/wallpapers/couple_hugs_art_140777_2560x1440.png b/users/jan/wallpapers/couple_hugs_art_140777_2560x1440.png similarity index 100% rename from wallpapers/couple_hugs_art_140777_2560x1440.png rename to users/jan/wallpapers/couple_hugs_art_140777_2560x1440.png diff --git a/wallpapers/deer_silhouette_forest_130032_2560x1440.png b/users/jan/wallpapers/deer_silhouette_forest_130032_2560x1440.png similarity index 100% rename from wallpapers/deer_silhouette_forest_130032_2560x1440.png rename to users/jan/wallpapers/deer_silhouette_forest_130032_2560x1440.png diff --git a/wallpapers/landscape_art_moon_127187_2560x1440.png b/users/jan/wallpapers/landscape_art_moon_127187_2560x1440.png similarity index 100% rename from wallpapers/landscape_art_moon_127187_2560x1440.png rename to users/jan/wallpapers/landscape_art_moon_127187_2560x1440.png diff --git a/wallpapers/landscape_art_road_127350_2560x1440.png b/users/jan/wallpapers/landscape_art_road_127350_2560x1440.png similarity index 100% rename from wallpapers/landscape_art_road_127350_2560x1440.png rename to users/jan/wallpapers/landscape_art_road_127350_2560x1440.png diff --git a/wallpapers/sea_sunset_art_131736_2560x1440.png b/users/jan/wallpapers/sea_sunset_art_131736_2560x1440.png similarity index 100% rename from wallpapers/sea_sunset_art_131736_2560x1440.png rename to users/jan/wallpapers/sea_sunset_art_131736_2560x1440.png diff --git a/wallpapers/sea_waves_art_130915_2560x1440.png b/users/jan/wallpapers/sea_waves_art_130915_2560x1440.png similarity index 100% rename from wallpapers/sea_waves_art_130915_2560x1440.png rename to users/jan/wallpapers/sea_waves_art_130915_2560x1440.png diff --git a/wallpapers/torii_art_solitude_129792_2560x1440.png b/users/jan/wallpapers/torii_art_solitude_129792_2560x1440.png similarity index 100% rename from wallpapers/torii_art_solitude_129792_2560x1440.png rename to users/jan/wallpapers/torii_art_solitude_129792_2560x1440.png diff --git a/wallpapers/wolf_silhouette_hills_130119_2560x1440.png b/users/jan/wallpapers/wolf_silhouette_hills_130119_2560x1440.png similarity index 100% rename from wallpapers/wolf_silhouette_hills_130119_2560x1440.png rename to users/jan/wallpapers/wolf_silhouette_hills_130119_2560x1440.png diff --git a/home/wired.ron b/users/jan/wired.ron similarity index 100% rename from home/wired.ron rename to users/jan/wired.ron