From f3e971e290cb0d16b4098117a6359dd85d231f03 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Mon, 26 May 2025 16:00:53 +0530 Subject: [PATCH] feat: Removed alvr and added sudo for nix-darwin --- flake.lock | 215 +++++++++++++++++---------------------------- flake.nix | 8 +- justfile | 2 +- neovim/default.nix | 24 +---- overlays.nix | 2 +- 5 files changed, 86 insertions(+), 165 deletions(-) diff --git a/flake.lock b/flake.lock index f825e988..f24ba061 100644 --- a/flake.lock +++ b/flake.lock @@ -80,36 +80,13 @@ "type": "github" } }, - "alvr": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1747930387, - "narHash": "sha256-3xot4vNRTHrYuE3ffbYwY3EozYeYkBgF2Gga19k1J/o=", - "ref": "nixos_debug", - "rev": "29eca663b644bcea6e7d8da0c91a32dda9fe79e9", - "revCount": 3211, - "submodules": true, - "type": "git", - "url": "https://github.com/uttarayan21/alvr.git" - }, - "original": { - "ref": "nixos_debug", - "type": "git", - "url": "https://github.com/uttarayan21/alvr.git" - } - }, "anyrun": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1735828456, @@ -129,7 +106,7 @@ "inputs": { "advisory-db": "advisory-db", "crane": "crane", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" @@ -315,7 +292,7 @@ "crane_5": { "inputs": { "flake-compat": "flake-compat_6", - "flake-utils": "flake-utils_7", + "flake-utils": "flake-utils_6", "nixpkgs": [ "music-player", "nixpkgs" @@ -417,7 +394,7 @@ "inputs": { "advisory-db": "advisory-db_2", "crane": "crane_2", - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "nix-github-actions": "nix-github-actions_2", "nixpkgs": [ "nixpkgs" @@ -775,7 +752,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1731533236, @@ -792,15 +769,12 @@ } }, "flake-utils_10": { - "inputs": { - "systems": "systems_15" - }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1644229661, + "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "type": "github" }, "original": { @@ -825,23 +799,8 @@ } }, "flake-utils_12": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_13": { "inputs": { - "systems": "systems_16" + "systems": "systems_15" }, "locked": { "lastModified": 1710146030, @@ -857,9 +816,9 @@ "type": "github" } }, - "flake-utils_14": { + "flake-utils_13": { "inputs": { - "systems": "systems_17" + "systems": "systems_16" }, "locked": { "lastModified": 1731533236, @@ -875,9 +834,9 @@ "type": "github" } }, - "flake-utils_15": { + "flake-utils_14": { "inputs": { - "systems": "systems_18" + "systems": "systems_17" }, "locked": { "lastModified": 1726560853, @@ -893,9 +852,9 @@ "type": "github" } }, - "flake-utils_16": { + "flake-utils_15": { "inputs": { - "systems": "systems_19" + "systems": "systems_18" }, "locked": { "lastModified": 1731533236, @@ -915,24 +874,6 @@ "inputs": { "systems": "systems_3" }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -947,9 +888,27 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_4": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -985,14 +944,14 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_8" + "systems": "systems_10" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -1024,11 +983,11 @@ "systems": "systems_12" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1039,7 +998,7 @@ }, "flake-utils_9": { "inputs": { - "systems": "systems_13" + "systems": "systems_14" }, "locked": { "lastModified": 1731533236, @@ -1058,7 +1017,7 @@ "ghostty": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "zig": "zig", @@ -1275,7 +1234,7 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_9", + "systems": "systems_8", "xdph": "xdph" }, "locked": { @@ -1452,7 +1411,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1746809694, @@ -1651,7 +1610,7 @@ "advisory-db": "advisory-db_3", "crane": "crane_5", "fenix": "fenix", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_7", "nixpkgs": [ "nixpkgs" ] @@ -2111,7 +2070,7 @@ "nixpkgs" ], "nuschtosSearch": "nuschtosSearch", - "systems": "systems_14" + "systems": "systems_13" }, "locked": { "lastModified": 1747449013, @@ -2129,7 +2088,7 @@ }, "nno": { "inputs": { - "flake-utils": "flake-utils_10", + "flake-utils": "flake-utils_9", "neorg": "neorg", "neorg-telescope": "neorg-telescope", "nixpkgs": [ @@ -2155,7 +2114,7 @@ "norg": { "inputs": { "flake-compat": "flake-compat_7", - "flake-utils": "flake-utils_11", + "flake-utils": "flake-utils_10", "nixpkgs": "nixpkgs_5" }, "locked": { @@ -2176,7 +2135,7 @@ "norg-meta": { "inputs": { "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_12", + "flake-utils": "flake-utils_11", "nixpkgs": "nixpkgs_6" }, "locked": { @@ -2215,7 +2174,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_9", + "flake-utils": "flake-utils_8", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -2238,7 +2197,7 @@ }, "onepassword-shell-plugins": { "inputs": { - "flake-utils": "flake-utils_13", + "flake-utils": "flake-utils_12", "nixpkgs": [ "nixpkgs" ] @@ -2356,7 +2315,6 @@ }, "root": { "inputs": { - "alvr": "alvr", "anyrun": "anyrun", "anyrun-hyprwin": "anyrun-hyprwin", "anyrun-nixos-options": "anyrun-nixos-options", @@ -2367,7 +2325,7 @@ "ddcbacklight": "ddcbacklight", "deploy-rs": "deploy-rs", "disko": "disko", - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "ghostty": "ghostty", "guihua": "guihua", "home-manager": "home-manager", @@ -2448,7 +2406,7 @@ }, "rust-overlay_2": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs" }, "locked": { @@ -2638,21 +2596,6 @@ } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_10": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -2667,6 +2610,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_11": { "locked": { "lastModified": 1681028828, @@ -2787,7 +2745,7 @@ "type": "github" } }, - "systems_19": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2802,21 +2760,6 @@ "type": "github" } }, - "systems_2": { - "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" - } - }, "systems_3": { "locked": { "lastModified": 1681028828, @@ -2894,16 +2837,16 @@ }, "systems_8": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -2926,7 +2869,7 @@ "inputs": { "advisory-db": "advisory-db_4", "crane": "crane_6", - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_13", "nix-github-actions": "nix-github-actions_3", "nixpkgs": [ "nixpkgs" @@ -3050,7 +2993,7 @@ }, "utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1701680307, @@ -3127,7 +3070,7 @@ "inputs": { "advisory-db": "advisory-db_5", "crane": "crane_7", - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_14", "nix-github-actions": "nix-github-actions_4", "nixpkgs": [ "nixpkgs" @@ -3179,7 +3122,7 @@ "zjstatus": { "inputs": { "crane": "crane_8", - "flake-utils": "flake-utils_16", + "flake-utils": "flake-utils_15", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index 893f191c..9ca184a4 100644 --- a/flake.nix +++ b/flake.nix @@ -163,10 +163,10 @@ url = "github:uttarayan21/zeronsd"; inputs.nixpkgs.follows = "nixpkgs"; }; - alvr = { - url = "git+file:/home/servius/Projects/ALVR"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # alvr = { + # url = "git+file:/home/servius/Projects/ALVR"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; }; outputs = { diff --git a/justfile b/justfile index 513bd386..dc3b4b6a 100644 --- a/justfile +++ b/justfile @@ -2,7 +2,7 @@ set dotenv-load [macos] install: - nix run nix-darwin -- switch --flake . + sudo nix run nix-darwin -- switch --flake . [linux] install: diff --git a/neovim/default.nix b/neovim/default.nix index 4a110643..b3dc9135 100644 --- a/neovim/default.nix +++ b/neovim/default.nix @@ -203,11 +203,6 @@ in { }; }; - # navic = { - # enable = true; - # settings.lsp.auto_attach = true; - # }; - mini = { enable = true; modules = { @@ -579,22 +574,9 @@ in { end end - -- require("copilot").setup({ - -- suggestion = { - -- enabled = true, - -- auto_trigger = true, - -- keymap = { - -- accept = "", - -- } - -- }, - -- panel = { enabled = true }, - -- }) - catcher(require('crates').setup) catcher(require('outline').setup) - - require('FTerm').setup({ border = 'single', dimensions = { @@ -725,9 +707,7 @@ in { ''; extraPlugins = with pkgs.vimPlugins; [ FTerm-nvim - # copilot-lua crates-nvim - # d2 image-nvim iron-nvim luasnip @@ -737,7 +717,6 @@ in { octo-nvim outline-nvim plenary-nvim - # typr vim-abolish vim-speeddating webapi-vim @@ -746,8 +725,7 @@ in { pkgs.tree-sitter-grammars.tree-sitter-norg pkgs.tree-sitter-grammars.tree-sitter-norg-meta pkgs.tree-sitter-grammars.tree-sitter-nu - # pkgs.tree-sitter-grammars.tree-sitter-d2 ]; extraLuaPackages = luaPkgs: with luaPkgs; [lua-utils-nvim nvim-nio pathlib-nvim]; - extraPackages = [pkgs.lldb pkgs.taplo pkgs.d2 pkgs.sleek pkgs.graphqurl]; + extraPackages = [pkgs.lldb pkgs.taplo pkgs.d2 pkgs.sleek pkgs.graphqurl pkgs.sqls]; } diff --git a/overlays.nix b/overlays.nix index 5b62c7b3..48afc391 100644 --- a/overlays.nix +++ b/overlays.nix @@ -152,7 +152,7 @@ cargoLock = {lockFile = "${src}/Cargo.lock";}; }; - alvr-master = inputs.alvr.packages.${prev.system}.default; + # alvr-master = inputs.alvr.packages.${prev.system}.default; }; anyrun-overlay = final: prev: { anyrun =