Adjustments for 24.11 -> 25.05
package replacements, warnings, deprecations
This commit is contained in:
parent
d95c277383
commit
82b0a6cab1
8 changed files with 124 additions and 125 deletions
|
|
@ -181,7 +181,7 @@ in
|
|||
|
||||
# Flatpak support
|
||||
services.flatpak.enable = true;
|
||||
xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-kde ];
|
||||
xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
|
||||
|
||||
# Define a user account. Don't forget to set a password with `passwd`.
|
||||
users.users.spiollinux = {
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
exfat
|
||||
iotop
|
||||
cifs-utils
|
||||
dstat
|
||||
dool
|
||||
lsof
|
||||
macchanger
|
||||
borgbackup
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
{
|
||||
# Enable sound.
|
||||
hardware.pulseaudio = {
|
||||
services.pulseaudio = {
|
||||
enable = true;
|
||||
package = pkgs.pulseaudioFull;
|
||||
# decouple pulseaudio application and sink volumes
|
||||
|
|
|
|||
|
|
@ -51,9 +51,7 @@
|
|||
merge.tool = "vimdiff";
|
||||
# provide `git mergetool -t nixfmt`
|
||||
mergetool.nixfmt = {
|
||||
cmd = "${
|
||||
lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style
|
||||
} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
|
||||
cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
|
||||
trustExitCode = true;
|
||||
};
|
||||
core.excludesfile = toString (
|
||||
|
|
@ -105,7 +103,7 @@
|
|||
enable = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
history.ignoreSpace = true;
|
||||
initExtra = ''
|
||||
initContent = ''
|
||||
# Uncomment following line if you want red dots to be displayed while waiting for completion
|
||||
COMPLETION_WAITING_DOTS="true"
|
||||
### Fix slowness of pastes with zsh-syntax-highlighting.zsh
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@
|
|||
services.gpg-agent = {
|
||||
enable = true;
|
||||
#enableSshSupport = true;
|
||||
pinentryPackage = pkgs.pinentry-qt;
|
||||
pinentry.package = pkgs.pinentry-qt;
|
||||
};
|
||||
|
||||
programs.ssh = {
|
||||
|
|
|
|||
|
|
@ -17,16 +17,16 @@ let
|
|||
inkscape
|
||||
darktable
|
||||
exiftool
|
||||
gimp
|
||||
gimp3
|
||||
]
|
||||
++ (with gimpPlugins; [
|
||||
fourier
|
||||
lqrPlugin
|
||||
++ (with gimp3Plugins; [
|
||||
#fourier # broken
|
||||
#lqrPlugin # broken
|
||||
])
|
||||
++ lib.optionals pkgs.stdenv.isLinux [
|
||||
hugin
|
||||
luminanceHDR
|
||||
xournal
|
||||
#luminanceHDR # FIXME, build failure
|
||||
xournalpp
|
||||
];
|
||||
|
||||
multimediaApps =
|
||||
|
|
@ -38,7 +38,7 @@ let
|
|||
vlc
|
||||
amarok
|
||||
clementine
|
||||
elisa
|
||||
kdePackages.elisa
|
||||
musescore
|
||||
tenacity
|
||||
soundkonverter
|
||||
|
|
@ -122,7 +122,7 @@ let
|
|||
];
|
||||
|
||||
pythonTools = with python3Packages; [
|
||||
python3 # to shadow old macOS python
|
||||
python # to shadow old macOS python
|
||||
ipython
|
||||
uv
|
||||
pip
|
||||
|
|
@ -148,7 +148,7 @@ let
|
|||
desktopLinux = [
|
||||
firefox
|
||||
chromium
|
||||
falkon
|
||||
kdePackages.falkon
|
||||
thunderbird
|
||||
calibre
|
||||
dino
|
||||
|
|
@ -172,7 +172,6 @@ let
|
|||
pulseaudioSupport = pkgs.stdenv.isLinux;
|
||||
})
|
||||
pdfpc
|
||||
quaternion
|
||||
nheko
|
||||
gpxsee
|
||||
subsurface
|
||||
|
|
@ -183,7 +182,7 @@ let
|
|||
#(pkgs.pidgin-with-plugins.override {
|
||||
# plugins = [ pkgs.pidginotr ];})
|
||||
|
||||
unstable.logseq
|
||||
logseq
|
||||
|
||||
# for Hibiscus banking software
|
||||
jameica
|
||||
|
|
|
|||
|
|
@ -11,112 +11,114 @@
|
|||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
mutableExtensionsDir = true;
|
||||
extensions =
|
||||
with pkgs.vscode-extensions;
|
||||
[
|
||||
ms-python.python
|
||||
vscodevim.vim
|
||||
yzhang.markdown-all-in-one
|
||||
bungcip.better-toml
|
||||
eamodio.gitlens
|
||||
jnoortheen.nix-ide
|
||||
mkhl.direnv
|
||||
editorconfig.editorconfig
|
||||
]
|
||||
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||
profiles.default = {
|
||||
extensions =
|
||||
with pkgs.vscode-extensions;
|
||||
[
|
||||
ms-python.python
|
||||
vscodevim.vim
|
||||
yzhang.markdown-all-in-one
|
||||
bungcip.better-toml
|
||||
eamodio.gitlens
|
||||
jnoortheen.nix-ide
|
||||
mkhl.direnv
|
||||
editorconfig.editorconfig
|
||||
]
|
||||
++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
|
||||
{
|
||||
name = "Sync-Rsync";
|
||||
publisher = "vscode-ext";
|
||||
version = "0.36.0";
|
||||
sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
|
||||
}
|
||||
# TODO: probably available in nixpkgs soonish?
|
||||
{
|
||||
name = "mypy-type-checker";
|
||||
publisher = "ms-python";
|
||||
version = "2023.3.12681020";
|
||||
sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
|
||||
}
|
||||
{
|
||||
name = "black-formatter";
|
||||
publisher = "ms-python";
|
||||
version = "2023.5.12771008";
|
||||
sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o=";
|
||||
}
|
||||
{
|
||||
name = "vscode-pets";
|
||||
publisher = "tonybaloney";
|
||||
version = "1.25.1";
|
||||
sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
|
||||
}
|
||||
];
|
||||
userSettings =
|
||||
let
|
||||
defaultPython = pkgs.python3.withPackages (ps: [
|
||||
ps.jedi
|
||||
ps.jedi-language-server
|
||||
ps.pip
|
||||
ps.setuptools # for pkg_resources
|
||||
ps.black
|
||||
ps.mypy
|
||||
]);
|
||||
in
|
||||
{
|
||||
name = "Sync-Rsync";
|
||||
publisher = "vscode-ext";
|
||||
version = "0.36.0";
|
||||
sha256 = "sha256-0b/OHLZfXo0NAVAVkzZSqMGDzF0uvPRoiqsZtW1iOdA";
|
||||
}
|
||||
# TODO: probably available in nixpkgs soonish?
|
||||
{
|
||||
name = "mypy-type-checker";
|
||||
publisher = "ms-python";
|
||||
version = "2023.3.12681020";
|
||||
sha256 = "sha256-rhed7CQlvxksVCGc9nPU2oYQWtXcAV5TzuG63e8Y3zM=";
|
||||
}
|
||||
{
|
||||
name = "black-formatter";
|
||||
publisher = "ms-python";
|
||||
version = "2023.5.12771008";
|
||||
sha256 = "sha256-lJG0RRUUMhQGs2a6oBtoqt+uY1kSJ0+cbmaP07hNh2o=";
|
||||
}
|
||||
{
|
||||
name = "vscode-pets";
|
||||
publisher = "tonybaloney";
|
||||
version = "1.25.1";
|
||||
sha256 = "sha256-as3e2LzKBSsiGs/UGIZ06XqbLh37irDUaCzslqITEJQ=";
|
||||
}
|
||||
];
|
||||
userSettings =
|
||||
let
|
||||
defaultPython = pkgs.python3.withPackages (ps: [
|
||||
ps.jedi
|
||||
ps.jedi-language-server
|
||||
ps.pip
|
||||
ps.setuptools # for pkg_resources
|
||||
ps.black
|
||||
ps.mypy
|
||||
]);
|
||||
in
|
||||
{
|
||||
"editor.fontLigatures" = true;
|
||||
"editor.accessibilitySupport" = false; # prevent asking
|
||||
"editor.cursorBlinking" = "phase";
|
||||
"editor.stickyScroll.enabled" = true;
|
||||
"workbench.editor.highlightModifiedTabs" = true;
|
||||
"window.autoDetectColorScheme" = true;
|
||||
"workbench.preferredDarkColorTheme" = "Default Dark Modern";
|
||||
"workbench.preferredLightColorTheme" = "Default Light Modern";
|
||||
"[nix]" = {
|
||||
"editor.insertSpaces" = true;
|
||||
"editor.tabSize" = 2;
|
||||
# for now, disable automatic formatting to prevent disruption of existing code bases
|
||||
"editor.formatOnPaste" = false;
|
||||
"editor.formatOnSave" = false;
|
||||
"editor.formatOnType" = false;
|
||||
"editor.fontLigatures" = true;
|
||||
"editor.accessibilitySupport" = false; # prevent asking
|
||||
"editor.cursorBlinking" = "phase";
|
||||
"editor.stickyScroll.enabled" = true;
|
||||
"workbench.editor.highlightModifiedTabs" = true;
|
||||
"window.autoDetectColorScheme" = true;
|
||||
"workbench.preferredDarkColorTheme" = "Default Dark Modern";
|
||||
"workbench.preferredLightColorTheme" = "Default Light Modern";
|
||||
"[nix]" = {
|
||||
"editor.insertSpaces" = true;
|
||||
"editor.tabSize" = 2;
|
||||
# for now, disable automatic formatting to prevent disruption of existing code bases
|
||||
"editor.formatOnPaste" = false;
|
||||
"editor.formatOnSave" = false;
|
||||
"editor.formatOnType" = false;
|
||||
};
|
||||
"nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = lib.getExe pkgs.nixd;
|
||||
"nix.serverSettings" = { };
|
||||
"editor.fontSize" = 13;
|
||||
"editor.fontWeight" = "normal";
|
||||
"git.detectSubmodulesLimit" = 30;
|
||||
"[python]" = {
|
||||
"breadcrumbs.showClasses" = true;
|
||||
"breadcrumbs.showFunctions" = true;
|
||||
"gitlens.codeLens.symbolScopes" = [ "!Module" ];
|
||||
"editor.defaultFormatter" = "ms-python.black-formatter";
|
||||
"editor.formatOnSave" = true;
|
||||
};
|
||||
"python.languageServer" = "Jedi"; # don't use proprietary pylance server
|
||||
"python.defaultInterpreterPath" = "${defaultPython}/bin/python";
|
||||
"black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ];
|
||||
"black-formatter.importStrategy" = "fromEnvironment";
|
||||
"mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ];
|
||||
"mypy-type-checker.importStrategy" = "fromEnvironment";
|
||||
"mypy-type-checker.args" = [ "--ignore-missing-imports" ];
|
||||
"gitlens.telemetry.enabled" = false;
|
||||
"vim.highlightedyank.enable" = true;
|
||||
"vim.history" = 500;
|
||||
"vim.neovimUseConfigFile" = true;
|
||||
"vim.enableNeovim" = true;
|
||||
"git.suggestSmartCommit" = false;
|
||||
"editor.rulers" = [ 79 ];
|
||||
"vim.useSystemClipboard" = true;
|
||||
"vim.smartRelativeLine" = true;
|
||||
"diffEditor.ignoreTrimWhitespace" = false;
|
||||
"files.associations" = {
|
||||
"*.py" = "python";
|
||||
};
|
||||
"editor.renderWhitespace" = "all";
|
||||
"editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
|
||||
"vim.neovimPath" = lib.getExe pkgs.myVim;
|
||||
"sync-rsync.options" = [ ];
|
||||
"direnv.path.executable" = lib.getExe pkgs.direnv;
|
||||
};
|
||||
"nix.formatterPath" = lib.getExe pkgs.nixfmt-rfc-style;
|
||||
"nix.enableLanguageServer" = true;
|
||||
"nix.serverPath" = lib.getExe pkgs.nixd;
|
||||
"nix.serverSettings" = { };
|
||||
"editor.fontSize" = 13;
|
||||
"editor.fontWeight" = "normal";
|
||||
"git.detectSubmodulesLimit" = 30;
|
||||
"[python]" = {
|
||||
"breadcrumbs.showClasses" = true;
|
||||
"breadcrumbs.showFunctions" = true;
|
||||
"gitlens.codeLens.symbolScopes" = [ "!Module" ];
|
||||
"editor.defaultFormatter" = "ms-python.black-formatter";
|
||||
"editor.formatOnSave" = true;
|
||||
};
|
||||
"python.languageServer" = "Jedi"; # don't use proprietary pylance server
|
||||
"python.defaultInterpreterPath" = "${defaultPython}/bin/python";
|
||||
"black-formatter.path" = [ "${pkgs.python3Packages.black}/bin/black" ];
|
||||
"black-formatter.importStrategy" = "fromEnvironment";
|
||||
"mypy-type-checker.path" = [ "${pkgs.python3Packages.mypy}/bin/mypy" ];
|
||||
"mypy-type-checker.importStrategy" = "fromEnvironment";
|
||||
"mypy-type-checker.args" = [ "--ignore-missing-imports" ];
|
||||
"gitlens.telemetry.enabled" = false;
|
||||
"vim.highlightedyank.enable" = true;
|
||||
"vim.history" = 500;
|
||||
"vim.neovimUseConfigFile" = true;
|
||||
"vim.enableNeovim" = true;
|
||||
"git.suggestSmartCommit" = false;
|
||||
"editor.rulers" = [ 79 ];
|
||||
"vim.useSystemClipboard" = true;
|
||||
"vim.smartRelativeLine" = true;
|
||||
"diffEditor.ignoreTrimWhitespace" = false;
|
||||
"files.associations" = {
|
||||
"*.py" = "python";
|
||||
};
|
||||
"editor.renderWhitespace" = "all";
|
||||
"editor.fontFamily" = "Iosevka Curly Slab, Menlo, Monaco, 'Courier New', monospace";
|
||||
"vim.neovimPath" = lib.getExe pkgs.myVim;
|
||||
"sync-rsync.options" = [ ];
|
||||
"direnv.path.executable" = lib.getExe pkgs.direnv;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ in
|
|||
};
|
||||
|
||||
# some extra shell scripts
|
||||
programs.zsh.initExtra = lib.mkAfter (
|
||||
programs.zsh.initContent = lib.mkAfter (
|
||||
import ./scripts/reporsync.nix { inherit pkgs lib; }
|
||||
+ import ./scripts/ssh-loop-fc.nix { inherit pkgs lib; }
|
||||
);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue