ctucx.git: nixfiles

update to 23.11 (and required changes to configs)

diff --git a/configurations/common/programs/bash.nix b/configurations/common/programs/bash.nix
@@ -22,11 +22,11 @@
 
           rm           = "rm -i";
 
-          ls           = "exa";
-          ll           = "exa -l";
-          la           = "exa -a";
-          lt           = "exa --tree";
-          lla          = "exa -la";
+          ls           = "eza";
+          ll           = "eza -l";
+          la           = "eza -a";
+          lt           = "eza --tree";
+          lla          = "eza -la";
 
           cat          = "bat -p";
           grep         = "rg";

diff --git a/configurations/common/programs/utilities.nix b/configurations/common/programs/utilities.nix
@@ -19,7 +19,7 @@
           exec ${pkgs.yt-dlp}/bin/yt-dlp --compat-options youtube-dl "$@"
         '')
 
-        exa
+        eza
         bat
         ripgrep
         fd

diff --git a/configurations/linux/default.nix b/configurations/linux/default.nix
@@ -87,7 +87,7 @@
 
     leah = {
       isNormalUser                  = true;
-      passwordFile                  = config.age.secrets.leah-systempassword.path;
+      hashedPasswordFile            = config.age.secrets.leah-systempassword.path;
       extraGroups                   = [ "wheel" ]; # Enable ‘sudo’ for the user.
       openssh.authorizedKeys.keys   = [
         #yubikey gpg

diff --git a/configurations/linux/desktop/programs/systemd-lock-handler.nix b/configurations/linux/desktop/programs/systemd-lock-handler.nix
@@ -9,7 +9,7 @@ let
       rev    = "a0b3cec818520f2970b7da36b2cf25d860d8d017";
       sha256 = "1cna5kpcm9sb7azyk3355g5lb6vs8fyszkwjalv2ld159n80w63f";
     };
-    vendorSha256 = "09n8g7m8pk442jgji7ws8mwp92c3ig8nvbbkbghh2pcgbgkyc3gn";
+    vendorHash = "09n8g7m8pk442jgji7ws8mwp92c3ig8nvbbkbghh2pcgbgkyc3gn";
   };
 
 in {

diff --git a/configurations/linux/services/syncthing-nginx.nix b/configurations/linux/services/syncthing-nginx.nix
@@ -13,7 +13,7 @@
   services = {
     syncthing = {
       guiAddress = "[::1]:8384";
-      extraOptions.gui.insecureSkipHostcheck = true;
+      settings.gui.insecureSkipHostcheck = true;
     };
 
     nginx = {

diff --git a/configurations/linux/services/syncthing.nix b/configurations/linux/services/syncthing.nix
@@ -31,8 +31,8 @@ in {
     dataDir          = lib.mkDefault "/home/leah";
     configDir        = lib.mkDefault "/home/leah/.config/syncthing";
 
-    devices          = syncthingConfig.devices;
-    folders          = syncthingConfig.folders;
+    settings.devices = syncthingConfig.devices;
+    settings.folders = syncthingConfig.folders;
   };
 
 }

diff --git a/flake.nix b/flake.nix
@@ -90,14 +90,14 @@
       type  = "github";
       owner = "NixOS";
       repo  = "nixpkgs";
-      ref   = "nixos-23.05";
+      ref   = "nixos-23.11";
     };
 
     nixpkgsDarwin = {
       type  = "github";
       owner = "NixOS";
       repo  = "nixpkgs";
-      ref   = "nixpkgs-23.05-darwin";
+      ref   = "nixpkgs-23.11-darwin";
     };
 
     nixpkgsUnstable = {

@@ -118,7 +118,7 @@
       type  = "github";
       owner = "nix-community";
       repo  = "home-manager";
-      ref   = "release-23.05";
+      ref   = "release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

diff --git a/modules/default.nix b/modules/default.nix
@@ -3,7 +3,10 @@
 
 {
 
-  disabledModules = [ "services/misc/gitolite.nix" ];
+  disabledModules = [
+    "services/misc/gitolite.nix"
+    "services/web-apps/gotosocial.nix"
+  ];
 
   imports = (builtins.concatLists [
     (if (currentSystem == "x86_64-linux") then [

diff --git a/pkgs/gotosocial/default.nix b/pkgs/gotosocial/default.nix
@@ -41,7 +41,7 @@ pkgs.unstable.buildGo121Module rec {
   ldflags = ["-s" "-w" "-extldflags '-static'" "-X 'main.Commit=${rev}'" "-X 'main.Version=${version}'"];
   tags    = ["netgo" "osusergo" "static_build"];
 
-  vendorSha256 = null;
+  vendorHash = null;
 
 	propagatedBuildInputs = [ ffmpeg ];
   nativeBuildInputs     = [ installShellFiles ];

diff --git a/pkgs/matrix-sliding-sync.nix b/pkgs/matrix-sliding-sync.nix
@@ -13,7 +13,7 @@ buildGoModule rec {
 
   subPackages = [ "cmd/syncv3" ];
 
-  vendorSha256 = "sha256-FmibAVjKeJUrMSlhoE7onLoa4EVjQvjDI4oU4PB5LBE=";
+  vendorHash = "sha256-FmibAVjKeJUrMSlhoE7onLoa4EVjQvjDI4oU4PB5LBE=";
 
   postInstall = ''
     mkdir -p $out/share

diff --git a/pkgs/mbusd.nix b/pkgs/mbusd.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, ... }:
+{ stdenv, fetchFromGitHub, cmake, pkg-config, ... }:
 
 stdenv.mkDerivation rec {
   pname = "mbusd";

@@ -11,5 +11,5 @@ stdenv.mkDerivation rec {
     sha256 = "1mvrwr02vcsgf9lc9bq4mhr0s6ww5z7ml7lwpyrl4axpz59i4l9s";
   };
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkg-config ];
 }