diff --git a/flake.lock b/flake.lock index 826a75b..7cc942b 100644 --- a/flake.lock +++ b/flake.lock @@ -91,11 +91,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1780946137, - "narHash": "sha256-Q4AZp42SvUIi/978LuC0sBiJdNP3Yn/PaBlmMolnQNQ=", + "lastModified": 1781005595, + "narHash": "sha256-mWx7QLnJrWcw0EfWXzf2Rpv30xRM+cgOWVEuWKxAJiw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "db22c1641c439653db978dae7de159fc84fb738f", + "rev": "2aba9beb9b36aa281e4677c2bc519f2cca2173c7", "type": "github" }, "original": { @@ -114,11 +114,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1780946137, - "narHash": "sha256-Q4AZp42SvUIi/978LuC0sBiJdNP3Yn/PaBlmMolnQNQ=", + "lastModified": 1781005595, + "narHash": "sha256-mWx7QLnJrWcw0EfWXzf2Rpv30xRM+cgOWVEuWKxAJiw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "db22c1641c439653db978dae7de159fc84fb738f", + "rev": "2aba9beb9b36aa281e4677c2bc519f2cca2173c7", "type": "github" }, "original": { @@ -348,16 +348,16 @@ ] }, "locked": { - "lastModified": 1779506708, - "narHash": "sha256-QOD/CNm196nCJRheux/URi4/HE66fthdOMqCJoPP1Y0=", + "lastModified": 1780883961, + "narHash": "sha256-WU6SUrESuPiEXEUvX4D51AgWrXRJty+sLJBwBaDBGqE=", "owner": "nix-community", "repo": "home-manager", - "rev": "3ee51fbdac8c8bdfe1e7e1fcaba6520a563f394f", + "rev": "4eb4fec41674d5b059aa2eedf0f98453890546fa", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "release-26.05", "repo": "home-manager", "type": "github" } @@ -370,11 +370,11 @@ ] }, "locked": { - "lastModified": 1780943742, - "narHash": "sha256-01bTMR9ZPG+uxPaZBeOwagg5uxIaFYs2/3YIrOX+bCA=", + "lastModified": 1781009359, + "narHash": "sha256-w/mZkRscTatf8NWyUstli8ROzM/eopxZzi0WRjoeYkU=", "owner": "nix-community", "repo": "home-manager", - "rev": "df39142474950e42d5fc3bf2fef9d6c62abbe8d7", + "rev": "c58ead12efcac436afffa93a22099a5595eb4157", "type": "github" }, "original": { @@ -448,11 +448,11 @@ ] }, "locked": { - "lastModified": 1780892930, - "narHash": "sha256-YjT3Kf3tEdh6LK7YtW1d3DP02mH+Cf331Xt8CDuBg9s=", + "lastModified": 1780977736, + "narHash": "sha256-++gnmHagnlrp8zxRLaVMFS00EfLiXXoEEwYFeJd+r6s=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ebd0101b03e316f3a62089335102d47e4bf65d5a", + "rev": "4bb5e8d544537f62d3d0bc6da6c56f9895a50eab", "type": "github" }, "original": { @@ -470,11 +470,11 @@ ] }, "locked": { - "lastModified": 1780892930, - "narHash": "sha256-YjT3Kf3tEdh6LK7YtW1d3DP02mH+Cf331Xt8CDuBg9s=", + "lastModified": 1780977736, + "narHash": "sha256-++gnmHagnlrp8zxRLaVMFS00EfLiXXoEEwYFeJd+r6s=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "ebd0101b03e316f3a62089335102d47e4bf65d5a", + "rev": "4bb5e8d544537f62d3d0bc6da6c56f9895a50eab", "type": "github" }, "original": { @@ -497,11 +497,11 @@ "nur": "nur" }, "locked": { - "lastModified": 1767995196, - "narHash": "sha256-aHcce1tj2ilO3BYGbHsuKkMWGPnJA7luMr0ihX/Ez0Y=", + "lastModified": 1781018938, + "narHash": "sha256-5LUzkIEBQGo1/hYeu9Ku5feWsv8CYyaE/FOCnlKAdio=", "owner": "materusPL", "repo": "Nixerus", - "rev": "b151b5139b93a9bf7d990f112ed3bc55358bfa68", + "rev": "6b9c35b7175a0356d4d513ab49b57921c8a0845e", "type": "github" }, "original": { @@ -524,11 +524,11 @@ "nur": "nur_3" }, "locked": { - "lastModified": 1767995196, - "narHash": "sha256-aHcce1tj2ilO3BYGbHsuKkMWGPnJA7luMr0ihX/Ez0Y=", + "lastModified": 1781018938, + "narHash": "sha256-5LUzkIEBQGo1/hYeu9Ku5feWsv8CYyaE/FOCnlKAdio=", "owner": "materusPL", "repo": "Nixerus", - "rev": "b151b5139b93a9bf7d990f112ed3bc55358bfa68", + "rev": "6b9c35b7175a0356d4d513ab49b57921c8a0845e", "type": "github" }, "original": { @@ -578,11 +578,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1780749050, + "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", "type": "github" }, "original": { @@ -671,11 +671,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1780749050, + "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb", "type": "github" }, "original": { @@ -716,16 +716,16 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1780511130, - "narHash": "sha256-2v9lT4ya59Lh1FqPeLnz1MoX9y/wz2huqfe9RtQZITk=", + "lastModified": 1780902259, + "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "535f3e6942cb1cead3929c604320d3db54b542b9", + "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } @@ -736,11 +736,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756145408, - "narHash": "sha256-ltkbs5Watrq+V2l9hWefSdM7cfvxLkabtMJeZn0MiCo=", + "lastModified": 1781015510, + "narHash": "sha256-DqRzaFfLijAyd3TDilgKEjNiqJ1UVymA/seyVamoWS4=", "owner": "nix-community", "repo": "NUR", - "rev": "c9c985b60eb46d97370f7d3fefdc300b953c044d", + "rev": "961e2e196da88c8d6513bb8e9865ec5e5a6cb954", "type": "github" }, "original": { @@ -775,11 +775,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1756145408, - "narHash": "sha256-ltkbs5Watrq+V2l9hWefSdM7cfvxLkabtMJeZn0MiCo=", + "lastModified": 1781015510, + "narHash": "sha256-DqRzaFfLijAyd3TDilgKEjNiqJ1UVymA/seyVamoWS4=", "owner": "nix-community", "repo": "NUR", - "rev": "c9c985b60eb46d97370f7d3fefdc300b953c044d", + "rev": "961e2e196da88c8d6513bb8e9865ec5e5a6cb954", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 13d517c..87f8d62 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ type = "github"; owner = "NixOS"; repo = "nixpkgs"; - ref = "nixos-25.11"; + ref = "nixos-26.05"; }; nixpkgs-unstable = { @@ -19,7 +19,7 @@ materus-inputs = { url = "path:./nix-config/subflake"; 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 = { url = "path:./nix-config/subflake"; diff --git a/nix-config/home/materus/default.nix b/nix-config/home/materus/default.nix index a36595f..6d40ed0 100644 --- a/nix-config/home/materus/default.nix +++ b/nix-config/home/materus/default.nix @@ -41,22 +41,22 @@ xdg.userDirs.desktop = lib.mkDefault "${config.home.homeDirectory}/Pulpit"; xdg.userDirs.documents = lib.mkDefault "${config.home.homeDirectory}/Dokumenty"; 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.publicShare = lib.mkDefault "${config.home.homeDirectory}/Publiczny"; xdg.userDirs.templates = lib.mkDefault "${config.home.homeDirectory}/Szablony"; xdg.userDirs.videos = lib.mkDefault "${config.home.homeDirectory}/Wideo"; xdg.userDirs.extraConfig = { - XDG_MISC_DIR = lib.mkDefault "${config.home.homeDirectory}/Inne"; - XDG_PIC_SCREENSHOTS_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Zrzuty ekranu"; - XDG_PIC_MEMES_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Memy"; - XDG_PIC_MISC_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Inne"; - XDG_PIC_PHOTOS_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Zdjęcia"; - XDG_PIC_AVATARS_DIR = "${config.xdg.userDirs.pictures}/Avatar"; - XDG_AUDIO_DIR = lib.mkDefault "${config.home.homeDirectory}/Audio"; - XDG_KEYS_DIR = lib.mkDefault "${config.xdg.userDirs.documents}/Klucze"; + MISC = lib.mkDefault "${config.home.homeDirectory}/Inne"; + PIC_SCREENSHOTS = lib.mkDefault "${config.xdg.userDirs.pictures}/Zrzuty ekranu"; + PIC_MEMES = lib.mkDefault "${config.xdg.userDirs.pictures}/Memy"; + PIC_MISC = lib.mkDefault "${config.xdg.userDirs.pictures}/Inne"; + PIC_PHOTOS = lib.mkDefault "${config.xdg.userDirs.pictures}/Zdjęcia"; + PIC_AVATARS = "${config.xdg.userDirs.pictures}/Avatar"; + AUDIO = lib.mkDefault "${config.home.homeDirectory}/Audio"; + KEYS = lib.mkDefault "${config.xdg.userDirs.documents}/Klucze"; }; - + xdg.userDirs.setSessionVariables = true; home.sessionVariables = { }; diff --git a/nix-config/host/materusPC/audio.nix b/nix-config/host/materusPC/audio.nix index db2bdbd..52b92cf 100644 --- a/nix-config/host/materusPC/audio.nix +++ b/nix-config/host/materusPC/audio.nix @@ -44,7 +44,6 @@ vital odin2 - surge fire lsp-plugins ]; diff --git a/nix-config/host/materusPC/configuration.nix b/nix-config/host/materusPC/configuration.nix index be14286..0479542 100644 --- a/nix-config/host/materusPC/configuration.nix +++ b/nix-config/host/materusPC/configuration.nix @@ -140,8 +140,8 @@ in PATH = [ "\${XDG_BIN_HOME}" ]; }; environment.shellInit = '' - if ! [ -z "$DISPLAY" ]; then ${pkgs.xorg.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:root &> /dev/null; fi; + if ! [ -z "$DISPLAY" ]; then ${pkgs.xhost}/bin/xhost +si:localuser:$USER &> /dev/null; fi; ''; i18n.inputMethod.enabled = "fcitx5"; i18n.inputMethod.fcitx5.addons = [ @@ -255,7 +255,6 @@ in [ "nix-command" "flakes" - "no-url-literals" ] ]; auto-optimise-store = true; @@ -287,12 +286,12 @@ in promptInit = ''''; }; - systemd.sleep.extraConfig = '' - AllowSuspend=yes - AllowHibernation=no - AllowHybridSleep=no - AllowSuspendThenHibernate=no - ''; + systemd.sleep.settings.Sleep = { + AllowSuspend="yes"; + AllowHibernation="no"; + AllowHybridSleep="no"; + AllowSuspendThenHibernate="no"; + }; diff --git a/nix-config/host/materusPC/home-manager/materus.nix b/nix-config/host/materusPC/home-manager/materus.nix index ba2e117..0e08bf0 100644 --- a/nix-config/host/materusPC/home-manager/materus.nix +++ b/nix-config/host/materusPC/home-manager/materus.nix @@ -45,7 +45,7 @@ in jsonnet-language-server ]; - programs.vscode = { + programs.vscodium = { enable = true; mutableExtensionsDir = true; profiles.default.enableExtensionUpdateCheck = true; @@ -88,9 +88,6 @@ in cs128.cs128-clang-tidy xaver.clang-format - # D - webfreak.code-d - # Other redhat.vscode-yaml redhat.vscode-xml @@ -99,15 +96,13 @@ in package = ( pkgs.vscodium.fhsWithPackages ( ps: with ps; [ - nixfmt-rfc-style + nixfmt nixd direnv jsonnet jsonnet-language-server clang-tools clang - dmd - ldc ] ) ); @@ -135,7 +130,7 @@ in "editor.defaultFormatter" = "jnoortheen.nix-ide"; }; "nix.enableLanguageServer" = true; - "nix.formatterPath" = "${pkgs.nixfmt-rfc-style}/bin/nixfmt"; + "nix.formatterPath" = "${pkgs.nixfmt}/bin/nixfmt"; "nix.serverPath" = "${pkgs.nixd}/bin/nixd"; "nix.serverSettings" = { diff --git a/nix-config/shared/nvim.nix b/nix-config/shared/nvim.nix index b620a79..61e904e 100644 --- a/nix-config/shared/nvim.nix +++ b/nix-config/shared/nvim.nix @@ -19,11 +19,13 @@ isHm: xdg.configFile."nvim/lua/materus".source = "${config.mkk.dir}/config/editor/neovim/lua/materus"; programs.neovim = { enable = true; + withRuby = true; + withPython3 = true; plugins = [ pkgs.vimPlugins.nvim-treesitter.withAllGrammars ]; - extraLuaConfig = lib.mkAfter '' + initLua = lib.mkAfter '' MATERUS = { NIXOS = 1 }