--show-trace

This commit is contained in:
alex 2023-06-16 20:30:33 -04:00
parent d16f864fce
commit 084fa4a64e
5 changed files with 40 additions and 37 deletions

View File

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running `nixos-help`). # and in the NixOS manual (accessible by running `nixos-help`).
{ config, pkgs, home-manager, ... }: { config, pkgs, ... }:
{ {
imports = imports =
@ -123,7 +123,7 @@ externaldrive UUID=b9e3979c-9362-4242-a835-6dd702dfb0ee /etc/externalHD_keyfile.
]; ];
}; };
home-manager.users.alex = import ./home.nix; # home-manager.users.alex = import ./home.nix;
fileSystems."/home/alex/Documents" = { fileSystems."/home/alex/Documents" = {
device = "/media/external/Documents"; device = "/media/external/Documents";

View File

@ -7,15 +7,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1686922395, "lastModified": 1686693375,
"narHash": "sha256-ysevinohPxdKp0RXyhDRsz1/vh1eXazg4AWp0n5X/U4=", "narHash": "sha256-1Smjo0E8WI9PeVGmmCjpQWRX04aQvz5gAGXfdanIjgw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "9ba7b3990eb1f4782ea3f5fe7ac4f3c88dd7a32c", "rev": "61e5d1c38ef04ba30a9119825b159bce9c6010be",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }

View File

@ -3,7 +3,7 @@
inputs = { inputs = {
nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05; nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05;
home-manager.url = "github:nix-community/home-manager"; home-manager.url = "github:nix-community/home-manager/release-23.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -12,13 +12,13 @@
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
./configuration.nix ./configuration.nix
home-manager.nixosModules.home-manager # home-manager.nixosModules.home-manager
{ # {
home-manager.useGlobalPkgs = true; # home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; # home-manager.useUserPackages = true;
# Optionally, use home-manager.extraSpecialArgs to pass # # Optionally, use home-manager.extraSpecialArgs to pass
# arguments to home.nix # # arguments to home.nix
} # }
] ]
; ;

View File

@ -1,29 +1,29 @@
{ config, pkgs, ... }: # { config, pkgs, ... }:
{ # {
# Home Manager needs a bit of information about you and the # # Home Manager needs a bit of information about you and the
# paths it should manage. # # paths it should manage.
home.username = "alex"; # home.username = "alex";
home.homeDirectory = "/home/alex"; # home.homeDirectory = "/home/alex";
# Packages that should be installed to the user profile. # # Packages that should be installed to the user profile.
home.packages = [ # home.packages = [
pkgs.htop # pkgs.htop
pkgs.nixpkgs-fmt # pkgs.nixpkgs-fmt
]; # ];
# This value determines the Home Manager release that your # # This value determines the Home Manager release that your
# configuration is compatible with. This helps avoid breakage # # configuration is compatible with. This helps avoid breakage
# when a new Home Manager release introduces backwards # # when a new Home Manager release introduces backwards
# incompatible changes. # # incompatible changes.
# # #
# You can update Home Manager without changing this value. See # # You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version # # the Home Manager release notes for a list of state version
# changes in each release. # # changes in each release.
home.stateVersion = "23.05"; # home.stateVersion = "23.05";
# Let Home Manager install and manage itself. # # Let Home Manager install and manage itself.
programs.home-manager.enable = true; # programs.home-manager.enable = true;
} # }

View File

@ -3,7 +3,9 @@
if [ -z "$(git status --porcelain)" ] if [ -z "$(git status --porcelain)" ]
then then
git push --force-with-lease git push --force-with-lease
sudo nixos-rebuild switch --flake "git+https://git.atauno.com/atau/nixos-config.git#nixos76" sudo nixos-rebuild switch \
--show-trace \
--flake "git+https://git.atauno.com/atau/nixos-config.git#nixos76" > output.txt 2> err.txt
else else
echo "Git working directory is unclean, please commit changes" echo "Git working directory is unclean, please commit changes"
exit 1 exit 1