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

chore: upgrade to NixOS 25.05

Browse source
This commit is contained in:
Felix Schröter 2025-05-18 17:07:53 +02:00
parent 1ace6186cf
commit 418fc173e6
Signed by: felschr
GPG key ID: 671E39E6744C807D
14 changed files with 99 additions and 82 deletions

16
flake.lock generated
View file

@ -294,16 +294,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747331121, "lastModified": 1747556831,
"narHash": "sha256-3MmiUN/jOHBHQUnjqzg6qKArc17j2OS6jisEppDY4g8=", "narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1eec32f0efe3b830927989767a9e6ece0d82d608", "rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
"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"
} }
@ -386,16 +386,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1747335874, "lastModified": 1747428706,
"narHash": "sha256-IKKIXTSYJMmUtE+Kav5Rob8SgLPnfnq4Qu8LyT4gdqQ=", "narHash": "sha256-XVds9FkRrY59xRNNq14FNsFGqDiexXX/mlHcX4hPyyk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba8b70ee098bc5654c459d6a95dfc498b91ff858", "rev": "2e1496bf8652ff4af4e4d4737277f71e4a4f5cb2",
"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"
} }

4
flake.nix
View file

@ -15,7 +15,7 @@ rec {
}; };
inputs = { 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"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
@ -29,7 +29,7 @@ rec {
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
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";
}; };

7
home/browsers/firefox.nix
View file

