diff options
Diffstat (limited to 'hosts/caladan')
| -rw-r--r-- | hosts/caladan/default.nix | 77 | ||||
| -rw-r--r-- | hosts/caladan/hardware-configuration.nix | 44 | ||||
| -rw-r--r-- | hosts/caladan/services.nix | 6 |
3 files changed, 88 insertions, 39 deletions
diff --git a/hosts/caladan/default.nix b/hosts/caladan/default.nix index 5ec1e96..f3f1185 100644 --- a/hosts/caladan/default.nix +++ b/hosts/caladan/default.nix @@ -1,11 +1,15 @@ { config, inputs, outputs, pkgs, ... }: { boot = { initrd.kernelModules = [ "amdgpu" "zfs" ]; - kernelPackages = pkgs.master.linuxPackages_6_14; - kernelParams = [ - "amdgpu.ppfeaturemask=0xfffd3fff" - "split_lock_detect=off" - ]; + kernel.sysctl = { + "kernel.hostname" = "caladan.bitgnome.net"; + "kernel.split_lock_mitigate" = 0; # https://lwn.net/Articles/911219/ + }; + kernelPackages = pkgs.linuxPackages_6_18; + #kernelParams = [ + # "amdgpu.ppfeaturemask=0xfffd3fff" + # "split_lock_detect=off" + #]; loader = { efi = { canTouchEfiVariables = true; @@ -16,40 +20,47 @@ extraInstallCommands = '' ${pkgs.rsync}/bin/rsync -av --delete /efiboot/efi1/ /efiboot/efi2 ''; + memtest86.enable = true; }; timeout = 3; }; supportedFilesystems = [ "zfs" ]; - zfs.package = pkgs.master.zfs; + zfs.package = pkgs.zfs_unstable; }; environment.systemPackages = [ pkgs.angband - #pkgs.assaultcube + pkgs.assaultcube + pkgs.beyond-all-reason pkgs.bsdgames pkgs.bzflag pkgs.extremetuxracer pkgs.fastfetch #pkgs.frozen-bubble pkgs.hedgewars + #pkgs.igir pkgs.kobodeluxe + pkgs.linux-firmware + pkgs.linuxKernel.packages.linux_6_18.turbostat pkgs.mailutils - pkgs.moc + #pkgs.moc pkgs.nethack - #pkgs.openttd - pkgs.qbittorrent-nox + pkgs.openttd + pkgs.piper + #pkgs.qbittorrent-nox pkgs.rdiff-backup - #pkgs.scorched3d + pkgs.scorched3d pkgs.signal-desktop pkgs.superTux pkgs.superTuxKart pkgs.umoria pkgs.vial - pkgs.warzone2100 - #pkgs.wine9_22.wineWowPackages.stagingFull + pkgs.vice + #pkgs.warzone2100 + pkgs.wayback-x11 pkgs.wpa_supplicant pkgs.xonotic-sdl - #pkgs.xpilot-ng + pkgs.xpilot-ng ]; imports = [ @@ -66,9 +77,11 @@ ../common/optional/misc.nix ../common/optional/multimedia.nix ../common/optional/pipewire.nix + ../common/optional/printer.nix ../common/optional/sdr.nix ../common/optional/services/chrony.nix ../common/optional/services/openssh.nix + #../common/optional/services/wayland.nix ../common/optional/services/xorg.nix ../common/optional/sound.nix ../common/optional/wdt.nix @@ -82,7 +95,6 @@ address = "192.168.1.1"; interface = "wlp15s0"; }; - domain = "bitgnome.net"; hostId = "8981d1e5"; hostName = "caladan"; interfaces = { @@ -94,6 +106,9 @@ }; nameservers = [ "192.168.1.1" ]; nftables.enable = true; + search = [ + "bitgnome.net" + ]; useDHCP = false; wireless = { enable = true; @@ -121,6 +136,35 @@ ]; }; + programs = { + nix-ld = { + enable = true; + libraries = [ + pkgs.alsa-lib + pkgs.at-spi2-core + pkgs.cairo + pkgs.cups + pkgs.dbus + pkgs.fontconfig + pkgs.freetype + pkgs.glib + pkgs.libgbm + pkgs.libx11 + pkgs.libxcb + pkgs.libxext + pkgs.libxfixes + pkgs.libxkbcommon + pkgs.libxrandr + pkgs.nspr + pkgs.nss + pkgs.pango + pkgs.vulkan-loader + pkgs.xorg.libXcomposite + pkgs.xorg.libXdamage + ]; + }; + }; + services.openssh.settings.X11Forwarding = true; services.xserver.videoDrivers = [ "amdgpu" ]; @@ -168,4 +212,7 @@ }; + users.users.root.openssh.authorizedKeys.keys = [ + (builtins.readFile ../common/users/nipsy/keys/id_att.pub) + ]; } diff --git a/hosts/caladan/hardware-configuration.nix b/hosts/caladan/hardware-configuration.nix index de0e516..4e19405 100644 --- a/hosts/caladan/hardware-configuration.nix +++ b/hosts/caladan/hardware-configuration.nix @@ -21,37 +21,33 @@ MOZ_DISABLE_RDD_SANDBOX = "1"; }; + fileSystems."/mnt/downloads" = { + device = "192.168.1.2:/srv/caladan/downloads"; + fsType = "nfs"; + options = [ + "nfsvers=4.2" + ]; + }; + + fileSystems."/mnt/www" = { + device = "192.168.1.2:/srv/caladan/www"; + fsType = "nfs"; + options = [ + "nfsvers=4.2" + ]; + }; + hardware = { + amdgpu.overdrive.enable = true; + bluetooth.enable = true; graphics = { enable = true; #extraPackages = [ pkgs.nvidia-vaapi-driver ]; #extraPackages32 = [ pkgs.pkgsi686Linux.nvidia-vaapi-driver ]; - }; - - #nvidia = let - # betaPkg = config.boot.kernelPackages.nvidiaPackages.beta; - # pkgAfterFbc = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.fbc then pkgs.nvidia-patch.patch-fbc betaPkg else betaPkg; - # finalPkg = if builtins.hasAttr betaPkg.version pkgs.nvidia-patch-list.nvenc then pkgs.nvidia-patch.patch-nvenc pkgAfterFbc else pkgAfterFbc; - #in { - # modesetting.enable = true; - # open = true; - # package = if finalPkg == betaPkg then betaPkg else finalPkg; - #}; - - printers = let - brother = "Brother_HL-L2340D"; - ip = "192.168.1.20"; - in { - ensureDefaultPrinter = brother; - ensurePrinters = [{ - name = brother; - deviceUri = "ipp://${ip}/ipp"; - model = "everywhere"; - description = lib.replaceStrings [ "_" ] [ " " ] brother; - location = "home"; - }]; + #package = pkgs.master.mesa; + #package32 = pkgs.master.pkgsi686Linux.mesa; }; }; } diff --git a/hosts/caladan/services.nix b/hosts/caladan/services.nix index 4644188..79c5b97 100644 --- a/hosts/caladan/services.nix +++ b/hosts/caladan/services.nix @@ -10,8 +10,14 @@ iperf3.openFirewall = true; + lact.enable = true; + + nfs.server.enable = true; + printing.enable = true; + ratbagd.enable = true; + #smartd = let my_email_addr = "nipsy@bitgnome.net"; in { # enable = true; # devices = [ |