From 1f9b248c04dcd2091b7237474620c56c0b7a0860 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Tue, 18 Jul 2023 11:12:40 -0700 Subject: [PATCH] updates --- flake.lock | 6 +++--- systems/NOcomputer.nix | 7 +++++-- systems/NOlaptop.nix | 11 +++++++---- users/tao.nix | 2 ++ uwuraid.nix | 2 ++ 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 2a84e63..bfa7cb4 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689209875, - "narHash": "sha256-8AVcBV1DiszaZzHFd5iLc8HSLfxRAuqcU0QdfBEF3Ag=", + "lastModified": 1689503327, + "narHash": "sha256-qVwzYLA8oT2oWNDXO0A3bZHOhoPOihIB9T677+Hor1E=", "owner": "Nixos", "repo": "nixpkgs", - "rev": "fcc147b1e9358a8386b2c4368bd928e1f63a7df2", + "rev": "f64b9738da8e86195766147e9752c67fccee006c", "type": "github" }, "original": { diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index bfe38b7..7282b30 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -54,12 +54,15 @@ imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + nixpkgs.hostPlatform = "x86_64-linux"; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.kernelModules = [ "i2c-dev" "kvm-amd" ]; - networking.useDHCP = lib.mkDefault true; + hardware.nvidia = { + modesetting.enable = true; + }; + networking.hostName = "NOcomputer"; } diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 413c587..c13f2f9 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -1,6 +1,5 @@ { lib, modulesPath, pkgs, ... }: { environment.systemPackages = with pkgs; [ - ]; fileSystems."/home" = { @@ -21,9 +20,12 @@ swapDevices = [{ device = "/dev/disk/by-uuid/ca55d0ea-c0db-44c5-af3a-e38eec803929"; }]; + services.fprintd.enable = true; + services.fwupd.enable = true; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + nixpkgs.hostPlatform = "x86_64-linux"; boot.initrd.availableKernelModules = [ "nvme" @@ -37,8 +39,9 @@ "nvme.noacpi=1" ]; boot.kernelModules = [ "kvm-intel" ]; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + powerManagement.cpuFreqGovernor = "powersave"; + + hardware.sensor.iio.enable = true; - networking.useDHCP = lib.mkDefault true; networking.hostName = "NOlaptop"; } diff --git a/users/tao.nix b/users/tao.nix index e66054f..60fe3c4 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -4,11 +4,13 @@ let in { users.users.tao.packages = with pkgs; [ + darktable deluge discord elf2uf2-rs # fractal gcc + gh gdb keepassxc libsForQt5.kdeconnect-kde diff --git a/uwuraid.nix b/uwuraid.nix index 1cd3f38..e33738c 100644 --- a/uwuraid.nix +++ b/uwuraid.nix @@ -4,6 +4,7 @@ [ (commonMountOptions // { what = "192.168.86.56:/mnt/user/anime"; where = "/mnt/uwuraid/anime"; }) (commonMountOptions // { what = "192.168.86.56:/mnt/user/backup"; where = "/mnt/uwuraid/backup"; }) + (commonMountOptions // { what = "192.168.86.56:/mnt/user/everything"; where = "/mnt/uwuraid/everything"; }) (commonMountOptions // { what = "192.168.86.56:/mnt/user/syncthing"; where = "/mnt/uwuraid/syncthing"; }) (commonMountOptions // { what = "192.168.86.56:/mnt/user/television"; where = "/mnt/uwuraid/television"; }) (commonMountOptions // { what = "192.168.86.56:/mnt/user/photos"; where = "/mnt/uwuraid/photos"; }) @@ -13,6 +14,7 @@ [ (commonAutoMountOptions // { where = "/mnt/uwuraid/anime"; }) (commonAutoMountOptions // { where = "/mnt/uwuraid/backup"; }) + (commonAutoMountOptions // { where = "/mnt/uwuraid/everything"; }) (commonAutoMountOptions // { where = "/mnt/uwuraid/syncthing"; }) (commonAutoMountOptions // { where = "/mnt/uwuraid/television"; }) (commonAutoMountOptions // { where = "/mnt/uwuraid/photos"; })