From e83145214f240503df859c8681b3b308f0651446 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Thu, 20 Feb 2025 20:54:02 +0100 Subject: [PATCH] Simpler setup --- flake.lock | 30 +++++++++++------------ flake.nix | 2 +- instances/thor/configuration.nix | 17 ++++++++++--- instances/thor/hardware-configuration.nix | 8 +++--- instances/thor/hm.nix | 12 ++++----- modules/hm/vscode.nix | 2 +- 6 files changed, 40 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index a04482a..ad71754 100644 --- a/flake.lock +++ b/flake.lock @@ -291,11 +291,11 @@ ] }, "locked": { - "lastModified": 1736373539, - "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd65bc3cde04c16755955630b344bc9e35272c56", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1739416022, - "narHash": "sha256-Af1CIT+XlXEb+Dk11sgPDzJoOUiada2Xoj5hA8TBvLY=", + "lastModified": 1740060750, + "narHash": "sha256-FOC9OzJ5Ckh6VjzGSRh4F3UCUOdM8NrzQT19PQcQJ44=", "owner": "nix-community", "repo": "home-manager", - "rev": "c9d343cfa0565671cc7e8d5aefebaf61cc840abd", + "rev": "0c0b0ac8af6ca76b1fcb514483a9bd73c18f1e8c", "type": "github" }, "original": { @@ -425,11 +425,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738816619, - "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", + "lastModified": 1739798439, + "narHash": "sha256-GyipmjbbQEaosel/+wq1xihCKbv0/e1LU00x/8b/fP4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", + "rev": "3e2ea8a49d4d76276b0f4e2041df8ca5c0771371", "type": "github" }, "original": { @@ -511,11 +511,11 @@ }, "nixpkgs-u": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -558,11 +558,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1739415763, - "narHash": "sha256-cGoUtw8NeOXxizbX3ZgWIgF7s13OYCTWRM+IE1uQx+A=", + "lastModified": 1740070409, + "narHash": "sha256-KPyQxtbVJfwLzHgg+h5zQnmjEl77AtRUzk2gDvjeyRU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f276411ff7ba4510d9158084d6b6500879614b6", + "rev": "a47b881e04af1dd6d414618846407b2d6c759380", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 11b46ee..0557468 100644 --- a/flake.nix +++ b/flake.nix @@ -171,7 +171,7 @@ statix.enable = true; }; - devShells.default = pkgs.mkShell { + devShells.default = pkgs.mkShellNoCC { buildInputs = [ pkgs.deploy-rs ]; shellHook = '' ${config.pre-commit.installationScript} diff --git a/instances/thor/configuration.nix b/instances/thor/configuration.nix index 0fb2501..ad6dac7 100644 --- a/instances/thor/configuration.nix +++ b/instances/thor/configuration.nix @@ -62,12 +62,21 @@ # persistencedSha256 = lib.fakeSha256; # }; + # package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + # version = "565.77"; + # sha256_64bit = "sha256-CnqnQsRrzzTXZpgkAtF7PbH9s7wbiTRNcM0SPByzFHw="; + # sha256_aarch64 = lib.fakeSha256; + # openSha256 = "sha256-Fxo0t61KQDs71YA8u7arY+503wkAc1foaa51vi2Pl5I="; + # settingsSha256 = "sha256-VUetj3LlOSz/LB+DDfMCN34uA4bNTTpjDrb6C6Iwukk="; + # persistencedSha256 = "sha256-E2J2wYYyRu2Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs="; + # }; + package = config.boot.kernelPackages.nvidiaPackages.mkDriver { - version = "565.77"; - sha256_64bit = "sha256-CnqnQsRrzzTXZpgkAtF7PbH9s7wbiTRNcM0SPByzFHw="; + version = "570.86.16"; + sha256_64bit = "sha256-RWPqS7ZUJH9JEAWlfHLGdqrNlavhaR1xMyzs8lJhy9U="; sha256_aarch64 = lib.fakeSha256; - openSha256 = "sha256-Fxo0t61KQDs71YA8u7arY+503wkAc1foaa51vi2Pl5I="; - settingsSha256 = "sha256-VUetj3LlOSz/LB+DDfMCN34uA4bNTTpjDrb6C6Iwukk="; + openSha256 = "sha256-DuVNA63+pJ8IB7Tw2gM4HbwlOh1bcDg2AN2mbEU9VPE="; + settingsSha256 = "sha256-9rtqh64TyhDF5fFAYiWl3oDHzKJqyOW3abpcf2iNRT8="; persistencedSha256 = "sha256-E2J2wYYyRu2Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs="; }; open = true; diff --git a/instances/thor/hardware-configuration.nix b/instances/thor/hardware-configuration.nix index 7ac7b20..50a1e5c 100644 --- a/instances/thor/hardware-configuration.nix +++ b/instances/thor/hardware-configuration.nix @@ -17,25 +17,25 @@ fileSystems = { "/" = { - device = "/dev/nvme1n1p2"; + device = "/dev/disk/by-partuuid/738c1b35-4e7f-46be-be86-1c2ce3731cb5"; fsType = "btrfs"; options = [ "subvol=@root" ]; }; "/boot" = { - device = "/dev/nvme1n1p1"; + device = "/dev/disk/by-partuuid/63464168-656a-4b74-81ba-9a3ed5cf533b"; fsType = "vfat"; options = [ "fmask=0022" "dmask=0022" ]; }; "/nix" = { - device = "/dev/nvme1n1p2"; + device = "/dev/disk/by-partuuid/738c1b35-4e7f-46be-be86-1c2ce3731cb5"; fsType = "btrfs"; options = [ "subvol=@nix" ]; }; "/home/bertof" = { - device = "/dev/nvme1n1p2"; + device = "/dev/disk/by-partuuid/738c1b35-4e7f-46be-be86-1c2ce3731cb5"; fsType = "btrfs"; options = [ "subvol=@home_bertof" ]; }; diff --git a/instances/thor/hm.nix b/instances/thor/hm.nix index fc1f47e..eca4ba9 100644 --- a/instances/thor/hm.nix +++ b/instances/thor/hm.nix @@ -71,18 +71,18 @@ imports = [ ../../modules/hm/__basic.nix - ../../modules/hm/development/cpp.nix + # ../../modules/hm/development/cpp.nix ../../modules/hm/development/data.nix # ../../modules/hm/development/database.nix ../../modules/hm/development/docker.nix # ../../modules/hm/development/go.nix - ../../modules/hm/development/javascript.nix + # ../../modules/hm/development/javascript.nix ../../modules/hm/development/kubernetes.nix - ../../modules/hm/development/latex.nix + # ../../modules/hm/development/latex.nix ../../modules/hm/development/markdown.nix ../../modules/hm/development/nix.nix ../../modules/hm/development/python.nix - ../../modules/hm/development/rust.nix + # ../../modules/hm/development/rust.nix ../../modules/hm/development/web.nix # ../../modules/hm/alacritty.nix @@ -116,7 +116,7 @@ ../../modules/hm/ncspot.nix ../../modules/hm/noti.nix ../../modules/hm/nushell.nix - ../../modules/hm/obs-studio.nix + # ../../modules/hm/obs-studio.nix ../../modules/hm/office.nix ../../modules/hm/pass.nix ../../modules/hm/picom.nix @@ -134,7 +134,7 @@ # ../../modules/hm/update_background.nix ../../modules/hm/vim.nix ../../modules/hm/virtualization.nix - ../../modules/hm/vscode.nix + # ../../modules/hm/vscode.nix ../../modules/hm/webapp.nix ../../modules/hm/xresources.nix ../../modules/hm/zathura.nix diff --git a/modules/hm/vscode.nix b/modules/hm/vscode.nix index d53b73a..fc1f9cc 100644 --- a/modules/hm/vscode.nix +++ b/modules/hm/vscode.nix @@ -4,7 +4,7 @@ extensions = with pkgs.vscode-extensions; [ coder.coder-remote james-yu.latex-workshop - rust-lang.rust-analyzer + # rust-lang.rust-analyzer ]; }; }