bump nixpkgs

Signed-off-by: Xe Iaso <me@xeiaso.net>

.envrc

@@ -1 +1 @@
-use_nix
+use flake

flake.lock

@@ -1,12 +1,15 @@
 {
   "nodes": {
     "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
       "locked": {
-        "lastModified": 1649676176,
+        "lastModified": 1689068808,
-        "narHash": "sha256-OWKJratjt2RW151VUlJPRALb7OU2S5s+f0vLj4o1bHM=",
+        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a4b154ebbdc88c8498a5c7b01589addc9e9cb678",
+        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
         "type": "github"
       },
       "original": {
@@ -20,11 +23,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1650265945,
+        "lastModified": 1688534083,
-        "narHash": "sha256-SO8+1db4jTOjnwP++29vVgImLIfETSXyoz0FuLkiikE=",
+        "narHash": "sha256-/bI5vsioXscQTsx+Hk9X5HfweeNZz/6kVKsbdqfwW7g=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "e8f9f8d037774becd82fce2781e1abdb7836d7df",
+        "rev": "abca1fb7a6cfdd355231fc220c3d0302dbb4369a",
         "type": "github"
       },
       "original": {
@@ -35,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1650555608,
+        "lastModified": 1689631193,
-        "narHash": "sha256-e34oMPWPwRWhF1K6NZnF0mNle7qDADJzjWujp8UupGo=",
+        "narHash": "sha256-AGSkBZaiTODQc8eT1rZDrQIjtb8JtFwJ0wVPzArlrnM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c11ee1c598b15a24d18f142f85ee3d438afc39e6",
+        "rev": "57695599bdc4f7bfe5d28cfa23f14b3d8bdf8a5f",
         "type": "github"
       },
       "original": {
@@ -49,11 +52,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1650555608,
+        "lastModified": 1689631193,
-        "narHash": "sha256-e34oMPWPwRWhF1K6NZnF0mNle7qDADJzjWujp8UupGo=",
+        "narHash": "sha256-AGSkBZaiTODQc8eT1rZDrQIjtb8JtFwJ0wVPzArlrnM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c11ee1c598b15a24d18f142f85ee3d438afc39e6",
+        "rev": "57695599bdc4f7bfe5d28cfa23f14b3d8bdf8a5f",
         "type": "github"
       },
       "original": {
@@ -63,26 +66,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1650161686,
+        "lastModified": 1678898370,
-        "narHash": "sha256-70ZWAlOQ9nAZ08OU6WY7n4Ij2kOO199dLfNlvO/+pf8=",
+        "narHash": "sha256-xTICr1j+uat5hk9FyuPOFGxpWHdJRibwZC+ATi0RbtE=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "1ffba9f2f683063c2b14c9f4d12c55ad5f4ed887",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1640319671,
-        "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf",
+        "rev": "ac718d02867a84b42522a0ece52d841188208f2c",
         "type": "github"
       },
       "original": {
@@ -92,41 +80,36 @@
         "type": "github"
       }
     },
-    "portable-svc": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_3"
-      },
-      "locked": {
-        "lastModified": 1650586426,
-        "narHash": "sha256-n/Q2IzITm8s5sej3l3D0rxJcd7vx4P7KF4hOkN9pOOg=",
-        "ref": "main",
-        "rev": "eb4b2c4754e5cd4a976a2941c27194526e8781de",
-        "revCount": 6,
-        "type": "git",
-        "url": "https://tulpa.dev/cadey/portable-svc.git"
-      },
-      "original": {
-        "ref": "main",
-        "type": "git",
-        "url": "https://tulpa.dev/cadey/portable-svc.git"
-      }
-    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
         "naersk": "naersk",
         "nixpkgs": "nixpkgs_2",
-        "portable-svc": "portable-svc",
         "xess": "xess"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "utils": {
       "locked": {
-        "lastModified": 1638122382,
+        "lastModified": 1678901627,
-        "narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
         "type": "github"
       },
       "original": {
@@ -137,15 +120,15 @@
     },
     "xess": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_3",
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1640540322,
+        "lastModified": 1682266158,
-        "narHash": "sha256-II4raADUWKTLDAALyJSToAgL8FB1ADbRHqEr/b3JeIc=",
+        "narHash": "sha256-VK66KyF1doJ24yktb9rp7Yv7auS6i0P8EnJLhFOz+jY=",
         "owner": "Xe",
         "repo": "Xess",
-        "rev": "5fabc96de6487a721235c4bdf18214519d9e6201",
+        "rev": "3a85d1de06cd3420b4d56a8edd72cd57e6f0806e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -3,14 +3,12 @@
     flake-utils.url = "github:numtide/flake-utils";
     naersk.url = "github:nix-community/naersk";
     xess.url = "github:Xe/Xess";
-    portable-svc.url = "git+https://tulpa.dev/cadey/portable-svc.git?ref=main";
   };
 
-  outputs = { self, nixpkgs, flake-utils, naersk, xess, portable-svc }:
+  outputs = { self, nixpkgs, flake-utils, naersk, xess }:
     flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system:
       let
         pkgs = import nixpkgs {
-          overlays = [ portable-svc.overlay ];
           inherit system;
         };
         naersk-lib = naersk.lib."${system}";
@@ -33,7 +31,7 @@
               cp -rf $src/templates $out/templates
               cp -rf ${printerfacts-bin}/bin $out/bin
               cp -rf ${
-                xess.defaultPackage."${system}"
+                xess.packages."${system}".default
               }/static/css/xess.css $out/static/gruvbox.css
             '';
           };
@@ -52,13 +50,13 @@
             };
           };
           printerfacts-service = pkgs.substituteAll {
-            name = "printerfacts.service";
+            pname = "printerfacts.service";
             src = ./systemd/printerfacts.service.in;
             printerfacts = self.packages.${system}.printerfacts;
           };
           portable-service = pkgs.portableService {
             inherit (self.packages.${system}.printerfacts) version;
-            name = "printerfacts";
+            pname = "printerfacts";
             description = "Printer facts";
             units = [ self.packages.${system}.printerfacts-service ];
           };
@@ -71,12 +69,12 @@
         defaultApp = apps.printerfacts;
 
         # `nix develop`
-        devShell = pkgs.mkShell {
+        devShells.default = pkgs.mkShell {
           nativeBuildInputs = with pkgs; [
             rustc
             cargo
             cargo-watch
-            rls
+            rust-analyzer
             rustfmt
           ];
 

shell.nix

@@ -1,13 +0,0 @@
-let
-  pkgs = import <nixpkgs> { };
-in pkgs.mkShell {
-  buildInputs = with pkgs; [
-    rustc
-    cargo
-    cargo-watch
-    rls
-    rustfmt
-  ];
-
-  RUST_LOG = "info";
-}