max/nixos
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:
Max Känner 2025-05-26 20:08:04 +02:00
parent bec9559314
commit b5ace6ccb9
7 changed files with 60 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flake.lock generated
View File

@ -7,16 +7,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747688870, "lastModified": 1748226808,
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "narHash": "sha256-GaBRgxjWO1bAQa8P2+FDxG4ANBVhjnSjBms096qQdxo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d5f1f641b289553927b3801580598d200a501863", "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"
} }
@ -43,27 +43,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1747676747, "lastModified": 1748162331,
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "72841a4a8761d1aed92ef6169a636872c986c76d", "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": 1747744144, "lastModified": 1748026106,
"narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c",
"type": "github" "type": "github"
}, },
"original": { "original": {

29
flake.nix
View File

@ -2,10 +2,10 @@
description = "Nixos config flake"; description = "Nixos config flake";
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";
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"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
sops-nix.url = "github:Mic92/sops-nix"; sops-nix.url = "github:Mic92/sops-nix";
@ -36,7 +36,7 @@
allowUnfreePredicate = pkg: allowUnfreePredicate = pkg:
builtins.elem (nixpkgs.lib.getName pkg) [ builtins.elem (nixpkgs.lib.getName pkg) [
"discord" "discord"
"samsung-UnifiedLinuxDriver" "samsung-unified-linux-driver"
"steam" "steam"
"steam-unwrapped" "steam-unwrapped"
"stm32cubemx" "stm32cubemx"
@ -49,7 +49,7 @@
"MaxNixosLaptop" = nixpkgs.lib.nixosSystem { "MaxNixosLaptop" = nixpkgs.lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit inputs pkgs system; inherit inputs system;
}; };
modules = [ modules = [
./hosts/MaxNixosLaptop/configuration.nix ./hosts/MaxNixosLaptop/configuration.nix
@ -63,6 +63,27 @@
]; ];
} }
musnix.nixosModules.musnix 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 { ServerIso = nixpkgs.lib.nixosSystem {

1
modules/home/shell/neovim.nix
View File

@ -66,6 +66,7 @@ in {
texliveMedium texliveMedium
biber biber
gcc gcc
just-lsp
]; ];
}; };

2
modules/home/shell/zsh.nix
View File

@ -44,7 +44,7 @@ in {
}; };
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
syntaxHighlighting.highlighters = ["main" "brackets"]; syntaxHighlighting.highlighters = ["main" "brackets"];
initExtra = '' initContent = ''
# auto completion # auto completion
bindkey '^I' complete-word bindkey '^I' complete-word
bindkey '^[[Z' autosuggest-accept bindkey '^[[Z' autosuggest-accept

3
modules/home/sway/default.nix
View File

@ -69,7 +69,8 @@ in {
# fonts # fonts
noto-fonts noto-fonts
nerdfonts nerd-fonts.fira-code
nerd-fonts.fira-mono
fira fira
]; ];

22
modules/home/sway/mako.nix
View File

@ -12,18 +12,20 @@ in {
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
services.mako = { services.mako = {
enable = true; enable = true;
actions = true; settings = {
anchor = "top-right"; actions = true;
anchor = "top-right";
borderRadius = 10; border-radius = 10;
borderSize = 2; border-size = 2;
height = 100; height = 100;
width = 400; width = 400;
defaultTimeout = 10000; # ms default-timeout = 10000; # ms
font = "FiraCode Nerd Font 11"; font = "FiraCode Nerd Font 11";
icons = true; icons = true;
markup = true; markup = true;
};
}; };
}; };
} }

17
modules/home/sway/theme.nix
View File

@ -116,15 +116,14 @@ in {
}; };
xsession.enable = true; xsession.enable = true;
services.mako = { services.mako.settings = {
backgroundColor = "#313131"; background-color = "#313131";
borderColor = "#00FFEE"; border-color = "#00FFEE";
progressColor = "#338833"; progress-color = "#338833";
textColor = "#e0e0e0"; text-color = "#e0e0e0";
extraConfig = '' "urgency=low" = {
[urgency=low] border-color = "#008877";
border-color=#008877 };
'';
}; };
}; };
} }