diff --git a/flake.nix b/flake.nix index 77ec059..1505170 100644 --- a/flake.nix +++ b/flake.nix @@ -33,6 +33,9 @@ # default config default = nixpkgs.lib.nixosSystem { inherit system; + specialArgs = { + inherit inputs; + }; modules = [ # import host specific configs ./hosts/default/configuration.nix @@ -58,14 +61,5 @@ }; }; - - ## home-manager config - #homeConfigurations = { - # aaron = home-manager.lib.homeManagerConfiguration { - # inherit pkgs; - # modules = [ ./hosts/default/home.nix ]; - # }; - #}; - }; } diff --git a/hosts/neon/configuration.nix b/hosts/neon/configuration.nix index 3de36bf..a24756d 100644 --- a/hosts/neon/configuration.nix +++ b/hosts/neon/configuration.nix @@ -1,11 +1,12 @@ # 0x29a nixos conifg -{ pkgs, lib, ... }: +{ pkgs, lib, inputs, ... }: { imports = [ ./hardware-configuration.nix + inputs.home-manager.nixosModules.home-manager ]; # use flakes @@ -126,6 +127,14 @@ networking.firewall.allowedTCPPorts = [ 22 ]; networking.firewall.allowedUDPPorts = [ ]; + # enable home-manager globally + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.backupFileExtension = "backup"; + + # Add the user's home-manager configuration + home-manager.users.aaron = import ./home.nix; + # install state version system.stateVersion = "25.11"; # Don't change } diff --git a/hosts/neon/home.nix b/hosts/neon/home.nix index c93b67a..39b03a6 100644 --- a/hosts/neon/home.nix +++ b/hosts/neon/home.nix @@ -45,25 +45,18 @@ userEmail = "aaron@0x29a.ch"; }; + #programs.starship.enable = true; + #programs.starship.enableZshIntegration = true; programs.zsh = { enable = true; autosuggestion.enable = true; syntaxHighlighting.enable = true; oh-my-zsh = { enable = true; - plugins = [ "git" "sudo" "python" "ansible" ]; - theme = "agnoster"; + theme = "gentoo"; }; }; - - ## deploy qtile config - #home.file."qtile-config" = { - # target = ".config/qtile/config.py"; - # source = "${inputs.qtile-config}/qtile_config/config.py"; - # force = true; - #}; - home.sessionVariables = { EDITOR = "vim"; }; @@ -72,5 +65,5 @@ programs.home-manager.enable = true; # don't change - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; }