home: format packages

etcnixos/flake.lock

@@ -34,11 +34,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743000413,
+        "lastModified": 1743275891,
-        "narHash": "sha256-3F9ap1452VmR8xDjUmeCf9h2nnRIODY4Fh5RnCr0d0s=",
+        "narHash": "sha256-0Y1E2pct908JZhVNlv4dprEZ0eB9WPjNn8WPuDnFUSE=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "21c2b03a213775c88eb0738f9ceb2e02b8463981",
+        "rev": "b17f707c484af8a41a9798e1cde7ddb5d2a80119",
         "type": "github"
       },
       "original": {
@@ -230,11 +230,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742871411,
+        "lastModified": 1743267068,
-        "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=",
+        "narHash": "sha256-G7866vbO5jgqMcYJzgbxej40O6mBGQMGt6gM0himjoA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625",
+        "rev": "b431496538b0e294fbe44a1441b24ae8195c63f0",
         "type": "github"
       },
       "original": {
@@ -252,11 +252,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742465245,
+        "lastModified": 1743144043,
-        "narHash": "sha256-gpjtkoeq5Ye9J8GoR+rWg3NL4bbEtcLvvF4nN6MtxdU=",
+        "narHash": "sha256-QlEk4Xm5KG0jW5Kus9teY3bhxdf0GUTexxTUCaJM5ms=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "a95606cae5c9e1f5b84debe7865ef171d4deb287",
+        "rev": "1c17514c8558886af0afc34b6c348c1f2ee9fd24",
         "type": "github"
       },
       "original": {
@@ -315,11 +315,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1742806253,
+        "lastModified": 1743167577,
-        "narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
+        "narHash": "sha256-I09SrXIO0UdyBFfh0fxDq5WnCDg8XKmZ1HQbaXzMA1k=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
+        "rev": "0ed819e708af17bfc4bbc63ee080ef308a24aa42",
         "type": "github"
       },
       "original": {
@@ -331,11 +331,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742889210,
+        "lastModified": 1743315132,
-        "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
+        "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
+        "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
         "type": "github"
       },
       "original": {

home-manager/flake.lock

@@ -54,11 +54,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743082807,
+        "lastModified": 1743360001,
-        "narHash": "sha256-qmrCYHVqE6j0TQApfxGx8aRYNdNsqtOrZuH09A+cjTU=",
+        "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "171915bfce41018528fda9960211e81946d999b7",
+        "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d",
         "type": "github"
       },
       "original": {
@@ -79,11 +79,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1742954683,
+        "lastModified": 1743370893,
-        "narHash": "sha256-ZJBJzpWQcZYuxiX7YbLCaiZl1aOt8xQphXt0ZO0st+8=",
+        "narHash": "sha256-u2PqVBoECxAsnY+1yy9DwWetuYyT7uw1FkSpGgh1mBI=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "41db28938147dfa2a2d528f24b59b6962b96f0c5",
+        "rev": "22b0f8584e754448911fb50dd028af91ba9f579d",
         "type": "github"
       },
       "original": {
@@ -112,11 +112,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1742877599,
+        "lastModified": 1743260207,
-        "narHash": "sha256-3Xy1mlAUcYSQSpt0Q/flA+o6Y1ZACDW52vVP2CX52w8=",
+        "narHash": "sha256-AtizkeSqu7AeMe/JjN8CjENfTKgMGifDW0U2z+S0ygA=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "4534d3726676a403eb3dd19d28371bd8acd98401",
+        "rev": "b2c34e7fe94a12a65083ac73759672427ea2ccbf",
         "type": "github"
       },
       "original": {
@@ -127,11 +127,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742889210,
+        "lastModified": 1743315132,
-        "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
+        "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "698214a32beb4f4c8e3942372c694f40848b360d",
+        "rev": "52faf482a3889b7619003c0daec593a1912fddc1",
         "type": "github"
       },
       "original": {
@@ -143,11 +143,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1742751704,
+        "lastModified": 1743231893,
-        "narHash": "sha256-rBfc+H1dDBUQ2mgVITMGBPI1PGuCznf9rcWX/XIULyE=",
+        "narHash": "sha256-tpJsHMUPEhEnzySoQxx7+kA+KUtgWqvlcUBqROYNNt0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f0946fa5f1fb876a9dc2e1850d9d3a4e3f914092",
+        "rev": "c570c1f5304493cafe133b8d843c7c1c4a10d3a6",
         "type": "github"
       },
       "original": {
@@ -174,11 +174,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743042789,
+        "lastModified": 1743388531,
-        "narHash": "sha256-yPlxN0r3pQjUIwyX/qeWSTdpHjWy/AfmM0PK1bYkO18=",
+        "narHash": "sha256-OBcNE+2/TD1AMgq8HKMotSQF8ZPJEFGZdRoBJ7t/HIc=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "b4d2dee9d16e7725b71969f28862ded3a94a7934",
+        "rev": "011de3c895927300651d9c2cb8e062adf17aa665",
         "type": "github"
       },
       "original": {
@@ -222,11 +222,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1742773235,
+        "lastModified": 1743346993,
-        "narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=",
+        "narHash": "sha256-i7rWd/5BcqLgQEtB5L/6gKN5R5GUJcmm34F+iBivH60=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "b2613aec05f9e3f8488ef924203d62cafb712642",
+        "rev": "45c055696437a08e3989d9b91d9c617b84cc2bc3",
         "type": "github"
       },
       "original": {
@@ -242,11 +242,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742973471,
+        "lastModified": 1743216975,
-        "narHash": "sha256-nneE0lIst5IDINF6+dW6Xgp8KNmsC12pb05Ws+wXkVQ=",
+        "narHash": "sha256-29xgm8F3DCcTNrQZ9V3Pwj6BkjalkKvGyjd+sF9/+3k=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "bae854c6767fb5c004cd7a4049a77be9da1b16db",
+        "rev": "165ee672e6b17a8bcc0a3fb51fab3f79715cc1f3",
         "type": "github"
       },
       "original": {

home-manager/flake.nix

@@ -57,7 +57,7 @@
             # gimp 3.0
             (builtins.fetchurl {
               url = "https://github.com/NixOS/nixpkgs/pull/67576.diff";
-              sha256 = "1mkddzzdkl2md1zfkdpbn17kzxa4bs7gfc4h2f4frjjhk0mqaxsn";
+              sha256 = "0x7jbg4j7cz74h6b1ysxk1d5cbg5shi0r2wlyvbngwfy1gp7ffif";
             })
           ];
         }

