Enable fish in server profile

Flake lock file updates:

• Updated input 'anyrun':
    'github:Kirottu/anyrun/f9073a6184f61a07bb584ecc47fbb8eb997e9216' (2023-10-10)
  → 'github:Kirottu/anyrun/52cec0a39350cc4e79fc4009c64e56a93b9150ba' (2023-11-28)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/87af8a9faf5cfbbd25795d9fe7574808bef46870' (2023-11-28)
  → 'github:nix-community/emacs-overlay/f59e99c3973f99a9338bdb03876b9072400589aa' (2023-11-29)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/d2e4de209881b38392933fabf303cde3454b0b4c' (2023-11-26)
  → 'github:NixOS/nixpkgs/5b528f99f73c4fad127118a8c1126b5e003b01a9' (2023-11-27)
• Updated input 'microvm':
    'github:astro/microvm.nix/d5f76520886b6918f3bfc115bc58de967a651540' (2023-11-27)
  → 'github:astro/microvm.nix/89bb7a5230a4820736a43e058c8d2a2c560d672b' (2023-11-28)
• Updated input 'nil':
    'github:oxalica/nil/1348b53085d3befd86b39cf15dc00702af3e5a79' (2023-11-27)
  → 'github:oxalica/nil/0031eb4343fd4672742fd6ff839da9b4f5120646' (2023-11-29)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/b006ec52fce23b1d57f6ab4a42d7400732e9a0a2' (2023-11-26)
  → 'github:NixOS/nixos-hardware/8772491ed75f150f02552c60694e1beff9f46013' (2023-11-29)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8' (2023-11-24)
  → 'github:nixos/nixpkgs/8cfef6986adfb599ba379ae53c9f5631ecd2fd9c' (2023-11-27)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/9dd940c967502f844eacea52a61e9596268d4f70' (2023-11-28)
  → 'github:oxalica/rust-overlay/4a080e26d55eaedb95ab1bf8eeaeb84149c10f12' (2023-11-29)

flake.lock

@@ -8,11 +8,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696926085,
+        "lastModified": 1701201993,
-        "narHash": "sha256-PuaKdM4Nems/wQ2B+K7hI2UJYld/+64NdkcsYD1YJwM=",
+        "narHash": "sha256-gxkCX8u+vkSFjYklNuY/6mch91n9TLvfAHqPvyrA/hA=",
         "owner": "Kirottu",
         "repo": "anyrun",
