diff --git a/configurations/home/materus/default.nix b/configurations/home/materus/default.nix index c77cb83..922bac4 100644 --- a/configurations/home/materus/default.nix +++ b/configurations/home/materus/default.nix @@ -2,7 +2,7 @@ { home.username = "materus"; - home.packages = [pkgs.papirus-icon-theme]; + home.packages = []; programs.git.signing.key = lib.mkDefault "28D140BCA60B4FD1"; programs.git.userEmail = lib.mkDefault "materus@podkos.pl"; diff --git a/configurations/host/default.nix b/configurations/host/default.nix index 1ed8b8c..9fa26bb 100644 --- a/configurations/host/default.nix +++ b/configurations/host/default.nix @@ -36,6 +36,21 @@ in ./valkyrie inputs.private.systemModule profiles.osProfile + inputs.home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.materus = { config ,... }: { + imports = [ + ../home/materus + valkyrie/extraHome.nix + profiles.homeProfile + inputs.private.homeModule + ]; + materus.profile.nixpkgs.enable = false; + }; + home-manager.extraSpecialArgs = { inherit inputs; inherit materusFlake; }; + } ]; }; diff --git a/configurations/host/materusPC/extraHome.nix b/configurations/host/materusPC/extraHome.nix index 633ea43..7cb6f17 100644 --- a/configurations/host/materusPC/extraHome.nix +++ b/configurations/host/materusPC/extraHome.nix @@ -2,7 +2,7 @@ { home.stateVersion = "23.05"; home.homeDirectory = "/home/materus"; - + programs.git.signing.signByDefault = true; materus.profile = { @@ -15,11 +15,15 @@ }; - home.packages = [materusPkgs.ffmpeg6-amf-full (materusPkgs.polymc.wrap {extraJDKs = [pkgs.graalvm17-ce];})]; + home.packages = [ + pkgs.papirus-icon-theme + materusPkgs.ffmpeg6-amf-full + (materusPkgs.polymc.wrap { extraJDKs = [ pkgs.graalvm17-ce ]; }) + ]; programs.obs-studio = { enable = true; - plugins = with pkgs.obs-studio-plugins; [wlrobs obs-vaapi obs-vkcapture obs-gstreamer input-overlay obs-multi-rtmp obs-pipewire-audio-capture]; + plugins = with pkgs.obs-studio-plugins; [ wlrobs obs-vaapi obs-vkcapture obs-gstreamer input-overlay obs-multi-rtmp obs-pipewire-audio-capture ]; package = materusPkgs.obs-amf; }; } diff --git a/configurations/host/valkyrie/default.nix b/configurations/host/valkyrie/default.nix index 08e9e2a..adcd3fd 100644 --- a/configurations/host/valkyrie/default.nix +++ b/configurations/host/valkyrie/default.nix @@ -118,5 +118,20 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "23.05"; # Did you read the comment? + + + + + + + security.acme.acceptTerms = true; + security.acme.defaults.email = "materus+acme@podkos.pl"; + security.acme.certs."materus.pl" = { + domain = "materus.pl"; + extraDomainNames = ["*.materus.pl"]; + dnsProvider = "ovh"; + credentialsFile = "/materus/config/valkyrie/certs.secret"; + }; + } diff --git a/configurations/host/valkyrie/extraHome.nix b/configurations/host/valkyrie/extraHome.nix index 7908316..0693e0c 100644 --- a/configurations/host/valkyrie/extraHome.nix +++ b/configurations/host/valkyrie/extraHome.nix @@ -2,13 +2,15 @@ { home.stateVersion = "23.05"; home.homeDirectory = "/home/materus"; - materus.profile = { fonts.enable = false; - nixpkgs.enable = true; + nixpkgs.enable = false; enableDesktop = false; - enableTerminal = true; + enableTerminal = false; enableTerminalExtra = false; enableNixDevel = false; + + fish.enable = true; + bash.enable = true; }; } diff --git a/configurations/profile/home/default.nix b/configurations/profile/home/default.nix index fca0080..784f736 100644 --- a/configurations/profile/home/default.nix +++ b/configurations/profile/home/default.nix @@ -33,7 +33,7 @@ in delta.enable = lib.mkDefault cfg.enableTerminal; lfs.enable = lib.mkDefault cfg.enableTerminal; }; - programs.gitui.enable = cfg.enableTerminal; + programs.gitui.enable = cfg.enableTerminalExtra; programs.nix-index = { enable = lib.mkDefault cfg.enableTerminal; diff --git a/configurations/profile/home/editor/neovim.nix b/configurations/profile/home/editor/neovim.nix index b634962..e8fc006 100644 --- a/configurations/profile/home/editor/neovim.nix +++ b/configurations/profile/home/editor/neovim.nix @@ -3,7 +3,7 @@ let cfg = config.materus.profile.editor.neovim; in { - options.materus.profile.editor.neovim.enable = materusPkgs.lib.mkBoolOpt config.materus.profile.enableTerminal "Enable neovim with materus cfg"; + options.materus.profile.editor.neovim.enable = materusPkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable neovim with materus cfg"; config = lib.mkIf cfg.enable { programs.neovim = { enable = true;