diff --git a/modules/user/default.nix b/modules/user/default.nix index 8d83591..3757dd4 100644 --- a/modules/user/default.nix +++ b/modules/user/default.nix @@ -1,4 +1,4 @@ -{ system, inputs, config, lib, pkgs, impurity, ... }: let +{ system, inputs, config, lib, impurity, ... }: let username = "admin"; homeDirectory = "/home/${username}"; in { @@ -21,42 +21,6 @@ in { initialPassword = "test"; }; - fonts = { - enableDefaultFonts = false; - - fonts = with inputs.stable.legacyPackages.${system}; [ - dejavu_fonts - nerdfonts - noto-fonts - noto-fonts-cjk - ]; - }; - - systemd = { - # kde polkit agent - user.services.polkit-agent = { - wants = [ "graphical-session.target" ]; - after = [ "graphical-session.target" ]; - - serviceConfig = { - Type = "simple"; - ExecStart = "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"; - Restart = "on-failure"; - RestartSec = 1; - TimeoutStopSec = 10; - }; - }; - }; - - programs.gnupg.agent = { - enable = true; - pinentryFlavor = "gnome3"; - }; - - environment.variables = { - XCURSOR_SIZE = "24"; - }; - home-manager = { extraSpecialArgs = { inherit system inputs impurity; diff --git a/modules/user/general.nix b/modules/user/general.nix index f9ebcfc..153038b 100644 --- a/modules/user/general.nix +++ b/modules/user/general.nix @@ -1,4 +1,54 @@ -{ pkgs, config, ... }: { +{ system, inputs, pkgs, config, ... }: { + system.extraDependencies = with pkgs; [ ungoogled-chromium ]; + + fonts = { + enableDefaultFonts = false; + + fonts = with inputs.stable.legacyPackages.${system}; [ + dejavu_fonts + nerdfonts + noto-fonts + noto-fonts-cjk + ]; + }; + + systemd = { + # kde polkit agent + user.services.polkit-agent = { + wants = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; + }; + + environment.variables = { + XCURSOR_SIZE = "24"; + }; + + programs = { + gnupg.agent = { + enable = true; + pinentryFlavor = "gnome3"; + }; + kdeconnect.enable = true; + }; + + services = { + syncthing = { + enable = true; + user = config.main-user; + dataDir = "/home/${config.main-user}/.syncthing"; + configDir = "/home/${config.main-user}/.config/syncthing"; + }; + }; + home-manager.users.${config.main-user} = homeInputs: let homeConfig = homeInputs.config; in {