@ -65,15 +65,16 @@ in
private = { private = {
id = 0; id = 0;
extraConfig = sharedExtraConfig; extraConfig = sharedExtraConfig;
extensions = commonExtensions; extensions.packages = commonExtensions;
}; };
work = { work = {
id = 1; id = 1;
extraConfig = sharedExtraConfig; extraConfig = sharedExtraConfig;
extensions = extensions.packages =
commonExtensions commonExtensions
++ (with firefox-addons; [ ++ (with firefox-addons; [
bitwarden # dashlane
# bitwarden
react-devtools react-devtools
reduxdevtools reduxdevtools
]); ]);

116
home/browsers/mullvad-browser.nix
View file

@ -50,124 +50,145 @@ let
commonSearch = { commonSearch = {
force = true; force = true;
# TODO defaults don't work # TODO defaults don't work
default = "Qwant"; default = "qwant";
privateDefault = "Qwant"; privateDefault = "qwant";
order = [ order = [
"Qwant" "qwant"
"Ecosia" "ecosia"
"DuckDuckGo" "ddg"
"Startpage" "startpage"
"kagi" "kagi"
]; ];
engines = { engines = {
# builtin # builtin
"Startpage".metaData.alias = "@s"; startpage.metaData.alias = "@s";
"DuckDuckGo".metaData.alias = "@d"; ddg.metaData.alias = "@d";
# extra # extra
"Qwant" = { qwant = {
name = "Qwant";
urls = [ { template = "https://www.qwant.com/?q={searchTerms}"; } ]; urls = [ { template = "https://www.qwant.com/?q={searchTerms}"; } ];
iconURL = "https://www.qwant.com/favicon.ico"; iconMapObj."16" = "https://www.qwant.com/favicon.ico";
definedAliases = [ "@q" ]; definedAliases = [ "@q" ];
}; };
"Ecosia" = { ecosia = {
name = "Ecosia";
urls = [ { template = "https://www.ecosia.org/search?q={searchTerms}"; } ]; urls = [ { template = "https://www.ecosia.org/search?q={searchTerms}"; } ];
iconURL = "https://www.ecosia.org/favicon.ico"; iconMapObj."16" = "https://www.ecosia.org/favicon.ico";
definedAliases = [ "@e" ]; definedAliases = [ "@e" ];
}; };
"kagi" = { kagi = {
name = "Kagi";
urls = [ { template = "https://kagi.com/search?q={searchTerms}"; } ]; urls = [ { template = "https://kagi.com/search?q={searchTerms}"; } ];
iconURL = "https://kagi.com/favicon.ico"; iconMapObj."16" = "https://kagi.com/favicon.ico";
definedAliases = [ "@k" ]; definedAliases = [ "@k" ];
}; };
"GitHub" = { github = {
name = "GitHub";
urls = [ { template = "https://github.com/search?q={searchTerms}"; } ]; urls = [ { template = "https://github.com/search?q={searchTerms}"; } ];
iconURL = "https://github.com/favicon.ico"; iconMapObj."16" = "https://github.com/favicon.ico";
definedAliases = [ "@gh" ]; definedAliases = [ "@gh" ];
}; };
"GitLab" = { gitlab = {
name = "GitLab";
urls = [ { template = "https://gitlab.com/search?search={searchTerms}"; } ]; urls = [ { template = "https://gitlab.com/search?search={searchTerms}"; } ];
iconURL = "https://gitlab.com/favicon.ico"; iconMapObj."16" = "https://gitlab.com/favicon.ico";
definedAliases = [ "@gl" ]; definedAliases = [ "@gl" ];
}; };
"Codeberg" = { codeberg = {
name = "Codeberg";
urls = [ { template = "https://codeberg.org/explore/repos?q={searchTerms}"; } ]; urls = [ { template = "https://codeberg.org/explore/repos?q={searchTerms}"; } ];
iconURL = "https://codeberg.org/favicon.ico"; iconMapObj."16" = "https://codeberg.org/favicon.ico";
definedAliases = [ "@cb" ]; definedAliases = [ "@cb" ];
}; };
"Nix Packages" = { nix-packages = {
name = "Nix Packages";
urls = [ { template = "https://search.nixos.org/packages?query={searchTerms}"; } ]; urls = [ { template = "https://search.nixos.org/packages?query={searchTerms}"; } ];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@np" ]; definedAliases = [ "@np" ];
}; };
"NixOS Options" = { nixos-options = {
name = "NixOS Options";
urls = [ { template = "https://search.nixos.org/options?query={searchTerms}"; } ]; urls = [ { template = "https://search.nixos.org/options?query={searchTerms}"; } ];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@no" ]; definedAliases = [ "@no" ];
}; };
"Nix Flakes: Packages" = { nix-flakes-packages = {
name = "Nix Flakes: Packages";
urls = [ { template = "https://search.nixos.org/flakes?type=packages&query={searchTerms}"; } ]; urls = [ { template = "https://search.nixos.org/flakes?type=packages&query={searchTerms}"; } ];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@nfp" ]; definedAliases = [ "@nfp" ];
}; };
"Nix Flakes: Options" = { nix-flakes-options = {
name = "Nix Flakes: Options";
urls = [ { template = "https://search.nixos.org/flakes?type=options&query={searchTerms}"; } ]; urls = [ { template = "https://search.nixos.org/flakes?type=options&query={searchTerms}"; } ];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@nfo" ]; definedAliases = [ "@nfo" ];
}; };
"NixOS Wiki" = { nixos-wiki = {
name = "NixOS Wiki";
urls = [ { template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; } ]; urls = [ { template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; } ];
icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; icon = "''${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
definedAliases = [ "@nw" ]; definedAliases = [ "@nw" ];
}; };
"Crates.io" = { crates-io = {
name = "Crates.io";
urls = [ { template = "https://crates.io/search?q={searchTerms}"; } ]; urls = [ { template = "https://crates.io/search?q={searchTerms}"; } ];
iconURL = "https://crates.io/favicon.ico"; iconMapObj."16" = "https://crates.io/favicon.ico";
definedAliases = [ "@rc" ]; definedAliases = [ "@rc" ];
}; };
"Docs.rs" = { docs-rs = {
name = "Docs.rs";
urls = [ { template = "https://docs.rs/releases/search?query={searchTerms}"; } ]; urls = [ { template = "https://docs.rs/releases/search?query={searchTerms}"; } ];
iconURL = "https://docs.rs/favicon.ico"; iconMapObj."16" = "https://docs.rs/favicon.ico";
definedAliases = [ "@rd" ]; definedAliases = [ "@rd" ];
}; };
"Rust Book" = { rust-book = {
name = "Rust Book";
urls = [ { template = "https://doc.rust-lang.org/book/?search={searchTerms}"; } ]; urls = [ { template = "https://doc.rust-lang.org/book/?search={searchTerms}"; } ];
iconURL = "https://doc.rust-lang.org/book/favicon.svg"; iconMapObj."16" = "https://doc.rust-lang.org/book/favicon.svg";
definedAliases = [ "@rb" ]; definedAliases = [ "@rb" ];
}; };
"Rust std" = { rust-std = {
name = "Rust std";
urls = [ { template = "https://doc.rust-lang.org/stable/std/?search={searchTerms}"; } ]; urls = [ { template = "https://doc.rust-lang.org/stable/std/?search={searchTerms}"; } ];
iconURL = "https://www.rust-lang.org/static/images/favicon.svg"; iconMapObj."16" = "https://www.rust-lang.org/static/images/favicon.svg";
definedAliases = [ "@rs" ]; definedAliases = [ "@rs" ];
}; };
"npm" = { npm = {
name = "npm";
urls = [ { template = "https://www.npmjs.com/search?q={searchTerms}"; } ]; urls = [ { template = "https://www.npmjs.com/search?q={searchTerms}"; } ];
iconURL = "https://static-production.npmjs.com/da3ab40fb0861d15c83854c29f5f2962.png"; iconMapObj."16" = "https://static-production.npmjs.com/da3ab40fb0861d15c83854c29f5f2962.png";
definedAliases = [ "@npm" ]; definedAliases = [ "@npm" ];
}; };
"PyPI" = { pypi = {
name = "PyPI";
urls = [ { template = "https://pypi.org/search/?q={searchTerms}"; } ]; urls = [ { template = "https://pypi.org/search/?q={searchTerms}"; } ];
iconURL = "https://pypi.org/favicon.ico"; iconMapObj."16" = "https://pypi.org/favicon.ico";
definedAliases = [ "@pypi" ]; definedAliases = [ "@pypi" ];
}; };
"Stack Overflow" = { stack-overflow = {
name = "Stack Overflow";
urls = [ { template = "https://stackoverflow.com/search?q={searchTerms}"; } ]; urls = [ { template = "https://stackoverflow.com/search?q={searchTerms}"; } ];
iconURL = "https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico"; iconMapObj."16" = "https://cdn.sstatic.net/Sites/stackoverflow/Img/favicon.ico";
definedAliases = [ "@so" ]; definedAliases = [ "@so" ];
}; };
"Wikipedia" = { wikipedia = {
name = "Wikipedia";
urls = [ { template = "https://en.wikipedia.org/wiki/{searchTerms}"; } ]; urls = [ { template = "https://en.wikipedia.org/wiki/{searchTerms}"; } ];
iconURL = "https://en.wikipedia.org/favicon.ico"; iconMapObj."16" = "https://en.wikipedia.org/favicon.ico";
definedAliases = [ "@w" ]; definedAliases = [ "@w" ];
}; };
"Wolfram Alpha" = { wolfram-alpha = {
name = "Wolfram Alpha";
urls = [ { template = "https://www.wolframalpha.com/input?i={searchTerms}"; } ]; urls = [ { template = "https://www.wolframalpha.com/input?i={searchTerms}"; } ];
iconURL = "https://www.wolframalpha.com/_next/static/images/favicon_1zbE9hjk.ico"; iconMapObj."16" = "https://www.wolframalpha.com/_next/static/images/favicon_1zbE9hjk.ico";
definedAliases = [ "@wa" ]; definedAliases = [ "@wa" ];
}; };
"Reddit" = { reddit = {
name = "Reddit";
urls = [ { template = "https://www.reddit.com/search/?q={searchTerms}"; } ]; urls = [ { template = "https://www.reddit.com/search/?q={searchTerms}"; } ];
iconURL = "https://www.reddit.com/favicon.ico"; iconMapObj."16" = "https://www.reddit.com/favicon.ico";
definedAliases = [ "@r" ]; definedAliases = [ "@r" ];
}; };
}; };
@ -191,13 +212,12 @@ in
id = 0; id = 0;
settings = commonSettings; settings = commonSettings;
search = commonSearch; search = commonSearch;
extensions = commonExtensions; extensions.packages = commonExtensions;
}; };
work = { work = {
id = 1; id = 1;
settings = commonSettings; settings = commonSettings;
search = commonSearch; extensions.packages =
extensions =
commonExtensions commonExtensions
++ (with firefox-addons; [ ++ (with firefox-addons; [
bitwarden bitwarden

4
home/desktop/mimeapps.nix
View file

@ -26,7 +26,7 @@ let
pdf = [ "re.sonny.Junction.desktop" ] ++ browsers; pdf = [ "re.sonny.Junction.desktop" ] ++ browsers;
ebook = [ "com.github.johnfactotum.Foliate.desktop" ]; ebook = [ "com.github.johnfactotum.Foliate.desktop" ];
magnet = [ "transmission-gtk.desktop" ]; magnet = [ "transmission-gtk.desktop" ];
signal = [ "signal-desktop.desktop" ]; signal = [ "signal.desktop" ];
}; };
mimeMap = { mimeMap = {
@ -89,7 +89,7 @@ let
pdf = [ "application/pdf" ]; pdf = [ "application/pdf" ];
ebook = [ "application/epub+zip" ]; ebook = [ "application/epub+zip" ];
magnet = [ "x-scheme-handler/magnet" ]; magnet = [ "x-scheme-handler/magnet" ];
signal = [ "signal-desktop.desktop" ]; signal = [ "signal.desktop" ];
}; };
associations = associations =

6
home/felschr-server.nix
View file

@ -26,9 +26,9 @@
sshKeys = [ "3C48489F3B0FBB44E72180D4B1D7541C201C9987" ]; sshKeys = [ "3C48489F3B0FBB44E72180D4B1D7541C201C9987" ];
defaultCacheTtl = 600; defaultCacheTtl = 600;
defaultCacheTtlSsh = 600; defaultCacheTtlSsh = 600;
pinentryPackage = pkgs.pinentry-curses; pinentry.package = pkgs.pinentry-curses;
}; };
programs.zsh.initExtra = '' programs.zsh.initContent = ''
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
''; '';
@ -44,5 +44,5 @@
} }
''; '';
home.stateVersion = "24.11"; home.stateVersion = "25.05";
} }

