diff --git a/nixos/flake.lock b/nixos/flake.lock index 2cb288db..f061b174 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -183,11 +183,11 @@ ] }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -205,11 +205,11 @@ ] }, "locked": { - "lastModified": 1696343447, - "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -697,11 +697,11 @@ ] }, "locked": { - "lastModified": 1699381651, - "narHash": "sha256-mZlQ54xJs3j5+SJrLhzePPMXzS+Czbx7gNyOnOAQrHA=", + "lastModified": 1733333617, + "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "0bd99f5ab7ec7a74c11238bd02bb29e709c14328", + "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea", "type": "github" }, "original": { @@ -839,11 +839,11 @@ ] }, "locked": { - "lastModified": 1734893686, - "narHash": "sha256-JUEZn9MmpLGsW4J3luSX+R4BhcThccYpYg5AuKW7zG0=", + "lastModified": 1735381016, + "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", "owner": "nix-community", "repo": "home-manager", - "rev": "edb8b00e4d17b2116b60eca50f38ac68f12b9ab4", + "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", "type": "github" }, "original": { @@ -901,23 +901,6 @@ "type": "path" } }, - "invokeai-src": { - "flake": false, - "locked": { - "lastModified": 1697424725, - "narHash": "sha256-y3nxZ4PQ/d2wMX1crpJPDMYXf48YBG0sRIBOTgN6XlI=", - "owner": "invoke-ai", - "repo": "InvokeAI", - "rev": "ad786130ffb11f91cbfcc40846114dd1fdcecdf6", - "type": "github" - }, - "original": { - "owner": "invoke-ai", - "ref": "v3.3.0post3", - "repo": "InvokeAI", - "type": "github" - } - }, "libgit2": { "flake": false, "locked": { @@ -1018,11 +1001,11 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1734708505, - "narHash": "sha256-NyQErDMVmRB0xPLLylZcw1mIBH3d8bSue8Fp+vRBLso=", + "lastModified": 1735389339, + "narHash": "sha256-JfQXQL0MysQSfvbw7xHto9YbqZ1VQLFgus+c4KYt6xg=", "owner": "NixOS", "repo": "nix", - "rev": "f72752c0dc6547b1568a9ef46deba875e38fada2", + "rev": "8a3fc27f1b63a08ac983ee46435a56cf49ebaf4a", "type": "github" }, "original": { @@ -1034,16 +1017,14 @@ "inputs": { "flake-parts": "flake-parts_2", "hercules-ci-effects": "hercules-ci-effects", - "invokeai-src": "invokeai-src", - "nixpkgs": "nixpkgs_3", - "textgen-src": "textgen-src" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1701304375, - "narHash": "sha256-WI/SimUvHPIWFhQTY04+1yCVjZzVjVb28pSE4S2yhFA=", + "lastModified": 1735213977, + "narHash": "sha256-vzt485aPhuhCz0b4zmC6E1SJKk784W544b7mNqqcgzw=", "owner": "nixified-ai", "repo": "flake", - "rev": "63339e4c8727578a0fe0f2c63865f60b6e800079", + "rev": "ec664f7b4aadac5d6f33e76b60e64e100cf9400a", "type": "github" }, "original": { @@ -1202,11 +1183,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1700204040, - "narHash": "sha256-xSVcS5HBYnD3LTer7Y2K8ZQCDCXMa3QUD1MzRjHzuhI=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c757e9bd77b16ca2e03c89bf8bc9ecb28e0c06ad", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -1234,11 +1215,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { @@ -1706,30 +1687,13 @@ "type": "github" } }, - "textgen-src": { - "flake": false, - "locked": { - "lastModified": 1696789008, - "narHash": "sha256-+V8XOVnEyImj+a8uCkZXEHXW8bTIBRlnfMcQfcZNgqg=", - "owner": "oobabooga", - "repo": "text-generation-webui", - "rev": "2e471071af48e19867cfa522d2def44c24785c50", - "type": "github" - }, - "original": { - "owner": "oobabooga", - "ref": "v1.7", - "repo": "text-generation-webui", - "type": "github" - } - }, "unstable": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { diff --git a/nixos/games.nix b/nixos/games.nix index 15f93b90..1b8f1862 100644 --- a/nixos/games.nix +++ b/nixos/games.nix @@ -4,8 +4,5 @@ makeEnable config "myModules.games" false { steam # heroic ]; - boot.extraModulePackages = with pkgs; [ - xboxdrv - ]; hardware.xone.enable = true; } diff --git a/nixos/machines/ryzen-shine-unencrypted.nix b/nixos/machines/ryzen-shine-unencrypted.nix new file mode 100644 index 00000000..5922c36c --- /dev/null +++ b/nixos/machines/ryzen-shine-unencrypted.nix @@ -0,0 +1,89 @@ +{ lib, pkgs, forEachUser, ... }: + +{ + imports = [ + ../configuration.nix + ]; + + features.full.enable = true; + myModules.kubelet.enable = false; + myModules.nvidia.enable = true; + # Needed for now because monitors have different refresh rates + myModules.xmonad.picom.vSync.enable = false; + myModules.cache-server = { + enable = true; + port = 3090; + }; + myModules.gitea-runner.enable = true; + myModules.postgres.enable = true; + myModules.railbird-k3s = { + enable = true; + # extraFlags = ["--node-taint preferNoSchedule=true:NoSchedule"]; + }; + boot.kernelPackages = pkgs.linuxPackages_latest; + + boot.loader.systemd-boot.configurationLimit = 5; + + networking.hostName = "ryzen-shine"; + + environment.systemPackages = with pkgs; [ + linuxPackages_latest.perf + ]; + + boot.initrd.systemd.enable = true; + boot.plymouth = { + enable = false; + }; + + services.autorandr = { + enable = true; + }; + + hardware.enableRedistributableFirmware = true; + + networking.interfaces.enp5s0.useDHCP = true; + networking.interfaces.wlp4s0.useDHCP = true; + + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; + + hardware.nvidia.modesetting.enable = true; + + hardware.graphics.enable32Bit = true; + + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = { + device = "/dev/disk/by-uuid/9bd06145-8151-4f7b-bcfe-f1809e0db1ea"; + fsType = "ext4"; + }; + + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/E1E1-909E"; + fsType = "vfat"; + }; + + fileSystems."/shared" = { + device = "/dev/disk/by-uuid/D4009CE8009CD33A"; + fsType = "ntfs"; + options = [ "nofail" "uid=0" "gid=users" "umask=002" ]; + }; + + # nix.settings.maxJobs = lib.mkDefault 16; + # High-DPI console + console.font = lib.mkDefault "${pkgs.terminus_font}/share/consolefonts/ter-u28n.psf.gz"; + + # services.xrdp.enable = true; + # services.xrdp.defaultWindowManager = "startplasma-x11"; + # services.xrdp.openFirewall = true; + + system.stateVersion = "20.03"; + home-manager.users = forEachUser { + home.stateVersion = "21.05"; + }; + + # users.extraUsers.dean.home = "/shared/dean"; +} diff --git a/nixos/nixified.ai.nix b/nixos/nixified.ai.nix index 1513b54b..f600bf0e 100644 --- a/nixos/nixified.ai.nix +++ b/nixos/nixified.ai.nix @@ -1,16 +1,16 @@ { inputs, config, specialArgs, ... }: specialArgs.makeEnable config "myModules.nixified-ai" false { imports = [ - inputs.nixified-ai.nixosModules.invokeai + # inputs.nixified-ai.nixosModules.invokeai ]; environment.systemPackages = [ - inputs.nixified-ai.packages.${config.nixpkgs.system}.invokeai-nvidia + # inputs.nixified-ai.packages.${config.nixpkgs.system}.invokeai-nvidia ]; - services.invokeai = { - enable = false; - host = "0.0.0.0"; - package = inputs.nixified-ai.packages.${config.nixpkgs.system}.invokeai-nvidia; - }; + # services.invokeai = { + # enable = false; + # host = "0.0.0.0"; + # package = inputs.nixified-ai.packages.${config.nixpkgs.system}.invokeai-nvidia; + # }; } diff --git a/nixos/ssh.nix b/nixos/ssh.nix index 35e49641..a713b7b5 100644 --- a/nixos/ssh.nix +++ b/nixos/ssh.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { - security.pam.sshAgentAuth.enable = true; + # security.pam.sshAgentAuth.enable = true; services.avahi = { enable = true; nssmdns4 = true;