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

Upgrade to NixOS 25.05

Browse source
This commit is contained in:
Pedro Rey Anca 2025-06-08 13:09:24 +02:00
parent d61ccede07
commit 769c2c53f1
Signed by: peprolinbot
GPG key ID: 053EA6E00116533A
10 changed files with 168 additions and 237 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

157
flake.lock
View file

@ -50,18 +50,17 @@
},
"firefox-addons": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1743119709,
"narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=",
"lastModified": 1749269004,
"narHash": "sha256-20eV5kl7iP7ODy9ZNW2SAg8bIg2ttud+IWs7UHxsbE0=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65",
"rev": "c579adeca940c70ac7dd661a1cda662f2d1fb158",
"type": "gitlab"
},
"original": {
@ -73,17 +72,17 @@
},
"fjordlauncher": {
"inputs": {
"flake-compat": "flake-compat",
"libnbtplusplus": "libnbtplusplus",
"nix-filter": "nix-filter",
"nixpkgs": "nixpkgs"
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1742936233,
"narHash": "sha256-x3DdB1SrnSLLIBpmGgXbMAnDYUajJHDYC/3rthhAsUA=",
"lastModified": 1747431520,
"narHash": "sha256-b1cxAw7MDEqOCX3uLpVWT8L2vRyrJJgCJR5NAdV/IXw=",
"owner": "unmojang",
"repo": "FjordLauncher",
"rev": "808277d2f8954e2d6d19fc91723c217ffef061fd",
"rev": "ae5541a3fd81e80ecb82576285d685ae6e80f52c",
"type": "github"
},
"original": {
@ -92,22 +91,6 @@
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@ -129,21 +112,6 @@
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1629284811,
"narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -151,30 +119,30 @@
]
},
"locked": {
"lastModified": 1743387206,
"narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=",
"lastModified": 1749154018,
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146",
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
},
"hypr-contrib": {
"inputs": {
"nixpkgs": "nixpkgs_2"
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1743417258,
"narHash": "sha256-YItzk1pj8Kz+b7VlC9zN1pSZ6CuX35asYy3HuMQ3lBQ=",
"lastModified": 1747572947,
"narHash": "sha256-PMQoXbfmWPuXnF8EaWqRmvTvl7+WFUrDVgufFRPgOM4=",
"owner": "hyprwm",
"repo": "contrib",
"rev": "bc2ad24e0b2e66c3e164994c4897cd94a933fd10",
"rev": "910dad4c5755c1735d30da10c96d9086aa2a608d",
"type": "github"
},
"original": {
@ -199,54 +167,7 @@
"type": "github"
}
},
"nix-filter": {
"locked": {
"lastModified": 1731533336,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1742422364,
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1743315132,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "52faf482a3889b7619003c0daec593a1912fddc1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1712163089,
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
@ -262,29 +183,45 @@
"type": "github"
}
},
"nixpkgs_3": {
"nixpkgs-unstable": {
"locked": {
"lastModified": 1743367904,
"narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=",
"lastModified": 1749143949,
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c",
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"nixpkgs_2": {
"locked": {
"lastModified": 1743315132,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=",
"lastModified": 1749086602,
"narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4792576cb003c994bd7cc1edada3129def20b27d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1749143949,
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "52faf482a3889b7619003c0daec593a1912fddc1",
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
"type": "github"
},
"original": {
@ -297,15 +234,15 @@
"nur": {
"inputs": {
"flake-parts": "flake-parts",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_3",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1743416833,
"narHash": "sha256-JBz6KWbF4MFgQVpwrq7FaUsPxDN/wQEbUAUHmm1Q494=",
"lastModified": 1749303967,
"narHash": "sha256-UrHaS143wyHACqs2ESD4weMCtivbq5lOktS/Luhl2XI=",
"owner": "nix-community",
"repo": "NUR",
"rev": "a3f52fa7fae676916064a4b32cf306f15a79b408",
"rev": "da271064af31c632bb26a06a16307e7ec20cbbe1",
"type": "github"
},
"original": {
@ -323,7 +260,7 @@
"fjordlauncher": "fjordlauncher",
"home-manager": "home-manager",
"hypr-contrib": "hypr-contrib",
"nixpkgs": "nixpkgs_3",
"nixpkgs": "nixpkgs_2",
"nixpkgs-unstable": "nixpkgs-unstable",
"nur": "nur"
}

9
flake.nix
View file

@ -2,7 +2,7 @@
description = "peprolinbot's nixos configuration";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR";
@ -13,10 +13,13 @@
hypr-contrib.url = "github:hyprwm/contrib";
fjordlauncher.url = "github:unmojang/FjordLauncher";
fjordlauncher = {
url = "github:unmojang/FjordLauncher";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = {
url = "github:nix-community/home-manager/release-24.11";
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};

10
modules/core/nix.nix
View file

@ -1,15 +1,5 @@
{username, ...}: {
nix.settings = {
trusted-users = ["${username}"];
trusted-substituters = [
"https://cache.garnix.io"
"https://hyprland.cachix.org"
];
trusted-public-keys = [
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
];
};
}

1
modules/core/pipewire.nix
View file

@ -1,5 +1,4 @@
{pkgs, ...}: {
hardware.pulseaudio.enable = false;
services.pipewire = {
enable = true;
alsa.enable = true;

26
modules/home/browsers/librewolf.nix
View file

@ -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

2
modules/home/gpg.nix
View file

@ -3,7 +3,7 @@
services.gpg-agent = {
enable = true;
enableSshSupport = true;
pinentryPackage = pkgs.pinentry-gnome3;
pinentry.package = pkgs.pinentry-gnome3;
sshKeys = ["D2A3680589B81F2B07DA6CFE21DF848F1AF4E9D3"];
};
}

17
modules/home/gtk.nix
View file

@ -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;
};
};

2
modules/home/packages.nix
View file

@ -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

177
modules/home/vscodium.nix
View file

@ -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";
}
];
};
}

4
modules/home/zsh.nix
View file

@ -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')";