diff --git a/.gitignore b/.gitignore index 46302cd..456ec08 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -repl-result-* +device-configuration.nix +hardware-configuration.nix result -result-* -*.qcow2 +*.qcow2 \ No newline at end of file diff --git a/lock.nix b/lock.nix index bfeabcd..dee1367 100644 --- a/lock.nix +++ b/lock.nix @@ -4,19 +4,19 @@ sha256 = "sha256-DlvJv33ml5UTKgu4b0HauOfFIoDx6QXtbqUF3vWeRCY="; }; nixpkgs = { - revision = "1eae3268880484be84199bdb77941c09bb4a97ba"; - sha256 = "sha256-1Sj8MToixDwakJYNMYBS/PYbg8Oa4CAxreXraMHB5qg="; + revision = "26d499fc9f1d567283d5d56fcf367edd815dba1d"; + sha256 = "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4="; }; nixpkgs-unstable = { - revision = "c11863f1e964833214b767f4a369c6e6a7aba141"; - sha256 = "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0="; + revision = "2631b0b7abcea6e640ce31cd78ea58910d31e650"; + sha256 = "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM="; }; nix-bitcoin = { revision = "990805aa7c7fcd1552c6e14e8c6df9a88ba9be41"; sha256 = "sha256-yU7iYlDSD8lOrm02igxIl3y+bXGZDDO0qcG0gO48Cto="; }; cosmic-modules = { - revision = "84d7c1002734f21f150c641da095c5ce43f1cb98"; - sha256 = "sha256-Rbw+E3Na694sTPjNSRFHtT1o31eQXO3OLEzM+25kcME="; + revision = "14bedf460c4d98b0f6358904965147c01ccb41fe"; + sha256 = "sha256-ka+DI/jnNLGOt4dbROv18m6MhqnQAgTTvezswYHuDoo="; }; } diff --git a/nix-os/nvidia.nix b/nix-os/nvidia.nix index afd3d33..5da8b1d 100644 --- a/nix-os/nvidia.nix +++ b/nix-os/nvidia.nix @@ -24,12 +24,12 @@ nvidiaSettings = true; package = let mkDriverArgs = { - version = "575.51.02"; - sha256_64bit = "sha256-XZ0N8ISmoAC8p28DrGHk/YN1rJsInJ2dZNL8O+Tuaa0="; - sha256_aarch64 = "sha256-NNeQU9sPfH1sq3d5RUq1MWT6+7mTo1SpVfzabYSVMVI="; - openSha256 = "sha256-NQg+QDm9Gt+5bapbUO96UFsPnz1hG1dtEwT/g/vKHkw="; - settingsSha256 = "sha256-6n9mVkEL39wJj5FB1HBml7TTJhNAhS/j5hqpNGFQE4w="; - persistencedSha256 = "sha256-dgmco+clEIY8bedxHC4wp+fH5JavTzyI1BI8BxoeJJI="; + version = "570.133.07"; + sha256_64bit = "sha256-LUPmTFgb5e9VTemIixqpADfvbUX1QoTT2dztwI3E3CY="; + sha256_aarch64 = "sha256-yTovUno/1TkakemRlNpNB91U+V04ACTMwPEhDok7jI0="; + openSha256 = "sha256-9l8N83Spj0MccA8+8R1uqiXBS0Ag4JrLPjrU3TaXHnM="; + settingsSha256 = "sha256-XMk+FvTlGpMquM8aE8kgYK2PIEszUZD2+Zmj2OpYrzU="; + persistencedSha256 = "sha256-G1V7JtHQbfnSRfVjz/LE2fYTlh9okpCbE4dfX9oYSg8="; }; in ( config.boot.kernelPackages.nvidiaPackages.mkDriver mkDriverArgs ).overrideAttrs (super: { passthru = super.passthru or {} // { diff --git a/nix-os/shell.nix b/nix-os/shell.nix index 3c6833a..e30c9a7 100644 --- a/nix-os/shell.nix +++ b/nix-os/shell.nix @@ -27,18 +27,12 @@ in ]; config = { - environment.systemPackages = ( with pkgs; [ + environment.systemPackages = with pkgs; [ aliasDrag rangerGit ripgrep kitty zoxide - ]) ++ [ - ( - pkgs.writeScriptBin "nix-convert-hash" '' - ${lib.getExe' config.nix.package "nix"} --extra-experimental-features "nix-command" hash convert "$@" - '' - ) ]; programs.bash.shellInit = ''