diff options
| -rw-r--r-- | config/desktop.nix | 12 | ||||
| -rw-r--r-- | config/laptop.nix | 20 | ||||
| -rw-r--r-- | machines/firelink.nix | 20 |
3 files changed, 51 insertions, 1 deletions
diff --git a/config/desktop.nix b/config/desktop.nix index 283b1dd..2e05ad4 100644 --- a/config/desktop.nix +++ b/config/desktop.nix @@ -29,6 +29,14 @@ fonts = { enableDefaultFonts = true; fonts = with pkgs; [ fira-code dejavu_fonts steamPackages.steam-fonts wqy_microhei ]; + fontconfig = { + defaultFonts = { + sansSerif = [ "Noto Sans" "WenQuanYi Micro Hei" ]; + serif = [ "Noto Serif" "WenQuanYi Micro Hei-14" ]; + emoji = [ "Noto Color Emoji" ]; + monospace = [ "DejaVu Sans Mono" "WenQuanYi Micro Hei Mono" ]; + }; + }; }; environment.systemPackages = with pkgs; [ @@ -41,13 +49,17 @@ rxvt_unicode-with-plugins sshfsFuse trayer + (conky.override { pulseSupport = true; }) xbindkeys xorg.xbacklight xorg.xev xscreensaver xsel # used by urxvt clipboard xss-lock + networkmanagerapplet imagemagick + pkgs.dzen2 + rofi ]; i18n.inputMethod = { diff --git a/config/laptop.nix b/config/laptop.nix new file mode 100644 index 0000000..230d513 --- /dev/null +++ b/config/laptop.nix @@ -0,0 +1,20 @@ +{ config, lib, pkgs, ... }: +{ + boot = { + loader = { + systemd-boot.enable = true; + # systemd-boot.memtest86.enable = true; + timeout = 0; + efi.canTouchEfiVariables = true; + }; + }; + + networking = { + networkmanager.enable = lib.mkDefault true; + firewall.enable = lib.mkDefault true; + }; + +}; + + +} diff --git a/machines/firelink.nix b/machines/firelink.nix index ac588e1..6b47c79 100644 --- a/machines/firelink.nix +++ b/machines/firelink.nix @@ -6,12 +6,22 @@ in { imports = [ ../config/gaming.nix - ../config/ap.nix + # ../config/ap.nix ../config/common.nix ../config/desktop.nix ../config/yubikey.nix ]; + networking.networkmanager.enable = true; + networking.networkmanager.wifi.powersave = false; + networking.vlans = { + "enp37s0.admin" = { + id = 255; + interface = "enp37s0"; + }; + }; + networking.interfaces."enp37s0.admin".useDHCP = true; + programs.bcc.enable = true; systemd.extraConfig = "DefaultLimitNOFILE=1048576"; @@ -77,6 +87,14 @@ in boot.loader.efi.canTouchEfiVariables = true; boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelModules = [ "kvm-amd" "i2c-dev" ]; + + # https://bugzilla.kernel.org/show_bug.cgi?id=203709 + boot.extraModprobeConfig = '' + options iwlwifi power_save=0 + options iwlwifi swcrypto=1 + options iwlwifi disable_11ax=1 + options iwlmvm power_scheme=1 + ''; # boot.kernelPackages = nixpkgs-unstable.linuxPackages_latest; systemd.services.monitor-switch-to-me = { |