diff --git a/flake.lock b/flake.lock index ef8a7f9..67c0ba9 100644 --- a/flake.lock +++ b/flake.lock @@ -94,16 +94,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1733050161, + "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "62d536255879be574ebfe9b87c4ac194febf47c5", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -351,16 +351,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index a88e557..851c6f8 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ systems.url = "github:nix-systems/default"; # Nixpkgs unstable.url = "github:NixOS/nixpkgs/master"; - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; # Cosmic nixos-cosmic = { url = "github:lilyinstarlight/nixos-cosmic"; @@ -21,7 +21,7 @@ nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=main"; # Home manager home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; unstable-home-manager = { @@ -54,7 +54,7 @@ fullName = "Ari Sosnovsky"; email = "ariel@sosnovsky.ca"; }; - homeManagerVersion = "24.05"; + homeManagerVersion = "24.11"; # Local Services localNixCaches = { urls = [ @@ -116,10 +116,6 @@ "hl-minipc1" "hl-minipc2" "hl-terra1" - ]; - }) // (unstableLib.makeHLServices { - user = user; - nodeNames = [ "hl-bigbox1" ]; }) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index 706b3ab..a35064b 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -93,9 +93,7 @@ in "io.github.zen_browser.zen" ]; # # Opengl - hardware.opengl = { - driSupport = true; - driSupport32Bit = true; + hardware.graphics = { extraPackages = [ pkgs.amdvlk ]; extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; }; @@ -117,8 +115,9 @@ in # Ollama services.ollama = { enable = true; + host = "0.0.0.0"; + port = 11434; acceleration = "rocm"; - listenAddress = "0.0.0.0:11434"; package = unstable.ollama; }; # # Brother Printer diff --git a/hosts/hl-bigbox1.hardware-configuration.nix b/hosts/hl-bigbox1.hardware-configuration.nix index 2da1a8b..42b8c6b 100644 --- a/hosts/hl-bigbox1.hardware-configuration.nix +++ b/hosts/hl-bigbox1.hardware-configuration.nix @@ -11,7 +11,7 @@ boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-amd" ]; + # boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = @@ -27,7 +27,11 @@ options = [ "fmask=0022" "dmask=0022" ]; }; - swapDevices = [ ]; + swapDevices = [{ + device = "/var/lib/swapfile"; + size = 32 * 1024; + }]; + zramSwap.enable = true; networking.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/hosts/hl-bigbox1.nix b/hosts/hl-bigbox1.nix index e6e1235..b5c776c 100644 --- a/hosts/hl-bigbox1.nix +++ b/hosts/hl-bigbox1.nix @@ -11,14 +11,13 @@ common.containers.openMetricsPort = true; server.services = { ai.enable = true; - jellyfin.enable = true; + jellyfin.enable = false; }; }; }; users.users.ari.extraGroups = [ "input" ]; # firmware updater services.fwupd.enable = true; - hardware.nvidia-container-toolkit.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -32,10 +31,11 @@ services.autosuspend.enable = false; services.xserver.displayManager.gdm.autoSuspend = false; # Nvidia Settings + hardware.nvidia-container-toolkit.enable = true; + virtualisation.docker.enableNvidia = true; services.xserver.videoDrivers = [ "nvidia" ]; hardware.graphics.enable32Bit = true; hardware.graphics.enable = true; - #hardware.opengl.enable = true; hardware.nvidia = { modesetting.enable = true; powerManagement.enable = false; diff --git a/modules/home/programs.nix b/modules/home/programs.nix index e557cc3..adf223f 100644 --- a/modules/home/programs.nix +++ b/modules/home/programs.nix @@ -40,8 +40,8 @@ alacritty = { enable = true; settings = { - import = [ - "${pkgs.alacritty-theme}/nord.toml" + general.import = [ + "${pkgs.alacritty-theme}/ayu_dark.toml" ]; window = { title = "Terminal"; @@ -52,12 +52,12 @@ bold = { family = "Fira Code"; style = "Bold"; }; italic = { family = "Fira Code"; style = "Italic"; }; }; - shell = { + terminal.shell = { program = "/home/${user.name}/.nix-profile/bin/zsh"; args = [ "-l" "-c" - "tmux attach || tmux" + "tmux" ]; }; }; diff --git a/modules/nixos/common/core.nix b/modules/nixos/common/core.nix index 6cfa3ee..402c00b 100644 --- a/modules/nixos/common/core.nix +++ b/modules/nixos/common/core.nix @@ -14,6 +14,9 @@ # system utils nfs-utils + lm_sensors + hwinfo + dig # misc glib-networking @@ -22,6 +25,7 @@ # printer system-config-printer + ]; services.xserver.excludePackages = with pkgs; [ xterm diff --git a/modules/nixos/common/hardware/sound.nix b/modules/nixos/common/hardware/sound.nix index 0223732..972f72b 100644 --- a/modules/nixos/common/hardware/sound.nix +++ b/modules/nixos/common/hardware/sound.nix @@ -12,7 +12,6 @@ in config = lib.mkIf cfg.enable { # Enable sound with pipewire. - sound.enable = true; hardware.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { diff --git a/modules/nixos/server/services/jellyfin.nix b/modules/nixos/server/services/jellyfin.nix index dcb0819..296a9ba 100644 --- a/modules/nixos/server/services/jellyfin.nix +++ b/modules/nixos/server/services/jellyfin.nix @@ -1,7 +1,5 @@ { config, lib, ... }: -with lib; - let cfg = config.skyg.nixos.server.services.jellyfin; user = "jellyfin"; @@ -10,12 +8,12 @@ in { options = { skyg.nixos.server.services.jellyfin = { - enable = mkEnableOption + enable = lib.mkEnableOption "Enable Jellyfish"; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { users.users.${user} = { uid = 7777; isSystemUser = true; @@ -33,9 +31,9 @@ in services.jellyfin = { inherit user group; enable = true; - dataDir = "/mnt/apps/jellyfin/data"; - cacheDir = "/mnt/apps/jellyfin/cache"; - configDir = "/mnt/apps/jellyfin/config"; + dataDir = "/mnt/apps/jellyfin/data"; + cacheDir = "/mnt/apps/jellyfin/cache"; + configDir = "/mnt/apps/jellyfin/config"; openFirewall = true; }; fileSystems."/mnt/apps/jellyfin" = {