From 1652347991a39cacdb4f7a4f859b2f79d3aa9629 Mon Sep 17 00:00:00 2001 From: Tristan Druyen Date: Mon, 4 Nov 2024 01:12:21 +0100 Subject: [PATCH] Add nixos-pulse customs --- systems/nixos-pulse/default.nix | 63 +++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/systems/nixos-pulse/default.nix b/systems/nixos-pulse/default.nix index e5997e4..c8c04ac 100644 --- a/systems/nixos-pulse/default.nix +++ b/systems/nixos-pulse/default.nix @@ -16,9 +16,9 @@ ../../os-mods/amdgpu ../../os-mods/cachix ../../os-mods/common - ../../os-mods/desktop - ../../os-mods/desktop/audio.nix - ../../os-mods/desktop/printing.nix + # ../../os-mods/desktop + # ../../os-mods/desktop/audio.nix + # ../../os-mods/desktop/printing.nix ../../os-mods/network ../../os-mods/ryzenapu ../../os-mods/virt @@ -37,15 +37,31 @@ }; programs.corectrl.gpuOverclock.enable = lib.mkForce false; + networking = { + useDHCP = lib.mkForce false; + useNetworkd = true; + wireless = { + enable = true; + networks."DruyenWLAN" = { + psk = "DidWvTDruyenH4"; + }; + }; + networkmanager.unmanaged = [ "wlp3s0" ]; + }; + systemd.network = { + enable = true; + networks."10-homewifi" = { + name = "wlp3s0"; + matchConfig = { + SSID = "DruyenWLAN"; + }; + DHCP = "yes"; # both ipv4 & 6 + }; + }; home-manager = { useUserPackages = true; useGlobalPkgs = true; - users.tester = import ../../users/admin-shell.nix { - username = "tester"; - - inherit pkgs config inputs system lib; - }; users.tristand = import ../../users/admin-shell.nix { username = "tristand"; @@ -55,14 +71,6 @@ users.groups.nixremote = { }; users.users = { - tester = { - isNormalUser = true; - description = "Testa Test"; - extraGroups = [ "audio" "corectrl" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ]; - shell = pkgs.fish; - home = "/home/tester"; - hashedPassword = "$6$YJT50/Za3FSFQuNT$0orD1URwoURoRKO9sIAsUiIHxOtEOjmPXn5Mp7vAmIYlgVmI629qS7YPUInmztEtEorRpkSMbV3.fCy9NQhKX."; - }; tristand = { isNormalUser = true; description = "Tristan Druyen"; @@ -200,11 +208,11 @@ ]; }; - "/mnt/media_v2" = { - device = "root@23.88.68.113:/media_v2"; - fsType = "sshfs"; - options = sshfs_opts; - }; + # "/mnt/media_v2" = { + # device = "root@23.88.68.113:/media_v2"; + # fsType = "sshfs"; + # options = sshfs_opts; + # }; }; system.fsPackages = [ pkgs.sshfs ]; @@ -216,17 +224,20 @@ hardware = { enableRedistributableFirmware = true; i2c.enable = true; - tuxedo-keyboard.enable = true; + # tuxedo-keyboard.enable = true; // not needed for server use cpu.amd.updateMicrocode = true; sensor.iio.enable = true; - tuxedo-rs = { - enable = true; - tailor-gui.enable = false; # used headless atm - }; + # tuxedo-rs = { // not needed for server use + # enable = true; + # tailor-gui.enable = false; # used headless atm + # } ; }; zramSwap.enable = true; + environment.systemPackages = with pkgs; [ + firefox + ]; system.stateVersion = "23.05"; }