Lock file maintenance

flake.lock

@@ -22,11 +22,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1719733833,
+        "lastModified": 1719640067,
-        "narHash": "sha256-6h2EqZU9bL9rHlXE+2LCBgnDImejzbS+4dYsNDDFlkY=",
+        "narHash": "sha256-ZEJFGHnElbMH3JgnFANxOlJgniFamu9MemvHCMQZtpA=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "d185770ea261fb5cf81aa5ad1791b93a7834d12c",
+        "rev": "423b86a7f756421325e71663ada79a199bf13408",
         "type": "github"
       },
       "original": {
@@ -100,11 +100,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719827439,
+        "lastModified": 1719677234,
-        "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
+        "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
+        "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d",
         "type": "github"
       },
       "original": {
@@ -179,11 +179,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719832725,
+        "lastModified": 1719111455,
-        "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=",
+        "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "2917972ed34ce292309b3a4976286f8b5c08db27",
+        "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
         "type": "github"
       },
       "original": {
@@ -221,11 +221,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719797603,
+        "lastModified": 1719624269,
-        "narHash": "sha256-Bw9K0LgCwuBKg0534d0Ss71prBKzUR/b1SqWyRqOSzg=",
+        "narHash": "sha256-pRvYQcIJ1B9Fo52SglSXUMWDq/4PUTqLQEBitKIQS64=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "bec5bcb9503603a84f92d8801e304f7acdd89c86",
+        "rev": "60056ea2311c8a9eb21b693b53727a8a42812b21",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1719663039,
+        "lastModified": 1719099622,
-        "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
+        "narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
+        "rev": "5e8e3b89adbd0be63192f6e645e0a54080004924",
         "type": "github"
       },
       "original": {
@@ -300,11 +300,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1719690277,
+        "lastModified": 1719506693,
-        "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
+        "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
+        "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
         "type": "github"
       },
       "original": {
@@ -316,11 +316,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1719837916,
+        "lastModified": 1719706074,
-        "narHash": "sha256-dV1URYa5SezYyz/1IDb1BHmIZ4tM0WtpPfVkFGH8xfY=",
+        "narHash": "sha256-lTV3rJHSs20AVIL20SpiAWs+YbbKIwgmWINpFbL4ZAU=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "0575d7fb334ea662a0a03620780c87df0612eb9a",
+        "rev": "c64950a01a4f2d115c06264842083db84d865bb9",
         "type": "github"
       },
       "original": {
@@ -475,11 +475,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1719716556,
+        "lastModified": 1719268571,
-        "narHash": "sha256-KA9gy2Wkv76s4A8eLnOcdKVTygewbw3xsB8+awNMyqs=",
+        "narHash": "sha256-pcUk2Fg5vPXLUEnFI97qaB8hto/IToRfqskFqsjvjb8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "b5974d4331fb6c893e808977a2e1a6d34b3162d6",
+        "rev": "c2ea1186c0cbfa4d06d406ae50f3e4b085ddc9b3",
         "type": "github"
       },
       "original": {

nixos/modules/nixos/hardware/nvidia/default.nix

@@ -63,12 +63,12 @@ in
         # };
         # in
         config.boot.kernelPackages.nvidiaPackages.mkDriver {
-          version = "555.58";
+          version = "550.67";
-          sha256_64bit = "sha256-bXvcXkg2kQZuCNKRZM5QoTaTjF4l2TtrsKUvyicj5ew=";
+          sha256_64bit = "sha256-mSAaCccc/w/QJh6w8Mva0oLrqB+cOSO1YMz1Se/32uI=";
-          sha256_aarch64 = "sha256-7XswQwW1iFP4ji5mbRQ6PVEhD4SGWpjUJe1o8zoXYRE=";
+          sha256_aarch64 = "sha256-+UuK0UniAsndN15VDb/xopjkdlc6ZGk5LIm/GNs5ivA=";
-          openSha256 = "sha256-hEAmFISMuXm8tbsrB+WiUcEFuSGRNZ37aKWvf0WJ2/c=";
+          openSha256 = "sha256-M/1qAQxTm61bznAtCoNQXICfThh3hLqfd0s1n1BFj2A=";
-          settingsSha256 = "sha256-vWnrXlBCb3K5uVkDFmJDVq51wrCoqgPF03lSjZOuU8M=";
+          settingsSha256 = "sha256-FUEwXpeUMH1DYH77/t76wF1UslkcW721x9BHasaRUaM=";
-          persistencedSha256 = "sha256-lyYxDuGDTMdGxX3CaiWUh1IQuQlkI2hPEs5LI20vEVw=";
+          persistencedSha256 = "sha256-ojHbmSAOYl3lOi2X6HOBlokTXhTCK6VNsH6+xfGQsyo=";
           # patches = [ rcu_patch ];
         };
     };

nixos/modules/nixos/system/systempackages.nix

