From fde14a05d8b000a527f0394ba754818f2ead63bb Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Mon, 28 Apr 2025 10:06:24 +0200 Subject: [PATCH] update --- .config/hypr/hyprland.conf | 2 +- .config/nixpkgs/config.nix | 1 + .config/nushell/base-config.nu | 4 +- .config/waybar/config.jsonc | 2 +- configuration.nix | 5 +- flake.lock | 382 ++++++++++++++------------------- flake.nix | 15 +- home.nix | 16 +- remove-old-nix.sh | 2 +- setup-nix-channels.sh | 10 +- sync-nix.sh | 4 +- 11 files changed, 202 insertions(+), 241 deletions(-) create mode 100644 .config/nixpkgs/config.nix diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 543456b..a8dc823 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -105,7 +105,7 @@ env = XDG_SESSION_TYPE,wayland env = WLR_NO_HARDWARE_CURSORS,1 env = WLR_DRM_DEVICES,/dev/dri/card1:/dev/dri/card0 env = GDK_SCALE,1 -env = GDK_BACKEND,wayland +env = GDK_BACKEND,wayland,x11 env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 env = MOZ_ENABLE_WAYLAND,1 env = XDG_SESSION_DESKTOP,Hyprland diff --git a/.config/nixpkgs/config.nix b/.config/nixpkgs/config.nix new file mode 100644 index 0000000..69baf10 --- /dev/null +++ b/.config/nixpkgs/config.nix @@ -0,0 +1 @@ +{ allowUnfree = true; } diff --git a/.config/nushell/base-config.nu b/.config/nushell/base-config.nu index aabf6c9..4ba3e87 100644 --- a/.config/nushell/base-config.nu +++ b/.config/nushell/base-config.nu @@ -815,6 +815,7 @@ use sockets.nu use jc.nu $env.CARAPACE_BRIDGES = 'zsh,fish,bash,inshellisense' +$env.RUSTC_WRAPPER = (which sccache) source ../carapace/init.nu print "" @@ -834,4 +835,5 @@ alias p = pnpm alias pi = pnpm install alias c = code . alias ns = nix-shell --run nu -alias nsp = nix-shell --run nu -p \ No newline at end of file +alias nsp = nix-shell --run nu -p +alias la = ls -la diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index ceda04b..cc4b8c2 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -135,7 +135,7 @@ }, "pulseaudio": { - "format": "{icon} {volume}", + "format": "{icon} {volume}", "format-muted": "婢", "on-click": "pavucontrol -t 3", "on-click-middle": "pactl set-sink-mute @DEFAULT_SINK@ toggle", diff --git a/configuration.nix b/configuration.nix index 69d8adb..f4a6d4b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -121,6 +121,7 @@ hardware.bluetooth.enable = true; hardware.bluetooth.powerOnBoot = true; programs.wireshark.enable = true; + programs.partition-manager.enable = true; time.hardwareClockInLocalTime = true; users.users.dan = { @@ -156,7 +157,7 @@ # Comment out below for the first time to avoid cache miss, if using flake programs.hyprland = { enable = true; - # package = hyprland.packages.${pkgs.system}.hyprland; + package = hyprland.packages.${pkgs.system}.hyprland; # portalPackage = hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland.override # { # inherit (pkgs) mesa; @@ -197,6 +198,7 @@ virtualisation.docker = { enable = true; enableOnBoot = false; + enableNvidia = true; }; hardware.nvidia-container-toolkit.enable = true; services.avahi.enable = true; @@ -267,7 +269,6 @@ nvtopPackages.full btop lshw - nvidia-docker ]; nixpkgs.config.allowUnfree = true; diff --git a/flake.lock b/flake.lock index c63111f..f4772ef 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1737636397, - "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=", + "lastModified": 1742213273, + "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7fe006981fae53e931f513026fc754e322f13145", + "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", "type": "github" }, "original": { @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1734400729, - "narHash": "sha256-Bf+oya0BuleVXYGIWsb0eWnrK6s0aiesOsI7Mpj1pMU=", + "lastModified": 1744289235, + "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a132fa41be7ebe797ad758e84d9df068151a723b", + "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a", "type": "github" }, "original": { @@ -172,11 +172,11 @@ ] }, "locked": { - "lastModified": 1743808813, - "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", + "lastModified": 1745557122, + "narHash": "sha256-eqSo9ugzsqhFgaDFYUZj943nurlX4L6f+AW0skJ4W+M=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", + "rev": "dd26f75fb4ec1c731d4b1396eaf4439ce40a91c1", "type": "github" }, "original": { @@ -202,11 +202,11 @@ ] }, "locked": { - "lastModified": 1737634937, - "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=", + "lastModified": 1742215578, + "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e", + "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1734364709, - "narHash": "sha256-+2bZJL2u5hva7rSp65OfKJBK+k03T6GB/NCvpoS1OOo=", + "lastModified": 1742215578, + "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "f388aacd22be4a6e4d634fbaf6f75eb0713d239a", + "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", "type": "github" }, "original": { @@ -263,11 +263,11 @@ ] }, "locked": { - "lastModified": 1737634889, - "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -295,11 +295,11 @@ ] }, "locked": { - "lastModified": 1733684019, - "narHash": "sha256-2kYREgmSmbLsmDpLEq96hxVAU3qz8aCvVhF65yCFZHY=", + "lastModified": 1745015490, + "narHash": "sha256-apEJ9zoSzmslhJ2vOKFcXTMZLUFYzh1ghfB6Rbw3Low=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "fb2c0268645a77403af3b8a4ce8fa7ba5917f15d", + "rev": "60754910946b4e2dc1377b967b7156cb989c5873", "type": "github" }, "original": { @@ -315,8 +315,8 @@ "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", @@ -324,16 +324,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1738457237, - "narHash": "sha256-9mtM+lwnmXnv5TPmdij1rR5fLzzqSjkltcyEuRf8uIk=", + "lastModified": 1743178567, + "narHash": "sha256-MRgOvqs+bqS7I72N/1CJUShaXxej1m1XzheH60t1xLs=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff", + "rev": "29e2e59fdbab8ed2cc23a20e3c6043d5decb5cdc", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.47.2", + "ref": "v0.48.1", "repo": "Hyprland", "type": "github" } @@ -351,11 +351,11 @@ ] }, "locked": { - "lastModified": 1743950622, - "narHash": "sha256-8qjDapcQeDqxQUIm5gA0x6XZtowV/14bOs3K0tCSMoU=", + "lastModified": 1745592125, + "narHash": "sha256-X2HCSqyu6tnDMkiKFyALO1Tt0HSmjxU3egxBBx1bB/c=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "be6b9875dd5c586fb401d294bb98c31973849651", + "rev": "bd929f71ef74d3e2569091ec307ad699399a8b3a", "type": "github" }, "original": { @@ -376,11 +376,11 @@ ] }, "locked": { - "lastModified": 1737556638, - "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -403,11 +403,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1743714874, + "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", "type": "github" }, "original": { @@ -418,7 +418,11 @@ }, "hyprland-qt-support": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], "nixpkgs": [ "hyprland", "hyprland-qtutils", @@ -444,11 +448,52 @@ "type": "github" } }, + "hyprland-qt-support_2": { + "inputs": { + "hyprlang": [ + "hyprland-plugins", + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "hyprland-plugins", + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland-plugins", + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, "hyprland-qtutils": { "inputs": { "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "hyprutils": [ "hyprland", + "hyprland-qtutils", + "hyprlang", "hyprutils" ], "nixpkgs": [ @@ -461,11 +506,11 @@ ] }, "locked": { - "lastModified": 1737811848, - "narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=", + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "type": "github" }, "original": { @@ -476,9 +521,17 @@ }, "hyprland-qtutils_2": { "inputs": { + "hyprland-qt-support": "hyprland-qt-support_2", + "hyprlang": [ + "hyprland-plugins", + "hyprland", + "hyprlang" + ], "hyprutils": [ "hyprland-plugins", "hyprland", + "hyprland-qtutils", + "hyprlang", "hyprutils" ], "nixpkgs": [ @@ -493,11 +546,11 @@ ] }, "locked": { - "lastModified": 1733940128, - "narHash": "sha256-hmfXWj2GA9cj1QUkPFYtAAeohhs615zL4E3APy3FnvQ=", + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3833097e50473a152dd614d4b468886840b4ea78", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "type": "github" }, "original": { @@ -513,8 +566,8 @@ "hyprgraphics": "hyprgraphics_2", "hyprland-protocols": "hyprland-protocols_2", "hyprland-qtutils": "hyprland-qtutils_2", - "hyprlang": "hyprlang_3", - "hyprutils": "hyprutils_3", + "hyprlang": "hyprlang_2", + "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": "nixpkgs_2", "pre-commit-hooks": "pre-commit-hooks_2", @@ -522,11 +575,11 @@ "xdph": "xdph_2" }, "locked": { - "lastModified": 1734808910, - "narHash": "sha256-p3b1pgacsB7zVGa/VFsMu7U8FN4Jy0okZSI8TribLTg=", + "lastModified": 1745328209, + "narHash": "sha256-eP3x+JNE1T6RjXhimaEnoc4GvNJcyzppW1vpAs287Zg=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "57921d7dbd1b87a9474f609cb9cd30e6174027cd", + "rev": "241a4935a244f403fa7108259075b04c81ed258f", "type": "github" }, "original": { @@ -537,26 +590,25 @@ }, "hyprlang": { "inputs": { - "hyprutils": "hyprutils", + "hyprutils": [ + "hyprland", + "hyprutils" + ], "nixpkgs": [ "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", "nixpkgs" ], "systems": [ "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", "systems" ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1741191527, + "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "72df3861f1197e41b078faa3e38eedd60e00018d", "type": "github" }, "original": { @@ -566,35 +618,6 @@ } }, "hyprlang_2": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_3": { "inputs": { "hyprutils": [ "hyprland-plugins", @@ -613,11 +636,11 @@ ] }, "locked": { - "lastModified": 1734364628, - "narHash": "sha256-ii8fzJfI953n/EmIxVvq64ZAwhvwuuPHWfGd61/mJG8=", + "lastModified": 1744468525, + "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5", + "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", "type": "github" }, "original": { @@ -630,25 +653,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "hyprlang", "nixpkgs" ], "systems": [ "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "hyprlang", "systems" ] }, "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "lastModified": 1741534688, + "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", "type": "github" }, "original": { @@ -658,31 +675,6 @@ } }, "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737725508, - "narHash": "sha256-jGmcPc6y/prg/4A8KGYqJ27nSPaProCMiFadaxNAKvA=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "fb0c2d1de3d1ef7396d19c18ac09e12bd956929e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprland-plugins", @@ -696,11 +688,11 @@ ] }, "locked": { - "lastModified": 1734384247, - "narHash": "sha256-bl3YyJb2CgaeVKYq/l8j27vKdbkTpDNFDsnCl0dnNlY=", + "lastModified": 1743950287, + "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e6cf45cd1845368702e03b8912f4cc44ebba3322", + "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", "type": "github" }, "original": { @@ -721,11 +713,11 @@ ] }, "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "type": "github" }, "original": { @@ -748,11 +740,11 @@ ] }, "locked": { - "lastModified": 1734384417, - "narHash": "sha256-noYeXcNQ15g1/gIJIYT2zdO66wzY5Z06PYz6BfKUZA8=", + "lastModified": 1739870480, + "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "90e87f7fcfcce4862826d60332cbc5e2f87e1f88", + "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b", "type": "github" }, "original": { @@ -767,11 +759,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1743990663, - "narHash": "sha256-n7bzOLVlYvxgawlIl8fXIxaDjATKhYOhp2OyP61DxdI=", + "lastModified": 1745545937, + "narHash": "sha256-joiviAxX26H0RFIe8E5iP3gSAV/f3v5Ae4SUZ85IDnE=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "35e3aef6ebb7b27195586130175f1409cd71d7f7", + "rev": "8ae51ad90e1c75b8b77102240a02b6dea65fc15a", "type": "github" }, "original": { @@ -787,11 +779,11 @@ ] }, "locked": { - "lastModified": 1743911143, - "narHash": "sha256-4j4JPwr0TXHH4ZyorXN5yIcmqIQr0WYacsuPA4ktONo=", + "lastModified": 1745120797, + "narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "a36f6a7148aec2c77d78e4466215cceb2f5f4bfb", + "rev": "69716041f881a2af935021c1182ed5b0cc04d40e", "type": "github" }, "original": { @@ -802,11 +794,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1743420942, - "narHash": "sha256-b/exDDQSLmENZZgbAEI3qi9yHkuXAXCPbormD8CSJXo=", + "lastModified": 1745503349, + "narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "de6fc5551121c59c01e2a3d45b277a6d05077bc4", + "rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1", "type": "github" }, "original": { @@ -817,11 +809,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1737632463, - "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -846,29 +838,13 @@ "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { - "lastModified": 1743827369, - "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", + "lastModified": 1745391562, + "narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "42a1c966be226125b48c384171c44c651c236c22", + "rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7", "type": "github" }, "original": { @@ -880,11 +856,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734119587, - "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { @@ -896,11 +872,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1743689281, - "narHash": "sha256-y7Hg5lwWhEOgflEHRfzSH96BOt26LaYfrYWzZ+VoVdg=", + "lastModified": 1744868846, + "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2bfc080955153be0be56724be6fa5477b4eefabb", + "rev": "ebe4301cbd8f81c4f8d3244b3632338bbeb6d49c", "type": "github" }, "original": { @@ -912,11 +888,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1743813633, - "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", + "lastModified": 1745487689, + "narHash": "sha256-FQoi3R0NjQeBAsEOo49b5tbDPcJSMWc3QhhaIi9eddw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", + "rev": "5630cf13cceac06cefe9fc607e8dfa8fb342dde3", "type": "github" }, "original": { @@ -952,11 +928,11 @@ ] }, "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", + "lastModified": 1742058297, + "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", + "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a", "type": "github" }, "original": { @@ -973,15 +949,14 @@ "hyprland-plugins", "hyprland", "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1734379367, - "narHash": "sha256-Keu8z5VgT5gnCF4pmB+g7XZFftHpfl4qOn7nqBcywdE=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -1000,31 +975,9 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", "nixpkgs-unstable": "nixpkgs-unstable", - "suyu": "suyu", "zen-browser": "zen-browser" } }, - "suyu": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_3" - }, - "locked": { - "lastModified": 1714727263, - "narHash": "sha256-R+x0UZrBedeR6w+h44JaGwuQJrut5VVD2yjNgYNt9f4=", - "ref": "refs/heads/master", - "rev": "4013bb63ca2217eab5c4a25e266d68d908b96791", - "revCount": 15, - "type": "git", - "url": "https://git.suyu.dev/suyu/nix-flake" - }, - "original": { - "type": "git", - "url": "https://git.suyu.dev/suyu/nix-flake" - } - }, "systems": { "locked": { "lastModified": 1689347949, @@ -1055,21 +1008,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -1098,11 +1036,11 @@ ] }, "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "lastModified": 1741934139, + "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "type": "github" }, "original": { @@ -1145,11 +1083,11 @@ ] }, "locked": { - "lastModified": 1734422917, - "narHash": "sha256-0y7DRaXslhfqVKV8a/talYTYAe2NHOQhMZG7KMNRCtc=", + "lastModified": 1744644585, + "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "3e884d941ca819c1f2e50df8bdae0debded1ed87", + "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bef44f0..3e2ac5c 100644 --- a/flake.nix +++ b/flake.nix @@ -5,16 +5,16 @@ zen-browser.url = "github:MarceColl/zen-browser-flake"; nixos-hardware.url = "github:NixOS/nixos-hardware"; #hyprland.url = "github:hyprwm/Hyprland/v0.44.1-b"; - hyprland.url = "github:hyprwm/Hyprland/v0.47.2"; + hyprland.url = "github:hyprwm/Hyprland/v0.48.1"; hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; # inputs.hyprland.follows = "hyprland"; inputs.nixpkgs.follows = "nixpkgs"; }; - suyu = { - url = "git+https://git.suyu.dev/suyu/nix-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - }; +# suyu = { +# url = "git+https://git.suyu.dev/suyu/nix-flake"; +# inputs.nixpkgs.follows = "nixpkgs"; +# }; home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; @@ -26,7 +26,7 @@ nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { nixpkgs, hyprland-plugins, hyprland, home-manager, nixpkgs-unstable, nix-gaming, suyu, nix-index-database, ... }@attrs: { + outputs = { nixpkgs, hyprland-plugins, hyprland, home-manager, nixpkgs-unstable, nix-gaming,/* suyu, */nix-index-database, ... }@attrs: { nixosConfigurations.lenovo-nix = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = attrs; @@ -34,7 +34,8 @@ # ./obs.nix # doesn't work. Use nix-shell -p obs-studio instead home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; - home-manager.users.dan = (import ./home.nix) { inherit nixpkgs-unstable nix-gaming suyu hyprland-plugins hyprland; }; + home-manager.useUserPackages = true; + home-manager.users.dan = (import ./home.nix) { inherit nixpkgs-unstable nix-gaming /*suyu */hyprland-plugins hyprland; }; home-manager.backupFileExtension = "backup"; } ./configuration.nix diff --git a/home.nix b/home.nix index 5ef7a84..c762c4d 100644 --- a/home.nix +++ b/home.nix @@ -1,9 +1,12 @@ -{ nix-gaming, nixpkgs-unstable, suyu, hyprland-plugins, hyprland, ... }: +{ nix-gaming, nixpkgs-unstable,/* suyu, */hyprland-plugins, hyprland, ... }: { pkgs, inputs, ...}: let - unstable = import inputs.nixpkgs-unstable { + unstable = import nixpkgs-unstable { system = pkgs.system; + config = { + allowUnfree = true; + }; }; in @@ -13,6 +16,11 @@ in packages = with pkgs; [ # davinci-resolve # builds spidermonkey for some reason bruh +# robot3t + nixpkgs-unstable.legacyPackages.${system}.jet-pilot + k9s + + syncthingtray anki-bin xournalpp simple-scan @@ -70,6 +78,7 @@ in nwg-displays wireguard-tools mongodb-compass + mongo-tools hashcat tldr dunst @@ -148,6 +157,8 @@ in qpwgraph nixpkgs-unstable.legacyPackages.${system}.zed-editor + nixpkgs-unstable.legacyPackages.${system}.pineflash + unstable.nosql-booster # suyu.packages.${pkgs.stdenv.hostPlatform.system}.suyu android-tools @@ -321,4 +332,5 @@ in "x-scheme-handler/unknown" = "firefox.desktop"; }; }; + } diff --git a/remove-old-nix.sh b/remove-old-nix.sh index 8f067ff..addc45a 100644 --- a/remove-old-nix.sh +++ b/remove-old-nix.sh @@ -1,4 +1,4 @@ # sudo nix profile wipe-history --profile /nix/var/nix/profiles/system --older-than 30d # nix-env --delete-generations 30d # nix-collect-garbage -nh clean all -k 2 -K 10d +nh clean all -k 2 # -K 10d diff --git a/setup-nix-channels.sh b/setup-nix-channels.sh index 7345702..fbf16f4 100644 --- a/setup-nix-channels.sh +++ b/setup-nix-channels.sh @@ -1,5 +1,11 @@ -sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager +sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable -sudo nix-channel --add https://nixos.org/channels/nixos-24.05 nixos +sudo nix-channel --add https://nixos.org/channels/nixos-24.11 nixos sudo nix-channel --update + +nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager +nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware +nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable +nix-channel --add https://nixos.org/channels/nixos-24.11 nixos +nix-channel --update diff --git a/sync-nix.sh b/sync-nix.sh index a4da44b..39ed55d 100755 --- a/sync-nix.sh +++ b/sync-nix.sh @@ -5,7 +5,7 @@ if [ -z "$(which nh)" ]; then sudo nixos-rebuild switch --show-trace cp /etc/nixos/flake.lock . else - sudo nix-channel --update - sudo nix flake update +# sudo nix-channel --update +# sudo nix flake update nh os switch . -- --show-trace fi