From f27022823e70a7d0ffd580d17d919ba0fb5fa13e Mon Sep 17 00:00:00 2001 From: xqtc Date: Tue, 10 Dec 2024 19:52:59 +0100 Subject: [PATCH] nix flake update --- common/default.nix | 2 +- flake.lock | 191 +++++++----------------- flake.nix | 8 +- home/modules/home-pkgs.nix | 1 + home/modules/nixvim.nix | 26 ++-- hosts/x86_64-linux/asmodeus/default.nix | 2 +- 6 files changed, 74 insertions(+), 156 deletions(-) diff --git a/common/default.nix b/common/default.nix index df2b4ca..8804546 100644 --- a/common/default.nix +++ b/common/default.nix @@ -35,7 +35,7 @@ tldr screen zsh - inputs.compose2nix.packages.${pkgs.system}.default + # inputs.compose2nix.packages.${pkgs.system}.default ]; programs.zsh.enable = true; diff --git a/flake.lock b/flake.lock index f754d3e..88411e4 100644 --- a/flake.lock +++ b/flake.lock @@ -40,27 +40,6 @@ "type": "github" } }, - "compose2nix": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "onchg": "onchg" - }, - "locked": { - "lastModified": 1732416782, - "narHash": "sha256-evu/J6D79rlQ6oYtKgZxpWvT6ORt0SH573R6IOIS6R0=", - "owner": "aksiksi", - "repo": "compose2nix", - "rev": "a81c2e5e485c722e74dce7c8e308c7b0a1381854", - "type": "github" - }, - "original": { - "owner": "aksiksi", - "repo": "compose2nix", - "type": "github" - } - }, "crane": { "inputs": { "nixpkgs": "nixpkgs_6" @@ -106,7 +85,6 @@ "locked": { "lastModified": 1712250545, "narHash": "sha256-HfJfLMciW1Xmu6rQDDNAHCWWvAJDXS3F8eBvYRIygB8=", - "ref": "refs/heads/main", "rev": "577d8da6d17dad5f847795582ebf813f3c5c04a7", "revCount": 1159, "type": "git", @@ -120,16 +98,16 @@ }, "firefox-addons": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1733390410, - "narHash": "sha256-bM3FIksaYkRloRh3y6GzuUrsJB7EizYtzeCgyftQ9rc=", + "lastModified": 1733823637, + "narHash": "sha256-xODinzazQwJnw1W7517zQeGlRno9LaM6bj3ROXVvwfQ=", "owner": "rycee", "repo": "nur-expressions", - "rev": "5f39164f253794b0101d596b7d4a7a0253f4b762", + "rev": "c263b58f0bc149e2f3648bb07afe4aa96267a9d6", "type": "gitlab" }, "original": { @@ -209,11 +187,11 @@ ] }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -223,21 +201,6 @@ } }, "flake-utils": { - "locked": { - "lastModified": 1652776076, - "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1629284811, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", @@ -252,7 +215,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -270,7 +233,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { "systems": "systems_2" }, @@ -288,7 +251,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { "systems": "systems_3" }, @@ -306,7 +269,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { "systems": "systems_5" }, @@ -356,11 +319,11 @@ ] }, "locked": { - "lastModified": 1732021966, - "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", + "lastModified": 1733318908, + "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", + "rev": "6f4e2a2112050951a314d2733a994fbab94864c6", "type": "github" }, "original": { @@ -398,11 +361,11 @@ ] }, "locked": { - "lastModified": 1733389730, - "narHash": "sha256-KZMu4ddMll5khS0rYkJsVD0hVqjMNHlhTM3PCQar0Ag=", + "lastModified": 1733769654, + "narHash": "sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0=", "owner": "nix-community", "repo": "home-manager", - "rev": "65912bc6841cf420eb8c0a20e03df7cbbff5963f", + "rev": "e952e94955dcc6fa2120c1430789fc41363f5237", "type": "github" }, "original": { @@ -420,11 +383,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1733484277, + "narHash": "sha256-i5ay20XsvpW91N4URET/nOc0VQWOAd4c4vbqYtcH8Rc=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "d00c6f6d0ad16d598bf7e2956f52c1d9d5de3c3a", "type": "github" }, "original": { @@ -477,7 +440,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -501,11 +464,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1733130784, - "narHash": "sha256-B3PK+e717FdrQXhg53DwTPWLY458yGYsH20tYj0pgzU=", + "lastModified": 1733475332, + "narHash": "sha256-LM9OESi5674zypxdb9N4ea5vR5crqnkByRiQL/nBBnQ=", "owner": "viperML", "repo": "nh", - "rev": "83db9160f7d79c0e3af45686454853d239202e54", + "rev": "97e70d0a2c6bddb2a1d081c949ebe1b48c169a87", "type": "github" }, "original": { @@ -522,11 +485,11 @@ ] }, "locked": { - "lastModified": 1733105089, - "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", + "lastModified": 1733570843, + "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "c6b65d946097baf3915dd51373251de98199280d", + "rev": "a35b08d09efda83625bef267eb24347b446c80b8", "type": "github" }, "original": { @@ -535,29 +498,6 @@ "type": "github" } }, - "nix-pre-commit": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "compose2nix", - "onchg", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1653259102, - "narHash": "sha256-XfCEu4zur/N2Dk4v8wFiQAgJ7bgNqPqwWp1vBXkeczM=", - "owner": "jmgilman", - "repo": "nix-pre-commit", - "rev": "6a99b2711c7eac9960939d8eb91e84322b22d50c", - "type": "github" - }, - "original": { - "owner": "jmgilman", - "repo": "nix-pre-commit", - "type": "github" - } - }, "nixos-aarch64-widevine": { "inputs": { "nixpkgs": "nixpkgs_4" @@ -578,11 +518,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1733217105, - "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", + "lastModified": 1733481457, + "narHash": "sha256-IS3bxa4N1VMSh3/P6vhEAHQZecQ3oAlKCDvzCQSO5Is=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", + "rev": "e563803af3526852b6b1d77107a81908c66a9fcf", "type": "github" }, "original": { @@ -610,11 +550,11 @@ }, "nixpkgs-2405": { "locked": { - "lastModified": 1733220138, - "narHash": "sha256-Yh5XZ9yVurrcYdNTSWxYgW4+EJ0pcOqgM1043z9JaRc=", + "lastModified": 1733730953, + "narHash": "sha256-dlK7n82FEyZlHH7BFHQAM5tua+lQO1Iv7aAtglc1O5s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bcb68885668cccec12276bbb379f8f2557aa06ce", + "rev": "7109b680d161993918b0a126f38bc39763e5a709", "type": "github" }, "original": { @@ -638,11 +578,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1733424746, - "narHash": "sha256-7LolhyQF3Tm2WSkcsDMuJp0MO9HQwPS1cgSdbF5Dt2M=", + "lastModified": 1733850663, + "narHash": "sha256-bpwFraB7XSsA6JwYaKY3ZEHu/G5nnLZeqKTNjOM9oRE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbc5b67ceb97dee4c7728ea562fc9eceb388a327", + "rev": "66676a8096a251cf53f4b3ae38a7422e793e3db5", "type": "github" }, "original": { @@ -732,11 +672,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -793,11 +733,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1733369744, - "narHash": "sha256-b2atMLs0myUiD5qnIxEko/gO/+ViNOGLNZnUFnYQ3bM=", + "lastModified": 1733847310, + "narHash": "sha256-VHzWuZYK/m5OFXzAczrjnI7vH6knj0sfLnziRVDqgFE=", "owner": "nix-community", "repo": "nixvim", - "rev": "38885227461de58a712362c1c484803d6c90a8b2", + "rev": "b752606681ded3f69e99ed568c7075b3578dce48", "type": "github" }, "original": { @@ -808,7 +748,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -816,11 +756,11 @@ ] }, "locked": { - "lastModified": 1733006402, - "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", + "lastModified": 1733411491, + "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=", "owner": "NuschtOS", "repo": "search", - "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", + "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe", "type": "github" }, "original": { @@ -829,28 +769,6 @@ "type": "github" } }, - "onchg": { - "inputs": { - "nix-pre-commit": "nix-pre-commit", - "nixpkgs": [ - "compose2nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1720368454, - "narHash": "sha256-NUSw3G2gsQX8/G64/pDBb1oitM+x13m7nFRvpiI4a+s=", - "owner": "aksiksi", - "repo": "onchg-rs", - "rev": "c42b693d10920874b3644ef1502e33318409d69c", - "type": "github" - }, - "original": { - "owner": "aksiksi", - "repo": "onchg-rs", - "type": "github" - } - }, "proxmox-nixos": { "inputs": { "crane": "crane", @@ -877,11 +795,10 @@ "inputs": { "apple-silicon": "apple-silicon", "comin": "comin", - "compose2nix": "compose2nix", "dwl-source": "dwl-source", "firefox-addons": "firefox-addons", "flake-parts": "flake-parts", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "home-manager": "home-manager", "lix-module": "lix-module", "nh": "nh", @@ -919,11 +836,11 @@ ] }, "locked": { - "lastModified": 1733128155, - "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=", + "lastModified": 1733785344, + "narHash": "sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee+HzNk+SQE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856", + "rev": "a80af8929781b5fe92ddb8ae52e9027fae780d2a", "type": "github" }, "original": { @@ -934,7 +851,7 @@ }, "spicetify-nix": { "inputs": { - "flake-utils": "flake-utils_6", + "flake-utils": "flake-utils_5", "nixpkgs": "nixpkgs_7" }, "locked": { @@ -1034,11 +951,11 @@ ] }, "locked": { - "lastModified": 1732894027, - "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", + "lastModified": 1733440889, + "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", + "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3e8db58..231e422 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,10 @@ url = "github:nlewo/comin"; inputs.nixpkgs.follows = "nixpkgs"; }; - compose2nix = { - url = "github:aksiksi/compose2nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + # compose2nix = { + # url = "github:aksiksi/compose2nix"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; home-manager = { url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/home/modules/home-pkgs.nix b/home/modules/home-pkgs.nix index 0148f80..b4ee243 100644 --- a/home/modules/home-pkgs.nix +++ b/home/modules/home-pkgs.nix @@ -48,6 +48,7 @@ in { kleopatra # ida-free # spotify + simplex-chat-desktop ])) ++ (with pkgs; [ nh diff --git a/home/modules/nixvim.nix b/home/modules/nixvim.nix index dad3820..48987b2 100644 --- a/home/modules/nixvim.nix +++ b/home/modules/nixvim.nix @@ -160,18 +160,18 @@ }; }; lsp-format = {enable = true;}; - copilot-lua = { - enable = true; - suggestion = { - enabled = false; - }; - panel.enabled = false; - }; - copilot-cmp.enable = true; - copilot-chat = { - enable = true; - settings.context = "buffers"; - }; + # copilot-lua = { + # enable = true; + # suggestion = { + # enabled = false; + # }; + # panel.enabled = false; + # }; + # copilot-cmp.enable = true; + # copilot-chat = { + # enable = true; + # settings.context = "buffers"; + # }; neocord.enable = false; rustaceanvim = { enable = false; @@ -282,7 +282,7 @@ {name = "path";} {name = "buffer";} {name = "luasnip";} - {name = "copilot";} + # {name = "copilot";} ]; #mapping = { # __raw = '' diff --git a/hosts/x86_64-linux/asmodeus/default.nix b/hosts/x86_64-linux/asmodeus/default.nix index ac993a7..72ddb64 100644 --- a/hosts/x86_64-linux/asmodeus/default.nix +++ b/hosts/x86_64-linux/asmodeus/default.nix @@ -80,7 +80,7 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - boot.kernelPackages = pkgs.linuxPackages_6_11; + boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelModules = ["v4l2loopback"]; boot.extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; boot.extraModprobeConfig = ''