diff --git a/nixos/flake.nix b/nixos/flake.nix index cda9173..95ac77c 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -2,7 +2,7 @@ description = "System configuration of my machines using flakes"; inputs = { - nixpkgs.url = "nixpkgs/nixos-24.05"; + nixpkgs.url = "nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; devshell = { @@ -11,7 +11,7 @@ }; flake-utils.url = "github:numtide/flake-utils"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; openconnect-sso = { @@ -41,9 +41,9 @@ unfreePackages = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "corefonts" "nvidia-settings" "nvidia-x11" "nvidia-persistenced" - "Oracle_VM_VirtualBox_Extension_Pack" + "Oracle_VirtualBox_Extension_Pack" "spotify" - "steam" "steam-original" "steam-run" + "steam" "steam-unwrapped" "steam-run" "vista-fonts" "nvidia-persistenced" # Docker ]; diff --git a/nixos/modules/desktop/sway/default.nix b/nixos/modules/desktop/sway/default.nix index bab109b..055bfb0 100644 --- a/nixos/modules/desktop/sway/default.nix +++ b/nixos/modules/desktop/sway/default.nix @@ -101,11 +101,9 @@ in { dejavu_fonts font-awesome noto-fonts - noto-fonts-cjk + noto-fonts-cjk-sans + noto-fonts-cjk-serif noto-fonts-emoji - source-han-sans - source-han-sans-japanese - source-han-serif-japanese ]; security.polkit.enable = true; diff --git a/nixos/modules/hardware/nvidia/default.nix b/nixos/modules/hardware/nvidia/default.nix index f4a0248..2b811fc 100644 --- a/nixos/modules/hardware/nvidia/default.nix +++ b/nixos/modules/hardware/nvidia/default.nix @@ -37,9 +37,8 @@ in { # }; hardware = { - opengl = { + graphics = { enable = true; - driSupport = true; driSupport32Bit = true; }; diff --git a/nixos/modules/nix/flakes/default.nix b/nixos/modules/nix/flakes/default.nix index 3c5d892..aeaf3c1 100644 --- a/nixos/modules/nix/flakes/default.nix +++ b/nixos/modules/nix/flakes/default.nix @@ -9,6 +9,6 @@ in { extraOptions = '' experimental-features = nix-command flakes ''; - package = pkgs.nixFlakes; + package = pkgs.nixVersions.stable; }; } diff --git a/nixos/modules/virtualisation/docker/default.nix b/nixos/modules/virtualisation/docker/default.nix index 51b9319..b48ae5e 100644 --- a/nixos/modules/virtualisation/docker/default.nix +++ b/nixos/modules/virtualisation/docker/default.nix @@ -10,6 +10,8 @@ in { enable = true; # Because these are made for development purposes and not for servers enableOnBoot = false; + + daemon.settings.features.cdi = true; }; # Updated version of deprecated enableNvidia. diff --git a/nixos/users/tdpeuter/default.nix b/nixos/users/tdpeuter/default.nix index 035bccf..6c1fcf3 100644 --- a/nixos/users/tdpeuter/default.nix +++ b/nixos/users/tdpeuter/default.nix @@ -39,8 +39,10 @@ in { corefonts # Calibri for Uni font-awesome # Dependency of Vifm & zsh config letter # Personal font - noto-fonts-cjk # Dependency of Zellij config + noto-fonts-cjk-sans # Dependency of Zellij config + noto-fonts-cjk-serif # Dependency of Zellij config noto-fonts # Dependency of Zellij config + noto-fonts-emoji # Dependency of Zellij config noto-fonts-color-emoji # Emoji's! vistafonts # Microsoft fonts ];