diff --git a/flake.lock b/flake.lock index ea02ab4..d1c5f5c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,15 +7,16 @@ ] }, "locked": { - "lastModified": 1716847642, - "narHash": "sha256-rjEswRV0o23eBBils8lJXyIGha+l/VjV73IPg+ztxgk=", + "lastModified": 1716736833, + "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", "owner": "nix-community", "repo": "home-manager", - "rev": "10c7c219b7dae5795fb67f465a0d86cbe29f25fa", + "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -38,16 +39,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1716509168, - "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfb7a882678e518398ce9a31a881538679f6f092", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index d697c4e..4b1a9b1 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,12 @@ { description = "Nix los hier"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/modules/desktop.nix b/modules/desktop.nix index 9288008..d644e02 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -5,9 +5,10 @@ programs.sway.enable = builtins.elem "sway" gui.flavour; services.xserver.windowManager.i3.enable = builtins.elem "i3" gui.flavour; + services.libinput.enable = true; + services.xserver = { enable = (builtins.elem "i3" gui.flavour || builtins.elem "gnome" gui.flavour); - libinput.enable = true; desktopManager.gnome.enable = builtins.elem "gnome" gui.flavour; displayManager = { gdm.enable = builtins.elem "gnome" gui.flavour; diff --git a/modules/virtualisation.nix b/modules/virtualisation.nix index 9112d25..47f5b25 100644 --- a/modules/virtualisation.nix +++ b/modules/virtualisation.nix @@ -21,10 +21,11 @@ }; containers = { enable = true; - cdi.dynamic.nvidia.enable = config.bchmnn.nvidia.enable; }; }; + hardware.nvidia-container-toolkit.enable = config.bchmnn.nvidia.enable; + programs = { dconf.enable = true; virt-manager.enable = true; diff --git a/users/gandalf/modules/gui/i3/autorandr.nix b/users/gandalf/modules/gui/i3/autorandr.nix index 62813aa..f046c10 100644 --- a/users/gandalf/modules/gui/i3/autorandr.nix +++ b/users/gandalf/modules/gui/i3/autorandr.nix @@ -15,10 +15,10 @@ samsung = { fingerprint = { - "DP-1" = "00ffffffffffff004c2d830e000e0001011c0103806b3c780a23ada4544d99260f474abdef80714f81c0810081809500a9c0b300010104740030f2705a80b0588a00501d7400001e023a801871382d40582c4500501d7400001e000000fd00184b0f511e000a202020202020000000fc0053414d53554e470a202020202001b902034cf0535f101f041305142021225d5e626364071603122909070715075057070183010000e2004fe30503016e030c001000b83c20008001020304e3060d01e50e60616566e5018b849001011d80d0721c1620102c2580501d7400009e662156aa51001e30468f3300501d7400001e000000000000000000000000000000a3"; + "HDMI-1" = "00ffffffffffff004c2d830e000e0001011c0103806b3c780a23ada4544d99260f474abdef80714f81c0810081809500a9c0b300010104740030f2705a80b0588a00501d7400001e023a801871382d40582c4500501d7400001e000000fd00184b0f511e000a202020202020000000fc0053414d53554e470a202020202001b902034cf0535f101f041305142021225d5e626364071603122909070715075057070183010000e2004fe30503016e030c001000b83c20008001020304e3060d01e50e60616566e5018b849001011d80d0721c1620102c2580501d7400009e662156aa51001e30468f3300501d7400001e000000000000000000000000000000a3"; }; config = { - "DP-1" = { + "HDMI-0" = { enable = true; primary = true; mode = "3840x2160"; diff --git a/users/gandalf/modules/gui/programs/chromium.nix b/users/gandalf/modules/gui/programs/chromium.nix index 21ae54a..a2c3e89 100644 --- a/users/gandalf/modules/gui/programs/chromium.nix +++ b/users/gandalf/modules/gui/programs/chromium.nix @@ -4,7 +4,7 @@ let icons = { chromium = pkgs.fetchurl { url = "https://upload.wikimedia.org/wikipedia/commons/thumb/2/28/Chromium_Logo.svg/240px-Chromium_Logo.svg.png"; - sha256 = "ff6383a5c08745100e1f8720397c3d6e1b30bc6d4a329cf44bbac16ec03948e7"; + sha256 = "df526fa1ba625bd619a7a938aeb504e8e3d9d7e55adc63f9802d8eadb4a3fb58"; meta.licenses = lib.licenses.publicDomain; }; spotify = pkgs.fetchurl { @@ -14,17 +14,17 @@ let }; teams = pkgs.fetchurl { url = "https://upload.wikimedia.org/wikipedia/commons/thumb/c/c9/Microsoft_Office_Teams_%282018%E2%80%93present%29.svg/258px-Microsoft_Office_Teams_%282018%E2%80%93present%29.svg.png"; - sha256 = "a7bf37b6132e45c3c3314e7ed3a465138caabe3d87535a8b82a84be6a5f70dac"; + sha256 = "3a7caf6bdc2f03833cb4273774af6859b29676c42844bb8f9743074768316a1f"; meta.licenses = lib.licenses.publicDomain; }; outlook = pkgs.fetchurl { url = "https://upload.wikimedia.org/wikipedia/commons/thumb/d/df/Microsoft_Office_Outlook_%282018%E2%80%93present%29.svg/258px-Microsoft_Office_Outlook_%282018%E2%80%93present%29.svg.png"; - sha256 = "565fff2ed6a3c4c98daf7a2b56aad386c2d076f4f5b88199785593eb380eb3d4"; + sha256 = "06d3265352f03ac7ac65c230eae019a9a1e2bc94aeb8b24247a5484c4f3e15a1"; meta.licenses = lib.licenses.publicDomain; }; whatsapp = pkgs.fetchurl { url = "https://upload.wikimedia.org/wikipedia/commons/thumb/6/6b/WhatsApp.svg/240px-WhatsApp.svg.png"; - sha256 = "65b4eeab9b5a02c46f75f26abeac3c72a479cf8fce829b7f9c46f59e9a7f9785"; + sha256 = "44ce29edaaba4fcd515702cef2f08ac6c1289f33c1d5c8983761db9d7ad8061d"; meta.licenses = lib.licenses.publicDomain; }; };