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