vinzenz/nixos-configuration
0
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

upgrade to 25.05, fix deprecation warnings, remove unfree extensions

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

36
flake.lock
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"
} }

6
flake.nix
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";
}; };

4
home/ronja/default.nix
View file

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

94
home/ronja/vscode.nix
View file

@ -5,60 +5,62 @@
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
enableUpdateCheck = false; profiles.default = {
extensions = with pkgs.vscode-extensions; [ enableUpdateCheck = false;
jnoortheen.nix-ide extensions = with pkgs.vscode-extensions; [
ms-python.python jnoortheen.nix-ide
editorconfig.editorconfig ms-python.python
yzhang.markdown-all-in-one editorconfig.editorconfig
redhat.vscode-yaml yzhang.markdown-all-in-one
pkief.material-icon-theme redhat.vscode-yaml
rust-lang.rust-analyzer pkief.material-icon-theme
tamasfe.even-better-toml rust-lang.rust-analyzer
llvm-vs-code-extensions.vscode-clangd tamasfe.even-better-toml
mkhl.direnv llvm-vs-code-extensions.vscode-clangd
vadimcn.vscode-lldb mkhl.direnv
ms-dotnettools.csharp vadimcn.vscode-lldb
ms-vscode-remote.remote-ssh # ms-dotnettools.csharp
]; # ms-vscode-remote.remote-ssh
userSettings = { ];
"files.autoSave" = "afterDelay"; userSettings = {
"files.autoSaveWhenNoErrors" = true; "files.autoSave" = "afterDelay";
"files.autoSaveWorkspaceFilesOnly" = true; "files.autoSaveWhenNoErrors" = true;
"files.autoSaveWorkspaceFilesOnly" = true;
"editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace"; "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
"editor.fontLigatures" = true; "editor.fontLigatures" = true;
"editor.formatOnSave" = true; "editor.formatOnSave" = true;
"editor.formatOnSaveMode" = "modificationsIfAvailable"; "editor.formatOnSaveMode" = "modificationsIfAvailable";
"editor.minimap.autohide" = true; "editor.minimap.autohide" = true;
"workbench.startupEditor" = "readme"; "workbench.startupEditor" = "readme";
"workbench.enableExperiments" = false; "workbench.enableExperiments" = false;
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";
"update.mode" = "none"; "update.mode" = "none";
"extensions.autoUpdate" = false; "extensions.autoUpdate" = false;
"extensions.autoCheckUpdates" = false; "extensions.autoCheckUpdates" = false;
"telemetry.telemetryLevel" = "off"; "telemetry.telemetryLevel" = "off";
"redhat.telemetry.enabled" = false; "redhat.telemetry.enabled" = false;
"git.autofetch" = true; "git.autofetch" = true;
"diffEditor.diffAlgorithm" = "advanced"; "diffEditor.diffAlgorithm" = "advanced";
"explorer.excludeGitIgnore" = true; "explorer.excludeGitIgnore" = true;
"markdown.extension.tableFormatter.normalizeIndentation" = true; "markdown.extension.tableFormatter.normalizeIndentation" = true;
"markdown.extension.toc.orderedList" = false; "markdown.extension.toc.orderedList" = false;
"rust-analyzer.checkOnSave.command" = "clippy"; "rust-analyzer.checkOnSave.command" = "clippy";
"nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt"; "nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt";
"\[makefile\]" = { "\[makefile\]" = {
"editor.insertSpaces" = false; "editor.insertSpaces" = false;
"editor.detectIndentation" = false; "editor.detectIndentation" = false;
}; };
"\[nix\]" = { "\[nix\]" = {
"editor.formatOnSave" = false; "editor.formatOnSave" = false;
};
}; };
}; };
}; };

