martials/nixos-configuration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

⬆️ [shared] Upgrade to NixOS 25.05

Browse Source
This commit is contained in:
Martin Berg Alstad
2025-05-26 20:27:34 +02:00
parent 53329b8d1c
commit fc89c377e8
14 changed files with 58 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -17,8 +17,6 @@ My NixOS configurations with dotfiles for my systems.
| Runner | Rofi | | Runner | Rofi |
| Fetch | Fastfetch | | Fetch | Fastfetch |
Requires Nix-channel with [NixOS 24.11](https://nixos.org/)
## Commands ## Commands
First time run, will create a shell with the minimum dependencies in order to download the rest First time run, will create a shell with the minimum dependencies in order to download the rest

72
flake.lock generated
View File

@ -49,11 +49,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1746650299, "lastModified": 1748080874,
"narHash": "sha256-4+pxk1KcSH8ww3tgN808nNJ3E7Q8gNWI+U0sesW7mBQ=", "narHash": "sha256-sUebEzAkrY8Aq5G0GHFyRddmRNGP/a2iTtV7ISNvi/c=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "f746600f15b69df05c84e3037749a3be5b1276d1", "rev": "0ba11b12be81f0849a89ed17ab635164ea8f0112",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -67,11 +67,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1745469639, "lastModified": 1748262720,
"narHash": "sha256-LNIzSWQ+xoVpanW4NKdN7Np8z9CtoU2+yXaztH1Upt4=", "narHash": "sha256-b9SRqnglNtyWE+ivBcIyyGybrDN1uy9zEy2D6X284bo=",
"owner": "rishabh5321", "owner": "rishabh5321",
"repo": "grayjay-flake", "repo": "grayjay-flake",
"rev": "da25d4ae2cd44954d6655ceb4781e766c2b1cccb", "rev": "b523be9dba411e9e7e5f36f71676dddede93c664",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -87,16 +87,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746171682, "lastModified": 1748226808,
"narHash": "sha256-EyXUNSa+H+YvGVuQJP1nZskXAowxKYp79RNUsNdQTj4=", "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "50eee705bbdbac942074a8c120e8194185633675", "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9",
"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"
} }
@ -128,11 +128,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1745885816, "lastModified": 1748203813,
"narHash": "sha256-yuIb6/gGcII+2YgtTLcYdga0pcL63B18xQ/oitOhg7k=", "narHash": "sha256-VCwlSYJjXFhQSdwjk7FdeyALIzknOM1TavCDt3KLgB8=",
"owner": "Jas-SinghFSU", "owner": "Jas-SinghFSU",
"repo": "HyprPanel", "repo": "HyprPanel",
"rev": "0c82ce9704c8063be8d8f60443071c91943eb68c", "rev": "12d6960e198cf5107aed84a4b21e95c826d43dad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,27 +159,27 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1746557022, "lastModified": 1748162331,
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
"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"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1746663147, "lastModified": 1748026106,
"narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -191,11 +191,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1745234285, "lastModified": 1748026106,
"narHash": "sha256-GfpyMzxwkfgRVN0cTGQSkTC0OHhEkv3Jf6Tcjm//qZ0=", "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c11863f1e964833214b767f4a369c6e6a7aba141", "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -223,16 +223,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1746557022, "lastModified": 1748162331,
"narHash": "sha256-QkNoyEf6TbaTW5UZYX0OkwIJ/ZMeKSSoOMnSDPQuol0=", "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1d3aeb5a193b9ff13f63f4d9cc169fb88129f860", "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
"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"
} }
@ -274,11 +274,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1746485181, "lastModified": 1747603214,
"narHash": "sha256-PxrrSFLaC7YuItShxmYbMgSuFFuwxBB+qsl9BZUnRvg=", "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "e93ee1d900ad264d65e9701a5c6f895683433386", "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -295,11 +295,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1746738008, "lastModified": 1748147548,
"narHash": "sha256-bIMysaVhNyjuFgt8QpnGZv0T4YMao26Vz5R/xfYAJO0=", "narHash": "sha256-9IaAQkgyF4PFtVyui8vF6oJah0iVcO9DaOefjdTMthE=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "a43fae27f33f8d3e793a6ca2946190cb24a00b03", "rev": "f0595e3b59260457042450749eaec00a5a47db35",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -329,11 +329,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1746846243, "lastModified": 1748229380,
"narHash": "sha256-AV7zvbi1SVbGxODW7SKw3MhMkS1SQNNwp+XEky14rR4=", "narHash": "sha256-ulYljT6A8/v9QsMWnTsDYxa1/bG/22Ufy+KfrN4jA74=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "efa32c933ca9f6341bbf57ede9a674d45ebe72e2", "rev": "14207b0fc7caba6b6a9c7a9aecf7f901435daa93",
"type": "github" "type": "github"
}, },
"original": { "original": {

6
flake.nix
View File

@ -5,17 +5,17 @@
# #
# ========= Official NixOS and HM Package Sources ========= # ========= Official NixOS and HM Package Sources =========
# #
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
# The next two are for pinning to stable vs unstable regardless of what the above is set to # The next two are for pinning to stable vs unstable regardless of what the above is set to
# This is particularly useful when an upcoming stable release is in beta because you can effectively # This is particularly useful when an upcoming stable release is in beta because you can effectively
# keep 'nixpkgs-stable' set to stable for critical packages while setting 'nixpkgs' to the beta branch to # keep 'nixpkgs-stable' set to stable for critical packages while setting 'nixpkgs' to the beta branch to
# get a jump start on deprecation changes. # get a jump start on deprecation changes.
# See also 'stable-packages' and 'unstable-packages' overlays at 'overlays/default.nix" # See also 'stable-packages' and 'unstable-packages' overlays at 'overlays/default.nix"
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
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";
}; };