6
home/felschr-work.nix
View file

@ -28,9 +28,9 @@ with pkgs;
sshKeys = [ "8A6213DCDAF86BD3A63549FCFDF71B2C92DAE02C" ]; sshKeys = [ "8A6213DCDAF86BD3A63549FCFDF71B2C92DAE02C" ];
defaultCacheTtl = 600; defaultCacheTtl = 600;
defaultCacheTtlSsh = 600; defaultCacheTtlSsh = 600;
pinentryPackage = pkgs.pinentry-gnome3; pinentry.package = pkgs.pinentry-gnome3;
}; };
programs.zsh.initExtra = '' programs.zsh.initContent = ''
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
''; '';
@ -75,5 +75,5 @@ with pkgs;
emblem emblem
]; ];
home.stateVersion = "24.11"; home.stateVersion = "25.05";
} }

6
home/felschr.nix
View file

@ -28,9 +28,9 @@
]; ];
defaultCacheTtl = 600; defaultCacheTtl = 600;
defaultCacheTtlSsh = 600; defaultCacheTtlSsh = 600;
pinentryPackage = pkgs.pinentry-gnome3; pinentry.package = pkgs.pinentry-gnome3;
}; };
programs.zsh.initExtra = '' programs.zsh.initContent = ''
export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/gnupg/S.gpg-agent.ssh
''; '';
@ -96,5 +96,5 @@
emblem emblem
]; ];
home.stateVersion = "24.11"; home.stateVersion = "25.05";
} }