5
home/vinzenz/configuration.nix
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 = {

1
home/vinzenz/default.nix
View file

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

100
home/vinzenz/vscode.nix
View file

@ -5,64 +5,66 @@
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
enableUpdateCheck = false; profiles.default = {
extensions = with pkgs.vscode-extensions; [ enableUpdateCheck = false;
jnoortheen.nix-ide extensions = with pkgs.vscode-extensions; [
ms-python.python jnoortheen.nix-ide
editorconfig.editorconfig ms-python.python
yzhang.markdown-all-in-one editorconfig.editorconfig
redhat.vscode-yaml yzhang.markdown-all-in-one
pkief.material-icon-theme redhat.vscode-yaml
rust-lang.rust-analyzer pkief.material-icon-theme
tamasfe.even-better-toml rust-lang.rust-analyzer
llvm-vs-code-extensions.vscode-clangd tamasfe.even-better-toml
mkhl.direnv llvm-vs-code-extensions.vscode-clangd
vadimcn.vscode-lldb mkhl.direnv
ms-dotnettools.csharp vadimcn.vscode-lldb
ms-vscode-remote.remote-ssh # ms-dotnettools.csharp
RoweWilsonFrederiskHolme.wikitext # ms-vscode-remote.remote-ssh
davidanson.vscode-markdownlint RoweWilsonFrederiskHolme.wikitext
]; davidanson.vscode-markdownlint
userSettings = { ];
"files.autoSave" = "afterDelay"; userSettings = {
"files.autoSaveWhenNoErrors" = true; "files.autoSave" = "afterDelay";
"files.autoSaveWorkspaceFilesOnly" = true; "files.autoSaveWhenNoErrors" = true;
"files.autoSaveWorkspaceFilesOnly" = true;
"editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace"; "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
"editor.fontLigatures" = true; "editor.fontLigatures" = true;
"editor.formatOnSave" = true; "editor.formatOnSave" = true;
"editor.formatOnSaveMode" = "modificationsIfAvailable"; "editor.formatOnSaveMode" = "modificationsIfAvailable";
"editor.minimap.autohide" = true; "editor.minimap.autohide" = true;
"workbench.startupEditor" = "readme"; "workbench.startupEditor" = "readme";
"workbench.enableExperiments" = false; "workbench.enableExperiments" = false;
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";
"update.mode" = "none"; "update.mode" = "none";
"extensions.autoUpdate" = false; "extensions.autoUpdate" = false;
"extensions.autoCheckUpdates" = false; "extensions.autoCheckUpdates" = false;
"telemetry.telemetryLevel" = "off"; "telemetry.telemetryLevel" = "off";
"redhat.telemetry.enabled" = false; "redhat.telemetry.enabled" = false;
"git.autofetch" = true; "git.autofetch" = true;
"git.path" = "${lib.getBin pkgs.git}/bin/git"; "git.path" = "${lib.getBin pkgs.git}/bin/git";
"diffEditor.diffAlgorithm" = "advanced"; "diffEditor.diffAlgorithm" = "advanced";
"explorer.excludeGitIgnore" = false; "explorer.excludeGitIgnore" = false;
"markdown.extension.tableFormatter.normalizeIndentation" = true; "markdown.extension.tableFormatter.normalizeIndentation" = true;
"markdown.extension.toc.orderedList" = false; "markdown.extension.toc.orderedList" = false;
"rust-analyzer.checkOnSave.command" = "clippy"; "rust-analyzer.checkOnSave.command" = "clippy";
"nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt"; "nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt";
"\[makefile\]" = { "\[makefile\]" = {
"editor.insertSpaces" = false; "editor.insertSpaces" = false;
"editor.detectIndentation" = false; "editor.detectIndentation" = false;
}; };
"\[nix\]" = { "\[nix\]" = {
"editor.formatOnSave" = false; "editor.formatOnSave" = false;
};
}; };
}; };
}; };

4
home/vinzenz/zsh.nix
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
''; '';

18
modules/desktop-environment.nix
View file

@ -13,14 +13,16 @@
}; };
# Enable sound with pipewire. # Enable sound with pipewire.
hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services = {
enable = true; pulseaudio.enable = false;
alsa.enable = true; pipewire = {
alsa.support32Bit = true; enable = true;
pulse.enable = true; alsa.enable = true;
#jack.enable = true; alsa.support32Bit = true;
pulse.enable = true;
#jack.enable = true;
};
}; };
programs = { programs = {
@ -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
]; ];