6
justfile
View File

@ -34,11 +34,9 @@ switch *FLAGS:
switch-now *FLAGS: switch-now *FLAGS:
nh os switch . {{FLAGS}} nh os switch . {{FLAGS}}
update-all: update-all *FLAGS:
nix-channel --update
nix flake update nix flake update
just switch {{FLAGS}}
just switch
update PKG: update PKG:
nix flake update {{PKG}} nix flake update {{PKG}}

2
shared/base/home-manager/gpg.nix
View File

@ -5,6 +5,6 @@
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
enableFishIntegration = true; enableFishIntegration = true;
pinentryPackage = pkgs.pinentry-curses; pinentry.package = pkgs.pinentry-curses;
}; };
} }

4
shared/base/home-manager/home-manager.nix
View File

@ -1,5 +1,4 @@
{ {
outputs,
systemConfig, systemConfig,
common, common,
... ...
@ -12,9 +11,6 @@
stateVersion = systemConfig.version; stateVersion = systemConfig.version;
}; };
# Adds pkgs.unstable in order to fetch packages from unstable repositories
nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
} }

5
shared/base/modules/nixos.nix
View File

@ -21,5 +21,8 @@
overlays = [ outputs.overlays.unstable-packages ]; overlays = [ outputs.overlays.unstable-packages ];
}; };
system.stateVersion = systemConfig.version; system = {
rebuild.enableNg = true;
stateVersion = systemConfig.version;
};
} }

2
shared/desktop/home-manager/development/zed.nix
View File

@ -19,7 +19,7 @@
fontSize = 14; fontSize = 14;
in in
{ {
assistant = { agent = {
default_model = { default_model = {
provider = "ollama"; provider = "ollama";
model = "deepseek-r1:8b"; model = "deepseek-r1:8b";

2
shared/desktop/home-manager/hyprland/hyprlock/default.nix
View File

@ -78,7 +78,7 @@
fail_color = "${theme.redRgb}"; fail_color = "${theme.redRgb}";
fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>"; fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
capslock_color = "${theme.yellowRgb}"; capslock_color = "${theme.yellowRgb}";
position = "0, -47"; # TODO change to use % at 25.05 position = "0, -5%";
halign = "center"; halign = "center";
valign = "center"; valign = "center";
}; };

5
shared/desktop/home-manager/hyprland/settings.nix
View File

@ -9,6 +9,11 @@ let
in in
{ {
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
ecosystem = {
no_update_news = true;
no_donation_nag = true;
};
monitor = [ monitor = [
", preferred, auto, 1" ", preferred, auto, 1"
]; ];

7
shared/desktop/modules/fonts.nix
View File

@ -1,4 +1,4 @@
{ pkgs, theme, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -8,10 +8,7 @@
fonts = { fonts = {
fontconfig.enable = true; fontconfig.enable = true;
packages = with pkgs; [ packages = with pkgs; [
(nerdfonts.override { fonts = [ theme.nerdFont ]; }) nerd-fonts.jetbrains-mono
jetbrains-mono
# The line below will replace the lines above in 25.05
# nerd-fonts.jetbrains-mono
font-awesome font-awesome
]; ];
}; };

4
shared/desktop/modules/hardware/audio.nix
View File

@ -13,8 +13,6 @@
spotify spotify
]; ];
hardware.pulseaudio.enable = false; # Will be moved to services in 25.05
security.rtkit.enable = true; # Enable RealtimeKit for audio purposes security.rtkit.enable = true; # Enable RealtimeKit for audio purposes
services = { services = {
@ -28,6 +26,6 @@
# Uncomment the following line if you want to use JACK applications # Uncomment the following line if you want to use JACK applications
# jack.enable = true; # jack.enable = true;
}; };
# pulseaudio.enable = false; # TODO uncommenct at 25.05 pulseaudio.enable = false; # Will be moved to services in 25.05
}; };
} }

2
shared/desktop/modules/locale.nix
View File

@ -11,7 +11,7 @@ in
# Select internationalisation properties. # Select internationalisation properties.
i18n = { i18n = {
defaultLocale = en; defaultLocale = en;
supportedLocales = [ extraLocales = [
"${en}/${utf-8}" "${en}/${utf-8}"
"${nb}/${utf-8}" "${nb}/${utf-8}"
]; ];

2
shared/desktop/modules/office.nix
View File

@ -3,6 +3,6 @@
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
onlyoffice-desktopeditors onlyoffice-desktopeditors
planify # planify
]; ];
} }