materus/nixos-config
1
0
Fork 0
mirror of https://github.com/materusPL/nixos-config synced 2026-06-12 05:27:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 26.05

Browse Source
This commit is contained in:
Mateusz Słodkowicz 2026-06-09 17:40:53 +02:00
parent 791e88e8a5
commit 5f753f2050
Signed by: materus
SSH Key Fingerprint: SHA256:rzVduzTiiszuYfLPYD0SDZV+g8lxhpcRgpbOZA1X0Uo
7 changed files with 67 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
flake.lock generated
View File

@ -91,11 +91,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1780946137, "lastModified": 1781005595,
"narHash": "sha256-Q4AZp42SvUIi/978LuC0sBiJdNP3Yn/PaBlmMolnQNQ=", "narHash": "sha256-mWx7QLnJrWcw0EfWXzf2Rpv30xRM+cgOWVEuWKxAJiw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "db22c1641c439653db978dae7de159fc84fb738f", "rev": "2aba9beb9b36aa281e4677c2bc519f2cca2173c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,11 +114,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1780946137, "lastModified": 1781005595,
"narHash": "sha256-Q4AZp42SvUIi/978LuC0sBiJdNP3Yn/PaBlmMolnQNQ=", "narHash": "sha256-mWx7QLnJrWcw0EfWXzf2Rpv30xRM+cgOWVEuWKxAJiw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "db22c1641c439653db978dae7de159fc84fb738f", "rev": "2aba9beb9b36aa281e4677c2bc519f2cca2173c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -348,16 +348,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1779506708, "lastModified": 1780883961,
"narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", "narHash": "sha256-WU6SUrESuPiEXEUvX4D51AgWrXRJty+sLJBwBaDBGqE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", "rev": "4eb4fec41674d5b059aa2eedf0f98453890546fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.11", "ref": "release-26.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -370,11 +370,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780943742, "lastModified": 1781009359,
"narHash": "sha256-01bTMR9ZPG+uxPaZBeOwagg5uxIaFYs2/3YIrOX+bCA=", "narHash": "sha256-w/mZkRscTatf8NWyUstli8ROzM/eopxZzi0WRjoeYkU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "df39142474950e42d5fc3bf2fef9d6c62abbe8d7", "rev": "c58ead12efcac436afffa93a22099a5595eb4157",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,11 +448,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780892930, "lastModified": 1780977736,
"narHash": "sha256-YjT3Kf3tEdh6LK7YtW1d3DP02mH+Cf331Xt8CDuBg9s=", "narHash": "sha256-++gnmHagnlrp8zxRLaVMFS00EfLiXXoEEwYFeJd+r6s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "ebd0101b03e316f3a62089335102d47e4bf65d5a", "rev": "4bb5e8d544537f62d3d0bc6da6c56f9895a50eab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -470,11 +470,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1780892930, "lastModified": 1780977736,
"narHash": "sha256-YjT3Kf3tEdh6LK7YtW1d3DP02mH+Cf331Xt8CDuBg9s=", "narHash": "sha256-++gnmHagnlrp8zxRLaVMFS00EfLiXXoEEwYFeJd+r6s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "ebd0101b03e316f3a62089335102d47e4bf65d5a", "rev": "4bb5e8d544537f62d3d0bc6da6c56f9895a50eab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +497,11 @@
"nur": "nur" "nur": "nur"
}, },
"locked": { "locked": {
"lastModified": 1767995196, "lastModified": 1781018938,
"narHash": "sha256-aHcce1tj2ilO3BYGbHsuKkMWGPnJA7luMr0ihX/Ez0Y=", "narHash": "sha256-5LUzkIEBQGo1/hYeu9Ku5feWsv8CYyaE/FOCnlKAdio=",
"owner": "materusPL", "owner": "materusPL",
"repo": "Nixerus", "repo": "Nixerus",
"rev": "b151b5139b93a9bf7d990f112ed3bc55358bfa68", "rev": "6b9c35b7175a0356d4d513ab49b57921c8a0845e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -524,11 +524,11 @@
"nur": "nur_3" "nur": "nur_3"
}, },
"locked": { "locked": {
"lastModified": 1767995196, "lastModified": 1781018938,
"narHash": "sha256-aHcce1tj2ilO3BYGbHsuKkMWGPnJA7luMr0ihX/Ez0Y=", "narHash": "sha256-5LUzkIEBQGo1/hYeu9Ku5feWsv8CYyaE/FOCnlKAdio=",
"owner": "materusPL", "owner": "materusPL",
"repo": "Nixerus", "repo": "Nixerus",
"rev": "b151b5139b93a9bf7d990f112ed3bc55358bfa68", "rev": "6b9c35b7175a0356d4d513ab49b57921c8a0845e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -578,11 +578,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1755615617, "lastModified": 1780749050,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4", "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -671,11 +671,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1755615617, "lastModified": 1780749050,
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20075955deac2583bb12f07151c2df830ef346b4", "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -716,16 +716,16 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1780511130, "lastModified": 1780902259,
"narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=", "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "535f3e6942cb1cead3929c604320d3db54b542b9", "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.11", "ref": "nixos-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -736,11 +736,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1756145408, "lastModified": 1781015510,
"narHash": "sha256-ltkbs5Watrq+V2l9hWefSdM7cfvxLkabtMJeZn0MiCo=", "narHash": "sha256-DqRzaFfLijAyd3TDilgKEjNiqJ1UVymA/seyVamoWS4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c9c985b60eb46d97370f7d3fefdc300b953c044d", "rev": "961e2e196da88c8d6513bb8e9865ec5e5a6cb954",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -775,11 +775,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1756145408, "lastModified": 1781015510,
"narHash": "sha256-ltkbs5Watrq+V2l9hWefSdM7cfvxLkabtMJeZn0MiCo=", "narHash": "sha256-DqRzaFfLijAyd3TDilgKEjNiqJ1UVymA/seyVamoWS4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c9c985b60eb46d97370f7d3fefdc300b953c044d", "rev": "961e2e196da88c8d6513bb8e9865ec5e5a6cb954",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
flake.nix
View File

@ -6,7 +6,7 @@
type = "github"; type = "github";
owner = "NixOS"; owner = "NixOS";
repo = "nixpkgs"; repo = "nixpkgs";
ref = "nixos-25.11"; ref = "nixos-26.05";
}; };
nixpkgs-unstable = { nixpkgs-unstable = {
@ -19,7 +19,7 @@
materus-inputs = { materus-inputs = {
url = "path:./nix-config/subflake"; url = "path:./nix-config/subflake";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.url = "github:nix-community/home-manager/release-25.11"; inputs.home-manager.url = "github:nix-community/home-manager/release-26.05";
}; };
materus-inputs-unstable = { materus-inputs-unstable = {
url = "path:./nix-config/subflake"; url = "path:./nix-config/subflake";

20
nix-config/home/materus/default.nix
View File

@ -41,22 +41,22 @@
xdg.userDirs.desktop = lib.mkDefault "${config.home.homeDirectory}/Pulpit"; xdg.userDirs.desktop = lib.mkDefault "${config.home.homeDirectory}/Pulpit";
xdg.userDirs.documents = lib.mkDefault "${config.home.homeDirectory}/Dokumenty"; xdg.userDirs.documents = lib.mkDefault "${config.home.homeDirectory}/Dokumenty";
xdg.userDirs.download = lib.mkDefault "${config.home.homeDirectory}/Pobrane"; xdg.userDirs.download = lib.mkDefault "${config.home.homeDirectory}/Pobrane";
xdg.userDirs.music = lib.mkDefault "${config.xdg.userDirs.extraConfig.XDG_AUDIO_DIR}/Muzyka"; xdg.userDirs.music = lib.mkDefault "${config.xdg.userDirs.extraConfig.AUDIO}/Muzyka";
xdg.userDirs.pictures = lib.mkDefault "${config.home.homeDirectory}/Obrazy"; xdg.userDirs.pictures = lib.mkDefault "${config.home.homeDirectory}/Obrazy";
xdg.userDirs.publicShare = lib.mkDefault "${config.home.homeDirectory}/Publiczny"; xdg.userDirs.publicShare = lib.mkDefault "${config.home.homeDirectory}/Publiczny";
xdg.userDirs.templates = lib.mkDefault "${config.home.homeDirectory}/Szablony"; xdg.userDirs.templates = lib.mkDefault "${config.home.homeDirectory}/Szablony";
xdg.userDirs.videos = lib.mkDefault "${config.home.homeDirectory}/Wideo"; xdg.userDirs.videos = lib.mkDefault "${config.home.homeDirectory}/Wideo";
xdg.userDirs.extraConfig = { xdg.userDirs.extraConfig = {
XDG_MISC_DIR = lib.mkDefault "${config.home.homeDirectory}/Inne"; MISC = lib.mkDefault "${config.home.homeDirectory}/Inne";
XDG_PIC_SCREENSHOTS_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Zrzuty ekranu"; PIC_SCREENSHOTS = lib.mkDefault "${config.xdg.userDirs.pictures}/Zrzuty ekranu";
XDG_PIC_MEMES_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Memy"; PIC_MEMES = lib.mkDefault "${config.xdg.userDirs.pictures}/Memy";
XDG_PIC_MISC_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Inne"; PIC_MISC = lib.mkDefault "${config.xdg.userDirs.pictures}/Inne";
XDG_PIC_PHOTOS_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Zdjęcia"; PIC_PHOTOS = lib.mkDefault "${config.xdg.userDirs.pictures}/Zdjęcia";
XDG_PIC_AVATARS_DIR = "${config.xdg.userDirs.pictures}/Avatar"; PIC_AVATARS = "${config.xdg.userDirs.pictures}/Avatar";
XDG_AUDIO_DIR = lib.mkDefault "${config.home.homeDirectory}/Audio"; AUDIO = lib.mkDefault "${config.home.homeDirectory}/Audio";
XDG_KEYS_DIR = lib.mkDefault "${config.xdg.userDirs.documents}/Klucze"; KEYS = lib.mkDefault "${config.xdg.userDirs.documents}/Klucze";
}; };
xdg.userDirs.setSessionVariables = true;
home.sessionVariables = { home.sessionVariables = {
}; };

1
nix-config/host/materusPC/audio.nix
View File

@ -44,7 +44,6 @@
vital vital
odin2 odin2
surge
fire fire
lsp-plugins lsp-plugins
]; ];

17
nix-config/host/materusPC/configuration.nix
View File

@ -140,8 +140,8 @@ in
PATH = [ "\${XDG_BIN_HOME}" ]; PATH = [ "\${XDG_BIN_HOME}" ];
}; };
environment.shellInit = '' environment.shellInit = ''
if ! [ -z "$DISPLAY" ]; then ${pkgs.xorg.xhost}/bin/xhost +si:localuser:root &> /dev/null; fi; if ! [ -z "$DISPLAY" ]; then ${pkgs.xhost}/bin/xhost +si:localuser:root &> /dev/null; fi;
if ! [ -z "$DISPLAY" ]; then ${pkgs.xorg.xhost}/bin/xhost +si:localuser:$USER &> /dev/null; fi; if ! [ -z "$DISPLAY" ]; then ${pkgs.xhost}/bin/xhost +si:localuser:$USER &> /dev/null; fi;
''; '';
i18n.inputMethod.enabled = "fcitx5"; i18n.inputMethod.enabled = "fcitx5";
i18n.inputMethod.fcitx5.addons = [ i18n.inputMethod.fcitx5.addons = [
@ -255,7 +255,6 @@ in
[ [
"nix-command" "nix-command"
"flakes" "flakes"
"no-url-literals"
] ]
]; ];
auto-optimise-store = true; auto-optimise-store = true;
@ -287,12 +286,12 @@ in
promptInit = ''''; promptInit = '''';
}; };
systemd.sleep.extraConfig = '' systemd.sleep.settings.Sleep = {
AllowSuspend=yes AllowSuspend="yes";
AllowHibernation=no AllowHibernation="no";
AllowHybridSleep=no AllowHybridSleep="no";
AllowSuspendThenHibernate=no AllowSuspendThenHibernate="no";
''; };

