Update to 26.05

nix-config/home/materus/default.nix

@@ -41,22 +41,22 @@
   xdg.userDirs.desktop = lib.mkDefault "${config.home.homeDirectory}/Pulpit";
   xdg.userDirs.documents = lib.mkDefault "${config.home.homeDirectory}/Dokumenty";
   xdg.userDirs.download = lib.mkDefault "${config.home.homeDirectory}/Pobrane";
-  xdg.userDirs.music = lib.mkDefault "${config.xdg.userDirs.extraConfig.XDG_AUDIO_DIR}/Muzyka";
+  xdg.userDirs.music = lib.mkDefault "${config.xdg.userDirs.extraConfig.AUDIO}/Muzyka";
   xdg.userDirs.pictures = lib.mkDefault "${config.home.homeDirectory}/Obrazy";
   xdg.userDirs.publicShare = lib.mkDefault "${config.home.homeDirectory}/Publiczny";
   xdg.userDirs.templates = lib.mkDefault "${config.home.homeDirectory}/Szablony";
   xdg.userDirs.videos = lib.mkDefault "${config.home.homeDirectory}/Wideo";
   xdg.userDirs.extraConfig = {
-    XDG_MISC_DIR = lib.mkDefault "${config.home.homeDirectory}/Inne";
-    XDG_PIC_SCREENSHOTS_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Zrzuty ekranu";
-    XDG_PIC_MEMES_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Memy";
-    XDG_PIC_MISC_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Inne";
-    XDG_PIC_PHOTOS_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Zdjęcia";
-    XDG_PIC_AVATARS_DIR = "${config.xdg.userDirs.pictures}/Avatar";
-    XDG_AUDIO_DIR = lib.mkDefault "${config.home.homeDirectory}/Audio";
-    XDG_KEYS_DIR = lib.mkDefault "${config.xdg.userDirs.documents}/Klucze";
+    MISC = lib.mkDefault "${config.home.homeDirectory}/Inne";
+    PIC_SCREENSHOTS = lib.mkDefault "${config.xdg.userDirs.pictures}/Zrzuty ekranu";
+    PIC_MEMES = lib.mkDefault "${config.xdg.userDirs.pictures}/Memy";
+    PIC_MISC = lib.mkDefault "${config.xdg.userDirs.pictures}/Inne";
+    PIC_PHOTOS = lib.mkDefault "${config.xdg.userDirs.pictures}/Zdjęcia";
+    PIC_AVATARS = "${config.xdg.userDirs.pictures}/Avatar";
+    AUDIO = lib.mkDefault "${config.home.homeDirectory}/Audio";
+    KEYS = lib.mkDefault "${config.xdg.userDirs.documents}/Klucze";
   };
-
+  xdg.userDirs.setSessionVariables = true;
 
   home.sessionVariables = {
   };

nix-config/host/materusPC/audio.nix

@@ -44,7 +44,6 @@
 
     vital
     odin2
-    surge
     fire
     lsp-plugins
   ];

nix-config/host/materusPC/configuration.nix

@@ -140,8 +140,8 @@ in
     PATH = [ "\${XDG_BIN_HOME}" ];
   };
   environment.shellInit = ''
-    if ! [ -z "$DISPLAY" ]; then ${pkgs.xorg.xhost}/bin/xhost +si:localuser:root &> /dev/null; fi;
-    if ! [ -z "$DISPLAY" ]; then ${pkgs.xorg.xhost}/bin/xhost +si:localuser:$USER &> /dev/null; fi;
+    if ! [ -z "$DISPLAY" ]; then ${pkgs.xhost}/bin/xhost +si:localuser:root &> /dev/null; fi;
+    if ! [ -z "$DISPLAY" ]; then ${pkgs.xhost}/bin/xhost +si:localuser:$USER &> /dev/null; fi;
   '';
   i18n.inputMethod.enabled = "fcitx5";
   i18n.inputMethod.fcitx5.addons = [
@@ -255,7 +255,6 @@ in
       [
         "nix-command"
         "flakes"
-        "no-url-literals"
       ]
     ];
     auto-optimise-store = true;
@@ -287,12 +286,12 @@ in
     promptInit = '''';
   };
 
-  systemd.sleep.extraConfig = ''
-    AllowSuspend=yes
-    AllowHibernation=no
-    AllowHybridSleep=no
-    AllowSuspendThenHibernate=no
-  '';
+  systemd.sleep.settings.Sleep = {
+    AllowSuspend="yes";
+    AllowHibernation="no";
+    AllowHybridSleep="no";
+    AllowSuspendThenHibernate="no";
+  };
   
 
 

nix-config/host/materusPC/home-manager/materus.nix

@@ -45,7 +45,7 @@ in
     jsonnet-language-server
   ];
 
-  programs.vscode = {
+  programs.vscodium = {
     enable = true;
     mutableExtensionsDir = true;
     profiles.default.enableExtensionUpdateCheck = true;
@@ -88,9 +88,6 @@ in
       cs128.cs128-clang-tidy
       xaver.clang-format
 
-      # D
-      webfreak.code-d
-
       # Other
       redhat.vscode-yaml
       redhat.vscode-xml
@@ -99,15 +96,13 @@ in
     package = (
       pkgs.vscodium.fhsWithPackages (
         ps: with ps; [
-          nixfmt-rfc-style
+          nixfmt
           nixd
           direnv
           jsonnet
           jsonnet-language-server
           clang-tools
           clang
-          dmd
-          ldc
         ]
       )
     );
@@ -135,7 +130,7 @@ in
           "editor.defaultFormatter" = "jnoortheen.nix-ide";
         };
         "nix.enableLanguageServer" = true;
-        "nix.formatterPath" = "${pkgs.nixfmt-rfc-style}/bin/nixfmt";
+        "nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt";
         "nix.serverPath" = "${pkgs.nixd}/bin/nixd";
         "nix.serverSettings" = {
 

nix-config/shared/nvim.nix

@@ -19,11 +19,13 @@ isHm:
         xdg.configFile."nvim/lua/materus".source = "${config.mkk.dir}/config/editor/neovim/lua/materus";
         programs.neovim = {
           enable = true;
+          withRuby = true;
+          withPython3 = true;
           plugins = [
             pkgs.vimPlugins.nvim-treesitter.withAllGrammars
           ];
 
-          extraLuaConfig = lib.mkAfter ''
+          initLua = lib.mkAfter ''
             MATERUS = {
               NIXOS = 1
             }