diff --git a/flake.nix b/flake.nix index 7df8ab1..affbdb8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,7 @@ { description = "Fully Declarative YOLO"; - inputs = - { + inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; home-manager= { url = "github:nix-community/home-manager/release-23.11"; diff --git a/homeConfig/modules/bash/config/alias.nix b/homeConfig/modules/bash/config/alias.nix index e277741..2991411 100644 --- a/homeConfig/modules/bash/config/alias.nix +++ b/homeConfig/modules/bash/config/alias.nix @@ -1,6 +1,5 @@ { - hmup = "home-manager switch --flake '$HOME/Documents/projects/nixos#bryan'"; - nixup = "sudo nixos-rebuild switch --flake $HOME/Documents/projects/nixos#desktop"; + nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#desktop"; chat = "weechat"; open = "xdg-open"; } diff --git a/homeConfig/modules/bash/default.nix b/homeConfig/modules/bash/default.nix index 6987260..940d68b 100644 --- a/homeConfig/modules/bash/default.nix +++ b/homeConfig/modules/bash/default.nix @@ -1,10 +1,10 @@ { lib, config, ... }: with lib; -let +let cfg = config.modules.bash; -in +in { options.modules.bash = { enable = mkEnableOption "bash"; }; config = mkIf cfg.enable { programs.bash = { diff --git a/homeConfig/modules/git/config/git.nix b/homeConfig/modules/git/config/git.nix index 2609a43..246a59c 100644 --- a/homeConfig/modules/git/config/git.nix +++ b/homeConfig/modules/git/config/git.nix @@ -18,6 +18,9 @@ merge = { tool = "lazygit"; }; + safe = { + directory = "/etc/nixos"; + }; }; ignores = [ diff --git a/user/default.nix b/user/default.nix index 3d50857..7396466 100644 --- a/user/default.nix +++ b/user/default.nix @@ -13,6 +13,8 @@ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDl4895aB9P5p/lp8Hq5rHun4clvhyTSHFi3U2d6OOBoW5Fm+VcQnW/xbjmCBsXk5BdiowsBxQhwnzdfz/KJL7J5RobomUEaVRwb9UwT88eJveLp14BG8j2J3SjfyhrCX+4jkPx0bPQk1HGcuYY+tPEXf1q/ps88Dhu0CARBIzYQOTYY6b1qWzxpDoFZGHjKG8g5iY6FIu65yKKvvVy1f8IgZ3l3IpwBWVamxgkTcYY0QYSrmzo1n7TXxwrWbvenAqBsQ0cBPs+gVa3uIr+1TJl0Az5SElBVGu3LvUdlk58trtPUj6TQR3YUkg7Vjll7WHOdqhux5ZQNhjkOsHerf0Tw86e6cEzgeTuIbQHIb0LcsUunwKcuh2+au7RO599cvHn0+xZE5MZBxloDDaJ3JsiliM8kyPP/U3ERj03cWLW7BqbT+sfjAOl21RCzk0iQxk1wt/8VmtCr9Adv7IyrtaYvf/bwRP+g+9ldmzKGt8Mdb605uVzZ70H/LLm17f40Te+QHaex5by/6p6cuwEEZtgIg53Wpglu0rA6UxrBfQEHKl/Jt3FLeE0mnEyYkkR2MnHNtyWRIXtuqYZMAm2Ub1pFHH7jQV1gGiDVTw6a2eIwK21a/hXtRjFUpFd1nB1n+KNfJBE4zT3wm3Ud7mKw/6rWnoRyhYZvGXkFdp+iEs49Q==" "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK2ROz7EVvE+nzF5k9EYZ2v3JhBzk058uh3QJTzcG4t70fkZgh9y56AOx26eXlKQWuuV05e8EkWRuVI8gfA2ROI=" ]; + + flakeDefaultPath = /etc/nixos; }; }; };