flake.lock: Update

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/8cbc6500dfca22d907054f68c564019b3b6cf295' (2022-10-13)
  → 'github:nix-community/home-manager/2ecb3ea990cf737cfb42d8cd805fa86347c1afaf' (2022-10-15)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/e858db900443414fd8dd2f78c3ecb47df3febc44' (2022-10-13)
  → 'github:nixos/nixpkgs/26b7e6ab6a864c3e7e077bcb27a49f0480b9894a' (2022-10-15)

flake.lock

@@ -72,11 +72,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1665655007,
-        "narHash": "sha256-34ZMJlgqJb73RY/gJz8B4cjdM5ukas2crMYQpmyRGeQ=",
+        "lastModified": 1665863351,
+        "narHash": "sha256-u8YWmHBTXWvQPBfKOrPWFVjvqhJ+5hUk3/29eR7APko=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8cbc6500dfca22d907054f68c564019b3b6cf295",
+        "rev": "2ecb3ea990cf737cfb42d8cd805fa86347c1afaf",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1665695307,
-        "narHash": "sha256-Nt0ZBvRjQaZFVcYH5kwnCO6EUnSbL5zTf12NIIfHDeA=",
+        "lastModified": 1665830552,
+        "narHash": "sha256-qel2bZ9TqfW8WzWCWdjuCy4bVFhhGsEeqFv/bj1ka2s=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e858db900443414fd8dd2f78c3ecb47df3febc44",
+        "rev": "26b7e6ab6a864c3e7e077bcb27a49f0480b9894a",
         "type": "github"
       },
       "original": {

justfile

@@ -1,4 +1,4 @@
-in_nix_shell := if env_var_or_default("IN_NIX_SHELL", "false") == "false" { "false" } else { "true" }
+in_nix_shell := env_var_or_default("IN_NIX_SHELL", "false")
 root_dir := justfile_directory()
 
 # choose a just command to run
@@ -11,10 +11,10 @@ help:
 
 _run cmd:
     #!/usr/bin/env -S sh -eu
-    if [ "{{ in_nix_shell }}" = "true" ]; then
-      just "{{ root_dir }}/{{ cmd }}"
-    else
+    if [ "{{ in_nix_shell }}" = "false" ]; then
       nix-shell "{{ root_dir }}/shell.nix" --run "just \"{{ root_dir }}/{{ cmd }}\""
+    else
+      just "{{ root_dir }}/{{ cmd }}"
     fi
 
 _build:

programs/default.nix

@@ -1,45 +1,50 @@
 { inputs, config, pkgs, ... }:
 
-{
-  imports = [ ./fish.nix ./git.nix ./starship.nix ./vscode.nix ];
-
-  home.packages = with pkgs; [
-    bash
-    broot
-    cloc
-    cloudflare-dyndns
-    comma
+let
+  nixPackages = with pkgs; [
     config.nix.package
-    coreutils-full
-    curl
-    ddgr
-    dig
-    dua
-    entr
-    fd
-    gitui
-    graphviz-nox
-    httpie
-    jetbrains.idea-community
-    less
-    micro
-    neofetch
     niv
     nix
     nix-diff
+    nix-du
     nixfmt
-    openssh
-    proselint
-    ranger
     rnix-lsp
-    shellcheck
-    spotify-tui
     statix
+  ];
+  networkingPackages = with pkgs; [
+    curl
+    dig
+    httpie
+    openssh
+  ];
+  cmdLineUtilPackages = with pkgs; [
+    bash
+    broot
+    coreutils-full
+    fd
+    gnugrep
+    less
+    ranger
     tealdeer
     thefuck
     tree
-
-    # fonts
+  ];
+  miscPackages = with pkgs; [
+    cloc
+    comma
+    ddgr
+    dua
+    entr
+    gitui
+    graphviz-nox
+    jetbrains.idea-community
+    micro
+    neofetch
+    proselint
+    shellcheck
+    spotify-tui
+  ];
+  fonts = with pkgs; [
     fira-mono
     inconsolata
     jetbrains-mono
@@ -49,6 +54,10 @@
     (pkgs.callPackage ../packages/dm-mono.nix { dm-mono-src = "${inputs.dm-mono-font}"; })
     (nerdfonts.override { fonts = [ "Monoid" "Agave" "Iosevka" "Lekton" "VictorMono" ]; })
   ];
+in {
+  imports = [ ./fish.nix ./git.nix ./starship.nix ./vscode.nix ];
+
+  home.packages = nixPackages ++ networkingPackages ++ cmdLineUtilPackages ++ miscPackages ++ fonts;
 
   programs.htop = {
     enable = true;

programs/vscode/extensions.nix

@@ -62,8 +62,8 @@
   {
     name = "nix-ide";
     publisher = "jnoortheen";
-    version = "0.1.23";
-    sha256 = "0i5zqfz2ic57z9b4v6mrs68dzhvgpnr5984srjapi0nzm30k127b";
+    version = "0.2.1";
+    sha256 = "0bibb3r4cb7chnx6vpyl41ig12pc0cbg0sb8f2khs52c71nk4bn8";
   }
   {
     name = "language-haskell";
@@ -98,8 +98,8 @@
   {
     name = "rust-analyzer";
     publisher = "rust-lang";
-    version = "0.4.1243";
-    sha256 = "069s4wjyf6zzlxvlwycb4vryf5rflk0x6bq1a2h9x7jsgqjm3lc0";
+    version = "0.4.1246";
+    sha256 = "0zwggmv3f6mq8wkzgzlkni6ha1cis298vkfjacvkw6b9am416gk1";
   }
   {
     name = "just";