11
nix-config/host/materusPC/home-manager/materus.nix
View File

@ -45,7 +45,7 @@ in
jsonnet-language-server jsonnet-language-server
]; ];
programs.vscode = { programs.vscodium = {
enable = true; enable = true;
mutableExtensionsDir = true; mutableExtensionsDir = true;
profiles.default.enableExtensionUpdateCheck = true; profiles.default.enableExtensionUpdateCheck = true;
@ -88,9 +88,6 @@ in
cs128.cs128-clang-tidy cs128.cs128-clang-tidy
xaver.clang-format xaver.clang-format
# D
webfreak.code-d
# Other # Other
redhat.vscode-yaml redhat.vscode-yaml
redhat.vscode-xml redhat.vscode-xml
@ -99,15 +96,13 @@ in
package = ( package = (
pkgs.vscodium.fhsWithPackages ( pkgs.vscodium.fhsWithPackages (
ps: with ps; [ ps: with ps; [
nixfmt-rfc-style nixfmt
nixd nixd
direnv direnv
jsonnet jsonnet
jsonnet-language-server jsonnet-language-server
clang-tools clang-tools
clang clang
dmd
ldc
] ]
) )
); );
@ -135,7 +130,7 @@ in
"editor.defaultFormatter" = "jnoortheen.nix-ide"; "editor.defaultFormatter" = "jnoortheen.nix-ide";
}; };
"nix.enableLanguageServer" = true; "nix.enableLanguageServer" = true;
"nix.formatterPath" = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; "nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt";
"nix.serverPath" = "${pkgs.nixd}/bin/nixd"; "nix.serverPath" = "${pkgs.nixd}/bin/nixd";
"nix.serverSettings" = { "nix.serverSettings" = {

4
nix-config/shared/nvim.nix
View File

@ -19,11 +19,13 @@ isHm:
xdg.configFile."nvim/lua/materus".source = "${config.mkk.dir}/config/editor/neovim/lua/materus"; xdg.configFile."nvim/lua/materus".source = "${config.mkk.dir}/config/editor/neovim/lua/materus";
programs.neovim = { programs.neovim = {
enable = true; enable = true;
withRuby = true;
withPython3 = true;
plugins = [ plugins = [
pkgs.vimPlugins.nvim-treesitter.withAllGrammars pkgs.vimPlugins.nvim-treesitter.withAllGrammars
]; ];
extraLuaConfig = lib.mkAfter '' initLua = lib.mkAfter ''
MATERUS = { MATERUS = {
NIXOS = 1 NIXOS = 1
} }