summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--common/modules/beevim/default.nix6
-rw-r--r--common/modules/default.nix2
-rw-r--r--flake.lock508
-rw-r--r--flake.nix7
-rw-r--r--users/bee/default.nix1
5 files changed, 507 insertions, 17 deletions
diff --git a/common/modules/beevim/default.nix b/common/modules/beevim/default.nix
index d7c3a97..2f8336f 100644
--- a/common/modules/beevim/default.nix
+++ b/common/modules/beevim/default.nix
@@ -14,8 +14,8 @@ let
cfg = config.${moduleNameSpace}.beeVim;
in
{
- imports = [
- # inputs.beebVim.homeModules.default
+ imports = lib.optionals homeManager [
+ inputs.beeVim.homeModules.default
];
options.${moduleNameSpace}.beeVim = {
@@ -23,7 +23,7 @@ in
};
config = lib.mkIf (cfg.enable && homeManager) {
- beevim = {
+ beeVim = {
enable = true;
packageDefinitions.replace = builtins.mapAttrs (
n: _:
diff --git a/common/modules/default.nix b/common/modules/default.nix
index 4df376f..bbf3bd9 100644
--- a/common/modules/default.nix
+++ b/common/modules/default.nix
@@ -11,7 +11,7 @@ let
modules = {
mango = import ./mango args;
terminal = import ./terminal args;
- # beevim = import ./beevim args;
+ beevim = import ./beevim args;
matugen = import ./matugen args;
};
in
diff --git a/flake.lock b/flake.lock
index a53d028..cd607f2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,8 +1,53 @@
{
"nodes": {
+ "beeVim": {
+ "inputs": {
+ "neovim-nightly-overlay": "neovim-nightly-overlay",
+ "nixCats": "nixCats",
+ "nixpkgs": "nixpkgs_2",
+ "plugins-lze": "plugins-lze",
+ "plugins-lzextras": "plugins-lzextras",
+ "plugins-neogit": "plugins-neogit",
+ "plugins-opencode-nvim": "plugins-opencode-nvim",
+ "plugins-rustaceanvim": "plugins-rustaceanvim"
+ },
+ "locked": {
+ "lastModified": 1773055923,
+ "narHash": "sha256-i6CiGmH+JjpOI0SiP+MHwrHmN3Frelisdhn0XPMZvcc=",
+ "ref": "refs/heads/main",
+ "rev": "972e5f9c68cc433c5fc26adf92cd25b293a3776a",
+ "revCount": 1,
+ "type": "git",
+ "url": "https://codeberg.org/brustybee/beeVim"
+ },
+ "original": {
+ "type": "git",
+ "url": "https://codeberg.org/brustybee/beeVim"
+ }
+ },
+ "flake-compat": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1767039857,
+ "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+ "owner": "NixOS",
+ "repo": "flake-compat",
+ "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
"flake-parts": {
"inputs": {
- "nixpkgs-lib": "nixpkgs-lib"
+ "nixpkgs-lib": [
+ "beeVim",
+ "neovim-nightly-overlay",
+ "nixpkgs"
+ ]
},
"locked": {
"lastModified": 1772408722,
@@ -20,9 +65,68 @@
},
"flake-parts_2": {
"inputs": {
+ "nixpkgs-lib": "nixpkgs-lib"
+ },
+ "locked": {
+ "lastModified": 1769996383,
+ "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_3": {
+ "inputs": {
+ "nixpkgs-lib": [
+ "beeVim",
+ "plugins-rustaceanvim",
+ "neovim-nightly-overlay",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1769996383,
+ "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "57928607ea566b5db3ad13af0e57e921e6b12381",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_4": {
+ "inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
+ "lastModified": 1772408722,
+ "narHash": "sha256-rHuJtdcOjK7rAHpHphUb1iCvgkU3GpfvicLMwwnfMT0=",
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "rev": "f20dc5d9b8027381c474144ecabc9034d6a839a3",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "flake-parts",
+ "type": "github"
+ }
+ },
+ "flake-parts_5": {
+ "inputs": {
+ "nixpkgs-lib": "nixpkgs-lib_3"
+ },
+ "locked": {
"lastModified": 1749398372,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci",
@@ -36,6 +140,86 @@
"type": "github"
}
},
+ "gen-luarc": {
+ "inputs": {
+ "flake-parts": [
+ "beeVim",
+ "plugins-rustaceanvim",
+ "flake-parts"
+ ],
+ "git-hooks": [
+ "beeVim",
+ "plugins-rustaceanvim",
+ "git-hooks"
+ ],
+ "luvit-meta": "luvit-meta",
+ "nixpkgs": [
+ "beeVim",
+ "plugins-rustaceanvim",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1755304025,
+ "narHash": "sha256-xVKfjFwc0zMbLMjLTiHz+0llggkjs93SmHkhaa9S3M4=",
+ "owner": "mrcjkb",
+ "repo": "nix-gen-luarc-json",
+ "rev": "1865b0ebb753ae5324d7381b1fa8c98c04ec7509",
+ "type": "github"
+ },
+ "original": {
+ "owner": "mrcjkb",
+ "repo": "nix-gen-luarc-json",
+ "type": "github"
+ }
+ },
+ "git-hooks": {
+ "inputs": {
+ "flake-compat": "flake-compat",
+ "gitignore": "gitignore",
+ "nixpkgs": [
+ "beeVim",
+ "plugins-rustaceanvim",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1769939035,
+ "narHash": "sha256-Fok2AmefgVA0+eprw2NDwqKkPGEI5wvR+twiZagBvrg=",
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "rev": "a8ca480175326551d6c4121498316261cbb5b260",
+ "type": "github"
+ },
+ "original": {
+ "owner": "cachix",
+ "repo": "git-hooks.nix",
+ "type": "github"
+ }
+ },
+ "gitignore": {
+ "inputs": {
+ "nixpkgs": [
+ "beeVim",
+ "plugins-rustaceanvim",
+ "git-hooks",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1709087332,
+ "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+ "type": "github"
+ },
+ "original": {
+ "owner": "hercules-ci",
+ "repo": "gitignore.nix",
+ "type": "github"
+ }
+ },
"home-manager": {
"inputs": {
"nixpkgs": [
@@ -56,9 +240,25 @@
"type": "github"
}
},
+ "luvit-meta": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1705776742,
+ "narHash": "sha256-zAAptV/oLuLAAsa2zSB/6fxlElk4+jNZd/cPr9oxFig=",
+ "owner": "Bilal2453",
+ "repo": "luvit-meta",
+ "rev": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60",
+ "type": "github"
+ },
+ "original": {
+ "owner": "Bilal2453",
+ "repo": "luvit-meta",
+ "type": "github"
+ }
+ },
"mango": {
"inputs": {
- "flake-parts": "flake-parts_2",
+ "flake-parts": "flake-parts_5",
"nixpkgs": [
"nixpkgs"
],
@@ -78,24 +278,126 @@
"type": "github"
}
},
+ "neovim-nightly-overlay": {
+ "inputs": {
+ "flake-parts": "flake-parts",
+ "neovim-src": "neovim-src",
+ "nixpkgs": "nixpkgs"
+ },
+ "locked": {
+ "lastModified": 1773014724,
+ "narHash": "sha256-foUFwEwhjSnjJVD6gkiR2SlaYhvzV9bwsUQlLUu2DjQ=",
+ "owner": "nix-community",
+ "repo": "neovim-nightly-overlay",
+ "rev": "b955e58bea690fdbfc20ff7c249e481ca169ca33",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "neovim-nightly-overlay",
+ "type": "github"
+ }
+ },
+ "neovim-nightly-overlay_2": {
+ "inputs": {
+ "flake-parts": "flake-parts_3",
+ "neovim-src": "neovim-src_2",
+ "nixpkgs": "nixpkgs_3"
+ },
+ "locked": {
+ "lastModified": 1770509107,
+ "narHash": "sha256-YsfKRbd5fbcb2VTxywzAGpc4txXApMXfG0vtxEldt7Q=",
+ "owner": "nix-community",
+ "repo": "neovim-nightly-overlay",
+ "rev": "0bb52596f3ea543781d2c20b1c2ee495a174a7d5",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "neovim-nightly-overlay",
+ "type": "github"
+ }
+ },
+ "neovim-src": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1773014294,
+ "narHash": "sha256-JLAIrpQTp8u6blb5iZrAx36fNe65LT+JOUvxiLxlN+8=",
+ "owner": "neovim",
+ "repo": "neovim",
+ "rev": "61f166ec409b7621fcc42e4da40d6ccb19973749",
+ "type": "github"
+ },
+ "original": {
+ "owner": "neovim",
+ "repo": "neovim",
+ "type": "github"
+ }
+ },
+ "neovim-src_2": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1770505476,
+ "narHash": "sha256-HvlTxVEso/hl9lwweHerBRLtI/q05SQTxDr2l0Njfig=",
+ "owner": "neovim",
+ "repo": "neovim",
+ "rev": "ed8fbd2e2992cb264cb62585098a1c7acc5c4585",
+ "type": "github"
+ },
+ "original": {
+ "owner": "neovim",
+ "repo": "neovim",
+ "type": "github"
+ }
+ },
+ "nixCats": {
+ "locked": {
+ "lastModified": 1770584904,
+ "narHash": "sha256-9Zaz8lbKF2W9pwXZEnbiGsicHdBoU+dHt3Wv3mCJoZ8=",
+ "owner": "BirdeeHub",
+ "repo": "nixCats-nvim",
+ "rev": "538fdde784d2909700d97a8ef307783b33a86fb1",
+ "type": "github"
+ },
+ "original": {
+ "owner": "BirdeeHub",
+ "repo": "nixCats-nvim",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
- "lastModified": 1772624091,
- "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
- "owner": "nixos",
+ "lastModified": 1772771118,
+ "narHash": "sha256-xWzaTvmmACR/SRWtABgI/Z97lcqwJAeoSd5QW1KdK1s=",
+ "owner": "NixOS",
"repo": "nixpkgs",
- "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
+ "rev": "e38213b91d3786389a446dfce4ff5a8aaf6012f2",
"type": "github"
},
"original": {
- "owner": "nixos",
- "ref": "nixos-unstable",
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": {
"locked": {
+ "lastModified": 1769909678,
+ "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=",
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "rev": "72716169fe93074c333e8d0173151350670b824c",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "type": "github"
+ }
+ },
+ "nixpkgs-lib_2": {
+ "locked": {
"lastModified": 1772328832,
"narHash": "sha256-e+/T/pmEkLP6BHhYjx6GmwP5ivonQQn0bJdH9YrRB+Q=",
"owner": "nix-community",
@@ -109,7 +411,7 @@
"type": "github"
}
},
- "nixpkgs-lib_2": {
+ "nixpkgs-lib_3": {
"locked": {
"lastModified": 1748740939,
"narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
@@ -124,12 +426,164 @@
"type": "github"
}
},
+ "nixpkgs_2": {
+ "locked": {
+ "lastModified": 1772927210,
+ "narHash": "sha256-FdRDRoV0jRTiPK5ID22BaUX5P0wdsclpxtIOjaEy9Lo=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "0e6cdd5be64608ef630c2e41f8d51d484468492f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_3": {
+ "locked": {
+ "lastModified": 1770380644,
+ "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=",
+ "owner": "NixOS",
+ "repo": "nixpkgs",
+ "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NixOS",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_4": {
+ "locked": {
+ "lastModified": 1770380644,
+ "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "ae67888ff7ef9dff69b3cf0cc0fbfbcd3a722abe",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixpkgs-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs_5": {
+ "locked": {
+ "lastModified": 1772624091,
+ "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "80bdc1e5ce51f56b19791b52b2901187931f5353",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-unstable",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "plugins-lze": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1772949858,
+ "narHash": "sha256-skLhmn/MvxOZbrBiceF/xiLRRmmEs6ZQS2sGrBrUyLU=",
+ "owner": "BirdeeHub",
+ "repo": "lze",
+ "rev": "a3ba1a2d469d4ab26acb629aba8c7d70a6cbe558",
+ "type": "github"
+ },
+ "original": {
+ "owner": "BirdeeHub",
+ "repo": "lze",
+ "type": "github"
+ }
+ },
+ "plugins-lzextras": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1772949841,
+ "narHash": "sha256-MQ1h2R5axM3u6mLNTDzXF/40o8+U0JOWb48UTQO9jfc=",
+ "owner": "BirdeeHub",
+ "repo": "lzextras",
+ "rev": "a6ac9a7bee380881af2dfbfd238ccb1697d677d7",
+ "type": "github"
+ },
+ "original": {
+ "owner": "BirdeeHub",
+ "repo": "lzextras",
+ "type": "github"
+ }
+ },
+ "plugins-neogit": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1772820817,
+ "narHash": "sha256-dELzsOqSIvQvfl3fXTQg2ZkIILmlRWVWb+ogqeoJDYE=",
+ "owner": "NeogitOrg",
+ "repo": "neogit",
+ "rev": "8fd90675caf8b847280ca56f464b66030adad876",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NeogitOrg",
+ "repo": "neogit",
+ "type": "github"
+ }
+ },
+ "plugins-opencode-nvim": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1772989697,
+ "narHash": "sha256-xxB6TKn0Nv9GoYc7Mz+rhAUX8OXaHSkD3zZzFgSSHkQ=",
+ "owner": "NickvanDyke",
+ "repo": "opencode.nvim",
+ "rev": "47f92ab676bf1c3d00a40100429c7b089f81a5fc",
+ "type": "github"
+ },
+ "original": {
+ "owner": "NickvanDyke",
+ "repo": "opencode.nvim",
+ "type": "github"
+ }
+ },
+ "plugins-rustaceanvim": {
+ "inputs": {
+ "flake-parts": "flake-parts_2",
+ "gen-luarc": "gen-luarc",
+ "git-hooks": "git-hooks",
+ "neovim-nightly-overlay": "neovim-nightly-overlay_2",
+ "nixpkgs": "nixpkgs_4",
+ "vimcats": "vimcats"
+ },
+ "locked": {
+ "lastModified": 1772653557,
+ "narHash": "sha256-7UTu+AKuGqPqZzM1WJ9s4qQklE27LEilaHO9vpCgC1o=",
+ "owner": "mrcjkb",
+ "repo": "rustaceanvim",
+ "rev": "f2f0c1231a5b019dbc1fd6dafac1751c878925a3",
+ "type": "github"
+ },
+ "original": {
+ "owner": "mrcjkb",
+ "repo": "rustaceanvim",
+ "type": "github"
+ }
+ },
"root": {
"inputs": {
- "flake-parts": "flake-parts",
+ "beeVim": "beeVim",
+ "flake-parts": "flake-parts_4",
"home-manager": "home-manager",
"mango": "mango",
- "nixpkgs": "nixpkgs",
+ "nixpkgs": "nixpkgs_5",
"sops-nix": "sops-nix",
"zen-browser": "zen-browser"
}
@@ -175,6 +629,38 @@
"type": "github"
}
},
+ "vimcats": {
+ "inputs": {
+ "flake-parts": [
+ "beeVim",
+ "plugins-rustaceanvim",
+ "flake-parts"
+ ],
+ "git-hooks": [
+ "beeVim",
+ "plugins-rustaceanvim",
+ "git-hooks"
+ ],
+ "nixpkgs": [
+ "beeVim",
+ "plugins-rustaceanvim",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1767630708,
+ "narHash": "sha256-i2QZbDqaIMfYQfXZtbvsu2wcgfDYR8Kb19ZMagtCZg8=",
+ "owner": "mrcjkb",
+ "repo": "vimcats",
+ "rev": "869ee28be8f056e2482fd8bbfbaa23dd237aafd4",
+ "type": "github"
+ },
+ "original": {
+ "owner": "mrcjkb",
+ "repo": "vimcats",
+ "type": "github"
+ }
+ },
"zen-browser": {
"inputs": {
"nixpkgs": [
diff --git a/flake.nix b/flake.nix
index 484b259..6fa0eec 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,8 +11,11 @@
inputs = {
flake-parts.url = "github:hercules-ci/flake-parts";
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
- home-manager.url = "github:nix-community/home-manager";
- home-manager.inputs.nixpkgs.follows = "nixpkgs";
+ beeVim.url = "git+https://codeberg.org/brustybee/beeVim";
+ home-manager = {
+ url = "github:nix-community/home-manager";
+ inputs.nixpkgs.follows = "nixpkgs";
+ };
mango = {
url = "github:DreamMaoMao/mango";
inputs.nixpkgs.follows = "nixpkgs";
diff --git a/users/bee/default.nix b/users/bee/default.nix
index 2ae0c50..9bdd0de 100644
--- a/users/bee/default.nix
+++ b/users/bee/default.nix
@@ -17,6 +17,7 @@
];
beeMods = {
+ beeVim.enable = true;
mango = {
enable = true;
animations = true;