Update to 26.05

This commit is contained in:
2026-06-09 17:40:53 +02:00
parent 791e88e8a5
commit 5f753f2050
7 changed files with 67 additions and 72 deletions
-1
View File
@@ -44,7 +44,6 @@
vital
odin2
surge
fire
lsp-plugins
];
+8 -9
View File
@@ -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";
};
@@ -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" = {