From c78a5376c9eb7d8ad236e3f9d50fa652365e62aa Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sun, 19 Mar 2023 15:51:22 +0100 Subject: [PATCH] Remove all references to arion --- flake.lock | 84 ++++------------------- flake.nix | 6 -- home/programs/nvim/plugins.nix | 36 +++++----- system/flakes/adsb-antenna.nix | 4 +- system/hosts/adsb-antenna.nix | 2 +- system/hosts/sail.nix | 2 +- system/nixos/{arion.nix => container.nix} | 0 7 files changed, 33 insertions(+), 101 deletions(-) rename system/nixos/{arion.nix => container.nix} (100%) diff --git a/flake.lock b/flake.lock index 4eff698..c8b52ab 100644 --- a/flake.lock +++ b/flake.lock @@ -22,28 +22,6 @@ "type": "github" } }, - "arion": { - "inputs": { - "flake-parts": "flake-parts", - "haskell-flake": "haskell-flake", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1677362634, - "narHash": "sha256-TbXibbeyPHFS+WVMlBQ3lY2L6Re5y3qUsZaHYtLQvkw=", - "owner": "hercules-ci", - "repo": "arion", - "rev": "0f27ae484f34a8f0bbc5ef495a96f3a3cecb3eb3", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "arion", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -103,27 +81,6 @@ "type": "github" } }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": [ - "arion", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -154,22 +111,6 @@ "type": "github" } }, - "haskell-flake": { - "locked": { - "lastModified": 1675296942, - "narHash": "sha256-u1X1sblozi5qYEcLp1hxcyo8FfDHnRUVX3dJ/tW19jY=", - "owner": "srid", - "repo": "haskell-flake", - "rev": "c2cafce9d57bfca41794dc3b99c593155006c71e", - "type": "github" - }, - "original": { - "owner": "srid", - "ref": "0.1.0", - "repo": "haskell-flake", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -201,11 +142,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1679104508, - "narHash": "sha256-yC9WCaj/yhjXO97+A1/Wx+fsjzkLtwbyeHUbp3JYb4k=", + "lastModified": 1679139884, + "narHash": "sha256-EZ60Qr4RT2bJwOHLoJq8jYJIGo/MoNmucy2pg7Lhx0A=", "owner": "neovim", "repo": "neovim", - "rev": "c6f8af36e134a67b489d59e078425cada5eafd7b", + "rev": "204a8b17c8ebab1619cc47a920a06dcc348d75f7", "type": "github" }, "original": { @@ -224,11 +165,11 @@ ] }, "locked": { - "lastModified": 1679127205, - "narHash": "sha256-l09rDZ8os/Edo185JVoOjpggKI/hxBV/IBAPk212jko=", + "lastModified": 1679213603, + "narHash": "sha256-ZZn/x6SAUL2zYOBmyrK/FDAuSewCRIoN27Stw1/7Hw0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "c1dbb253d5cad210d0479c5a4142d7afa2cf0eca", + "rev": "ed28acdc5da1191918cc219cce1bafbf26620d3b", "type": "github" }, "original": { @@ -244,11 +185,11 @@ ] }, "locked": { - "lastModified": 1678955105, - "narHash": "sha256-AEmtoXcswYkAx6ShRXhCmJM39N5HdEBWoPcdIsS9bhc=", + "lastModified": 1679214158, + "narHash": "sha256-n9XJBg040GH7+WHh6HeJp5wJpIrORT9GdNcbP/VYNd0=", "owner": "nifoc", "repo": "nix-overlay", - "rev": "b32d84ff0409e4d761a9c92ba86208382575b9f2", + "rev": "ca1af09630a0b6233e955b24627c25131e04bd29", "type": "github" }, "original": { @@ -259,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1678987615, - "narHash": "sha256-lF4agoB7ysQGNHRXvOqxtSKIZrUZwClA85aASahQlYM=", + "lastModified": 1679198465, + "narHash": "sha256-VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "194c2aa446b2b059886bb68be15ef6736d5a8c31", + "rev": "5a05160f7671434e1c833b1b01284b876e04eca4", "type": "github" }, "original": { @@ -298,7 +239,6 @@ }, "root": { "inputs": { - "arion": "arion", "darwin": "darwin", "home-manager": "home-manager", "neovim-nightly-overlay": "neovim-nightly-overlay", diff --git a/flake.nix b/flake.nix index 61a3dc3..84d3b9b 100644 --- a/flake.nix +++ b/flake.nix @@ -22,11 +22,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - arion = { - url = "github:hercules-ci/arion"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - nifoc-overlay = { url = "github:nifoc/nix-overlay"; inputs.nixpkgs.follows = "nixpkgs"; @@ -52,7 +47,6 @@ adsb-antenna = import ./system/flakes/adsb-antenna.nix { inherit (inputs) nixpkgs; inherit (inputs) home-manager; - inherit (inputs) arion; inherit inputs; }; in diff --git a/home/programs/nvim/plugins.nix b/home/programs/nvim/plugins.nix index dbe4a64..b825e9a 100644 --- a/home/programs/nvim/plugins.nix +++ b/home/programs/nvim/plugins.nix @@ -112,23 +112,23 @@ rec { }; }; nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: { - version = "2023-03-16"; + version = "2023-03-19"; src = pkgs.fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "dcb9a89ab4f0091bf87aed4e6801423d3667f76a"; - sha256 = "0xcp3z2l6kisva2ai1br9ncfw74hkp2n3jyc4n1kpxzpq6ia7yli"; + rev = "4536156f32b8ab0aab264e3cd7819fc8e3daede4"; + sha256 = "1y6lczvsv4bygh79gqbihxsaygmnhin4bwdi59hb7bjgi6xy8j8f"; fetchSubmodules = false; }; }); nvim-ts-rainbow2 = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow2"; - version = "2023-03-16"; + version = "2023-03-19"; src = pkgs.fetchFromGitHub { owner = "HiPhish"; repo = "nvim-ts-rainbow2"; - rev = "f56fbdaf9ce37d17fc376c449e0b3924982b0df3"; - sha256 = "103zak872y3y1lc2isck975a7vjjfp8442grdg3gjyng8jraqb76"; + rev = "cee4601ff8aac73dee4afa1074814343bb5a0b80"; + sha256 = "0g0jy6jcpmpia6k8c0i91yjajx9crin4lgwmmmr0dl20yd77gqki"; fetchSubmodules = false; }; }; @@ -236,12 +236,12 @@ rec { }; nvim-jdtls = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2023-03-17"; + version = "2023-03-19"; src = pkgs.fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "a71e656a553f0af306cffc81400f08dcedf295d6"; - sha256 = "0vpdlfh07vy1ghiqjfipmc4kcgr6v7mqh8gcd082ps73g7h4ffll"; + rev = "34202bc141620858159616ff79bd8a3c48c34214"; + sha256 = "1ia9vizq59rwb99cf6jhhq1jhxrrzk85ysxvgwf37c0f9vbivvpw"; fetchSubmodules = false; }; }; @@ -269,12 +269,12 @@ rec { }; vim-illuminate = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2023-02-10"; + version = "2023-03-19"; src = pkgs.fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "49062ab1dd8fec91833a69f0a1344223dd59d643"; - sha256 = "15456qlblskafaq3x92kp8n8hdfzdfv1hzs9yb4k4aqps1bj2plf"; + rev = "a2907275a6899c570d16e95b9db5fd921c167502"; + sha256 = "1i2s3d9c0c31pv0y0iljqk2s3qcqanjw84w81ww2dnnh31qgglpi"; fetchSubmodules = false; }; }; @@ -313,12 +313,12 @@ rec { }; friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2023-03-12"; + version = "2023-03-19"; src = pkgs.fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "2f5b8a41659a19bd602497a35da8d81f1e88f6d9"; - sha256 = "11h9i5b675p9h7h92lcn7vkn2hnkmn1kifji1932xkh45rizyshl"; + rev = "25ddcd96540a2ce41d714bd7fea2e7f75fea8ead"; + sha256 = "1j98blydm49bzla95w082qy2hd61yb0476zawflipa8awf7ja6ac"; fetchSubmodules = false; }; }; @@ -533,12 +533,12 @@ rec { }; urlview-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2023-03-17"; + version = "2023-03-19"; src = pkgs.fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "a6bafd3ca8177a83beef2f528b4b7174ee8ecbad"; - sha256 = "0h0d2jg39hm8izs0xb50caqdkihy09w90mpda1pmwl6dq8sksr58"; + rev = "e92d99f062685f9d3ab84238e1cdde6399dc64ce"; + sha256 = "0ahs5sgs95wkpr11s93r08w0xagiqrfw5zrgqyhhjqg2dfpqzxp9"; fetchSubmodules = false; }; }; diff --git a/system/flakes/adsb-antenna.nix b/system/flakes/adsb-antenna.nix index 59fbd7c..03828cb 100644 --- a/system/flakes/adsb-antenna.nix +++ b/system/flakes/adsb-antenna.nix @@ -1,4 +1,4 @@ -{ nixpkgs, home-manager, arion, inputs, ... }: +{ nixpkgs, home-manager, inputs, ... }: let overlay-neovim = inputs.neovim-nightly-overlay.overlay; @@ -25,8 +25,6 @@ in nixpkgs.config = nixpkgsConfig.config; }) - arion.nixosModules.arion - ../hosts/adsb-antenna.nix home-manager.nixosModules.home-manager diff --git a/system/hosts/adsb-antenna.nix b/system/hosts/adsb-antenna.nix index 1d27423..fd268a0 100644 --- a/system/hosts/adsb-antenna.nix +++ b/system/hosts/adsb-antenna.nix @@ -14,7 +14,7 @@ in ../nixos/git.nix - ../nixos/arion.nix + ../nixos/container.nix ../../container/adsb ]; diff --git a/system/hosts/sail.nix b/system/hosts/sail.nix index c087322..77b1325 100644 --- a/system/hosts/sail.nix +++ b/system/hosts/sail.nix @@ -41,7 +41,7 @@ in ../nixos/mosquitto.nix - ../nixos/arion.nix + ../nixos/container.nix ../../container/weewx ../../container/matrix ../../container/proxitok diff --git a/system/nixos/arion.nix b/system/nixos/container.nix similarity index 100% rename from system/nixos/arion.nix rename to system/nixos/container.nix