daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Remove all references to arion

Browse source
This commit is contained in:
Daniel Kempkens 2023-03-19 15:51:22 +01:00
parent 4f68c3c328
commit c78a5376c9
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
7 changed files with 33 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
flake.lock
View file

@ -22,28 +22,6 @@
"type": "github" "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": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -103,27 +81,6 @@
"type": "github" "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": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
@ -154,22 +111,6 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -201,11 +142,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1679104508, "lastModified": 1679139884,
"narHash": "sha256-yC9WCaj/yhjXO97+A1/Wx+fsjzkLtwbyeHUbp3JYb4k=", "narHash": "sha256-EZ60Qr4RT2bJwOHLoJq8jYJIGo/MoNmucy2pg7Lhx0A=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "c6f8af36e134a67b489d59e078425cada5eafd7b", "rev": "204a8b17c8ebab1619cc47a920a06dcc348d75f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -224,11 +165,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1679127205, "lastModified": 1679213603,
"narHash": "sha256-l09rDZ8os/Edo185JVoOjpggKI/hxBV/IBAPk212jko=", "narHash": "sha256-ZZn/x6SAUL2zYOBmyrK/FDAuSewCRIoN27Stw1/7Hw0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "c1dbb253d5cad210d0479c5a4142d7afa2cf0eca", "rev": "ed28acdc5da1191918cc219cce1bafbf26620d3b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -244,11 +185,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1678955105, "lastModified": 1679214158,
"narHash": "sha256-AEmtoXcswYkAx6ShRXhCmJM39N5HdEBWoPcdIsS9bhc=", "narHash": "sha256-n9XJBg040GH7+WHh6HeJp5wJpIrORT9GdNcbP/VYNd0=",
"owner": "nifoc", "owner": "nifoc",
"repo": "nix-overlay", "repo": "nix-overlay",
"rev": "b32d84ff0409e4d761a9c92ba86208382575b9f2", "rev": "ca1af09630a0b6233e955b24627c25131e04bd29",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -259,11 +200,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1678987615, "lastModified": 1679198465,
"narHash": "sha256-lF4agoB7ysQGNHRXvOqxtSKIZrUZwClA85aASahQlYM=", "narHash": "sha256-VfXpHpniNWgg7pBzxb20pRX7kqn80LApPDQYTReiFCw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "194c2aa446b2b059886bb68be15ef6736d5a8c31", "rev": "5a05160f7671434e1c833b1b01284b876e04eca4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -298,7 +239,6 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"arion": "arion",
"darwin": "darwin", "darwin": "darwin",
"home-manager": "home-manager", "home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",

6
flake.nix
View file