5
home/shell/zellij.nix
View file

@ -4,6 +4,7 @@
programs.zellij.enable = true; programs.zellij.enable = true;
programs.zellij.package = pkgs.unstable.zellij; programs.zellij.package = pkgs.unstable.zellij;
programs.zellij.enableZshIntegration = true; programs.zellij.enableZshIntegration = true;
programs.zellij.exitShellOnExit = true;
programs.zellij.settings = { programs.zellij.settings = {
default_layout = "compact"; # or default default_layout = "compact"; # or default
default_mode = "normal"; default_mode = "normal";
@ -17,8 +18,4 @@
strider.path = "strider"; strider.path = "strider";
}; };
}; };
home.sessionVariables = {
ZELLIJ_AUTO_EXIT = "true";
};
} }

2
home/shell/zsh.nix
View file

@ -29,7 +29,7 @@ in
file = "share/zsh-history-substring-search/zsh-history-substring-search.zsh"; file = "share/zsh-history-substring-search/zsh-history-substring-search.zsh";
} }
]; ];
initExtra = '' initContent = ''
export KEYTIMEOUT=1 export KEYTIMEOUT=1
ZSH_AUTOSUGGEST_USE_ASYNC=1 ZSH_AUTOSUGGEST_USE_ASYNC=1

2
home/signal.nix
View file

@ -4,7 +4,7 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
signal-desktop signal-desktop
(makeAutostartItem { (makeAutostartItem {
name = "signal-desktop"; name = "signal";
package = signal-desktop; package = signal-desktop;
prependExtraArgs = [ "--start-in-tray" ]; prependExtraArgs = [ "--start-in-tray" ];
}) })

3
services/authelia.nix
View file

@ -100,8 +100,7 @@ in
settings = { settings = {
theme = "dark"; theme = "dark";
server = { server = {
host = "::1"; address = "tcp://[::1]:${toString port}";
inherit port;
}; };
default_2fa_method = "webauthn"; default_2fa_method = "webauthn";
default_redirection_url = "https://${domain}"; default_redirection_url = "https://${domain}";

2
system/fonts.nix
View file

@ -6,7 +6,7 @@
noto-fonts-extra noto-fonts-extra
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-emoji
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) nerd-fonts.symbols-only
fira-code fira-code
]; ];
fonts.fontconfig.defaultFonts = { fonts.fontconfig.defaultFonts = {

2
system/sound.nix
View file

@ -6,8 +6,8 @@
}: }:
{ {
hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pulseaudio.enable = false;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;