upgrade to 25.05, fix deprecation warnings, remove unfree extensions

This commit is contained in:
Vinzenz Schroeter 2025-05-29 16:06:22 +02:00
parent f71f9f50fb
commit 1e91b4ba76
9 changed files with 137 additions and 131 deletions

View file

@ -40,16 +40,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746171682, "lastModified": 1748487945,
"narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "narHash": "sha256-e9zc/rHdoH9i+sFFhhQiKoF6IuD+T2rB/nUyPaO7CCg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "50eee705bbdbac942074a8c120e8194185633675", "rev": "0d13ea58d565d3c1c1468ddae1f623316dc395d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -57,15 +57,15 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737234286, "lastModified": 1746827285,
"narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=",
"rev": "079528098f5998ba13c88821a2eca1005c1695de", "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz"
} }
}, },
"lix-module": { "lix-module": {
@ -78,15 +78,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742943028, "lastModified": 1746838955,
"narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=",
"rev": "868d97695bab9d21f6070b03957bcace249fbe3c", "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz?rev=868d97695bab9d21f6070b03957bcace249fbe3c" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"
} }
}, },
"naersk": { "naersk": {
@ -201,16 +201,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1746557022, "lastModified": 1748302896,
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "narHash": "sha256-ixMT0a8mM091vSswlTORZj93WQAJsRNmEvqLL+qwTFM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "rev": "7848cd8c982f7740edf76ddb3b43d234cb80fc4d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View file

@ -1,16 +1,16 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.11"; url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

View file

@ -20,9 +20,5 @@
./configuration.nix ./configuration.nix
./vscode.nix ./vscode.nix
]; ];
allowedUnfreePackages = [
"vscode-extension-ms-vscode-remote-remote-ssh"
];
}; };
} }

View file

@ -5,6 +5,7 @@
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
profiles.default = {
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
jnoortheen.nix-ide jnoortheen.nix-ide
@ -18,8 +19,8 @@
llvm-vs-code-extensions.vscode-clangd llvm-vs-code-extensions.vscode-clangd
mkhl.direnv mkhl.direnv
vadimcn.vscode-lldb vadimcn.vscode-lldb
ms-dotnettools.csharp # ms-dotnettools.csharp
ms-vscode-remote.remote-ssh # ms-vscode-remote.remote-ssh
]; ];
userSettings = { userSettings = {
"files.autoSave" = "afterDelay"; "files.autoSave" = "afterDelay";
@ -63,4 +64,5 @@
}; };
}; };
}; };
};
} }

View file

@ -8,6 +8,7 @@
direnv = { direnv = {
enable = true; enable = true;
nix-direnv.enable = true; nix-direnv.enable = true;
enableZshIntegration = true;
}; };
eza = { eza = {
@ -44,6 +45,8 @@
blanket blanket
vlc vlc
ptyxis
arduino arduino
arduino-ide arduino-ide
arduino-cli arduino-cli
@ -54,6 +57,8 @@
servicepoint-cli servicepoint-cli
servicepoint-simulator servicepoint-simulator
anydesk
]; ];
home.file = { home.file = {

View file

@ -37,7 +37,6 @@
]; ];
allowedUnfreePackages = [ allowedUnfreePackages = [
"vscode-extension-ms-vscode-remote-remote-ssh"
"insync" "insync"
"insync-pkg" "insync-pkg"

View file

@ -5,6 +5,7 @@
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
profiles.default = {
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
jnoortheen.nix-ide jnoortheen.nix-ide
@ -18,8 +19,8 @@
llvm-vs-code-extensions.vscode-clangd llvm-vs-code-extensions.vscode-clangd
mkhl.direnv mkhl.direnv
vadimcn.vscode-lldb vadimcn.vscode-lldb
ms-dotnettools.csharp # ms-dotnettools.csharp
ms-vscode-remote.remote-ssh # ms-vscode-remote.remote-ssh
RoweWilsonFrederiskHolme.wikitext RoweWilsonFrederiskHolme.wikitext
davidanson.vscode-markdownlint davidanson.vscode-markdownlint
]; ];
@ -67,4 +68,5 @@
}; };
}; };
}; };
};
} }

View file

@ -1,8 +1,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
config.programs.zsh = { config.programs.zsh = {
initExtra = '' initContent = ''
eval "$(direnv hook zsh)"; # eval "$(direnv hook zsh)";
export PATH=$PATH:/home/vinzenz/.cargo/bin export PATH=$PATH:/home/vinzenz/.cargo/bin
''; '';

View file

@ -13,15 +13,17 @@
}; };
# Enable sound with pipewire. # Enable sound with pipewire.
hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services = {
pulseaudio.enable = false;
pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
#jack.enable = true; #jack.enable = true;
}; };
};
programs = { programs = {
kdeconnect.enable = true; kdeconnect.enable = true;
@ -100,7 +102,7 @@
enableDefaultPackages = true; enableDefaultPackages = true;
fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ]; fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font" ];
packages = with pkgs; [ packages = with pkgs; [
(nerdfonts.override { fonts = [ "FiraCode" ]; }) nerd-fonts.fira-code
roboto-mono roboto-mono
recursive recursive
]; ];