!update to 24.11 (beta)

nix/homeModules/common/cmus/default.nix

@@ -1,15 +1,12 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-{
-  options.programs.cmus.enable = lib.mkEnableOption "cmus";
+{ pkgs, lib, ... }:
 
-  config = lib.mkIf config.programs.cmus.enable {
-    home.packages = [ pkgs.cmus ];
-    xdg.configFile."cmus/rc".text = lib.mkMerge [
+{
+
+  programs.cmus = {
+
+    enable = true;
+
+    extraConfig = lib.mkMerge [
       (builtins.readFile ./rc)
 
       (lib.mkIf pkgs.stdenv.isLinux (
@@ -55,5 +52,7 @@
         set output_plugin=ao
       '')
     ];
+
   };
+
 }

nix/homeModules/common/user-nixconf.nix

@@ -1,9 +1,14 @@
-{ pkgs, lib, ... }:
+{
+  nixosConfig ? null,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
 
   nix = {
-    package = lib.mkForce pkgs.nixVersions.nix_2_23;
+    package = lib.mkDefault (nixosConfig.nix.package or pkgs.nix);
 
     settings = {
       allow-import-from-derivation = "true";

nix/homeModules/extra/neovim-moreLangServers.nix

@@ -9,7 +9,7 @@
     pkgs.nil # nix
     pkgs.yaml-language-server # yaml
 
-    pkgs.nodePackages.pyright # python
+    pkgs.pyright # python
 
     pkgs.marksman # markdown
     pkgs.taplo # toml

nix/homeModules/named/bismuth/default.nix

@@ -27,5 +27,5 @@ in
     pkgs.colima
   ];
 
-  programs.neovim.extraPackages = [ myPkgs.fish-lsp ];
+  programs.neovim.extraPackages = [ pkgs.fish-lsp ];
 }

nix/homeModules/named/carbon/dev.nix

@@ -1,9 +1,5 @@
 { pkgs, config, ... }:
 
-let
-  inherit (pkgs) myPkgs;
-in
-
 {
   home.packages = [
     pkgs.jetbrains.idea-community
@@ -53,7 +49,7 @@ in
 
   programs.neovim.extraPackages = [
     # fish
-    myPkgs.fish-lsp
+    pkgs.fish-lsp
 
     # golang
     pkgs.gopls

nix/nixosModules/named/carbon/audio.nix

@@ -1,9 +1,7 @@
 { pkgs, ... }:
+
 {
-  sound = {
-    enable = true;
-    mediaKeys.enable = true;
-  };
+
   security.rtkit.enable = true;
 
   services.pipewire = {
@@ -32,4 +30,5 @@
   ];
 
   users.users."leana".extraGroups = [ "audio" ];
+
 }

nix/nixosModules/named/carbon/networking.nix

@@ -10,7 +10,7 @@
   networking.wireless = {
     enable = true;
     userControlled.enable = true;
-    environmentFile = config.age.secrets.wpa_password.path;
+    secretsFile = config.age.secrets.wpa_password.path;
     networks =
       let
         ordered =
@@ -24,8 +24,8 @@
       ordered [
         # first in list is tried first
         {
-          "HiddenParadize@Earth2077".psk = "@HOME@";
-          "Pei’s Wifi".psk = "@PEI_PASSWORD@";
+          "HiddenParadize@Earth2077".pskRaw = "ext:HOME";
+          "Pei’s Wifi".pskRaw = "ext:PEI_PASSWORD";
         }
         {
           "_SNCF_WIFI_INOUI" = { };
@@ -42,12 +42,12 @@
               identity="@EDUROAM_ID@"
               altsubject_match="DNS:radius.univ-rennes1.fr;DNS:radius1.univ-rennes1.fr;DNS:radius2.univ-rennes1.fr;DNS:vmradius-psf1.univ-rennes1.fr;DNS:vmradius-psf2.univ-rennes1.fr"
               phase2="auth=MSCHAPV2"
-              password="@EDUROAM_PSK@"
+              password=ext:EDUROAM_PSK
               anonymous_identity="anonymous@univ-rennes.fr"
             '';
           };
         }
-        { "iPhone de Léana 江".psk = "@PHONE@"; }
+        { "iPhone de Léana 江".pskRaw = "ext:PHONE"; }
       ];
   };
 }

nix/nixosModules/named/carbon/packages.nix

@@ -6,7 +6,10 @@
     pkgs.gcc
   ];
 
-  programs.vim.defaultEditor = true;
+  programs.vim = {
+    enable = true;
+    defaultEditor = true;
+  };
   programs.git.enable = true;
 
   programs.dconf.enable = true;

nix/nixosModules/shared/system-nixconf.nix

@@ -1,9 +1,9 @@
-{ pkgs, lib, ... }:
+{ lib, pkgs, ... }:
 
 {
 
   nix = {
-    package = lib.mkDefault pkgs.nixVersions.nix_2_22;
+    package = lib.mkDefault pkgs.nix;
 
     settings = {
       extra-substituters = [
@@ -28,6 +28,7 @@
 
       sandbox = true;
     };
+
   };
 
 }

nix/overlays/default.nix

@@ -26,6 +26,10 @@ let
       inherit (inputs.agenix.packages.${final.system}) agenix;
       inherit (inputs.disko.packages.${final.system}) disko;
       wallpapers = inputs.wallpapers.packages.${final.system};
+
+      inherit (import inputs.nixpkgs-stable { inherit (final) system; })
+        isabelle
+        ;
     })
 
     inputs.nur.overlay

nix/packages/default.nix

@@ -181,7 +181,6 @@
       # Unmerged packages from nixfinal
       # TODO: use upstream when merged
       dl-librescore = final.callPackage ./dl-librescore.nix { };
-      fish-lsp = final.callPackage ./fish-lsp { };
     });
 
   perSystem =

nix/packages/fish-lsp/default.nix

@@ -1,51 +0,0 @@
-{
-  mkYarnPackage,
-  fetchFromGitHub,
-  fetchYarnDeps,
-  fish,
-  fixup-yarn-lock,
-  nodejs,
-  yarn,
-  makeWrapper,
-}:
-
-mkYarnPackage rec {
-  pname = "fish-lsp";
-  version = "1.0.7";
-
-  src = fetchFromGitHub {
-    owner = "ndonfris";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-Np7ELQxHqSnkzVkASYSyO9cTiO1yrakDuK88kkACNAI=";
-  };
-
-  offlineCache = fetchYarnDeps {
-    yarnLock = src + "/yarn.lock";
-    hash = "sha256-hmaLWO1Sj+2VujrGD2A+COfVE2D+tCnxyojjq1512K4=";
-  };
-
-  nativeBuildInputs = [
-    fish
-    fixup-yarn-lock
-    nodejs
-    yarn
-    makeWrapper
-  ];
-
-  buildPhase = ''
-    runHook preBuild
-    wasm_file=$(find node_modules -type f -a -name tree-sitter-fish.wasm)
-    cp -f $wasm_file ./deps/fish-lsp
-    yarn run sh:build-time
-    yarn --offline compile
-    yarn run sh:relink
-    # yarn run sh:build-completions
-    runHook postBuild
-  '';
-
-  postInstall = ''
-    wrapProgram "$out/bin/fish-lsp" \
-        --set-default fish_lsp_logfile "/tmp/fish_lsp_logs.txt"
-  '';
-}