@@ -5,11 +5,12 @@ let
 in
 {
   options.mySystem.system = {
-    packages = mkOption {
+    packages = mkOption
-      type = with types; listOf package;
+      {
-      description = "List of system level package installs";
+        type = with types; listOf package;
-      default = [ ];
+        description = "List of system level package installs";
-    };
+        default = [ ];
+      };
   };
   # System packages deployed globally.
   # This is NixOS so lets keep this liiight?

nixos/overlays/default.nix

@@ -1,13 +1,8 @@
-{ inputs, ... }:
+{ inputs
-let
+, ...
-  warpTerminal = import ./warp-terminal/warp-terminal.nix {
+}:
-    inherit (inputs.nixpkgs) lib;
-  };
-in
 {
   nur = inputs.nur.overlay;
-  warp-terminal = warpTerminal;
-
   # The unstable nixpkgs set (declared in the flake inputs) will
   # be accessible through 'pkgs.unstable'
   # great idea if I wasn't using unstable as my base.

nixos/overlays/warp-terminal/update.sh

@@ -1,74 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p cacert curl jq nix moreutils --pure
-#shellcheck shell=bash
-set -eu -o pipefail
-
-cd "$(dirname "$0")"
-nixpkgs=$(nix-instantiate --eval -E '<nixpkgs>' --impure)
-
-err() {
-    echo "$*" >&2
-    exit 1
-}
-
-json_get() {
-    jq -r "$1" < "./versions.json"
-}
-
-json_set() {
-    jq --arg x "$2" "$1 = \$x" < "./versions.json" | sponge "./versions.json"
-}
-
-resolve_url() {
-    local pkg sfx url
-    local -i i max_redirects
-    case "$1" in
-        darwin)
-            pkg=macos
-            sfx=dmg
-            ;;
-        linux)
-            pkg=pacman
-            sfx=pkg.tar.zst
-            ;;
-        *)
-            err "Unexpected download type: $1"
-            ;;
-    esac
-    url="https://app.warp.dev/download?package=${pkg}"
-    ((max_redirects = 15))
-    for ((i = 0; i < max_redirects; i++)); do
-        url=$(curl -s -o /dev/null -w '%{redirect_url}' "${url}")
-        [[ ${url} != *.${sfx} ]] || break
-    done
-    ((i < max_redirects)) || { err "too many redirects"; }
-    echo "${url}"
-}
-
-get_version() {
-    echo "$1" | grep -oP -m 1 '(?<=/v)[\d.\w]+(?=/)'
-}
-
-# nix-prefetch-url seems to be uncompressing the archive then taking the hash
-# so just get the hash from fetchurl
-sri_get() {
-    local ouput sri
-    output=$(nix-build  --expr \
-        "with import $nixpkgs {};
-         fetchurl {
-           url = \"$1\";
-         }" 2>&1 || true)
-    sri=$(echo "$output" | awk '/^\s+got:\s+/{ print $2 }')
-    [[ -z "$sri" ]] && err "$output"
-    echo "$sri"
-}
-
-for sys in darwin linux; do
-    url=$(resolve_url ${sys})
-    version=$(get_version "${url}")
-    if [[ ${version} != "$(json_get ".${sys}.version")" ]]; then
-        sri=$(sri_get "${url}")
-        json_set ".${sys}.version" "${version}"
-        json_set ".${sys}.hash" "${sri}"
-    fi
-done

nixos/overlays/warp-terminal/versions.json

@@ -1,10 +0,0 @@
-{
-  "darwin": {
-    "hash": "sha256-vogQAVbtiw2/U3oJrTj8SUexkEsEfYvmGq50nzy5aYo=",
-    "version": "0.2024.06.25.08.02.stable_01"
-  },
-  "linux": {
-    "hash": "sha256-Fc48bZzFBw9p636Mr8R+W/d1B3kIcOAu/Gd17nbzNfI=",
-    "version": "0.2024.06.25.08.02.stable_01"
-  }
-}

nixos/overlays/warp-terminal/warp-terminal.nix

@@ -1,13 +0,0 @@
-{ lib, ...}:
-let 
-  versions = lib.importJSON ./versions.json;
-in
-(final: prev: {
-  warp-terminal = prev.warp-terminal.overrideAttrs (oldAttrs: { 
-    version = versions.linux.version;
-    src = prev.fetchurl {
-      url = "https://releases.warp.dev/stable/v${versions.linux.version}/warp-terminal-v${versions.linux.version}-1-x86_64.pkg.tar.zst";
-      hash = versions.linux.hash;
-    };
-  });
-})

nixos/profiles/hw-legion-15arh05h.nix

@@ -1,11 +1,12 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
   # Support windows partition
   mySystem = {
     security.wheelNeedsSudoPassword = false;
     system.packages = with pkgs; [
+      gparted
       ntfs3g
-      warp-terminal
+      fira-code-nerdfont
     ];
   };
 
@@ -17,6 +18,7 @@
     loader = {
       grub = {
         enable = true;
+        useOSProber = true;
         zfsSupport = true;
         device = "nodev";
         mirroredBoots = [

nixos/profiles/role-dev.nix

@@ -11,7 +11,6 @@ with config;
     btop
     dnsutils
     nix
-    fira-code-nerdfont
 
     # TODO Move
     nil
@@ -28,4 +27,6 @@ with config;
     enable = true;
     nix-direnv.enable = true;
   };
+
+
 }

nixos/profiles/role-workstation.nix

@@ -54,7 +54,6 @@ with config;
     vscode
     vivaldi
     termius
-    gparted
   ];
 
   i18n = {