From ddc6897d80ca764a095daddd04c932015b287341 Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Thu, 5 Dec 2024 21:32:39 +0100 Subject: [PATCH] update to 24.11 --- flake.lock | 34 +++++++++++++++++----------------- flake.nix | 4 ++-- home/profiles/base/default.nix | 12 ++++++------ hosts/soryu/configuration.nix | 11 +++++------ 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index f9043c1..babc258 100644 --- a/flake.lock +++ b/flake.lock @@ -220,16 +220,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" } @@ -399,11 +399,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1731797098, - "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=", + "lastModified": 1733217105, + "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6", + "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "type": "github" }, "original": { @@ -431,16 +431,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1733261153, + "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -509,11 +509,11 @@ }, "nur": { "locked": { - "lastModified": 1732055209, - "narHash": "sha256-9VyOzWcA2qNRJcm1yjiE57ppRmeW2EJhKfC1Q+eMWu8=", + "lastModified": 1733417713, + "narHash": "sha256-/3foD2ePFtms/swS2J77CbAepo1nQ4CHlRBpj1IR8t0=", "owner": "nix-community", "repo": "NUR", - "rev": "526dd9871b1a85dbc23a7571b6a0b85857218de4", + "rev": "6e671d63e6b1e29f31781b8dfef69b147b69ab77", "type": "github" }, "original": { @@ -614,11 +614,11 @@ }, "unstable": { "locked": { - "lastModified": 1731890469, - "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=", + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5083ec887760adfe12af64830a66807423a859a7", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0ff770a..1da1266 100644 --- a/flake.nix +++ b/flake.nix @@ -5,9 +5,9 @@ # nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc="; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix index b071182..8982e9d 100644 --- a/home/profiles/base/default.nix +++ b/home/profiles/base/default.nix @@ -87,7 +87,7 @@ in ] ++ lib.optionals config.profiles.gui.enable [ mpv sxiv - gnome3.eog + eog dolphin plasma5Packages.dolphin-plugins @@ -205,7 +205,7 @@ in extensions = with pkgs.vscode-extensions; [ bbenoist.nix - matklad.rust-analyzer + rust-lang.rust-analyzer vadimcn.vscode-lldb ] ++ lib.optionals config.nixpkgs.config.allowUnfree [ ms-vsliveshare.vsliveshare @@ -262,20 +262,20 @@ in enable = true; matchBlocks = { "lilith" = { - hostname = "lilith.daniel"; + hostname = "lilith.tn.dodsorf.as"; user = "dandellion"; }; "desktop" = { - hostname = "desktop.daniel"; + hostname = "soryu.tn.dodsorf.as"; user = "dan"; }; "ubuntu-ai" = { - hostname = "100.64.0.2"; + hostname = "soryu.tn.dodsorf.as"; port = 2222; user = "daniel"; }; "laptop" = { - hostname = "laptop.daniel"; + hostname = "ayanami.tn.dodsorf.as"; user = "daniel"; }; "login.pvv.ntnu.no" = { diff --git a/hosts/soryu/configuration.nix b/hosts/soryu/configuration.nix index d902eaf..91dca0b 100644 --- a/hosts/soryu/configuration.nix +++ b/hosts/soryu/configuration.nix @@ -178,17 +178,16 @@ # "L+ /opt/rocm/hip - - - - ${pkgs.hip}" # ]; - - hardware.opengl.driSupport = true; - hardware.opengl.driSupport32Bit = true; - hardware.opengl.extraPackages = with pkgs; [ + hardware.graphics.enable = true; + hardware.graphics.enable32Bit = true; + hardware.graphics.extraPackages = with pkgs; [ libva - rocmPackages.clr.icd ]; + hardware.amdgpu.opencl.enable = true; # Enable the X11 windowing system. services.xserver.enable = true; - services.xserver.layout = "no"; + services.xserver.xkb.layout = "no"; # services.xserver.xkbOptions = "eurosign:e"; services.xserver.displayManager.lightdm.enable = true;