From 9c3359c5033ecb4708c3eead377cb901a1a4a268 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Fri, 11 Sep 2026 10:03:14 -0400 Subject: [PATCH] clean up & correct cache for cuda --- .vscode/extensions.json | 6 --- .vscode/settings.json | 9 ---- .zed/settings.json | 29 ++++++++++++ configs/fwbook/hypr/conf/window-rules.lua | 15 ++++++- configs/fwbook/hypr/dms/layout.lua | 5 --- flake.lock | 54 +++++++++++------------ flake.nix | 7 ++- hosts/fwbook.nix | 2 + hosts/hl-fws1.nix | 3 ++ modules/core/nix-substituters.nix | 5 ++- modules/nixos/desktop/tiler/niri.nix | 18 ++++---- 11 files changed, 93 insertions(+), 60 deletions(-) delete mode 100644 .vscode/extensions.json delete mode 100644 .vscode/settings.json create mode 100644 .zed/settings.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 1cb0196..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "recommendations": [ - "pinage404.nix-extension-pack", - "b4dm4n.nixpkgs-fmt" - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 6c0540a..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "nix.enableLanguageServer": true, - "nix.serverPath": "nixd", - "nixEnvSelector.nixFile": "${workspaceFolder}/flake.nix", - "cSpell.words": ["nixd", "nixos", "nixpkgs", "pkgs"], - "search.exclude": { - "system-special-links": true - } -} diff --git a/.zed/settings.json b/.zed/settings.json new file mode 100644 index 0000000..98cddac --- /dev/null +++ b/.zed/settings.json @@ -0,0 +1,29 @@ +{ + "show_completions_on_input": true, + "languages": { + "QML": { + "colorize_brackets": true, + "inlay_hints": { + "show_background": true, + "enabled": true + }, + "show_whitespaces": "all", + "show_completions_on_input": true, + "always_treat_brackets_as_autoclosed": true, + "format_on_save": "on", + "language_servers": ["qmljs"] + } + }, + "lsp": { + "qmljs": { + "enable_lsp_tasks": true, + "binary": { + "path": "qmlls", + "arguments": ["-E"] + }, + "initialization_options": { + "buildDir": "." + } + } + } +} diff --git a/configs/fwbook/hypr/conf/window-rules.lua b/configs/fwbook/hypr/conf/window-rules.lua index e400fde..7de8761 100644 --- a/configs/fwbook/hypr/conf/window-rules.lua +++ b/configs/fwbook/hypr/conf/window-rules.lua @@ -7,13 +7,14 @@ hl.window_rule({ name = "float-pavucontrol", - match = { class = "^(pavucontrol)$" }, + match = { class = "org.pulseaudio.pavucontrol" }, float = true, }) hl.window_rule({ name = "float-hyprland-share-picker", match = { title = "Select what to share" }, float = true, + stay_focused = true, }) hl.window_rule({ name = "float-blueman", @@ -40,3 +41,15 @@ hl.window_rule({ match = { title = "^(Save File)$" }, float = true, }) +hl.window_rule({ + match = { initial_title = "Slack - Huddle Preview" }, + float = true, + name = "float-slack-huddle", +}) +hl.window_rule({ + match = { float = true }, + name = "float-style", + no_screen_share = true, + xray = true, + -- stay_focused = true +}) diff --git a/configs/fwbook/hypr/dms/layout.lua b/configs/fwbook/hypr/dms/layout.lua index ff23023..42b3223 100644 --- a/configs/fwbook/hypr/dms/layout.lua +++ b/configs/fwbook/hypr/dms/layout.lua @@ -11,8 +11,3 @@ hl.config({ rounding = 12, }, }) - -hl.layer_rule({ - match = { namespace = "^dms:bar$" }, - xray = true, -}) diff --git a/flake.lock b/flake.lock index f95b0a1..394655b 100644 --- a/flake.lock +++ b/flake.lock @@ -224,12 +224,12 @@ ] }, "locked": { - "lastModified": 1786121778, - "narHash": "sha256-KV12+FdIAecrnrS97IYhDUUotvnwYMrB+bXirUMPOdA=", - "rev": "c5a93225f633faee482cbd0670e5d6dca0edf9de", - "revCount": 431, + "lastModified": 1788427446, + "narHash": "sha256-3JntNU/vT11eljUs+NKvVea8u+TTA3d+pGBZOD9KZBI=", + "rev": "cb76ac22754f6b36c008a3c39477c174a146dd6b", + "revCount": 436, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.22.0/019fdd2b-320e-7cf1-8321-a350e90231d9/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.22.3/01a06698-e4aa-7ed0-adb3-2be018fc0c1f/source.tar.gz" }, "original": { "type": "tarball", @@ -239,37 +239,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-MJ6w+0xdY7SGBfk90WzNo9qJAINb7EqywoTUyJf+rbE=", + "narHash": "sha256-hG3WJH3ox9F4jzQX6Tm4kkuu5Jld5ahSHWWLkLvqptg=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-CL1jY3+NauKiMgH52YE1ZxJ2X78XiOcSaAkAQJa03ek=", + "narHash": "sha256-JD6kygFDs/JIlFOe45IgeI5r/UjQOE0QyX90EB0s5mg=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-n2/CLr4NrldpdfNnBzH3jQL3CdAfxDvya1KzM9Hh5Ec=", + "narHash": "sha256-njskQtmrE+ynHHz1TOP1Ws0tgL9XJgDdQIM1KA/kW7E=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.0/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v3.22.3/x86_64-linux" } }, "disko": { @@ -521,11 +521,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1786145028, - "narHash": "sha256-5i+Pu6D+S3zLTfzjy34dPWMhbHTLnxEg8Tz0O7AAccQ=", + "lastModified": 1788558695, + "narHash": "sha256-YKDsDJnhcDSAhyiSnvLPIn+Czu6BPChNwQ+mst5I6js=", "owner": "flox", "repo": "flox", - "rev": "aad7ad29c151b061c2daa4ecb6162491ed834a86", + "rev": "3ed82959ced2913ea47cb97331b404e7e80bab4d", "type": "github" }, "original": { @@ -1282,12 +1282,12 @@ "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1786114274, - "narHash": "sha256-Quqthts9sCdYDCelos6cVrlxgJgkGcJNtQmWwFwvPQw=", - "rev": "c9c272f5ab1a99fb149ab2b152bd8cd8d6fa1186", - "revCount": 27199, + "lastModified": 1788380291, + "narHash": "sha256-bv8yt03cVAPdAc6/9nntqW2/QJeFsvuuYK0bbT99MDA=", + "rev": "3ed5caa3bbde51ab87977c8a80e27c6ed0ea8534", + "revCount": 27315, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.22.0/019fdd0b-8551-7d43-a627-08af9d70b415/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.22.3/01a063f1-9def-7051-9003-4691ca024a72/source.tar.gz" }, "original": { "type": "tarball", @@ -1433,12 +1433,12 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1784160687, - "narHash": "sha256-iYL/bixrb6FlHFu/gIuBYzq6c6lM5AAXsXNSWXtIgQc=", - "rev": "4382ed2b7a6839d4280a9b386db49cbc5907414d", - "revCount": 1009383, + "lastModified": 1787962033, + "narHash": "sha256-u6z9VTZA4Kf3RkHQo9sQI7NI4Ei/uiU9vrMqOiwWP1Y=", + "rev": "c5c4a43b0e8056328ec4529f735cabdb8f1942bb", + "revCount": 1012930, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009383%2Brev-4382ed2b7a6839d4280a9b386db49cbc5907414d/019f6c11-ad78-7500-a194-d18a5bad0fbe/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1012930%2Brev-c5c4a43b0e8056328ec4529f735cabdb8f1942bb/01a053c0-7061-7382-b001-102e9148a5b5/source.tar.gz" }, "original": { "type": "tarball", diff --git a/flake.nix b/flake.nix index 98c016f..d90b2b6 100644 --- a/flake.nix +++ b/flake.nix @@ -146,6 +146,7 @@ system: let pkgs = nixpkgs.legacyPackages.${system}; + qtDocs = pkgs.qt6.qtdoc; pre-commit-check = git-hooks.lib.${system}.run { src = ./.; hooks = { @@ -157,8 +158,12 @@ { default = pkgs.mkShell { name = "nixos-setup"; + QMLLS_DOC_DIR = "${qtDocs}/share/doc/qt6"; + QML_IMPORT_PATH = "${pkgs.qt6.qtdeclarative}/lib/qt-6/qml:${pkgs.quickshell}/lib/qt-6/qml"; + QT_PLUGIN_PATH = "${pkgs.qt6.qtdeclarative}/lib/qt-6/plugins"; packages = with pkgs; [ - kdePackages.qtdeclarative + qtDocs + qt6.qtdeclarative nixpkgs-fmt stylua nixd diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index faad6f6..333ac6f 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -150,6 +150,8 @@ in parted gparted-full f3 + nixd + kdePackages.qtdeclarative # Work postgresql diff --git a/hosts/hl-fws1.nix b/hosts/hl-fws1.nix index 2211b18..933c106 100644 --- a/hosts/hl-fws1.nix +++ b/hosts/hl-fws1.nix @@ -17,6 +17,9 @@ enable = true; mountAsSource = true; }; + quickshell = { + enable = true; + }; }; }; }; diff --git a/modules/core/nix-substituters.nix b/modules/core/nix-substituters.nix index 0b205f4..ccd7c5f 100644 --- a/modules/core/nix-substituters.nix +++ b/modules/core/nix-substituters.nix @@ -27,7 +27,7 @@ in "https://cache.nixos.org" "https://cache.flox.dev" "https://devenv.cachix.org" - "https://cuda-maintainers.cachix.org" + "https://cache.nixos-cuda.org" "https://cosmic.cachix.org/" "https://ai.cachix.org" "https://noctalia.cachix.org" @@ -36,7 +36,7 @@ in nix.settings.trusted-substituters = [ "https://cache.flox.dev" "https://devenv.cachix.org" - "https://cuda-maintainers.cachix.org" + "https://cache.nixos-cuda.org" "ai.cachix.org-1:N9dzRK+alWwoKXQlnn0H6aUx0lU/mspIoz8hMvGvbbc=" ] ++ cfg.urls; nix.settings.trusted-public-keys = [ @@ -48,6 +48,7 @@ in "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ] ++ cfg.keys; nix.settings.trusted-users = [ "root" skygUser.name ]; nix.extraOptions = '' diff --git a/modules/nixos/desktop/tiler/niri.nix b/modules/nixos/desktop/tiler/niri.nix index 6e69c60..5d1797a 100644 --- a/modules/nixos/desktop/tiler/niri.nix +++ b/modules/nixos/desktop/tiler/niri.nix @@ -31,15 +31,15 @@ in configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; }; - programs.dank-material-shell = { - enable = true; - dgop.package = unstablePkgs.dgop; - systemd = { - enable = true; # Systemd service for auto-start - target = "niri.service"; - restartIfChanged = true; # Auto-restart dms.service when dankMaterialShell changes - }; - }; + # programs.dank-material-shell = { + # enable = true; + # dgop.package = unstablePkgs.dgop; + # systemd = { + # enable = true; # Systemd service for auto-start + # target = "niri.service"; + # restartIfChanged = true; # Auto-restart dms.service when dankMaterialShell changes + # }; + # }; xdg.portal = { enable = true; extraPortals = with pkgs; [