flake cleanup and iso tweaks

flake.lock

@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682977601,
-        "narHash": "sha256-F1Va/Uiw2tVNn27FLqWyBkiqDyIm/eCamw9wA/GK8Fw=",
+        "lastModified": 1683196088,
+        "narHash": "sha256-MO4i1ceO2WqwyEn/iggDyMOWMVUb0oIicRpfY4MgNko=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0e4c33d76006c9080d2f228ba1c2308e3e4d7be6",
+        "rev": "6abb775e75a7f25451781dc704cfe03f27ad7496",
         "type": "github"
       },
       "original": {
@@ -217,11 +217,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1682980127,
-        "narHash": "sha256-gR9nRwiq1TGtc83SpDnaBcjnEbnOJks4oDDhduGVEZQ=",
+        "lastModified": 1683186212,
+        "narHash": "sha256-yX8IvlTZk/RoNWS7GuOWv4C3rnR/supXfK9hw1O5biY=",
         "owner": "therealr5",
         "repo": "purge",
-        "rev": "82a64f778ee5edb2af95236077afef237a150104",
+        "rev": "b5c626728aced5c7b5243f6c6ace69be39197d00",
         "type": "github"
       },
       "original": {
@@ -272,11 +272,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1683019282,
-        "narHash": "sha256-MfX/KiPTRllSzeRu3sBdLR2SpbNASL7LLxhUKbes6NQ=",
+        "lastModified": 1683186719,
+        "narHash": "sha256-BWSTeVPlqjkQ5J5M5WAeNKqUhHwVQXddfQaQek8qWRU=",
         "owner": "therealr5",
         "repo": "trucksimulatorbot-images",
-        "rev": "a2b6a62af5ff0a9bbf25200b9a296ccf12c8df2c",
+        "rev": "b7952feb4f1620e9f5f984d8f08aa4679d9b0177",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,13 +1,24 @@
 {
   description = "My nix setup";
   inputs = {
-    nixpkgs = {
-      url = "github:nixos/nixpkgs/nixos-unstable";
+
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixos-hardware.url = "github:nixos/nixos-hardware";
+    impermanence.url = "github:nix-community/impermanence";
+
+
+    nix-index-database = {
+      url = "github:Mic92/nix-index-database";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixos-hardware = {
-      url = "github:nixos/nixos-hardware";
+
+
+    sops-nix = {
+      url = "github:Mic92/sops-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs = {
@@ -15,27 +26,8 @@
       };
     };
 
-    impermanence = {
-      url = "github:nix-community/impermanence";
-    };
-
-    nix-index-database = {
-      url = "github:Mic92/nix-index-database";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    nix-colors = {
-      url = "github:Misterio77/nix-colors";
-    };
-
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    hyprland = {
-      url = "github:hyprwm/Hyprland/";
-    };
+    nix-colors.url = "github:Misterio77/nix-colors";
+    hyprland.url = "github:hyprwm/Hyprland/";
 
     purge = {
       url = "github:therealr5/purge";

hosts/falkenstein-1/default.nix

@@ -38,6 +38,7 @@
     wget
     htop-vim
     comma
+    hx
   ];
   programs.git = {
     enable = true;

hosts/iso/default.nix

@@ -10,6 +10,7 @@
     keyMap = "dvorak";
   };
   programs.git.enable = true;
+  services.fwupd.enable = true;
 
   # in case we need to rescue a zfs machine
   boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;

hosts/nuc/default.nix

@@ -40,6 +40,7 @@
     wget
     htop-vim
     comma
+    helix
   ];
   programs.git = {
     enable = true;

pkgs/jmri/default.nix

@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, lib, ant, jdk, ... }:
 stdenv.mkDerivation rec {
   pname = "jmri";
-  version = "v5.3.5";
+  version = "5.3.5";
 
   src = fetchFromGitHub {
     owner = "jmri";
     repo = "jmri";
-    rev = version;
+    rev = "v${version}";
     hash = "sha256-q3p9G16KhUjC3uUazNFDzAeKFIWu2BTds/Q1yhtSqPc=";
   };