diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/common.nix | 2 | ||||
| -rw-r--r-- | common/desktop.nix | 34 | ||||
| -rw-r--r-- | common/monitoring.nix | 4 |
3 files changed, 18 insertions, 22 deletions
diff --git a/common/common.nix b/common/common.nix index 02fec64..e10fbf1 100644 --- a/common/common.nix +++ b/common/common.nix @@ -37,7 +37,7 @@ documentation = { dev.enable = true; - man.generateCaches = true; + man.cache.enable = true; nixos.includeAllModules = true; nixos.options.warningsAreErrors = false; }; diff --git a/common/desktop.nix b/common/desktop.nix index 4c07183..cfe636c 100644 --- a/common/desktop.nix +++ b/common/desktop.nix @@ -21,7 +21,7 @@ users.defaultUserShell = pkgs.fish; users.users.stuebinm = { isNormalUser = true; - extraGroups = [ "docker" "wheel" "networking" "video" "wireshark" ]; + extraGroups = [ "docker" "wheel" "networking" "video" "wireshark" "dialout" ]; home = "/home/stuebinm"; hashedPassword = "$6$IULsCnY7HjDHAJWs$05DYuwXsfWWKj6m3KTWCPp5k9HuQikIamNBzn2GihMG8oeEf5c8YkXlwuO6uTnX8ZFmyAQdhXfO5yYNEM/YTm0"; useDefaultShell = true; @@ -42,27 +42,26 @@ }; # graphics and stuff - programs.light.enable = true; programs.slock.enable = true; environment.systemPackages = with pkgs; [ - hikari fuzzel apply-config + fuzzel apply-config ]; - security.pam.services.hikari-unlocker.text = '' - auth include login - ''; + # security.pam.services.hikari-unlocker.text = '' + # auth include login + # ''; services.davfs2.enable = true; services.greetd = { enable = true; settings = { - default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet -tr --asterisks --cmd 'hikari -c ~/hikari.conf'"; - user = "stuebinm"; - }; - terminal.vt = 2; + # default_session = { + # command = "${pkgs.tuigreet}/bin/tuigreet -tr --asterisks --cmd 'hikari -c ~/hikari.conf'"; + # user = "stuebinm"; + # }; + # terminal.vt = 2; }; }; @@ -72,7 +71,7 @@ #boot.kernelParams = [ "console=tty1" ]; - hardware.opengl.enable = true; + hardware.graphics.enable = true; programs.xwayland.enable = false; programs.wireshark.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; @@ -83,14 +82,11 @@ fonts.enableDefaultPackages = true; fonts.packages = with pkgs; [ noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans noto-fonts-cjk-serif - noto-fonts-emoji - ]; - - # Enable sound. - sound.enable = true; - # hardware.pulseaudio.enable = true; + noto-fonts-color-emoji + ] ++ (with lib.attrsets; + builtins.filter isDerivation (attrValues pkgs.nerd-fonts)); xdg.portal.wlr.enable = true; diff --git a/common/monitoring.nix b/common/monitoring.nix index e5f111c..0ae744d 100644 --- a/common/monitoring.nix +++ b/common/monitoring.nix @@ -12,8 +12,8 @@ set daemon 120 with start delay 60 set mailserver - ping.stuebinm.eu - port 2525 + mail.stuebinm.eu + port 25 set httpd port 2812 address localhost allow localhost |