From 6287b64f4bab8f4a5bbee1f8d56e5274c29caf60 Mon Sep 17 00:00:00 2001 From: xqtc Date: Fri, 16 Aug 2024 18:55:47 +0200 Subject: [PATCH] Nix flake update; nixvim; aarch64 --- flake.lock | 142 ++++++++++++++++--------------------- home/modules/home-pkgs.nix | 2 +- home/modules/nixvim.nix | 6 +- 3 files changed, 67 insertions(+), 83 deletions(-) diff --git a/flake.lock b/flake.lock index d3c55fe..29a15d5 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "onchg": "onchg" }, "locked": { - "lastModified": 1723077491, - "narHash": "sha256-Zdv5L9Uhh84HTppHszAFvTAUzZfvHY+MTEcQwHc6dIk=", + "lastModified": 1723521594, + "narHash": "sha256-dMmOueX08665Ox6YrAODutCPJfz+BRFyCtq4RJFDZcs=", "owner": "aksiksi", "repo": "compose2nix", - "rev": "e5f35685dd09435f648ec827335ab307b7c4574d", + "rev": "6e1a885f6142139182f28df68300ba33b9db0659", "type": "github" }, "original": { @@ -104,11 +104,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1723089792, - "narHash": "sha256-vXv+xno/CxWom/MFLz54QV4OYNZ8gJmqV82FtZeH51c=", + "lastModified": 1723781004, + "narHash": "sha256-DeqldZxk7Rr6Ak+6DQHgLAqmz41gktpCaw9/RM+hP5U=", "owner": "rycee", "repo": "nur-expressions", - "rev": "cba8af387c1e02cd459f5df427e190d2dbf7db85", + "rev": "782cf4b3e20822f4b17a3af9da467dce66effe40", "type": "gitlab" }, "original": { @@ -317,11 +317,11 @@ ] }, "locked": { - "lastModified": 1722857853, - "narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=", + "lastModified": 1723202784, + "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da", + "rev": "c7012d0c18567c889b948781bc74a501e92275d1", "type": "github" }, "original": { @@ -359,11 +359,11 @@ ] }, "locked": { - "lastModified": 1723015306, - "narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -381,11 +381,11 @@ ] }, "locked": { - "lastModified": 1722630065, - "narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=", + "lastModified": 1723399884, + "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "owner": "nix-community", "repo": "home-manager", - "rev": "afc892db74d65042031a093adb6010c4c3378422", + "rev": "086f619dd991a4d355c07837448244029fc2d9ab", "type": "github" }, "original": { @@ -434,11 +434,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1723021300, - "narHash": "sha256-Ujo6MQvwolE1eWSkPXCC9WFJeLtRfnMpvxoeAGNcbFI=", + "lastModified": 1723753423, + "narHash": "sha256-ULsoflnTS634565jqT1IXwHzISwcphLBq+YJYL7/p/Y=", "owner": "viperML", "repo": "nh", - "rev": "ea9053852f8575f650ca0080b2cac6735c7447f7", + "rev": "24d7b24f567ef3345ac267f61579df291e42bd71", "type": "github" }, "original": { @@ -511,11 +511,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1722332872, - "narHash": "sha256-2xLM4sc5QBfi0U/AANJAW21Bj4ZX479MHPMPkB+eKBU=", + "lastModified": 1723310128, + "narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "14c333162ba53c02853add87a0000cbd7aa230c2", + "rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "type": "github" }, "original": { @@ -543,11 +543,11 @@ }, "nixpkgs-2405": { "locked": { - "lastModified": 1722869614, - "narHash": "sha256-7ojM1KSk3mzutD7SkrdSflHXEujPvW1u7QuqWoTLXQU=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "883180e6550c1723395a3a342f830bfc5c371f6b", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1723111207, - "narHash": "sha256-WanxA10GYQol3RemQewSW1O1n3YjUWnHk6t4kOYQ4/4=", + "lastModified": 1723825988, + "narHash": "sha256-kIId9HTelaz7GrEdCU7FeeFk53lwiRej0WYM4tTZonM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa12935a32af71ab3a8b4ff60ab3c37490eea336", + "rev": "d58a8f4fd9c3bfb205fbe985e82329c2c8a71c27", "type": "github" }, "original": { @@ -574,6 +574,21 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1718208800, + "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-24.05", + "type": "indirect" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1721524707, "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", @@ -639,11 +654,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723637854, + "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "type": "github" }, "original": { @@ -670,21 +685,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1718208800, - "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-24.05", - "type": "indirect" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1686020360, "narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=", @@ -715,11 +715,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723097923, - "narHash": "sha256-DtE5JfdxpPraCuDBFDsOc6typ+t1l4IL1HYiyTLcjYM=", + "lastModified": 1723816538, + "narHash": "sha256-h37ltjdifkd7iLtMtBXSBBeYSTuBEKMW6ClFoC7nReQ=", "owner": "nix-community", "repo": "nixvim", - "rev": "78abafe280b1ea102fda879799b590da5d84725f", + "rev": "00f32f0430f82c74919c72af84bc95bf5ae434e4", "type": "github" }, "original": { @@ -737,11 +737,11 @@ ] }, "locked": { - "lastModified": 1722772237, - "narHash": "sha256-3eCYmzeLngX8eutIsTZAG8DIvT/0DWQQxiszTQz8n0s=", + "lastModified": 1723367906, + "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=", "owner": "NuschtOS", "repo": "search", - "rev": "aa5f6246565cc9b1e697d2c9d6ed2c842b17fff6", + "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d", "type": "github" }, "original": { @@ -776,16 +776,15 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_7", - "unstable": "unstable", + "nixpkgs-stable": "nixpkgs-stable", "utils": "utils" }, "locked": { - "lastModified": 1720733826, - "narHash": "sha256-vceyHamwxJo3E71byjeHhhcXNmEKopV0bRLmVqXhpKE=", + "lastModified": 1723742041, + "narHash": "sha256-uaNROl1f2UK2kwd39qbnom+/BeP3I9iPUctz22sAls8=", "owner": "SaumonNet", "repo": "proxmox-nixos", - "rev": "61b9547a97120b6091b6e919a195ebf92acb33ad", + "rev": "7ec39b09a63ef472f3529e5d4b6e159099cad243", "type": "github" }, "original": { @@ -836,14 +835,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1722897572, - "narHash": "sha256-3m/iyyjCdRBF8xyehf59QlckIcmShyTesymSb+N4Ap4=", + "lastModified": 1723501126, + "narHash": "sha256-N9IcHgj/p1+2Pvk8P4Zc1bfrMwld5PcosVA0nL6IGdE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8ae477955dfd9cbf5fa4eb82a8db8ddbb94e79d9", + "rev": "be0eec2d27563590194a9206f551a6f73d52fa34", "type": "github" }, "original": { @@ -855,7 +854,7 @@ "spicetify-nix": { "inputs": { "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1720901901, @@ -954,11 +953,11 @@ ] }, "locked": { - "lastModified": 1722330636, - "narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=", + "lastModified": 1723454642, + "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "768acdb06968e53aa1ee8de207fd955335c754b7", + "rev": "349de7bc435bdff37785c2466f054ed1766173be", "type": "github" }, "original": { @@ -967,21 +966,6 @@ "type": "github" } }, - "unstable": { - "locked": { - "lastModified": 1718318537, - "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "utils": { "inputs": { "systems": "systems_4" diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix index bc83459..6915c16 100644 --- a/home/modules/home-pkgs.nix +++ b/home/modules/home-pkgs.nix @@ -14,6 +14,7 @@ pkgs.telegram-desktop pkgs.jetbrains.rust-rover pkgs.tutanota-desktop + pkgs.bitwarden-desktop # pkgs.ida-free # pkgs.spotify ] @@ -69,7 +70,6 @@ in { pkgs.pavucontrol pkgs.bitwarden-cli - pkgs.bitwarden-desktop pkgs.rbw pkgs.swayfx diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix index 3f6d425..ce6f4a0 100644 --- a/home/modules/nixvim.nix +++ b/home/modules/nixvim.nix @@ -44,13 +44,13 @@ }; lsp-format = {enable = true;}; copilot-lua = { - enable = true; + enable = false; suggestion = { enabled = false; }; panel.enabled = false; }; - copilot-cmp.enable = true; + copilot-cmp.enable = false; neocord.enable = true; rustaceanvim = { enable = true; @@ -146,7 +146,7 @@ {name = "path";} {name = "buffer";} {name = "luasnip";} - {name = "copilot";} + # {name = "copilot";} ]; #mapping = { # __raw = ''