@ -22,11 +22,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
arion = {
url = "github:hercules-ci/arion";
inputs.nixpkgs.follows = "nixpkgs";
};
nifoc-overlay = { nifoc-overlay = {
url = "github:nifoc/nix-overlay"; url = "github:nifoc/nix-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -52,7 +47,6 @@
adsb-antenna = import ./system/flakes/adsb-antenna.nix { adsb-antenna = import ./system/flakes/adsb-antenna.nix {
inherit (inputs) nixpkgs; inherit (inputs) nixpkgs;
inherit (inputs) home-manager; inherit (inputs) home-manager;
inherit (inputs) arion;
inherit inputs; inherit inputs;
}; };
in in

36
home/programs/nvim/plugins.nix
View file

@ -112,23 +112,23 @@ rec {
}; };
}; };
nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: { nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.overrideAttrs (_: {
version = "2023-03-16"; version = "2023-03-19";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "dcb9a89ab4f0091bf87aed4e6801423d3667f76a"; rev = "4536156f32b8ab0aab264e3cd7819fc8e3daede4";
sha256 = "0xcp3z2l6kisva2ai1br9ncfw74hkp2n3jyc4n1kpxzpq6ia7yli"; sha256 = "1y6lczvsv4bygh79gqbihxsaygmnhin4bwdi59hb7bjgi6xy8j8f";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}); });
nvim-ts-rainbow2 = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-ts-rainbow2 = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-ts-rainbow2"; pname = "nvim-ts-rainbow2";
version = "2023-03-16"; version = "2023-03-19";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "HiPhish"; owner = "HiPhish";
repo = "nvim-ts-rainbow2"; repo = "nvim-ts-rainbow2";
rev = "f56fbdaf9ce37d17fc376c449e0b3924982b0df3"; rev = "cee4601ff8aac73dee4afa1074814343bb5a0b80";
sha256 = "103zak872y3y1lc2isck975a7vjjfp8442grdg3gjyng8jraqb76"; sha256 = "0g0jy6jcpmpia6k8c0i91yjajx9crin4lgwmmmr0dl20yd77gqki";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -236,12 +236,12 @@ rec {
}; };
nvim-jdtls = pkgs.vimUtils.buildVimPluginFrom2Nix { nvim-jdtls = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-jdtls"; pname = "nvim-jdtls";
version = "2023-03-17"; version = "2023-03-19";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "mfussenegger"; owner = "mfussenegger";
repo = "nvim-jdtls"; repo = "nvim-jdtls";
rev = "a71e656a553f0af306cffc81400f08dcedf295d6"; rev = "34202bc141620858159616ff79bd8a3c48c34214";
sha256 = "0vpdlfh07vy1ghiqjfipmc4kcgr6v7mqh8gcd082ps73g7h4ffll"; sha256 = "1ia9vizq59rwb99cf6jhhq1jhxrrzk85ysxvgwf37c0f9vbivvpw";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -269,12 +269,12 @@ rec {
}; };
vim-illuminate = pkgs.vimUtils.buildVimPluginFrom2Nix { vim-illuminate = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "vim-illuminate"; pname = "vim-illuminate";
version = "2023-02-10"; version = "2023-03-19";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "RRethy"; owner = "RRethy";
repo = "vim-illuminate"; repo = "vim-illuminate";
rev = "49062ab1dd8fec91833a69f0a1344223dd59d643"; rev = "a2907275a6899c570d16e95b9db5fd921c167502";
sha256 = "15456qlblskafaq3x92kp8n8hdfzdfv1hzs9yb4k4aqps1bj2plf"; sha256 = "1i2s3d9c0c31pv0y0iljqk2s3qcqanjw84w81ww2dnnh31qgglpi";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -313,12 +313,12 @@ rec {
}; };
friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix { friendly-snippets = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "friendly-snippets"; pname = "friendly-snippets";
version = "2023-03-12"; version = "2023-03-19";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "rafamadriz"; owner = "rafamadriz";
repo = "friendly-snippets"; repo = "friendly-snippets";
rev = "2f5b8a41659a19bd602497a35da8d81f1e88f6d9"; rev = "25ddcd96540a2ce41d714bd7fea2e7f75fea8ead";
sha256 = "11h9i5b675p9h7h92lcn7vkn2hnkmn1kifji1932xkh45rizyshl"; sha256 = "1j98blydm49bzla95w082qy2hd61yb0476zawflipa8awf7ja6ac";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -533,12 +533,12 @@ rec {
}; };
urlview-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix { urlview-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "urlview.nvim"; pname = "urlview.nvim";
version = "2023-03-17"; version = "2023-03-19";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "axieax"; owner = "axieax";
repo = "urlview.nvim"; repo = "urlview.nvim";
rev = "a6bafd3ca8177a83beef2f528b4b7174ee8ecbad"; rev = "e92d99f062685f9d3ab84238e1cdde6399dc64ce";
sha256 = "0h0d2jg39hm8izs0xb50caqdkihy09w90mpda1pmwl6dq8sksr58"; sha256 = "0ahs5sgs95wkpr11s93r08w0xagiqrfw5zrgqyhhjqg2dfpqzxp9";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

4
system/flakes/adsb-antenna.nix
View file

@ -1,4 +1,4 @@
{ nixpkgs, home-manager, arion, inputs, ... }: { nixpkgs, home-manager, inputs, ... }:
let let
overlay-neovim = inputs.neovim-nightly-overlay.overlay; overlay-neovim = inputs.neovim-nightly-overlay.overlay;
@ -25,8 +25,6 @@ in
nixpkgs.config = nixpkgsConfig.config; nixpkgs.config = nixpkgsConfig.config;
}) })
arion.nixosModules.arion
../hosts/adsb-antenna.nix ../hosts/adsb-antenna.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager

2
system/hosts/adsb-antenna.nix
View file

@ -14,7 +14,7 @@ in
../nixos/git.nix ../nixos/git.nix
../nixos/arion.nix ../nixos/container.nix
../../container/adsb ../../container/adsb
]; ];

2
system/hosts/sail.nix
View file

@ -41,7 +41,7 @@ in
../nixos/mosquitto.nix ../nixos/mosquitto.nix
../nixos/arion.nix ../nixos/container.nix
../../container/weewx ../../container/weewx
../../container/matrix ../../container/matrix
../../container/proxitok ../../container/proxitok

0
system/nixos/arion.nix → system/nixos/container.nix
View file