SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 14:01:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Upgrade to nixos 25.05

Browse source
This commit is contained in:
SebastianStork 2025-05-22 20:14:55 +02:00
parent fce4ee95d7
commit 67b18d9c1d
16 changed files with 45 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.lock generated
View file

@ -177,16 +177,16 @@
]
},
"locked": {
"lastModified": 1747688870,
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=",
"lastModified": 1747556831,
"narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d5f1f641b289553927b3801580598d200a501863",
"rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-24.11",
"ref": "release-25.05",
"repo": "home-manager",
"type": "github"
}
@ -284,16 +284,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1747676747,
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=",
"lastModified": 1747825515,
"narHash": "sha256-BWpMQymVI73QoKZdcVCxUCCK3GNvr/xa2Dc4DM1o2BE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "72841a4a8761d1aed92ef6169a636872c986c76d",
"rev": "cd2812de55cf87df88a9e09bf3be1ce63d50c1a6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"ref": "nixos-25.05",
"repo": "nixpkgs",
"type": "github"
}

4
flake.nix
View file

@ -2,14 +2,14 @@
inputs = {
flake-parts.url = "github:hercules-ci/flake-parts";
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
home-manager = {
url = "github:nix-community/home-manager/release-24.11";
url = "github:nix-community/home-manager/release-25.05";
inputs.nixpkgs.follows = "nixpkgs";
};

2
modules/home/de-utils/hypridle.nix
View file

@ -1,6 +1,5 @@
{
config,
pkgs-unstable,
lib,
...
}:
@ -10,7 +9,6 @@
config = lib.mkIf config.myConfig.deUtils.hypridle.enable {
services.hypridle = {
enable = true;
package = pkgs-unstable.hypridle;
settings = {
general = {

2
modules/home/de-utils/hyprlock.nix
View file

@ -1,6 +1,5 @@
{
config,
pkgs-unstable,
lib,
...
}@moduleArgs:
@ -18,7 +17,6 @@ in
config = lib.mkIf cfg.enable {
programs.hyprlock = {
enable = true;
package = pkgs-unstable.hyprlock;
settings = {
general.immediate_render = true;

5
modules/home/de/hyprland/default.nix
View file

@ -1,15 +1,10 @@
{
config,
inputs,
pkgs,
lib,
...
}@moduleArgs:
{
# Use unstable hyprland module for nullable package
disabledModules = [ "services/window-managers/hyprland.nix" ];
imports = [ "${inputs.home-manager-unstable}/modules/services/window-managers/hyprland.nix" ];
options.myConfig.de.hyprland.enable = lib.mkEnableOption "" // {
default = moduleArgs.osConfig.myConfig.de.hyprland.enable or false;
};

2
modules/home/de/hyprland/settings.nix
View file

@ -69,7 +69,7 @@
"special:music, gapsout:30, on-created-empty:spotify"
"special:chat, gapsout:30, on-created-empty:discord"
"special:flake, gapsout:30, on-created-empty:kitty --directory ${config.home.sessionVariables.FLAKE}"
"special:flake, gapsout:30, on-created-empty:kitty --directory ${config.home.sessionVariables.NH_FLAKE}"
"special:monitor, gapsout:30, on-created-empty:kitty btm"
"special:files, gapsout:30, on-created-empty:nemo"
];

2
modules/home/firefox.nix
View file

@ -2,7 +2,6 @@
config,
inputs,
pkgs,
pkgs-unstable,
lib,
...
}:
@ -12,7 +11,6 @@
config = lib.mkIf config.myConfig.firefox.enable {
programs.firefox = {
enable = true;
package = pkgs-unstable.firefox;
profiles.default = {
settings =

2
modules/home/shell/default.nix
View file

@ -29,7 +29,7 @@
}
];
initExtra = ''
initContent = ''
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-Z}'
zstyle ':completion:*' list-colors ''${(s.:.)LS_COLORS}
zstyle ':completion:*' menu no

2
modules/home/shell/p10k/default.nix
View file

@ -20,7 +20,7 @@
}
];
initExtraFirst = ''
initContent = lib.mkBefore ''
(( ''${+commands[direnv]} )) && emulate zsh -c "$(direnv export zsh)"
if [[ -r "''${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-''${(%):-%n}.zsh" ]]; then

28
modules/home/vscode.nix
View file

@ -12,22 +12,20 @@
config = lib.mkIf config.myConfig.vscode.enable {
programs.vscode = {
enable = true;
package = pkgs-unstable.vscode-with-extensions.override {
vscode = pkgs-unstable.vscodium;
vscodeExtensions =
let
inherit (inputs.nix-vscode-extensions.extensions.${pkgs.system}) open-vsx;
in
[
open-vsx.jnoortheen.nix-ide
open-vsx.aaron-bond.better-comments
open-vsx.llvm-vs-code-extensions.vscode-clangd
open-vsx.nefrob.vscode-just-syntax
package = pkgs-unstable.vscodium;
profiles.default.extensions =
let
inherit (inputs.nix-vscode-extensions.extensions.${pkgs.system}) open-vsx;
in
[
open-vsx.jnoortheen.nix-ide
open-vsx.aaron-bond.better-comments
open-vsx.llvm-vs-code-extensions.vscode-clangd
open-vsx.nefrob.vscode-just-syntax
open-vsx.github.github-vscode-theme
open-vsx.pkief.material-icon-theme
];
};
open-vsx.github.github-vscode-theme
open-vsx.pkief.material-icon-theme
];
};
systemd.user.tmpfiles.rules =

6
modules/system/actualbudget/default.nix
View file

@ -1,7 +1,5 @@
{
config,
inputs,
pkgs-unstable,
lib,
...
}:
@ -9,9 +7,6 @@ let
cfg = config.myConfig.actualbudget;
in
{
disabledModules = [ "services/web-apps/actual.nix" ];
imports = [ "${inputs.nixpkgs-unstable}/nixos/modules/services/web-apps/actual.nix" ];
options.myConfig.actualbudget = {
enable = lib.mkEnableOption "";
subdomain = lib.mkOption {
@ -33,7 +28,6 @@ in
services.actual = {
enable = true;
package = pkgs-unstable.actual-server;
settings = {
hostname = "localhost";

16
modules/system/de/hyprland.nix
View file

@ -1,6 +1,5 @@
{
config,
pkgs-unstable,
lib,
...
}:
@ -8,20 +7,7 @@
options.myConfig.de.hyprland.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.hyprland.enable {
programs = {
hyprland = {
enable = true;
package = pkgs-unstable.hyprland;
portalPackage = pkgs-unstable.xdg-desktop-portal-hyprland;
};
xwayland.package = pkgs-unstable.xwayland;
};
hardware.graphics = {
package = pkgs-unstable.mesa;
package32 = pkgs-unstable.pkgsi686Linux.mesa;
};
programs.hyprland.enable = true;
environment.sessionVariables.NIXOS_OZONE_WL = "1";

1
modules/system/geoclue.nix
View file

@ -5,7 +5,6 @@
config = lib.mkIf config.myConfig.geoclue.enable {
services.geoclue2 = {
enable = true;
geoProviderUrl = "https://beacondb.net/v1/geolocate";
appConfig.gammastep = {
isAllowed = true;

16
modules/system/sound.nix
View file

@ -4,14 +4,16 @@
config = lib.mkIf config.myConfig.sound.enable {
security.rtkit.enable = true;
hardware.pulseaudio.enable = false;
services.pipewire = {
enable = true;
wireplumber.enable = true;
pulse.enable = true;
alsa = {
services = {
pulseaudio.enable = false;
pipewire = {
enable = true;
support32Bit = true;
wireplumber.enable = true;
pulse.enable = true;
alsa = {
enable = true;
support32Bit = true;
};
};
};
};

4
modules/system/tailscale/caddy-serve.nix
View file

@ -1,13 +1,13 @@
{
config,
pkgs-unstable,
pkgs,
lib,
...
}:
let
nodes = config.myConfig.tailscale.caddyServe |> lib.filterAttrs (_: value: value.enable);
caddy-tailscale = pkgs-unstable.caddy.withPlugins {
caddy-tailscale = pkgs.caddy.withPlugins {
plugins = [ "github.com/tailscale/caddy-tailscale@v0.0.0-20250207163903-69a970c84556" ];
hash = "sha256-wt3+xCsT83RpPySbL7dKVwgqjKw06qzrP2Em+SxEPto=";
};

19
users/seb/home.nix
View file

@ -1,7 +1,6 @@
{
inputs,
pkgs,
pkgs-unstable,
...
}:
let
@ -22,7 +21,7 @@ in
{
imports = [ ../shared-home.nix ];
home.sessionVariables.FLAKE = "~/Projects/nixos-config";
home.sessionVariables.NH_FLAKE = "~/Projects/nixos-config";
myConfig = {
kitty.enable = true;
@ -41,17 +40,17 @@ in
pkgs.nemo-with-extensions
pkgs.celluloid
pkgs-unstable.spotify
pkgs.spotify
pkgs.obsidian
pkgs-unstable.anki
pkgs-unstable.discord
pkgs.anki
pkgs.discord
(lazyDesktopApp pkgs.brave)
pkgs.jetbrains.idea-community
pkgs.jetbrains.goland
pkgs.jetbrains.clion
pkgs.qtcreator
pkgs-unstable.logisim-evolution
pkgs.logisim-evolution
pkgs.libreoffice
pkgs.hunspell
@ -61,12 +60,8 @@ in
pkgs.corefonts
pkgs.roboto
pkgs.open-sans
(pkgs.nerdfonts.override {
fonts = [
"JetBrainsMono"
"NerdFontsSymbolsOnly"
];
})
pkgs.nerd-fonts.jetbrains-mono
pkgs.nerd-fonts.symbols-only
];
fonts.fontconfig.enable = true;