-        "rev": "f9073a6184f61a07bb584ecc47fbb8eb997e9216",
+        "rev": "52cec0a39350cc4e79fc4009c64e56a93b9150ba",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699781810,
+        "lastModified": 1700927249,
-        "narHash": "sha256-LD+PIUbm1yQmQmGIbSsc/PB1dtJtGqXFgxRc1C7LlfQ=",
+        "narHash": "sha256-iqmIWiEng890/ru7ZBf4nUezFPyRm2fjRTvuwwxqk2o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "2d7d77878c5d70f66f3d676ff66708d8d4f9d7df",
+        "rev": "3cb78c93e6a02f494aaf6aeb37481c27a2e2ee22",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1700793713,
+        "lastModified": 1701250828,
-        "narHash": "sha256-Y1TUGNWmp8Pm83OnpVI+QAerdltEV1gupl2fVPcSJ0E=",
+        "narHash": "sha256-liIO7Y1kaKElk44OgcWehah2hj5UHNtrtuXh+e2y9fM=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "cc8840b8c004b94164b38d003581cba25bb44c99",
+        "rev": "f59e99c3973f99a9338bdb03876b9072400589aa",
         "type": "github"
       },
       "original": {
@@ -306,11 +306,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700814342,
+        "lastModified": 1701071203,
-        "narHash": "sha256-orNc5wfsE7arQ9TWSTJwvk+utDvJrJ36V84N8o+VI/Y=",
+        "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e1f3b36ab01573fd35cae57d21f45d520433df61",
+        "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86",
         "type": "github"
       },
       "original": {
@@ -329,11 +329,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700320345,
+        "lastModified": 1701202812,
-        "narHash": "sha256-HDBVj9gEOG2ZBGc+UGtjqDsOIvYOQtDxDRGrbiWOXl0=",
+        "narHash": "sha256-ym/Rd4tR4i2d1WdPNKaeeIz/UoyfnCe5UBZbUl1M0PM=",
         "owner": "astro",
         "repo": "microvm.nix",
-        "rev": "b16e6261ad2f0bca6ac2a4b7a4d3377cf5e3d95d",
+        "rev": "89bb7a5230a4820736a43e058c8d2a2c560d672b",
         "type": "github"
       },
       "original": {
@@ -375,11 +375,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1699423608,
+        "lastModified": 1701225372,
-        "narHash": "sha256-WEVUgivm5DCziwZqiXRPeoD3FQTXW38ExKrZjvMveqE=",
+        "narHash": "sha256-QSiFeEmTzAIIiCtUaMesu7wi7bvfHuFzPMQpOKMt4Lo=",
         "owner": "oxalica",
         "repo": "nil",
-        "rev": "5607d429016d6f9a72843b07127fad23ea9d661f",
+        "rev": "0031eb4343fd4672742fd6ff839da9b4f5120646",
         "type": "github"
       },
       "original": {
@@ -410,11 +410,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1700559156,
+        "lastModified": 1701250978,
-        "narHash": "sha256-gL4epO/qf+wo30JjC3g+b5Bs8UrpxzkhNBBsUYxpw2g=",
+        "narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c3abafb01cd7045dba522af29b625bd1e170c2fb",
+        "rev": "8772491ed75f150f02552c60694e1beff9f46013",
         "type": "github"
       },
       "original": {
@@ -425,11 +425,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1700612854,
+        "lastModified": 1701068326,
-        "narHash": "sha256-yrQ8osMD+vDLGFX7pcwsY/Qr5PUd6OmDMYJZzZi0+zc=",
+        "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "19cbff58383a4ae384dea4d1d0c823d72b49d614",
+        "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c",
         "type": "github"
       },
       "original": {
@@ -459,11 +459,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1700678569,
+        "lastModified": 1701053011,
-        "narHash": "sha256-2Ki+2UvOidxEb3xB4ADqlbPQ2BZOF4uZMR094O8or2I=",
+        "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8f1180704ac35baded1a74164365ac7cdfba6f38",
+        "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9",
         "type": "github"
       },
       "original": {
@@ -491,11 +491,11 @@
     },
     "nixpkgs-stable_3": {
       "locked": {
-        "lastModified": 1700342017,
+        "lastModified": 1700905716,
-        "narHash": "sha256-HaibwlWH5LuqsaibW3sIVjZQtEM/jWtOHX4Nk93abGE=",
+        "narHash": "sha256-w1vHn2MbGfdC+CrP3xLZ3scsI06N0iQLU7eTHIVEFGw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "decdf666c833a325cb4417041a90681499e06a41",
+        "rev": "dfb95385d21475da10b63da74ae96d89ab352431",
         "type": "github"
       },
       "original": {
@@ -546,11 +546,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1700064067,
+        "lastModified": 1700922917,
-        "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=",
+        "narHash": "sha256-ej2fch/T584b5K9sk1UhmZF7W6wEfDHuoUYpFN8dtvM=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8",
+        "rev": "e5ee5c5f3844550c01d2131096c7271cec5e9b78",
         "type": "github"
       },
       "original": {
@@ -618,11 +618,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700792047,
+        "lastModified": 1701224160,
-        "narHash": "sha256-wVqEc4HuBEVeJAzLF7PUxuOUzTKpF9s3vuLUy4xGbIo=",
+        "narHash": "sha256-qnMmxNMKmd6Soel0cfauyMJ+LzuZbvmiDQPSIuTbQ+M=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "fbe3f99f47bdb85fe2b9a2387d20c75d57e8632f",
+        "rev": "4a080e26d55eaedb95ab1bf8eeaeb84149c10f12",
         "type": "github"
       },
       "original": {
@@ -639,11 +639,11 @@
         "nixpkgs-stable": "nixpkgs-stable_3"
       },
       "locked": {
-        "lastModified": 1700362823,
+        "lastModified": 1701127353,
-        "narHash": "sha256-/H7XgvrYM0IbkpWkcdfkOH0XyBM5ewSWT1UtaLvOgKY=",
+        "narHash": "sha256-qVNX0wOl0b7+I35aRu78xUphOyELh+mtUp1KBx89K1Q=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "49a87c6c827ccd21c225531e30745a9a6464775c",
+        "rev": "b1edbf5c0464b4cced90a3ba6f999e671f0af631",
         "type": "github"
       },
       "original": {

home-manager/modules/emacs/config.org

@@ -396,7 +396,7 @@ Disabled because the configuration is handled by Nix using [[https://github.com/
        :prefix my/leader
        "C" 'find-config)
 #+end_src
-** COMMENT Appearance
+** Appearance
 
 Enable pixel scrolling.
 
@@ -846,6 +846,7 @@ Paredit is a minor mode for editing parentheses
 #+begin_src emacs-lisp
   (use-package paredit
     :hook (emacs-lisp-mode . paredit-mode)
+    (lisp-mode . paredit-mode)
     (racket-mode . paredit-mode)
     (racket-repl-mode . paredit-mode)
     :general
@@ -1510,7 +1511,13 @@ Common Lisp does not use =lsp-mode=, but has it's own environment: [[https://git
 [[https://github.com/joaotavora/sly][SLY]] is a fork of SLIME, by the same author as =eglot=, with improved UX
 
 #+begin_src emacs-lisp
-    (use-package sly)
+  (use-package sly
+    :mode
+    (("\\.cl\\'" . lisp-mode))
+    :config
+    (setq sly-lisp-implementations
+          '((sbcl ("sbcl") :coding-system utf-8-unix))
+          sly-default-lisp 'sbcl))
 #+end_src
 
 *** Clojure

home-manager/modules/eww/config/eww.yuck

@@ -104,7 +104,7 @@
            (box :class "cpu"
                 :space-evenly false
                 :spacing 2
-                :tooltip {jq(EWW_CPU, "reduce .cores[] as $core (\"\"; . + $core.core + \": \" + ($core.usage | tostring) + \"%\\n\") | {tooltip:.}").tooltip}
+                :tooltip {jaq(EWW_CPU, "reduce .cores[] as $core (\"\"; . + $core.core + \": \" + ($core.usage | tostring) + \"%\\n\") | {tooltip:.}").tooltip}
                 (label :class "icon"
                        :text "󰻠")
                 (label :text "${round(EWW_CPU.avg, 2)}%")))
@@ -113,7 +113,7 @@
            (box :class "temperature"
                 :space-evenly false
                 :spacing 2
-                :tooltip {jq(EWW_TEMPS, ". | to_entries | reduce .[] as $temp (\"\"; . + $temp.key + \": \" + ($temp.value | tostring) + \"\\n\") | {tooltip:.}").tooltip}
+                :tooltip {jaq(EWW_TEMPS, ". | to_entries | reduce .[] as $temp (\"\"; . + $temp.key + \": \" + ($temp.value | tostring) + \"\\n\") | {tooltip:.}").tooltip}
                 (label :class "icon"
                        :text "󰔏")
                 (label :text "${round(EWW_TEMPS.ZENPOWER_TDIE, 1)}°C")))

home-manager/modules/nushell/config.nu

@@ -33,6 +33,7 @@ $env.config = {
     metric: false # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard)
   }
   show_banner: false
+  shell_integration: true
 
   hooks: {
     command_not_found: { |cmdname| (

home-manager/modules/nushell/default.nix

@@ -4,6 +4,7 @@ let
   cfg = config.eboskma.programs.nushell;
 
   zoxideOptions = concatStringsSep " " config.programs.zoxide.options;
+
 in
 {
   options.eboskma.programs.nushell = { enable = mkEnableOption "nu shell"; };
@@ -35,6 +36,7 @@ in
 
         register ${pkgs.nushellPlugins.query}/bin/nu_plugin_query
         register ${pkgs.nushellPlugins.formats}/bin/nu_plugin_formats
+        register ${pkgs.nushellPlugins.net}/bin/nu_plugin_net
 
         use kink.nu
 

home-manager/modules/sway/default.nix

@@ -230,8 +230,8 @@ in
 
           "${mod}+c" = mkIf config.eboskma.programs.emacs.enable "exec ${config.programs.emacs.package}/bin/emacsclient -c";
 
-          "${mod}+Print" = "exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[] | select(.focused) | .name')";
+          "${mod}+Print" = "exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jaq}/bin/jaq -r '.[] | select(.focused) | .name')";
-          "${mod}+Shift+Print" = "exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jq}/bin/jq -r '.[] | select(.focused) | .name') - | ${pkgs.wl-clipboard}/bin/wl-copy -t \"image/png\" -f";
+          "${mod}+Shift+Print" = "exec ${pkgs.grim}/bin/grim -o $(${pkgs.sway}/bin/swaymsg -t get_outputs | ${pkgs.jaq}/bin/jaq -r '.[] | select(.focused) | .name') - | ${pkgs.wl-clipboard}/bin/wl-copy -t \"image/png\" -f";
           "${mod}+Shift+Ctrl+Print" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\" - | ${pkgs.wl-clipboard}/bin/wl-copy -t \"image/png\" -f";
           "${mod}+Shift+Alt+Print" = "exec ${pkgs.grim}/bin/grim -g \"$(${pkgs.slurp}/bin/slurp)\"";
 

home-manager/modules/waybar/default.nix

@@ -66,7 +66,7 @@ in
           };
 
           "custom/keyboard-layout" = {
-            exec = ''${pkgs.sway}/bin/swaymsg -t get_inputs | ${pkgs.jq}/bin/jq -r '.[] | select(.identifier == "36125:40349:splitkb_Kyria_rev1") | .xkb_active_layout_name' '';
+            exec = ''${pkgs.sway}/bin/swaymsg -t get_inputs | ${pkgs.jaq}/bin/jaq -r '.[] | select(.identifier == "36125:40349:splitkb_Kyria_rev1") | .xkb_active_layout_name' '';
             interval = 30;
             format = "󰌌  {}"; # Icon: keyboard
             # Signal sent by Sway key binding (~/.config/sway/key-bindings)

machines/unifi/configuration.nix

@@ -1,5 +1,5 @@
 { self, ... }:
-{ modulesPath, pkgs, ... }: {
+{ modulesPath, pkgs, lib, ... }: {
   imports = [
     (modulesPath + "/virtualisation/proxmox-lxc.nix")
     ../../users/root
@@ -19,13 +19,14 @@
 
   services.unifi = {
     enable = true;
-    unifiPackage = pkgs.unifi.overrideAttrs (_oldAttrs: {
+    unifiPackage = pkgs.unifi;
-      version = "7.4.162";
+    # unifiPackage = pkgs.unifi.overrideAttrs (_oldAttrs: {
-      src = builtins.fetchurl {
+    #   version = "7.5.176";
-        url = "https://dl.ubnt.com/unifi/7.4.162/unifi_sysvinit_all.deb";
+    #   src = builtins.fetchurl {
-        sha256 = "sha256-BpZS95NJgSRGjJhVN6Vp8/4djdQEvj+2nfay0YsVPEw=";
+    #     url = "https://dl.ubnt.com/unifi/7.5.176-1136930355/unifi_sysvinit_all.deb";
-      };
+    #     sha256 = "prsFq09zYrB74p/MGKjwvZftw78k9wbIva5xFdk+Ztw=";
-    });
+    #   };
+    # });
     openFirewall = true;
   };
 

modules/base/default.nix

@@ -69,7 +69,7 @@ in
       du-dust
       file
       hexyl
-      jq
+      jaq
       lm_sensors
       man-pages
       man-pages-posix

users/erwin/default.nix

@@ -30,7 +30,7 @@ in
       openssh.authorizedKeys.keyFiles = [
         (pkgs.fetchurl {
           url = "https://github.com/eboskma.keys";
-          sha256 = "mmVvMuYQ56LT6dusZKxSFNdcF3g2PXbs4ejII2W0jFA=";
+          sha256 = "5pkayHiDL5JfXqAmTGtaYpbrjIjHFHyJWOLnM4yqgK0=";
         })
       ];
     };

users/erwin/server.nix

@@ -13,6 +13,7 @@ in
       eboskma = {
         programs = {
           bat.enable = true;
+          fish.enable = true;
           git = {
             enable = true;
             name = "Erwin Boskma";

users/root/default.nix

@@ -4,7 +4,7 @@
     openssh.authorizedKeys.keyFiles = [
       (pkgs.fetchurl {
         url = "https://github.com/eboskma.keys";
-        sha256 = "mmVvMuYQ56LT6dusZKxSFNdcF3g2PXbs4ejII2W0jFA=";
+        sha256 = "5pkayHiDL5JfXqAmTGtaYpbrjIjHFHyJWOLnM4yqgK0=";
       })
     ];
   };