From 322c63c0e660a4acea7a4f678d0256e372f498f0 Mon Sep 17 00:00:00 2001 From: Chris W Date: Tue, 16 Jan 2024 14:20:37 -0700 Subject: [PATCH] move things around --- flake.nix | 2 +- {nix => home-manager}/dconf.nix | 0 home.nix => home-manager/default.nix | 16 ++++++++-------- {nix => home-manager}/fonts.nix | 0 {nix => home-manager}/git.nix | 0 {nix => home-manager}/nvim.nix | 0 {nix => home-manager}/packages.nix | 0 {nix => home-manager}/packages/xpipe.nix | 0 {nix => home-manager}/sh.nix | 0 {nix => home-manager}/shell.nix | 0 {nix => home-manager}/vscode.nix | 0 {nix => home-manager}/watzon.asc | 0 12 files changed, 9 insertions(+), 9 deletions(-) rename {nix => home-manager}/dconf.nix (100%) rename home.nix => home-manager/default.nix (86%) rename {nix => home-manager}/fonts.nix (100%) rename {nix => home-manager}/git.nix (100%) rename {nix => home-manager}/nvim.nix (100%) rename {nix => home-manager}/packages.nix (100%) rename {nix => home-manager}/packages/xpipe.nix (100%) rename {nix => home-manager}/sh.nix (100%) rename {nix => home-manager}/shell.nix (100%) rename {nix => home-manager}/vscode.nix (100%) rename {nix => home-manager}/watzon.asc (100%) diff --git a/flake.nix b/flake.nix index 9fa02c8..e5514f6 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,7 @@ ghostty.packages.x86_64-linux.default ]; }) - ./home.nix + ./home-manager/default.nix ]; }; }; diff --git a/nix/dconf.nix b/home-manager/dconf.nix similarity index 100% rename from nix/dconf.nix rename to home-manager/dconf.nix diff --git a/home.nix b/home-manager/default.nix similarity index 86% rename from home.nix rename to home-manager/default.nix index 56cda02..7b50900 100644 --- a/home.nix +++ b/home-manager/default.nix @@ -2,12 +2,12 @@ { imports = [ - ./nix/packages.nix - ./nix/sh.nix - ./nix/dconf.nix - ./nix/vscode.nix - ./nix/git.nix - ./nix/fonts.nix + ./packages.nix + ./sh.nix + ./dconf.nix + ./vscode.nix + ./git.nix + ./fonts.nix ]; home.username = "watzon"; @@ -31,8 +31,8 @@ # org.gradle.console=verbose # org.gradle.daemon.idletimeout=3600000 # ''; - ".config/httpie/config.json".source = ./dotconfig/httpie/config.json; - ".config/ghostty/config".source = ./dotconfig/ghostty/config; + ".config/httpie/config.json".source = ../dotconfig/httpie/config.json; + ".config/ghostty/config".source = ../dotconfig/ghostty/config; }; home.sessionVariables = { diff --git a/nix/fonts.nix b/home-manager/fonts.nix similarity index 100% rename from nix/fonts.nix rename to home-manager/fonts.nix diff --git a/nix/git.nix b/home-manager/git.nix similarity index 100% rename from nix/git.nix rename to home-manager/git.nix diff --git a/nix/nvim.nix b/home-manager/nvim.nix similarity index 100% rename from nix/nvim.nix rename to home-manager/nvim.nix diff --git a/nix/packages.nix b/home-manager/packages.nix similarity index 100% rename from nix/packages.nix rename to home-manager/packages.nix diff --git a/nix/packages/xpipe.nix b/home-manager/packages/xpipe.nix similarity index 100% rename from nix/packages/xpipe.nix rename to home-manager/packages/xpipe.nix diff --git a/nix/sh.nix b/home-manager/sh.nix similarity index 100% rename from nix/sh.nix rename to home-manager/sh.nix diff --git a/nix/shell.nix b/home-manager/shell.nix similarity index 100% rename from nix/shell.nix rename to home-manager/shell.nix diff --git a/nix/vscode.nix b/home-manager/vscode.nix similarity index 100% rename from nix/vscode.nix rename to home-manager/vscode.nix diff --git a/nix/watzon.asc b/home-manager/watzon.asc similarity index 100% rename from nix/watzon.asc rename to home-manager/watzon.asc