diff --git a/flake.nix b/flake.nix index bb0a672..f391545 100644 --- a/flake.nix +++ b/flake.nix @@ -24,14 +24,14 @@ }; in { - homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { - extraSpecialArgs = specialArgs; - pkgs = nixpkgs.legacyPackages.${system}; - modules = [ - ./home-manager/${user}/home.nix - ./home-manager/${user}/yukigekko-home.nix - ]; - }; + homeConfigurations.${user} = home-manager.lib.homeManagerConfiguration { + extraSpecialArgs = specialArgs; + pkgs = nixpkgs.legacyPackages.${system}; + modules = [ + # ./home-manager/${user}/home.nix + ./home-manager/${user}/yukigekko-home.nix + ]; + }; nixosConfigurations."yukigekko" = nixpkgs.lib.nixosSystem{ specialArgs = specialArgs; @@ -39,14 +39,14 @@ ./system/nixos/configuration.nix # home-manager.nixosModules.home-manager{ # home-manager = { - # #pkgs = nixpkgs.legacyPackages.${system}; # useGlobalPkgs = true; # useUserPackages = true; # extraSpecialArgs = specialArgs; # users.${user} = { + # # pkgs = nixpkgs.legacyPackages.${system}; # imports = [ - # ./home-manager/${user}/home.nix - # ./home-manager/${user}/yukigekko-home.nix + # #./home-manager/${user}/home.nix + # ./home-manager/autumn/yukigekko-home.nix # ]; # }; # }; diff --git a/home-manager/autumn/yukigekko-home.nix b/home-manager/autumn/yukigekko-home.nix index 89f8b3e..b4292e2 100644 --- a/home-manager/autumn/yukigekko-home.nix +++ b/home-manager/autumn/yukigekko-home.nix @@ -3,66 +3,65 @@ { # Home Manager needs a bit of information about you and the paths it should # manage. - # home.username = "autumn"; - # home.homeDirectory = "/home/autumn"; - # home.stateVersion = "25.05"; # Please read the comment before changing. + home.username = "autumn"; + home.homeDirectory = "/home/autumn"; + home.stateVersion = "25.05"; # Please read the comment before changing. - # programs.home-manager.enable = true; + programs.home-manager.enable = true; - # nixpkgs.config = { - # alowUnfree = true; - # allowUnfreePredicate = (_: true); - # }; + nixpkgs.config = { + alowUnfree = true; + allowUnfreePredicate = (_: true); + }; - # home.packages = with pkgs; [ - # neofetch - # vscodium-fhs - # nerd-fonts.hack - # vesktop - # obsidian - # ccls - # docker-language-server - # nil - # ty - # rustc - # rustup - # htop - # gnumake - # python314Full - # eza - # gleam - # ruff - # ruby - # vscode-extensions.castwide.solargraph - # nim-2_0 - # nimlangserver - # ]; - - # programs.htop.enable = true; - # programs.starship.enable = true; - # programs.bash.initExtra = " - # fish - # "; + home.packages = with pkgs; [ + neofetch + vscodium-fhs + nerd-fonts.hack + vesktop + obsidian + ccls + docker-language-server + nil + ty + rustc + rustup + htop + gnumake + python314Full + eza + gleam + ruff + ruby + vscode-extensions.castwide.solargraph + nim-2_0 + nimlangserver + ]; + programs.htop.enable = true; + programs.starship.enable = true; + programs.bash.initExtra = " + fish + "; wayland.windowManager.river.enable = true; - # home.sessionVariables = { - # EDITOR = "helix"; - # TERM = "alacritty"; - # }; + home.sessionVariables = { + EDITOR = "helix"; + TERM = "alacritty"; + }; imports = [ - # ../packages/fish/fish.nix + ../packages/fish/fish.nix ../packages/river/river.nix - # ../packages/alacritty/alacritty.nix - # ../packages/helix/helix.nix - # ../packages/fuzzel/fuzzel.nix + ../packages/alacritty/alacritty.nix + ../packages/helix/helix.nix + ../packages/fuzzel/fuzzel.nix ../packages/waybar/waybar.nix - # ../packages/git/git.nix - # ../packages/starship/starship.nix + ../packages/git/git.nix + ../packages/starship/starship.nix ]; }