From 21a64fd68d2bab89a14956b4538a3d82d263f71f Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Sun, 12 May 2024 12:30:57 -0400 Subject: [PATCH] fixed dir --- src/system/machines/desktop/home.nix | 2 +- src/system/machines/server/home.nix | 2 +- src/system/machines/wsl/home.nix | 2 +- src/user/configs/default.nix | 1 - src/user/modules/git/default.nix | 2 +- src/user/modules/utils/modules/dev/default.nix | 4 ---- 6 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/system/machines/desktop/home.nix b/src/system/machines/desktop/home.nix index 6522ab5..382268a 100644 --- a/src/system/machines/desktop/home.nix +++ b/src/system/machines/desktop/home.nix @@ -10,7 +10,7 @@ programs.home-manager.enable = true; programs.bash.shellAliases = { - nixup = "sudo nixos-rebuild switch --flake ${config.user.nixosDir}/.#desktop"; + nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#desktop"; }; home.stateVersion = "22.11"; diff --git a/src/system/machines/server/home.nix b/src/system/machines/server/home.nix index 9c3b5de..fb18dc2 100644 --- a/src/system/machines/server/home.nix +++ b/src/system/machines/server/home.nix @@ -10,7 +10,7 @@ programs.home-manager.enable = true; programs.bash.shellAliases = { - nixup = "sudo nixos-rebuild switch --flake ${config.user.nixosDir}/.#server"; + nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#server"; }; home.stateVersion = "23.11"; diff --git a/src/system/machines/wsl/home.nix b/src/system/machines/wsl/home.nix index ec7f4f2..7b207e4 100644 --- a/src/system/machines/wsl/home.nix +++ b/src/system/machines/wsl/home.nix @@ -10,7 +10,7 @@ programs.home-manager.enable = true; programs.bash.shellAliases = { - nixup = "sudo nixos-rebuild switch --flake ${config.user.nixosDir}/.#wsl"; + nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#wsl"; }; home.stateVersion = "23.11"; diff --git a/src/user/configs/default.nix b/src/user/configs/default.nix index f271cf3..3f4882c 100644 --- a/src/user/configs/default.nix +++ b/src/user/configs/default.nix @@ -8,7 +8,6 @@ userConfigs = rec { name = "bryan"; email = "bryan@ramos.codes"; shell = pkgs.bash; - nixosDir = /etc/nixos; # PATH to this repo # Image name from ~Pictures/wallpapers directory wallpaper = "mountains.jpg"; diff --git a/src/user/modules/git/default.nix b/src/user/modules/git/default.nix index b700ced..e9850a9 100644 --- a/src/user/modules/git/default.nix +++ b/src/user/modules/git/default.nix @@ -19,7 +19,7 @@ in }; merge = { tool = "vimdiff"; }; safe = { - directory = "${config.user.nixosDir}"; + directory = "/etc/nixos"; }; }; ignores = [ diff --git a/src/user/modules/utils/modules/dev/default.nix b/src/user/modules/utils/modules/dev/default.nix index 7db0e83..9a9ecbd 100644 --- a/src/user/modules/utils/modules/dev/default.nix +++ b/src/user/modules/utils/modules/dev/default.nix @@ -29,10 +29,6 @@ in }; }; - programs.git.ignores = [ - ".direnv" - ]; - home.sessionVariables = { DIRENV_LOG_FORMAT = " "; };