From 1cad2253b34006982203cdb86566baa64709c7b2 Mon Sep 17 00:00:00 2001 From: tomoron Date: Sat, 21 Feb 2026 13:57:29 +0100 Subject: [PATCH] update lock and fix deprecated settings --- flake.lock | 42 ++++++++++---------- homeConfigs/global/fileManager.nix | 19 +++++----- homeConfigs/modules/vim.nix | 2 +- osConfigs/global/ld.nix | 61 +++++++++++------------------- 4 files changed, 54 insertions(+), 70 deletions(-) diff --git a/flake.lock b/flake.lock index c34d581..484ed8e 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1768575137, - "narHash": "sha256-e0SsKnkSnq+UwZNS9ZyPJjTjabzq9TRc1hqeDnvOF1Q=", + "lastModified": 1771587924, + "narHash": "sha256-eVYOGmF8nQBhudJyU6lHdgJI87kvGz8JyCq5/Vi9Mjk=", "owner": "catppuccin", "repo": "nix", - "rev": "48e67b4ad22072f1ae30b0ed8e1cb020cf06c611", + "rev": "b0c65edbf31c2ad3d84438d82c2310f2c28373f3", "type": "github" }, "original": { @@ -26,11 +26,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1768622624, - "narHash": "sha256-Em6PP667PeXbEjidbV2LnNwmUYohbrSFvVPLYLUDHms=", + "lastModified": 1771669320, + "narHash": "sha256-LqmgIBpjpMQKkHKCSGJkluMVFFoBdkUhJnu+Cq+jgGc=", "owner": "rycee", "repo": "nur-expressions", - "rev": "8061c6d9199dc6cc0727d4241959eea28f2fa0a6", + "rev": "496abb3aef244b896bf7cdd65e071cf624f16338", "type": "gitlab" }, "original": { @@ -47,11 +47,11 @@ ] }, "locked": { - "lastModified": 1768598210, - "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", + "lastModified": 1771647911, + "narHash": "sha256-18liNHHwOmcaKCpOptE3wLW97fm5v7RTLiZBecX7km0=", "owner": "nix-community", "repo": "home-manager", - "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", + "rev": "436b27742c996b75e2baf8e835e3b3eae0c9fbd4", "type": "github" }, "original": { @@ -62,11 +62,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1768584846, - "narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=", + "lastModified": 1771423359, + "narHash": "sha256-yRKJ7gpVmXbX2ZcA8nFi6CMPkJXZGjie2unsiMzj3Ig=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cce68f4a54fa4e3d633358364477f5cc1d782440", + "rev": "740a22363033e9f1bb6270fbfb5a9574067af15b", "type": "github" }, "original": { @@ -78,11 +78,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768305791, - "narHash": "sha256-AIdl6WAn9aymeaH/NvBj0H9qM+XuAuYbGMZaP0zcXAQ=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1412caf7bf9e660f2f962917c14b1ea1c3bc695e", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -94,11 +94,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1768564909, - "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -125,11 +125,11 @@ ] }, "locked": { - "lastModified": 1768481291, - "narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=", + "lastModified": 1771524872, + "narHash": "sha256-eksVUcUsfS9mQx4D9DrYu88u9w70bAf+n6KmTDuIGEE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "e085e303dfcce21adcb5fec535d65aacb066f101", + "rev": "e85540ffe97322dc1fea14dd11cdc2f59d540ac7", "type": "github" }, "original": { diff --git a/homeConfigs/global/fileManager.nix b/homeConfigs/global/fileManager.nix index 07b3081..bf38dac 100644 --- a/homeConfigs/global/fileManager.nix +++ b/homeConfigs/global/fileManager.nix @@ -6,13 +6,14 @@ }; home.sessionVariables.BROWSER = "yazi"; - programs.bash.bashrcExtra = '' - function y() { - local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd - yazi "$@" --cwd-file="$tmp" - IFS= read -r -d "" cwd < "$tmp" - [ -n "$cwd" ] && [ "$cwd" != "$PWD" ] && builtin cd -- "$cwd" - rm -f -- "$tmp" - } - ''; + programs.yazi.shellWrapperName = "y"; +# programs.bash.bashrcExtra = '' +# function y() { +# local tmp="$(mktemp -t "yazi-cwd.XXXXXX")" cwd +# yazi "$@" --cwd-file="$tmp" +# IFS= read -r -d "" cwd < "$tmp" +# [ -n "$cwd" ] && [ "$cwd" != "$PWD" ] && builtin cd -- "$cwd" +# rm -f -- "$tmp" +# } +# ''; } diff --git a/homeConfigs/modules/vim.nix b/homeConfigs/modules/vim.nix index cabf92c..bc73a97 100644 --- a/homeConfigs/modules/vim.nix +++ b/homeConfigs/modules/vim.nix @@ -32,7 +32,7 @@ # vim.lsp.config('pylsp', {}) # ''; - programs.neovim.extraLuaConfig = '' + programs.neovim.initLua= '' local coq = require "coq" vim.lsp.config('clangd', coq.lsp_ensure_capabilities({})) diff --git a/osConfigs/global/ld.nix b/osConfigs/global/ld.nix index db1fb5b..b87af58 100644 --- a/osConfigs/global/ld.nix +++ b/osConfigs/global/ld.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/12/30 20:37:07 by tomoron #+# #+# # -# Updated: 2026/02/05 12:47:23 by tomoron ### ########.fr # +# Updated: 2026/02/21 13:54:43 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -15,7 +15,6 @@ { programs.nix-ld.enable = true; programs.nix-ld.libraries = with pkgs; [ - # List by default zlib zstd stdenv.cc.cc @@ -31,28 +30,24 @@ xz systemd - # My own additions - xorg.libXcomposite - xorg.libXtst - xorg.libXrandr - xorg.libXext - xorg.libX11 - xorg.libXfixes + libxcomposite + libxtst + libxrandr + libxext + libx11 + libxfixes libGL libva pipewire - xorg.libxcb - xorg.libXdamage - xorg.libxshmfence - xorg.libXxf86vm + libxcb + libxdamage + libxshmfence + libxxf86vm libelf - # Required glib gtk2 - # Inspired by steam - # https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/st/steam/package.nix#L36-L85 networkmanager vulkan-loader libgbm @@ -61,16 +56,14 @@ coreutils pciutils zenity - # glibc_multi.bin # Seems to cause issue in ARM - # # Without these it silently fails - xorg.libXinerama - xorg.libXcursor - xorg.libXrender - xorg.libXScrnSaver - xorg.libXi - xorg.libSM - xorg.libICE + libxinerama + libxcursor + libxrender + libxscrnsaver + libxi + libsm + libice gnome2.GConf nspr nss @@ -80,7 +73,6 @@ libusb1 dbus-glib ffmpeg - # Only libraries are needed from those two libudev0-shim # needed to run unity @@ -88,16 +80,9 @@ icu libnotify gsettings-desktop-schemas - # https://github.com/NixOS/nixpkgs/issues/72282 - # https://github.com/NixOS/nixpkgs/blob/2e87260fafdd3d18aa1719246fd704b35e55b0f2/pkgs/applications/misc/joplin-desktop/default.nix#L16 - # log in /home/leo/.config/unity3d/Editor.log - # it will segfault when opening files if you don’t do: - # export XDG_DATA_DIRS=/nix/store/0nfsywbk0qml4faa7sk3sdfmbd85b7ra-gsettings-desktop-schemas-43.0/share/gsettings-schemas/gsettings-desktop-schemas-43.0:/nix/store/rkscn1raa3x850zq7jp9q3j5ghcf6zi2-gtk+3-3.24.35/share/gsettings-schemas/gtk+3-3.24.35/:$XDG_DATA_DIRS - # other issue: (Unity:377230): GLib-GIO-CRITICAL **: 21:09:04.706: g_dbus_proxy_call_sync_internal: assertion 'G_IS_DBUS_PROXY (proxy)' failed - # Verified games requirements - xorg.libXt - xorg.libXmu + libxt + libxmu libogg libvorbis SDL @@ -131,10 +116,9 @@ libgcrypt libvpx librsvg - xorg.libXft + libxft libvdpau - # ... - # Some more libraries that I needed to run programs + pango cairo atk @@ -150,7 +134,6 @@ libxcrypt-legacy # For natron libGLU # For natron - # Appimages need fuse, e.g. https://musescore.org/fr/download/musescore-x86_64.AppImage fuse e2fsprogs