From 084fa4a64e162eafa81fbf6d1bf13700b1eea40a Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 16 Jun 2023 20:30:33 -0400 Subject: [PATCH] --show-trace --- configuration.nix | 4 ++-- flake.lock | 7 ++++--- flake.nix | 16 ++++++++-------- home.nix | 46 +++++++++++++++++++++++----------------------- quick-switch.sh | 4 +++- 5 files changed, 40 insertions(+), 37 deletions(-) diff --git a/configuration.nix b/configuration.nix index 9d85c02..deebfa5 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running `nixos-help`). -{ config, pkgs, home-manager, ... }: +{ config, pkgs, ... }: { 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" = { device = "/media/external/Documents"; diff --git a/flake.lock b/flake.lock index 8a4989f..d70cd6c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,15 +7,16 @@ ] }, "locked": { - "lastModified": 1686922395, - "narHash": "sha256-ysevinohPxdKp0RXyhDRsz1/vh1eXazg4AWp0n5X/U4=", + "lastModified": 1686693375, + "narHash": "sha256-1Smjo0E8WI9PeVGmmCjpQWRX04aQvz5gAGXfdanIjgw=", "owner": "nix-community", "repo": "home-manager", - "rev": "9ba7b3990eb1f4782ea3f5fe7ac4f3c88dd7a32c", + "rev": "61e5d1c38ef04ba30a9119825b159bce9c6010be", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-23.05", "repo": "home-manager", "type": "github" } diff --git a/flake.nix b/flake.nix index 56907a1..8343e9f 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { 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"; }; @@ -12,13 +12,13 @@ system = "x86_64-linux"; modules = [ ./configuration.nix - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - # Optionally, use home-manager.extraSpecialArgs to pass - # arguments to home.nix - } + # home-manager.nixosModules.home-manager + # { + # home-manager.useGlobalPkgs = true; + # home-manager.useUserPackages = true; + # # Optionally, use home-manager.extraSpecialArgs to pass + # # arguments to home.nix + # } ] ; diff --git a/home.nix b/home.nix index 7ae327c..90ad457 100644 --- a/home.nix +++ b/home.nix @@ -1,29 +1,29 @@ -{ config, pkgs, ... }: +# { config, pkgs, ... }: -{ - # Home Manager needs a bit of information about you and the - # paths it should manage. - home.username = "alex"; - home.homeDirectory = "/home/alex"; +# { +# # Home Manager needs a bit of information about you and the +# # paths it should manage. +# home.username = "alex"; +# home.homeDirectory = "/home/alex"; - # Packages that should be installed to the user profile. - home.packages = [ +# # Packages that should be installed to the user profile. +# home.packages = [ - pkgs.htop - pkgs.nixpkgs-fmt - ]; +# pkgs.htop +# pkgs.nixpkgs-fmt +# ]; - # This value determines the Home Manager release that your - # configuration is compatible with. This helps avoid breakage - # when a new Home Manager release introduces backwards - # incompatible changes. - # - # You can update Home Manager without changing this value. See - # the Home Manager release notes for a list of state version - # changes in each release. - home.stateVersion = "23.05"; +# # This value determines the Home Manager release that your +# # configuration is compatible with. This helps avoid breakage +# # when a new Home Manager release introduces backwards +# # incompatible changes. +# # +# # You can update Home Manager without changing this value. See +# # the Home Manager release notes for a list of state version +# # changes in each release. +# home.stateVersion = "23.05"; - # Let Home Manager install and manage itself. - programs.home-manager.enable = true; -} \ No newline at end of file +# # Let Home Manager install and manage itself. +# programs.home-manager.enable = true; +# } \ No newline at end of file diff --git a/quick-switch.sh b/quick-switch.sh index 22f54e1..9890124 100755 --- a/quick-switch.sh +++ b/quick-switch.sh @@ -3,7 +3,9 @@ if [ -z "$(git status --porcelain)" ] then 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 echo "Git working directory is unclean, please commit changes" exit 1