From 6c397bc61a2e5a5debfea7567e74716159653eee Mon Sep 17 00:00:00 2001 From: Miguel Palhas Date: Wed, 25 Mar 2026 16:40:15 +0000 Subject: [PATCH] fixes --- flake.lock | 152 +++++++++++------------- home/arrakis/default.nix | 1 - home/arrakis/monitors.nix | 20 +--- home/common/features/bluetooth.nix | 14 --- home/common/programs/hyprland/dunst.nix | 11 -- home/common/programs/zsh.nix | 7 -- home/desktop/default.nix | 1 - hosts/common/global/nix.nix | 2 +- 8 files changed, 72 insertions(+), 136 deletions(-) delete mode 100644 home/common/features/bluetooth.nix delete mode 100644 home/common/programs/hyprland/dunst.nix diff --git a/flake.lock b/flake.lock index 948e156..f1343f8 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1773436376, - "narHash": "sha256-OUPRrprbgN27BXHuWkMAPSCfLLQ/uwpWghEfKYN2iAg=", + "lastModified": 1774211390, + "narHash": "sha256-sTtAgCCaX8VNNZlQFACd3i1IQ+DB0Wf3COgiFS152ds=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "43f10d24391692bba3d762931ee35e7f17f8e8b8", + "rev": "f62a4dbfa4e5584f14ad4c62afedf6e4b433cf70", "type": "github" }, "original": { @@ -55,11 +55,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1773961521, - "narHash": "sha256-enhjd1AcHHU+3RCRdSWVQj6TIqRXkJUbQSFVXzC6xLo=", + "lastModified": 1774419577, + "narHash": "sha256-1dmCZWYAhJ1Z65Bl11wgXCHcCu1CTTD0j+PBGFfjanM=", "owner": "sadjow", "repo": "claude-code-nix", - "rev": "1519be1f77ed017ae4a88916ac54529cef885573", + "rev": "8117d36a65200c7a2870620427296b381acb4c35", "type": "github" }, "original": { @@ -183,11 +183,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1773991147, - "narHash": "sha256-7PDpoLX8ctqnoLpFcfHdhyZIxjV9rg30uSUXHJK0WkE=", + "lastModified": 1774423357, + "narHash": "sha256-bqXiXHy9eAuHosLewF1GvZu4MUsvI5JlSw0R/WOvR9s=", "owner": "shazow", "repo": "foundry.nix", - "rev": "204a53224f95e22a5d1d633af0ead69245d6180a", + "rev": "7bf6218441359d21196c8f429405429ff52fffdc", "type": "github" }, "original": { @@ -220,11 +220,11 @@ }, "hardware": { "locked": { - "lastModified": 1773533765, - "narHash": "sha256-qonGfS2lzCgCl59Zl63jF6dIRRpvW3AJooBGMaXjHiY=", + "lastModified": 1774422943, + "narHash": "sha256-o1xgNumjljdBBfOrcQX95hhKGFOJQYNZqpF3EfaScMk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f8e82243fd601afb9f59ad230958bd073795cbfe", + "rev": "632e4bfc21c01e5be900d0d8255a5368a5d6082f", "type": "github" }, "original": { @@ -241,11 +241,11 @@ ] }, "locked": { - "lastModified": 1773962693, - "narHash": "sha256-nf9pgktDE4E2TCavUT1vh3Nd/tfKixL1BK6P32Zp3hI=", + "lastModified": 1774379316, + "narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d3c1d636e7b8ab10f357cd9bee653cd400437de", + "rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7", "type": "github" }, "original": { @@ -350,11 +350,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1773954292, - "narHash": "sha256-w/RA1CKR85/1CF4OgaB48Z/p9vxeiRyA1r5DHDGSU9o=", + "lastModified": 1774445873, + "narHash": "sha256-chWRF3JavLDD9tOI8Av/1LSAkpvk/+BYvNQvTB8Ctyo=", "ref": "refs/heads/main", - "rev": "b940b0d2c197841b0f648598ee782dbaf9e0a89b", - "revCount": 7042, + "rev": "8196711aaa78c8f62e6f720636ef707783685036", + "revCount": 7054, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -602,11 +602,11 @@ ] }, "locked": { - "lastModified": 1773436263, - "narHash": "sha256-n+2xFJngUkBqUJD5FsbVnYEHBTyDFSqtBIwQIGPXWWo=", + "lastModified": 1774211405, + "narHash": "sha256-6KNwP4ojUzv3YBlZU5BqCpTrWHcix1Jo01BISsTT0xk=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5e228db6821380a5875d5643176c5c46a47b8134", + "rev": "cb4e152dc72095a2af422956c6b689590572231a", "type": "github" }, "original": { @@ -690,11 +690,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773628058, - "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", + "lastModified": 1774273680, + "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", + "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", "type": "github" }, "original": { @@ -720,19 +720,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1773389992, - "narHash": "sha256-wLdaFm1T0uzQya3eG/5+LPbmyB92jE/AnMtVY6re818=", - "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre962836.c06b4ae3d659/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1773389992, "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", @@ -796,11 +783,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1773389992, - "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -812,11 +799,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -843,22 +830,6 @@ } }, "nixpkgs_8": { - "locked": { - "lastModified": 1770107345, - "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { "locked": { "lastModified": 1710272261, "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", @@ -874,6 +845,19 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1773389992, + "narHash": "sha256-wLdaFm1T0uzQya3eG/5+LPbmyB92jE/AnMtVY6re818=", + "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda", + "type": "tarball", + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre962836.c06b4ae3d659/nixexprs.tar.xz" + }, + "original": { + "type": "tarball", + "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts", @@ -881,11 +865,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1772402258, - "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=", + "lastModified": 1774309640, + "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=", "owner": "nix-community", "repo": "nixvim", - "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10", + "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554", "type": "github" }, "original": { @@ -902,11 +886,11 @@ "noctalia-qs": "noctalia-qs" }, "locked": { - "lastModified": 1773998346, - "narHash": "sha256-LcH6L4DWf4a1aLZHjblXxKbF8l+hOA0EpxEFGdYvJME=", + "lastModified": 1774442185, + "narHash": "sha256-dHxsDxA3kIn22eJZ+AhgIOJO6BLPH88DJfnviJ0le28=", "owner": "noctalia-dev", "repo": "noctalia-shell", - "rev": "829dedc2d0efbd3ecd323d1e0e07719fd474d2eb", + "rev": "c960e17791bdd73300c37ebb1619bc8f3ee45ade", "type": "github" }, "original": { @@ -925,11 +909,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1773842483, - "narHash": "sha256-oRqz+5AbNKfUWWwN5c83CsSOsUWVGITh0HZg+wX5Q/8=", + "lastModified": 1774351986, + "narHash": "sha256-N131zILQ06ZNEvtgtjjFZ0N5qEI70rKKhCZsBcZoDH8=", "owner": "noctalia-dev", "repo": "noctalia-qs", - "rev": "3962ff1e0b59ef067c57199d31271ddbf23b29cd", + "rev": "066835ebd5daeabc86df1e62fb5fe82a51407cc0", "type": "github" }, "original": { @@ -965,11 +949,11 @@ ] }, "locked": { - "lastModified": 1773922628, - "narHash": "sha256-bsnFTM5bJgVvMU5aDhoLoY/tH8g3yqi0if42hGwFw4w=", + "lastModified": 1774421688, + "narHash": "sha256-5RsBvxNCsylnBxnN6RVVSMInf4S0sxHSg7qkUAqOMPM=", "owner": "nix-community", "repo": "nix4nvchad", - "rev": "7fb203152aae22d6d012fef019142e5f5cb25d58", + "rev": "5fd6110bf32792ba9c1251ecccb62370025bdfa2", "type": "github" }, "original": { @@ -988,11 +972,11 @@ ] }, "locked": { - "lastModified": 1772893680, - "narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=", + "lastModified": 1774104215, + "narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8baab586afc9c9b57645a734c820e4ac0a604af9", + "rev": "f799ae951fde0627157f40aec28dec27b22076d0", "type": "github" }, "original": { @@ -1027,7 +1011,7 @@ "rose-pine-hyprcursor": { "inputs": { "hyprlang": "hyprlang_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "utils": "utils_2" }, "locked": { @@ -1064,7 +1048,7 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "systems": "systems_10" }, "locked": { @@ -1263,7 +1247,11 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": [ + "noctalia", + "noctalia-qs", + "nixpkgs" + ] }, "locked": { "lastModified": 1772660329, @@ -1361,11 +1349,11 @@ ] }, "locked": { - "lastModified": 1772669058, - "narHash": "sha256-XhnY0aRuDo5LT8pmJVPofPOgO2hAR7T+XRoaQxtNPzQ=", + "lastModified": 1773601989, + "narHash": "sha256-2tJf/CQoHApoIudxHeJye+0Ii7scR0Yyi7pNiWk0Hn8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "906d0ac159803a7df2dc1f948df9327670380f69", + "rev": "a9b862d1aa000a676d310cc62d249f7ad726233d", "type": "github" }, "original": { @@ -1377,7 +1365,7 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1773737882, diff --git a/home/arrakis/default.nix b/home/arrakis/default.nix index 046d441..ef7ad7e 100644 --- a/home/arrakis/default.nix +++ b/home/arrakis/default.nix @@ -22,7 +22,6 @@ ../common/features/xdg.nix ../common/features/downloads-cleanup.nix ../common/programs/3d.nix - ../common/features/bluetooth.nix ./monitors.nix ]; diff --git a/home/arrakis/monitors.nix b/home/arrakis/monitors.nix index c4ee7f5..1355591 100644 --- a/home/arrakis/monitors.nix +++ b/home/arrakis/monitors.nix @@ -1,15 +1,4 @@ -{ - inputs, - pkgs, - config, - ... -}: -let - wallpaper1 = pkgs.fetchurl { - url = "https://4kwallpapers.com/images/wallpapers/abstract-design-3840x2160-17068.jpg"; - hash = "sha256-F/XE/ETwzYwtbQWXY78c2AJc8xe2mRunB8Q9/c2F7kY="; - }; -in +{ ... }: { wayland.windowManager.hyprland.settings = { monitor = [ @@ -18,13 +7,6 @@ in "DP-2, preferred, auto-up, 1" "DP-3, preferred, auto-up, 1" "DP-4, preferred, auto-up, 1" - # "DP-3, 1920x1200, 0x0, 1, mirror, eDP-1" ]; }; - - services.hyprpaper.settings.preload = [ (builtins.toString wallpaper1) ]; - services.hyprpaper.settings.wallpaper = [ - "eDP-1,${builtins.toString wallpaper1}" - "DP-3,${builtins.toString wallpaper1}" - ]; } diff --git a/home/common/features/bluetooth.nix b/home/common/features/bluetooth.nix deleted file mode 100644 index b0b53db..0000000 --- a/home/common/features/bluetooth.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, ... }: -{ - # services.blueman-applet.enable = true; - - # systemd.user.services.mpris-proxy = { - # description = "Mpris proxy"; - # after = [ - # "network.target" - # "sound.target" - # ]; - # wantedBy = [ "default.target" ]; - # serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy"; - # }; -} diff --git a/home/common/programs/hyprland/dunst.nix b/home/common/programs/hyprland/dunst.nix deleted file mode 100644 index 88a272b..0000000 --- a/home/common/programs/hyprland/dunst.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - ... -}: -{ - home.packages = with pkgs; [ libnotify ]; - - services.dunst = { - enable = true; - }; -} diff --git a/home/common/programs/zsh.nix b/home/common/programs/zsh.nix index d90d5b7..604d4aa 100644 --- a/home/common/programs/zsh.nix +++ b/home/common/programs/zsh.nix @@ -68,13 +68,6 @@ export FOUNDRY_DISABLE_NIGHTLY_WARNING=true export LD_LIBRARY_PATH=${pkgs.zlib}/lib:${pkgs.icu}/lib:${pkgs.stdenv.cc.cc.lib}/lib:$LD_LIBRARY_PATH - 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/home/desktop/default.nix b/home/desktop/default.nix index 25c89bf..ced8181 100644 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -23,7 +23,6 @@ ../common/programs/nerd-dictation.nix ../common/features/xdg.nix ../common/features/downloads-cleanup.nix - ../common/features/bluetooth.nix ./monitors.nix ]; diff --git a/hosts/common/global/nix.nix b/hosts/common/global/nix.nix index 47ebf9c..c91ee81 100644 --- a/hosts/common/global/nix.nix +++ b/hosts/common/global/nix.nix @@ -8,7 +8,7 @@ nix = { settings = { trusted-users = [ - "'root" + "root" "@wheel" ]; auto-optimise-store = lib.mkDefault true;