diff --git a/flake.nix b/flake.nix index 9a7841c08ed9dc35942d1469c3116e8690da3661..d60ee0316ea8374c7a5d7a96e19273c0eb6d8152 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,9 @@ nixpkgs.overlays = [overlays]; home-manager = { useGlobalPkgs = true; useUserPackages = true; + sharedModules = [ + # inputs.jolheiser-nur.homeManagerModules.default + ]; users.${username}.imports = [./apps]; extraSpecialArgs = { flakePath = "/home/${username}/.config/nixpkgs"; @@ -54,9 +57,6 @@ home-manager.nixosModules.home-manager ./machines/common ./machines/chai (commonConfig {username = "jolheiser";}) - ({pkgs, ...}: { - home-manager.users.jolheiser.programs.git.package = pkgs.gitSVN; - }) ]; }; "matcha" = nixpkgs.lib.nixosSystem { diff --git a/machines/chai/default.nix b/machines/chai/default.nix index a285cfd3153330b2f3f2b7617c5572077184f0e2..c61f315a2bbe6dc5556d56248659ac565ce06ef4 100644 --- a/machines/chai/default.nix +++ b/machines/chai/default.nix @@ -52,6 +52,8 @@ jetbrains.pycharm-professional jetbrains.idea-ultimate jetbrains.datagrip imports = [./hardware.nix ../common]; + kernelParams = ["quiet" "splash"]; + imports = [./hardware.nix ../common]; username = "jolheiser"; xorg.xauth