Upgrade to NixOS 25.05
This commit is contained in:
parent
d61ccede07
commit
769c2c53f1
GPG key ID:
053EA6E00116533A
10 changed files with 168 additions and 237 deletions
|
|
@ -18,24 +18,26 @@
|
|||
force = true;
|
||||
default = "FruesX";
|
||||
privateDefault = "FruesX";
|
||||
order = ["FruesX" "DuckDuckGo" "Google"];
|
||||
order = ["FruesX" "ddg" "google"];
|
||||
engines = {
|
||||
"FruesX" = {
|
||||
urls = [{template = "https://searx.peprolinbot.com/search?q={searchTerms}";}];
|
||||
iconUpdateURL = "https://searx.peprolinbot.com/favicon.ico";
|
||||
icon = "https://searx.peprolinbot.com/favicon.ico";
|
||||
};
|
||||
};
|
||||
};
|
||||
bookmarks = {};
|
||||
extensions = with inputs.firefox-addons.packages.${pkgs.system}; [
|
||||
# ublock-origin # Included in Librewolf
|
||||
bitwarden
|
||||
skip-redirect
|
||||
libredirect
|
||||
multi-account-containers
|
||||
clearurls
|
||||
hoppscotch
|
||||
];
|
||||
|
||||
extensions = {
|
||||
packages = with inputs.firefox-addons.packages.${pkgs.system}; [
|
||||
# ublock-origin # Included in Librewolf
|
||||
bitwarden
|
||||
skip-redirect
|
||||
libredirect
|
||||
multi-account-containers
|
||||
clearurls
|
||||
hoppscotch
|
||||
];
|
||||
};
|
||||
bookmarks = {};
|
||||
settings = {
|
||||
# Sync settings
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
services.gpg-agent = {
|
||||
enable = true;
|
||||
enableSshSupport = true;
|
||||
pinentryPackage = pkgs.pinentry-gnome3;
|
||||
pinentry.package = pkgs.pinentry-gnome3;
|
||||
sshKeys = ["D2A3680589B81F2B07DA6CFE21DF848F1AF4E9D3"];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,12 +4,13 @@
|
|||
...
|
||||
}: {
|
||||
fonts.fontconfig.enable = true;
|
||||
home.packages = [
|
||||
pkgs.nerdfonts
|
||||
(pkgs.nerdfonts.override {fonts = ["JetBrainsMono" "Noto"];})
|
||||
pkgs.twemoji-color-font
|
||||
pkgs.noto-fonts-emoji
|
||||
pkgs.roboto
|
||||
home.packages = with pkgs; [
|
||||
nerd-fonts.jetbrains-mono
|
||||
nerd-fonts.noto
|
||||
|
||||
twemoji-color-font
|
||||
noto-fonts-emoji
|
||||
roboto
|
||||
];
|
||||
|
||||
gtk = {
|
||||
|
|
@ -30,8 +31,8 @@
|
|||
package = pkgs.dracula-theme;
|
||||
};
|
||||
cursorTheme = {
|
||||
name = "Nordzy-cursors";
|
||||
package = pkgs.nordzy-cursor-theme;
|
||||
name = "mochaDark";
|
||||
package = pkgs.catppuccin-cursors;
|
||||
size = 22;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
gtrash # rm replacement, put deleted files in system trash
|
||||
imagemagick
|
||||
inkscape
|
||||
kleopatra # Gpg GUI
|
||||
kdePackages.kleopatra # Gpg GUI
|
||||
lazygit
|
||||
nemo-with-extensions # file manager
|
||||
jq
|
||||
|
|
|
|||
|
|
@ -3,95 +3,98 @@
|
|||
programs.vscode = {
|
||||
enable = true;
|
||||
package = pkgs.vscodium;
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
# nix language
|
||||
bbenoist.nix
|
||||
# nix-shell suport
|
||||
arrterian.nix-env-selector
|
||||
# nix formatting
|
||||
kamadorueda.alejandra
|
||||
# python
|
||||
ms-python.python
|
||||
ms-python.black-formatter
|
||||
# C/C++
|
||||
ms-vscode.cpptools
|
||||
# OCaml
|
||||
ocamllabs.ocaml-platform
|
||||
# CMake
|
||||
ms-vscode.cmake-tools
|
||||
# TOML
|
||||
tamasfe.even-better-toml
|
||||
profiles.default = {
|
||||
extensions = with pkgs.vscode-extensions; [
|
||||
# nix language
|
||||
bbenoist.nix
|
||||
# nix-shell suport
|
||||
arrterian.nix-env-selector
|
||||
# nix formatting
|
||||
kamadorueda.alejandra
|
||||
# python
|
||||
ms-python.python
|
||||
ms-python.black-formatter
|
||||
# C/C++
|
||||
ms-vscode.cpptools
|
||||
# OCaml
|
||||
ocamllabs.ocaml-platform
|
||||
# CMake
|
||||
ms-vscode.cmake-tools
|
||||
# TOML
|
||||
tamasfe.even-better-toml
|
||||
|
||||
# Color theme
|
||||
catppuccin.catppuccin-vsc
|
||||
catppuccin.catppuccin-vsc-icons
|
||||
];
|
||||
userSettings = {
|
||||
"update.mode" = "none";
|
||||
"extensions.autoUpdate" = false; # This stuff fixes vscode freaking out when theres an update
|
||||
"window.titleBarStyle" = "custom"; # needed otherwise vscode crashes, see https://github.com/NixOS/nixpkgs/issues/246509
|
||||
|
||||
"window.menuBarVisibility" = "toggle";
|
||||
"editor.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont', 'monospace', monospace";
|
||||
"terminal.integrated.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont'";
|
||||
"editor.fontSize" = 16;
|
||||
"workbench.colorTheme" = "Catppuccin Mocha";
|
||||
"workbench.iconTheme" = "catppuccin-mocha";
|
||||
"catppuccin.accentColor" = "lavender";
|
||||
"vsicons.dontShowNewVersionMessage" = true;
|
||||
"explorer.confirmDragAndDrop" = true;
|
||||
"editor.fontLigatures" = true;
|
||||
"editor.minimap.enabled" = true;
|
||||
"workbench.startupEditor" = "none";
|
||||
|
||||
"editor.formatOnSave" = true;
|
||||
"editor.formatOnType" = true;
|
||||
"editor.formatOnPaste" = true;
|
||||
|
||||
"workbench.layoutControl.type" = "menu";
|
||||
"workbench.editor.limit.enabled" = true;
|
||||
"workbench.editor.limit.value" = 10;
|
||||
"workbench.editor.limit.perEditorGroup" = true;
|
||||
"workbench.editor.showTabs" = "multiple";
|
||||
"files.autoSave" = "onWindowChange";
|
||||
"explorer.openEditors.visible" = 0;
|
||||
"breadcrumbs.enabled" = false;
|
||||
"editor.renderControlCharacters" = false;
|
||||
"workbench.activityBar.location" = "default";
|
||||
"workbench.statusBar.visible" = false;
|
||||
"editor.scrollbar.verticalScrollbarSize" = 4;
|
||||
"editor.scrollbar.horizontalScrollbarSize" = 4;
|
||||
"editor.scrollbar.vertical" = "auto";
|
||||
"editor.scrollbar.horizontal" = "auto";
|
||||
"workbench.layoutControl.enabled" = false;
|
||||
|
||||
"editor.mouseWheelZoom" = true;
|
||||
|
||||
"C_Cpp.autocompleteAddParentheses" = true;
|
||||
"C_Cpp.formatting" = "clangFormat";
|
||||
"C_Cpp.intelliSenseCacheSize" = 2048;
|
||||
"C_Cpp.intelliSenseMemoryLimit" = 2048;
|
||||
"C_Cpp.default.browse.path" = [
|
||||
''''${workspaceFolder}/**''
|
||||
# Color theme
|
||||
catppuccin.catppuccin-vsc
|
||||
catppuccin.catppuccin-vsc-icons
|
||||
];
|
||||
|
||||
userSettings = {
|
||||
"update.mode" = "none";
|
||||
"extensions.autoUpdate" = false; # This stuff fixes vscode freaking out when theres an update
|
||||
"window.titleBarStyle" = "custom"; # needed otherwise vscode crashes, see https://github.com/NixOS/nixpkgs/issues/246509
|
||||
|
||||
"window.menuBarVisibility" = "toggle";
|
||||
"editor.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont', 'monospace', monospace";
|
||||
"terminal.integrated.fontFamily" = "'JetBrainsMono Nerd Font', 'SymbolsNerdFont'";
|
||||
"editor.fontSize" = 16;
|
||||
"workbench.colorTheme" = "Catppuccin Mocha";
|
||||
"workbench.iconTheme" = "catppuccin-mocha";
|
||||
"catppuccin.accentColor" = "lavender";
|
||||
"vsicons.dontShowNewVersionMessage" = true;
|
||||
"explorer.confirmDragAndDrop" = true;
|
||||
"editor.fontLigatures" = true;
|
||||
"editor.minimap.enabled" = true;
|
||||
"workbench.startupEditor" = "none";
|
||||
|
||||
"editor.formatOnSave" = true;
|
||||
"editor.formatOnType" = true;
|
||||
"editor.formatOnPaste" = true;
|
||||
|
||||
"workbench.layoutControl.type" = "menu";
|
||||
"workbench.editor.limit.enabled" = true;
|
||||
"workbench.editor.limit.value" = 10;
|
||||
"workbench.editor.limit.perEditorGroup" = true;
|
||||
"workbench.editor.showTabs" = "multiple";
|
||||
"files.autoSave" = "onWindowChange";
|
||||
"explorer.openEditors.visible" = 0;
|
||||
"breadcrumbs.enabled" = false;
|
||||
"editor.renderControlCharacters" = false;
|
||||
"workbench.activityBar.location" = "default";
|
||||
"workbench.statusBar.visible" = false;
|
||||
"editor.scrollbar.verticalScrollbarSize" = 4;
|
||||
"editor.scrollbar.horizontalScrollbarSize" = 4;
|
||||
"editor.scrollbar.vertical" = "auto";
|
||||
"editor.scrollbar.horizontal" = "auto";
|
||||
"workbench.layoutControl.enabled" = false;
|
||||
|
||||
"editor.mouseWheelZoom" = true;
|
||||
|
||||
"C_Cpp.autocompleteAddParentheses" = true;
|
||||
"C_Cpp.formatting" = "clangFormat";
|
||||
"C_Cpp.intelliSenseCacheSize" = 2048;
|
||||
"C_Cpp.intelliSenseMemoryLimit" = 2048;
|
||||
"C_Cpp.default.browse.path" = [
|
||||
''''${workspaceFolder}/**''
|
||||
];
|
||||
"C_Cpp.default.cStandard" = "gnu99";
|
||||
"C_Cpp.inlayHints.parameterNames.hideLeadingUnderscores" = false;
|
||||
"C_Cpp.intelliSenseUpdateDelay" = 500;
|
||||
"C_Cpp.workspaceParsingPriority" = "medium";
|
||||
"C_Cpp.clang_format_sortIncludes" = true;
|
||||
"C_Cpp.doxygen.generatedStyle" = "/**";
|
||||
};
|
||||
# Keybindings
|
||||
keybindings = [
|
||||
{
|
||||
key = "ctrl+q";
|
||||
command = "editor.action.commentLine";
|
||||
when = "editorTextFocus && !editorReadonly";
|
||||
}
|
||||
{
|
||||
key = "ctrl+s";
|
||||
command = "workbench.action.files.saveFiles";
|
||||
}
|
||||
];
|
||||
"C_Cpp.default.cStandard" = "gnu99";
|
||||
"C_Cpp.inlayHints.parameterNames.hideLeadingUnderscores" = false;
|
||||
"C_Cpp.intelliSenseUpdateDelay" = 500;
|
||||
"C_Cpp.workspaceParsingPriority" = "medium";
|
||||
"C_Cpp.clang_format_sortIncludes" = true;
|
||||
"C_Cpp.doxygen.generatedStyle" = "/**";
|
||||
};
|
||||
# Keybindings
|
||||
keybindings = [
|
||||
{
|
||||
key = "ctrl+q";
|
||||
command = "editor.action.commentLine";
|
||||
when = "editorTextFocus && !editorReadonly";
|
||||
}
|
||||
{
|
||||
key = "ctrl+s";
|
||||
command = "workbench.action.files.saveFiles";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,10 +14,6 @@
|
|||
enable = true;
|
||||
plugins = ["git" "fzf"];
|
||||
};
|
||||
initExtraFirst = ''
|
||||
DISABLE_MAGIC_FUNCTIONS=true
|
||||
export "MICRO_TRUECOLOR=1"
|
||||
'';
|
||||
shellAliases = {
|
||||
# record = "wf-recorder --audio=alsa_output.pci-0000_08_00.6.analog-stereo.monitor -f $HOME/Videos/$(date +'%Y%m%d%H%M%S_1.mp4')";
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue