diff --git a/configuration.nix b/configuration.nix index deebfa5..30c0868 100644 --- a/configuration.nix +++ b/configuration.nix @@ -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.nix b/flake.nix index 8343e9f..f2623ab 100644 --- a/flake.nix +++ b/flake.nix @@ -4,24 +4,22 @@ inputs = { nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05; home-manager.url = "github:nix-community/home-manager/release-23.05"; - home-manager.inputs.nixpkgs.follows = "nixpkgs"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs@{ nixpkgs, home-manager, ... }: { nixosConfigurations.nixos76 = nixpkgs.lib.nixosSystem { 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 - # } - - ] - ; + ./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 + } + ]; }; }; } diff --git a/home.nix b/home.nix index 90ad457..1e3438d 100644 --- a/home.nix +++ b/home.nix @@ -1,29 +1,26 @@ -# { 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.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"; -# 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"; - -# # 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; +} diff --git a/quick-switch.sh b/quick-switch.sh index 9890124..514a193 100755 --- a/quick-switch.sh +++ b/quick-switch.sh @@ -5,7 +5,7 @@ then git push --force-with-lease sudo nixos-rebuild switch \ --show-trace \ - --flake "git+https://git.atauno.com/atau/nixos-config.git#nixos76" > output.txt 2> err.txt + --flake "git+https://git.atauno.com/atau/nixos-config.git" else echo "Git working directory is unclean, please commit changes" exit 1