diff --git a/flake.lock b/flake.lock index bfa7cb4..674b76d 100644 --- a/flake.lock +++ b/flake.lock @@ -17,11 +17,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1689503327, - "narHash": "sha256-qVwzYLA8oT2oWNDXO0A3bZHOhoPOihIB9T677+Hor1E=", + "lastModified": 1689605451, + "narHash": "sha256-u2qp2k9V1smCfk6rdUcgMKvBj3G9jVvaPHyeXinjN9E=", "owner": "Nixos", "repo": "nixpkgs", - "rev": "f64b9738da8e86195766147e9752c67fccee006c", + "rev": "53657afe29748b3e462f1f892287b7e254c26d77", "type": "github" }, "original": { diff --git a/systems/BASED.nix b/systems/BASED.nix index aef8fd5..edd3ae2 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ lib, pkgs, modulesPath, ... }: { environment.systemPackages = with pkgs; [ appimage-run bat @@ -23,10 +23,10 @@ zstd ]; - services.tailscale.enable = true; - services.openssh.enable = true; - services.flatpak.enable = true; - services.printing.enable = true; + services.tailscale.enable = lib.mkDefault true; + services.openssh.enable = lib.mkDefault true; + services.flatpak.enable = lib.mkDefault true; + services.printing.enable = lib.mkDefault true; environment.variables = { EDITOR = "hx"; @@ -34,7 +34,7 @@ }; hardware.enableAllFirmware = true; - hardware.bluetooth.enable = true; + hardware.bluetooth.enable = lib.mkDefault true; boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -43,10 +43,10 @@ networking.firewall.enable = false; services.xserver.enable = true; - services.xserver.displayManager.sddm.enable = true; - services.xserver.desktopManager.plasma5.enable = true; services.xserver.layout = "us"; systemd.services.display-manager.restartIfChanged = false; + services.xserver.displayManager.sddm.enable = lib.mkDefault true; + services.xserver.desktopManager.plasma5.enable = lib.mkDefault true; environment.plasma5.excludePackages = with pkgs.libsForQt5; [ elisa konsole @@ -65,8 +65,15 @@ }; nixpkgs.config = { allowUnfree = true; }; + systemd.extraConfig = '' + DefaultTimeoutStopSec=15s + ''; + time.timeZone = "US/Pacific"; i18n.defaultLocale = "en_US.UTF-8"; + imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; system.stateVersion = "23.05"; } diff --git a/systems/NOcamp.nix b/systems/NOcamp.nix new file mode 100644 index 0000000..4e662a3 --- /dev/null +++ b/systems/NOcamp.nix @@ -0,0 +1,7 @@ +{ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + qgroundcontrol + qgis-ltr + arduino + ]; +} diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 7282b30..c24272f 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -1,5 +1,6 @@ -{ lib, pkgs, modulesPath, ... }: { +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ + # mesa openrgb gwe liquidctl @@ -42,8 +43,8 @@ script = '' liquidctl -m nzxt set sync speed 100 ''; - wantedBy = [ "graphical-session.target" ]; - partOf = [ "graphical-session.target" ]; + wantedBy = [ "default.target" ]; + # partOf = [ "graphical-session.target" ]; }; services.udev.packages = [ pkgs.openrgb ]; @@ -52,13 +53,14 @@ SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic UART Port", SYMLINK+="ttyBmpTarg" ''; - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - nixpkgs.hostPlatform = "x86_64-linux"; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.kernelModules = [ "i2c-dev" "kvm-amd" ]; + hardware.opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; hardware.nvidia = { modesetting.enable = true; }; diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index c13f2f9..e589566 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -1,4 +1,4 @@ -{ lib, modulesPath, pkgs, ... }: { +{ pkgs, ... }: { environment.systemPackages = with pkgs; [ ]; @@ -23,10 +23,6 @@ services.fprintd.enable = true; services.fwupd.enable = true; - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - nixpkgs.hostPlatform = "x86_64-linux"; - boot.initrd.availableKernelModules = [ "nvme" "sd_mod" diff --git a/users/tao.nix b/users/tao.nix index 60fe3c4..722788b 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -12,6 +12,10 @@ in gcc gh gdb + # gnumake + # pkg-config + # libftdi + # libusb keepassxc libsForQt5.kdeconnect-kde lldb diff --git a/uwuraid.nix b/uwuraid.nix index e33738c..fe8dd6c 100644 --- a/uwuraid.nix +++ b/uwuraid.nix @@ -2,22 +2,22 @@ services.rpcbind.enable = true; systemd.mounts = let commonMountOptions = { type = "nfs"; mountConfig = { Options = "noatime"; }; }; in [ - (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"; }) - (commonMountOptions // { what = "192.168.86.56:/mnt/user/movies"; where = "/mnt/uwuraid/movies"; }) + (commonMountOptions // { what = "100.86.160.104:/mnt/user/anime"; where = "/mnt/uwuraid/anime"; }) + (commonMountOptions // { what = "100.86.160.104:/mnt/user/backup"; where = "/mnt/uwuraid/backup"; }) + (commonMountOptions // { what = "100.86.160.104:/mnt/user/everything"; where = "/mnt/uwuraid/everything"; }) + (commonMountOptions // { what = "100.86.160.104:/mnt/user/movies"; where = "/mnt/uwuraid/syncthing"; }) + (commonMountOptions // { what = "100.86.160.104:/mnt/user/photos"; where = "/mnt/uwuraid/television"; }) + (commonMountOptions // { what = "100.86.160.104:/mnt/user/syncthing"; where = "/mnt/uwuraid/photos"; }) + (commonMountOptions // { what = "100.86.160.104:/mnt/user/television"; where = "/mnt/uwuraid/movies"; }) ]; systemd.automounts = let commonAutoMountOptions = { wantedBy = [ "multi-user.target" ]; automountConfig = { TimeoutIdleSec = "60"; }; }; in [ (commonAutoMountOptions // { where = "/mnt/uwuraid/anime"; }) (commonAutoMountOptions // { where = "/mnt/uwuraid/backup"; }) (commonAutoMountOptions // { where = "/mnt/uwuraid/everything"; }) + (commonAutoMountOptions // { where = "/mnt/uwuraid/movies"; }) + (commonAutoMountOptions // { where = "/mnt/uwuraid/photos"; }) (commonAutoMountOptions // { where = "/mnt/uwuraid/syncthing"; }) (commonAutoMountOptions // { where = "/mnt/uwuraid/television"; }) - (commonAutoMountOptions // { where = "/mnt/uwuraid/photos"; }) - (commonAutoMountOptions // { where = "/mnt/uwuraid/movies"; }) ]; }