diff --git a/home/users/jan/default.nix b/home/users/jan/default.nix index 2869bc0..0f1167d 100644 --- a/home/users/jan/default.nix +++ b/home/users/jan/default.nix @@ -1,4 +1,11 @@ -{ config, pkgs, lib, inputs, extraHomeModule ? null, ... }: +{ config +, pkgs +, lib +, inputs +, extraHomeModule ? null +, extraJanHomeModule ? null +, ... +}: let @@ -34,6 +41,7 @@ in inputs.wired.homeManagerModules.default ./home.nix extraHomeModule + extraJanHomeModule ]; home.stateVersion = config.system.stateVersion; diff --git a/home/users/jan/home.nix b/home/users/jan/home.nix index a58f87d..ab54384 100644 --- a/home/users/jan/home.nix +++ b/home/users/jan/home.nix @@ -45,8 +45,6 @@ hunspellDicts.ru_RU hunspellDicts.en_US - kicad-small - procs bottom asciinema # record the terminal @@ -56,14 +54,12 @@ # browsers # a fork of firefox, focused on privacy, security and freedom (librewolf.override { - extraNativeMessagingHosts = [ passff-host ]; + nativeMessagingHosts = [ passff-host ]; }) # ungoogled-chromium tor-browser-bundle-bin woodpecker-cli - - unciv ]; home.file = { diff --git a/home/users/nas/default.nix b/home/users/nas/default.nix index 5dde51a..088f95b 100644 --- a/home/users/nas/default.nix +++ b/home/users/nas/default.nix @@ -1,4 +1,10 @@ -{ config, pkgs, lib, inputs, extraHomeModule ? null, ... }: +{ config +, pkgs +, lib +, inputs +, extraHomeModule ? null +, ... +}: { nixpkgs.overlays = lib.mkAfter [ diff --git a/nixos/hosts/default.nix b/nixos/hosts/default.nix index 7f9fc23..c705064 100644 --- a/nixos/hosts/default.nix +++ b/nixos/hosts/default.nix @@ -14,13 +14,26 @@ in ../modules/nix.nix ../modules/wireguard-client.nix ../../home/users/jan - ../../home/users/nas + # ../../home/users/nas ]; - extraHomeModule = { ... }: { + extraHomeModule = { lib, pkgs, ... }: { local.polybar.wifiDevice = "wlp3s0"; # local.alacritty.fontSize = 8.0; local.wezterm.fontSize = 10.0; + + }; + + specialArgs = { + extraJanHomeModule = { lib, pkgs, ... }: { + home.packages = lib.mkAfter (with pkgs.unstable; [ + # 3d programs + blender + cura + # electronics + kicad-small + ]); + }; }; }; @@ -32,7 +45,7 @@ in ../modules/nix.nix ../modules/wireguard-client.nix ../../home/users/jan - ../../home/users/nas + # ../../home/users/nas ]; extraHomeModule = { ... }: { diff --git a/nixos/hosts/home/default.nix b/nixos/hosts/home/default.nix index c41f74e..1cfcff5 100644 --- a/nixos/hosts/home/default.nix +++ b/nixos/hosts/home/default.nix @@ -114,4 +114,11 @@ }; services.transmission.enable = true; + + # 3D printing + services.octoprint = { + enable = true; + port = 33002; + plugins = ps: [ ps.stlviewer ]; + }; }