home-manager/no-gui.nix

@@ -6,20 +6,9 @@
   config,
   ...
 }:
-{
+let
-  imports = [
+  rust_pkgs = with pkgs; [
-    ./progs/fish.nix
-    ./progs/helix.nix
-  ];
 
-  home.stateVersion = "24.11";
-  home.enableNixpkgsReleaseCheck = false;
-
-  home.packages = with pkgs; [
-    # hex viewer
-    hexyl
-
-    # rust stuff
     (rust-bin.stable.latest.default.override ({
       extensions = [
         "rust-src"
@@ -33,149 +22,167 @@
       targets = [ "thumbv7m-none-eabi" ];
     }))
     cargo-expand
+    cargo-edit # cargo upgrade and stuff
     cargo-pgo
     rust-script
     bolt_19
     libllvm # llvm-profdata
     cargo-show-asm
+    cargo-flamegraph
+  ];
 
-    # find typos in code
+  lsps = with pkgs; [
-    typos
+    # java
-
+    jdt-language-server
-    # python formatter
-    ruff
-
-    # for website generation
-    hugo
-    go
-
-    # java development
-    google-java-format # formatter
-    jdk # java
-    jdt-language-server # lsp server
-
-    # for benchmaking stuff
-    hyperfine
-
-    # replacements for common posix tools
-    eza # ls replacement
-    bat # pretty `cat` clone
-    delta # viewer for `git` and `diff` output
-    dust # pretty `du` version
-    duf # better `df` clone
-    gping # `ping`... but with a graph!!
-    tldr # `man` but more straight-forward and simpler
-    ripgrep # grep, but written in rust, respects .gitignore, and very very fast, command is `rg`
-    lurk # better strace
-
-    # adds `sensors` command
-    lm_sensors
-
-    # rssfeed
-    newsboat
 
     # HTML/CSS/JSON/ESLint language servers
     vscode-langservers-extracted
-
-    just
-
-    pfetch-rs
-    waypipe
-    htop
-    bottom
-    wget
-    unzip
-    compsize
-    killall
-
-    sshfs
-
-    # nix formatter
-    nixfmt-rfc-style
-
-    # serial viewer
-    minicom
-
-    # "~~matt's~~ my trace route"
-    mtr
-
-    file
-
-    b3sum
-
-    ffmpeg-full
-
-    # microcontroller tooling
-    probe-rs
-
     (python312.withPackages (
       ps: with ps; [
         python-lsp-server # lsp
         python-lsp-ruff # ruff integration
-
-        mypy # type checking
-
-        pyserial
-
-        numpy
-        matplotlib
-        notebook
-
-        pandas
       ]
     ))
-
-    # dep fails to build
-    # binwalk
-
-    smartmontools
-
     nil # nix lsp
     yaml-language-server # yaml lsp
     marksman # markdown lsp
     typescript-language-server # typescript lsp
     cmake-language-server # cmake lsp
-
-    # clang-format and clang-tidy
-    clang-tools
-    clang
-    gdb
-
-    # broken
-    # lldb
-
-    fio
-
-    age
-    git-crypt
-
-    imagemagick
-
-    nixpkgs-review
-
-    nmap
-
-    # terminal image viewer
-    timg
-    lsof
-
-    tcpdump
-
-    cargo-flamegraph
-    linuxKernel.packages.linux_6_14.perf
-
-    borgbackup
-
-    tinyxxd
-
-    bfc
-
-    # java assembler
-    jasmin
-
-    # rust-written LLM inference
-    mistral-rs
   ];
+in
+{
+  imports = [
+    ./progs/fish.nix
+    ./progs/helix.nix
+  ];
+
+  home.stateVersion = "24.11";
+  home.enableNixpkgsReleaseCheck = false;
+
+  home.packages =
+    with pkgs;
+    [
+      # hex viewer
+      hexyl
+
+      # find typos in code
+      typos
+
+      # python formatter
+      ruff
+
+      # for website generation
+      hugo
+      go
+
+      # java development
+      google-java-format # formatter
+      jdk # java
+
+      # for benchmaking stuff
+      hyperfine
+
+      # replacements for common posix tools
+      eza # ls replacement
+      bat # pretty `cat` clone
+      delta # viewer for `git` and `diff` output
+      dust # pretty `du` version
+      duf # better `df` clone
+      gping # `ping`... but with a graph!!
+      tldr # `man` but more straight-forward and simpler
+      ripgrep # grep, but written in rust, respects .gitignore, and very very fast, command is `rg`
+      lurk # better strace
+
+      # adds `sensors` command
+      lm_sensors
+
+      # rssfeed
+      newsboat
+
+      just
+
+      pfetch-rs
+      waypipe
+      htop
+      bottom
+      wget
+      unzip
+      compsize
+      killall
+
+      sshfs
+
+      # nix formatter
+      nixfmt-rfc-style
+
+      # serial viewer
+      minicom
+
+      # "~~matt's~~ my trace route"
+      mtr
+
+      file
+
+      b3sum
+
+      ffmpeg-full
+
+      # microcontroller tooling
+      probe-rs
+
+      (python312.withPackages (
+        ps: with ps; [
+          mypy # type checking
+
+          pyserial
+
+          numpy
+          matplotlib
+          notebook
+
+          pandas
+        ]
+      ))
+
+      binwalk
+
+      smartmontools
+
+      # clang-format and clang-tidy
+      clang-tools
+      clang
+      gdb
+
+      fio
+
+      age
+      git-crypt
+
+      imagemagick
+
+      nixpkgs-review
+
+      nmap
+
+      # terminal image viewer
+      timg
+      lsof
+
+      tcpdump
+
+      linuxKernel.packages.linux_6_14.perf
+
+      borgbackup
+
+      tinyxxd
+
+      bfc
+
+      # java assembler
+      jasmin
+    ]
+    ++ rust_pkgs
+    ++ lsps;
 
   # https://github.com/flamegraph-rs/flamegraph
   home.file.".cargo/config.toml".text = ''