From b5ace6ccb95777ef3f5935a60dceff15b0705c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20K=C3=A4nner?= Date: Mon, 26 May 2025 20:08:04 +0200 Subject: [PATCH] upgrade to NixOs 25.05 --- flake.lock | 22 +++++++++++----------- flake.nix | 29 +++++++++++++++++++++++++---- modules/home/shell/neovim.nix | 1 + modules/home/shell/zsh.nix | 2 +- modules/home/sway/default.nix | 3 ++- modules/home/sway/mako.nix | 22 ++++++++++++---------- modules/home/sway/theme.nix | 17 ++++++++--------- 7 files changed, 60 insertions(+), 36 deletions(-) diff --git a/flake.lock b/flake.lock index 439f4bb..bc10073 100644 --- a/flake.lock +++ b/flake.lock @@ -7,16 +7,16 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1748226808, + "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "83665c39fa688bd6a1f7c43cf7997a70f6a109f9", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -43,27 +43,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747676747, - "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", + "lastModified": 1748162331, + "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "72841a4a8761d1aed92ef6169a636872c986c76d", + "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748026106, + "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 46a0f23..946770d 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "Nixos config flake"; 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"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; @@ -36,7 +36,7 @@ allowUnfreePredicate = pkg: builtins.elem (nixpkgs.lib.getName pkg) [ "discord" - "samsung-UnifiedLinuxDriver" + "samsung-unified-linux-driver" "steam" "steam-unwrapped" "stm32cubemx" @@ -49,7 +49,7 @@ "MaxNixosLaptop" = nixpkgs.lib.nixosSystem { inherit system; specialArgs = { - inherit inputs pkgs system; + inherit inputs system; }; modules = [ ./hosts/MaxNixosLaptop/configuration.nix @@ -63,6 +63,27 @@ ]; } musnix.nixosModules.musnix + { + nixpkgs = { + overlays = [ + # make unstable packages available via overlay + (final: prev: { + unstable = nixpkgs-unstable.legacyPackages.${prev.system}; + }) + ]; + config = { + allowUnfreePredicate = pkg: + builtins.elem (nixpkgs.lib.getName pkg) [ + "discord" + "samsung-unified-linux-driver" + "steam" + "steam-unwrapped" + "stm32cubemx" + "obsidian" + ]; + }; + }; + } ]; }; ServerIso = nixpkgs.lib.nixosSystem { diff --git a/modules/home/shell/neovim.nix b/modules/home/shell/neovim.nix index edb984a..ab56714 100644 --- a/modules/home/shell/neovim.nix +++ b/modules/home/shell/neovim.nix @@ -66,6 +66,7 @@ in { texliveMedium biber gcc + just-lsp ]; }; diff --git a/modules/home/shell/zsh.nix b/modules/home/shell/zsh.nix index 9bfc535..01a6287 100644 --- a/modules/home/shell/zsh.nix +++ b/modules/home/shell/zsh.nix @@ -44,7 +44,7 @@ in { }; syntaxHighlighting.enable = true; syntaxHighlighting.highlighters = ["main" "brackets"]; - initExtra = '' + initContent = '' # auto completion bindkey '^I' complete-word bindkey '^[[Z' autosuggest-accept diff --git a/modules/home/sway/default.nix b/modules/home/sway/default.nix index 83079f6..f75b130 100644 --- a/modules/home/sway/default.nix +++ b/modules/home/sway/default.nix @@ -69,7 +69,8 @@ in { # fonts noto-fonts - nerdfonts + nerd-fonts.fira-code + nerd-fonts.fira-mono fira ]; diff --git a/modules/home/sway/mako.nix b/modules/home/sway/mako.nix index ee18e01..733a728 100644 --- a/modules/home/sway/mako.nix +++ b/modules/home/sway/mako.nix @@ -12,18 +12,20 @@ in { config = lib.mkIf cfg.enable { services.mako = { enable = true; - actions = true; - anchor = "top-right"; + settings = { + actions = true; + anchor = "top-right"; - borderRadius = 10; - borderSize = 2; - height = 100; - width = 400; + border-radius = 10; + border-size = 2; + height = 100; + width = 400; - defaultTimeout = 10000; # ms - font = "FiraCode Nerd Font 11"; - icons = true; - markup = true; + default-timeout = 10000; # ms + font = "FiraCode Nerd Font 11"; + icons = true; + markup = true; + }; }; }; } diff --git a/modules/home/sway/theme.nix b/modules/home/sway/theme.nix index f94e96a..365cca5 100644 --- a/modules/home/sway/theme.nix +++ b/modules/home/sway/theme.nix @@ -116,15 +116,14 @@ in { }; xsession.enable = true; - services.mako = { - backgroundColor = "#313131"; - borderColor = "#00FFEE"; - progressColor = "#338833"; - textColor = "#e0e0e0"; - extraConfig = '' - [urgency=low] - border-color=#008877 - ''; + services.mako.settings = { + background-color = "#313131"; + border-color = "#00FFEE"; + progress-color = "#338833"; + text-color = "#e0e0e0"; + "urgency=low" = { + border-color = "#008877"; + }; }; }; }