Compare commits
10 commits
fc21385ae6
...
d4303ccab3
Author | SHA1 | Date | |
---|---|---|---|
Benjamin Bädorf | d4303ccab3 | ||
Benjamin Bädorf | f6062d0019 | ||
teutat3s | 06ed2a78a9 | ||
teutat3s | 02c145697b | ||
teutat3s | c860d5e3f6 | ||
Hendrik Sokolowski | 630d0afc5e | ||
Benjamin Bädorf | e26ffd2725 | ||
teutat3s | 3aff6251b5 | ||
teutat3s | ea6233f57e | ||
teutat3s | 4520dece5f |
|
@ -1,11 +1,12 @@
|
|||
---
|
||||
kind: pipeline
|
||||
type: docker
|
||||
type: exec
|
||||
name: Check
|
||||
node:
|
||||
hosttype: baremetal
|
||||
|
||||
steps:
|
||||
- name: "Check"
|
||||
image: docker.nix-community.org/nixpkgs/nix-flakes:latest
|
||||
when:
|
||||
event:
|
||||
- pull_request
|
||||
|
@ -20,6 +21,8 @@ steps:
|
|||
kind: pipeline
|
||||
type: exec
|
||||
name: Tests
|
||||
node:
|
||||
hosttype: baremetal
|
||||
|
||||
steps:
|
||||
- name: "Tests"
|
||||
|
@ -145,6 +148,6 @@ volumes:
|
|||
|
||||
---
|
||||
kind: signature
|
||||
hmac: 3e6a89e903e214f21d488eba82863683b130ef6dbc2dc352377d4fd94ab3cd0c
|
||||
hmac: 291be33bbf2954d1f5e4bf569679e24a773e7d6f90db4765fb9dacb3686a825e
|
||||
|
||||
...
|
||||
|
|
79
flake.lock
79
flake.lock
|
@ -42,11 +42,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1667294277,
|
||||
"narHash": "sha256-YhVGYUpPZNpJZ8z3Sq9aT6n1/B8vKtfRfwaCtbsosxk=",
|
||||
"lastModified": 1668784520,
|
||||
"narHash": "sha256-gGgVAMwYPPmrfnvnoRi6OkEB5KRsNTb9uYzEceLdO/g=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "b7177030643374e698c29e993c2808efa7b85aaf",
|
||||
"rev": "6349b99bc2b96ded34d068a88c7c5ced406b7f7f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -85,11 +85,11 @@
|
|||
"utils": "utils"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1659725433,
|
||||
"narHash": "sha256-1ZxuK67TL29YLw88vQ18Y2Y6iYg8Jb7I6/HVzmNB6nM=",
|
||||
"lastModified": 1668797197,
|
||||
"narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=",
|
||||
"owner": "serokell",
|
||||
"repo": "deploy-rs",
|
||||
"rev": "41f15759dd8b638e7b4f299730d94d5aa46ab7eb",
|
||||
"rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -190,6 +190,22 @@
|
|||
}
|
||||
},
|
||||
"flake-compat_3": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1668681692,
|
||||
"narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "009399224d5e398d03b22badca40a37ac85412a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1650374568,
|
||||
|
@ -256,11 +272,11 @@
|
|||
},
|
||||
"flake-utils_3": {
|
||||
"locked": {
|
||||
"lastModified": 1659877975,
|
||||
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
|
||||
"lastModified": 1667077288,
|
||||
"narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
|
||||
"rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -276,11 +292,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1667299227,
|
||||
"narHash": "sha256-vAJPFSDYUq3DdCL8OzTg4xObRNW+yA1Pt+NzbhGu1f8=",
|
||||
"lastModified": 1667907331,
|
||||
"narHash": "sha256-bHkAwkYlBjkupPUFcQjimNS8gxWSWjOTevEuwdnp5m0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "f0ecd4b1db5e15103e955b18cb94bea4296e5c45",
|
||||
"rev": "6639e3a837fc5deb6f99554072789724997bc8e5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -308,11 +324,11 @@
|
|||
},
|
||||
"latest_2": {
|
||||
"locked": {
|
||||
"lastModified": 1667231093,
|
||||
"narHash": "sha256-RERXruzBEBuf0c7OfZeX1hxEKB+PTCUNxWeB6C1jd8Y=",
|
||||
"lastModified": 1669411043,
|
||||
"narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d40fea9aeb8840fea0d377baa4b38e39b9582458",
|
||||
"rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -324,11 +340,11 @@
|
|||
},
|
||||
"master": {
|
||||
"locked": {
|
||||
"lastModified": 1667394072,
|
||||
"narHash": "sha256-RFTHGjI46hg3ggVwSdssAsni5q5YRsQl2SENv5PPAnQ=",
|
||||
"lastModified": 1669582655,
|
||||
"narHash": "sha256-PiLuCZx+EPtvfWsQY6IoY4xAFbTjCVbh/fkMFjjNyrw=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "07c0c2707bfc78e2b615eb69977ffc6e366c5ec6",
|
||||
"rev": "cdad0ce127b0b32ae8c5c07233f44dd63a85661a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -375,11 +391,11 @@
|
|||
},
|
||||
"nixos": {
|
||||
"locked": {
|
||||
"lastModified": 1667318659,
|
||||
"narHash": "sha256-mRXqCdlnxPgm3Wk7mNAOanl7B3Q3U5scYTEiyYmNEOE=",
|
||||
"lastModified": 1669418739,
|
||||
"narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b3a8f7ed267e0a7ed100eb7d716c9137ff120fe3",
|
||||
"rev": "695b3515251873e0a7e2021add4bba643c56cde3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -395,11 +411,11 @@
|
|||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1666812839,
|
||||
"narHash": "sha256-0nBDgjPU+iDsvz89W+cDEyhnFGSwCJmwDl/gMGqYiU0=",
|
||||
"lastModified": 1669065280,
|
||||
"narHash": "sha256-3+pq1oJWjGDLfd8G/vR3IIFZ+EQ/aglukA0bTiMlf3o=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixos-generators",
|
||||
"rev": "41f3518bc194389df22a3d198215eae75e6b5ab9",
|
||||
"rev": "50aeec40f2072d2ab267c8ec8a345573704ec110",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -410,11 +426,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1667283320,
|
||||
"narHash": "sha256-qHvB/6XBKVjjJJCUM+z6/t9HzUC7J55wdY3KJ/ZWSHo=",
|
||||
"lastModified": 1669146234,
|
||||
"narHash": "sha256-HEby7EG1yaq1oT2Ze6Cvok9CFju1XHkSvVHmkptLW9U=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "18934557eeba8fa2e575b0fd4ab95186e2e3bde3",
|
||||
"rev": "0099253ad0b5283f06ffe31cf010af3f9ad7837d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -469,18 +485,18 @@
|
|||
},
|
||||
"nvfetcher": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-utils": "flake-utils_3",
|
||||
"nixpkgs": [
|
||||
"nixos"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1667246446,
|
||||
"narHash": "sha256-LTnDoH6B8cez7RAc7K/DJqFrnZr75OMtVsNqtIHIPBU=",
|
||||
"lastModified": 1667620329,
|
||||
"narHash": "sha256-v1Zk7rtEbAGpevBGPZvZBKpwbmw4I+uVwxvd+pBlp3o=",
|
||||
"owner": "berberman",
|
||||
"repo": "nvfetcher",
|
||||
"rev": "d5d1289327f26e870991656b2c5598ce62693311",
|
||||
"rev": "294826951113dcd3aa9abbcacfb1aa5b95a19116",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -511,6 +527,7 @@
|
|||
"darwin": "darwin",
|
||||
"deploy": "deploy",
|
||||
"digga": "digga",
|
||||
"flake-compat": "flake-compat_3",
|
||||
"home": "home",
|
||||
"latest": "latest_2",
|
||||
"master": "master",
|
||||
|
|
|
@ -13,6 +13,9 @@
|
|||
master.url = "github:nixos/nixpkgs/master";
|
||||
pub-solar.url = "github:pub-solar/nixpkgs/fix/use-latest-unstable-yubikey-agent";
|
||||
|
||||
flake-compat.url = "github:edolstra/flake-compat";
|
||||
flake-compat.flake = false;
|
||||
|
||||
digga.url = "github:pub-solar/digga/fix/bootstrap-iso";
|
||||
digga.inputs.nixpkgs.follows = "nixos";
|
||||
digga.inputs.nixlib.follows = "nixos";
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
let
|
||||
rev = "e7e5d481a0e15dcd459396e55327749989e04ce0";
|
||||
lock = builtins.fromJSON (builtins.readFile builtins.path { path = ../../flake.lock; name = "lockPath"; });
|
||||
flake = (import
|
||||
(
|
||||
fetchTarball {
|
||||
url = "https://github.com/edolstra/flake-compat/archive/${rev}.tar.gz";
|
||||
sha256 = "0zd3x46fswh5n6faq4x2kkpy6p3c6j593xbdlbsl40ppkclwc80x";
|
||||
url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
|
||||
sha256 = lock.nodes.flake-compat.locked.narHash;
|
||||
}
|
||||
)
|
||||
{
|
||||
src = ../../.;
|
||||
src = builtins.path { path = ../../.; name = "projectRoot"; };
|
||||
});
|
||||
in
|
||||
flake
|
||||
|
|
|
@ -5,76 +5,6 @@ let
|
|||
xdg = config.home-manager.users."${psCfg.user.name}".xdg;
|
||||
|
||||
preview-file = pkgs.writeShellScriptBin "preview-file" (import ./preview-file.nix pkgs);
|
||||
|
||||
vimagit-master = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "vimagit-master";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "jreybert";
|
||||
repo = "vimagit";
|
||||
rev = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
|
||||
sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
|
||||
};
|
||||
};
|
||||
|
||||
instant-nvim = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "instant";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "jbyuki";
|
||||
repo = "instant.nvim";
|
||||
rev = "c02d72267b12130609b7ad39b76cf7f4a3bc9554";
|
||||
sha256 = "sha256-7Pr2Au/oGKp5kMXuLsQY4BK5Wny9L1EBdXtyS5EaZPI=";
|
||||
};
|
||||
};
|
||||
|
||||
vim-caddyfile = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "vim-caddyfile";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "isobit";
|
||||
repo = "vim-caddyfile";
|
||||
rev = "24fe0720551883e407cb70ae1d7c03f162d1d5a0";
|
||||
sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o=";
|
||||
};
|
||||
};
|
||||
|
||||
workspace = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "vim-workspace";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "thaerkh";
|
||||
repo = "vim-workspace";
|
||||
rev = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
|
||||
sha256 = "sha256-XV7opLyfkHIDO0+JJaO/x0za0gsHuklrzapTGdLHJmI=";
|
||||
};
|
||||
};
|
||||
|
||||
beautify = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "vim-beautify";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "zeekay";
|
||||
repo = "vim-beautify";
|
||||
rev = "e0691483927dc5a0c051433602397419f9628623";
|
||||
sha256 = "QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ=";
|
||||
};
|
||||
};
|
||||
|
||||
vim-mdx-js = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "vim-mdx-js";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "jxnblk";
|
||||
repo = "vim-mdx-js";
|
||||
rev = "17179d7f2a73172af5f9a8d65b01a3acf12ddd50";
|
||||
sha256 = "wfYCvw9JVGG8p8PQhRPT6CeGGf2OVz9SR2KQM0LjQhY=";
|
||||
};
|
||||
};
|
||||
|
||||
apprentice = pkgs.vimUtils.buildVimPlugin {
|
||||
name = "vim-apprentice";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "romainl";
|
||||
repo = "Apprentice";
|
||||
rev = "ecd41698037f15a58125b349be76dbd2595bfb6d";
|
||||
sha256 = "sha256-9s7Yzn3IEJBjcyUq9NBIQ9wb45Xr7jOkEIoWf0lAYYg=";
|
||||
};
|
||||
};
|
||||
in
|
||||
{
|
||||
enable = true;
|
||||
|
@ -118,7 +48,7 @@ in
|
|||
lsp_extensions-nvim
|
||||
nvim-lspconfig
|
||||
|
||||
instant-nvim
|
||||
instant-nvim-nvfetcher
|
||||
|
||||
ack-vim
|
||||
vim-airline
|
||||
|
@ -128,23 +58,23 @@ in
|
|||
suda-vim
|
||||
syntastic
|
||||
vim-vinegar
|
||||
workspace
|
||||
vim-workspace-nvfetcher
|
||||
|
||||
sonokai
|
||||
vim-hybrid-material
|
||||
vim-airline-themes
|
||||
apprentice
|
||||
vim-apprentice-nvfetcher
|
||||
|
||||
fugitive
|
||||
vim-gitgutter
|
||||
vim-rhubarb
|
||||
vimagit-master
|
||||
vimagit-nvfetcher
|
||||
|
||||
fzf-vim
|
||||
fzfWrapper
|
||||
vim-highlightedyank
|
||||
|
||||
beautify
|
||||
vim-beautify-nvfetcher
|
||||
vim-surround
|
||||
|
||||
vim-bufkill
|
||||
|
@ -153,7 +83,7 @@ in
|
|||
ansible-vim
|
||||
emmet-vim
|
||||
rust-vim
|
||||
vim-caddyfile
|
||||
vim-caddyfile-nvfetcher
|
||||
vim-go
|
||||
vim-javascript
|
||||
vim-json
|
||||
|
|
|
@ -40,46 +40,27 @@ in
|
|||
myip = "dig +short myip.opendns.com @208.67.222.222 2>&1";
|
||||
};
|
||||
plugins = [
|
||||
# src gets fetched by nvfetcher, see: ./pkgs/sources.toml
|
||||
{
|
||||
# will source ohmyzsh/plugins/z/
|
||||
name = "zsh-plugins-z";
|
||||
file = "plugins/z/z.sh";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
rev = "249c708ed3a4a7a63d16a6e911a46b6fb9623cbd";
|
||||
sha256 = "sha256-NAVotL5RxpS/zKnO+ngMIjv787lqc1dj/c4blQrQcvU=";
|
||||
};
|
||||
file = "plugins/z/z.plugin.zsh";
|
||||
src = pkgs.sources.ohmyzsh.src;
|
||||
}
|
||||
{
|
||||
name = "zsh-powerlevel10k";
|
||||
file = "powerlevel10k.zsh-theme";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "romkatv";
|
||||
repo = "powerlevel10k";
|
||||
rev = "2dd6a29e4d7a33bfef10973d6550e087be37ddee";
|
||||
sha256 = "sha256-9vc4cMBCNOmPOyzGwnPeMrXXyQUq4pC9Du3AWl9+Rys=";
|
||||
};
|
||||
src = pkgs.sources.powerlevel10k.src;
|
||||
}
|
||||
{
|
||||
name = "zsh-fast-syntax-highlighting";
|
||||
file = "F-Sy-H.plugin.zsh";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "z-shell";
|
||||
repo = "F-Sy-H";
|
||||
rev = "c4bdc485b67b58351a24f21fcac92c9e0232b939";
|
||||
sha256 = "sha256-uXBGIdJwubuueNhQRdGxPUi0eJN17cflYAuHTjeQ8FQ=";
|
||||
};
|
||||
src = pkgs.sources.F-Sy-H.src;
|
||||
}
|
||||
{
|
||||
name = "zsh-nix-shell";
|
||||
file = "nix-shell.plugin.zsh";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "chisui";
|
||||
repo = "zsh-nix-shell";
|
||||
rev = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
|
||||
sha256 = "sha256-BjgMhILEL/qdgfno4LR64LSB8n9pC9R+gG7IQWwgyfQ=";
|
||||
};
|
||||
src = pkgs.sources.zsh-nix-shell.src;
|
||||
}
|
||||
];
|
||||
|
||||
|
|
22
overlays/neovim-plugins.nix
Normal file
22
overlays/neovim-plugins.nix
Normal file
|
@ -0,0 +1,22 @@
|
|||
final: prev: {
|
||||
vimPlugins = prev.vimPlugins // {
|
||||
instant-nvim-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
|
||||
inherit (prev.sources.instant-nvim-nvfetcher) pname version src;
|
||||
};
|
||||
vimagit-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
|
||||
inherit (prev.sources.vimagit-nvfetcher) pname version src;
|
||||
};
|
||||
vim-caddyfile-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
|
||||
inherit (prev.sources.vim-caddyfile-nvfetcher) pname version src;
|
||||
};
|
||||
vim-workspace-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
|
||||
inherit (prev.sources.vim-workspace-nvfetcher) pname version src;
|
||||
};
|
||||
vim-beautify-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
|
||||
inherit (prev.sources.vim-beautify-nvfetcher) pname version src;
|
||||
};
|
||||
vim-apprentice-nvfetcher = prev.vimUtils.buildVimPluginFrom2Nix {
|
||||
inherit (prev.sources.vim-apprentice-nvfetcher) pname version src;
|
||||
};
|
||||
};
|
||||
}
|
|
@ -1,13 +1,6 @@
|
|||
final: prev: {
|
||||
rnix-lsp = prev.rnix-lsp.overrideAttrs (oldAttrs: rec {
|
||||
version = "unstable-2022-07-28";
|
||||
|
||||
src = prev.fetchFromGitHub {
|
||||
owner = "nix-community";
|
||||
repo = "rnix-lsp";
|
||||
rev = "ff18e04551a39ccdab0ff9c83926db3807b23478";
|
||||
sha256 = "sha256-4OIpATLdPQvryyhRQPELeqNYC0n6PCyjD6LCPdwOztc=";
|
||||
};
|
||||
inherit (prev.sources.rnix-lsp-nvfetcher) pname version src;
|
||||
|
||||
cargoDeps = oldAttrs.cargoDeps.overrideAttrs (prev.lib.const {
|
||||
name = "rnix-lsp-vendor.tar.gz";
|
||||
|
|
|
@ -1,16 +1,136 @@
|
|||
# This file was generated by nvfetcher, please do not modify it manually.
|
||||
{ fetchgit, fetchurl }:
|
||||
{ fetchgit, fetchurl, fetchFromGitHub }:
|
||||
{
|
||||
F-Sy-H = {
|
||||
pname = "F-Sy-H";
|
||||
version = "b935a87a75560f8173dd78deee6717c59d464e06";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "z-shell";
|
||||
repo = "F-Sy-H";
|
||||
rev = "b935a87a75560f8173dd78deee6717c59d464e06";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-448OlDnrDkUjvaSLDhXsa9bkgYXzj1Ju8CTpJVjH8LM=";
|
||||
});
|
||||
};
|
||||
instant-nvim-nvfetcher = {
|
||||
pname = "instant-nvim-nvfetcher";
|
||||
version = "294b6d08143b3db8f9db7f606829270149e1a786";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "jbyuki";
|
||||
repo = "instant.nvim";
|
||||
rev = "294b6d08143b3db8f9db7f606829270149e1a786";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-DXJWji/NR8ZCxe014rD51v3EHJHMhRQeOoI3SsY8mR4=";
|
||||
});
|
||||
};
|
||||
manix = {
|
||||
pname = "manix";
|
||||
version = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
|
||||
src = fetchgit {
|
||||
url = "https://github.com/mlvzk/manix";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "mlvzk";
|
||||
repo = "manix";
|
||||
rev = "d08e7ca185445b929f097f8bfb1243a8ef3e10e4";
|
||||
fetchSubmodules = false;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
sha256 = "1b7xi8c2drbwzfz70czddc4j33s7g1alirv12dwl91hbqxifx8qs";
|
||||
sha256 = "sha256-GqPuYscLhkR5E2HnSFV4R48hCWvtM3C++3zlJhiK/aw=";
|
||||
});
|
||||
};
|
||||
ohmyzsh = {
|
||||
pname = "ohmyzsh";
|
||||
version = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "ohmyzsh";
|
||||
repo = "ohmyzsh";
|
||||
rev = "65a1e4edbe678cdac37ad96ca4bc4f6d77e27adf";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-qyI7CU0vKhhADZfQtD73GsyAbqdMPhDQ1uA03h4erpw=";
|
||||
});
|
||||
};
|
||||
powerlevel10k = {
|
||||
pname = "powerlevel10k";
|
||||
version = "8091c8a3a8a845c70046684235a01cd500075def";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "romkatv";
|
||||
repo = "powerlevel10k";
|
||||
rev = "8091c8a3a8a845c70046684235a01cd500075def";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-I0/tktXCbZ3hMYTNvPoWfOEYWRgmHoXsar/jcUB6bpo=";
|
||||
});
|
||||
};
|
||||
rnix-lsp-nvfetcher = {
|
||||
pname = "rnix-lsp-nvfetcher";
|
||||
version = "6925256babec4307479a4080b44f2be38056f210";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "nix-community";
|
||||
repo = "rnix-lsp";
|
||||
rev = "6925256babec4307479a4080b44f2be38056f210";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-OKLyIXIXhUnRB3Xw+7zI3u6XkwF7Mrbfz1XaasV6i7Q=";
|
||||
});
|
||||
};
|
||||
vim-apprentice-nvfetcher = {
|
||||
pname = "vim-apprentice-nvfetcher";
|
||||
version = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "romainl";
|
||||
repo = "Apprentice";
|
||||
rev = "9942d0bb0a5d82f7a24450b00051c1f2cc008659";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-Xs+vTdnihNbBFPOKsW+NB40pqN9eaadqzc0DIeNoOFo=";
|
||||
});
|
||||
};
|
||||
vim-beautify-nvfetcher = {
|
||||
pname = "vim-beautify-nvfetcher";
|
||||
version = "e0691483927dc5a0c051433602397419f9628623";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "zeekay";
|
||||
repo = "vim-beautify";
|
||||
rev = "e0691483927dc5a0c051433602397419f9628623";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-QPTCl6KaGcAjTS5yVDov9yxmv0fDaFoPLMsrtVIG6GQ=";
|
||||
});
|
||||
};
|
||||
vim-caddyfile-nvfetcher = {
|
||||
pname = "vim-caddyfile-nvfetcher";
|
||||
version = "24fe0720551883e407cb70ae1d7c03f162d1d5a0";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "isobit";
|
||||
repo = "vim-caddyfile";
|
||||
rev = "24fe0720551883e407cb70ae1d7c03f162d1d5a0";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-rRYv3vnt31g7hNTxttTD6BWdv5JJ+ko3rPNyDUEOZ9o=";
|
||||
});
|
||||
};
|
||||
vim-workspace-nvfetcher = {
|
||||
pname = "vim-workspace-nvfetcher";
|
||||
version = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "thaerkh";
|
||||
repo = "vim-workspace";
|
||||
rev = "c26b473f9b073f24bacecd38477f44c5cd1f5a62";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-XV7opLyfkHIDO0+JJaO/x0za0gsHuklrzapTGdLHJmI=";
|
||||
});
|
||||
};
|
||||
vimagit-nvfetcher = {
|
||||
pname = "vimagit-nvfetcher";
|
||||
version = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "jreybert";
|
||||
repo = "vimagit";
|
||||
rev = "308650ddc1e9a94e49fae0ea04bbc1c45f23d4c4";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-fhazQQqyFaO0fdoeNI9nBshwTDhKNHH262H/QThtuO0=";
|
||||
});
|
||||
};
|
||||
zsh-nix-shell = {
|
||||
pname = "zsh-nix-shell";
|
||||
version = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
|
||||
src = fetchFromGitHub ({
|
||||
owner = "chisui";
|
||||
repo = "zsh-nix-shell";
|
||||
rev = "af6f8a266ea1875b9a3e86e14796cadbe1cfbf08";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-BjgMhILEL/qdgfno4LR64LSB8n9pC9R+gG7IQWwgyfQ=";
|
||||
});
|
||||
};
|
||||
}
|
||||
|
|
|
@ -2,3 +2,47 @@
|
|||
[manix]
|
||||
src.git = "https://github.com/mlvzk/manix"
|
||||
fetch.github = "mlvzk/manix"
|
||||
|
||||
[ohmyzsh]
|
||||
src.git = "https://github.com/ohmyzsh/ohmyzsh"
|
||||
fetch.github = "ohmyzsh/ohmyzsh"
|
||||
|
||||
[powerlevel10k]
|
||||
src.git = "https://github.com/romkatv/powerlevel10k"
|
||||
fetch.github = "romkatv/powerlevel10k"
|
||||
|
||||
[F-Sy-H]
|
||||
src.git = "https://github.com/z-shell/F-Sy-H"
|
||||
fetch.github = "z-shell/F-Sy-H"
|
||||
|
||||
[zsh-nix-shell]
|
||||
src.git = "https://github.com/chisui/zsh-nix-shell"
|
||||
fetch.github = "chisui/zsh-nix-shell"
|
||||
|
||||
[rnix-lsp-nvfetcher]
|
||||
src.git = "https://github.com/nix-community/rnix-lsp"
|
||||
fetch.github = "nix-community/rnix-lsp"
|
||||
|
||||
[vimagit-nvfetcher]
|
||||
src.git = "https://github.com/jreybert/vimagit"
|
||||
fetch.github = "jreybert/vimagit"
|
||||
|
||||
[instant-nvim-nvfetcher]
|
||||
src.git = "https://github.com/jbyuki/instant.nvim"
|
||||
fetch.github = "jbyuki/instant.nvim"
|
||||
|
||||
[vim-caddyfile-nvfetcher]
|
||||
src.git = "https://github.com/isobit/vim-caddyfile"
|
||||
fetch.github = "isobit/vim-caddyfile"
|
||||
|
||||
[vim-workspace-nvfetcher]
|
||||
src.git = "https://github.com/thaerkh/vim-workspace"
|
||||
fetch.github = "thaerkh/vim-workspace"
|
||||
|
||||
[vim-beautify-nvfetcher]
|
||||
src.git = "https://github.com/zeekay/vim-beautify"
|
||||
fetch.github = "zeekay/vim-beautify"
|
||||
|
||||
[vim-apprentice-nvfetcher]
|
||||
src.git = "https://github.com/romainl/Apprentice"
|
||||
fetch.github = "romainl/Apprentice"
|
||||
|
|
|
@ -28,21 +28,6 @@ in
|
|||
# override for our own welcome
|
||||
devshell.name = pkgs.lib.mkForce "PubSolarOS";
|
||||
|
||||
# tempfix: remove when merged https://github.com/numtide/devshell/pull/123
|
||||
devshell.startup.load_profiles = pkgs.lib.mkForce (pkgs.lib.noDepEntry ''
|
||||
# PATH is devshell's exorbitant privilige:
|
||||
# fence against its pollution
|
||||
_PATH=''${PATH}
|
||||
# Load installed profiles
|
||||
for file in "$DEVSHELL_DIR/etc/profile.d/"*.sh; do
|
||||
# If that folder doesn't exist, bash loves to return the whole glob
|
||||
[[ -f "$file" ]] && source "$file"
|
||||
done
|
||||
# Exert exorbitant privilige and leave no trace
|
||||
export PATH=''${_PATH}
|
||||
unset _PATH
|
||||
'');
|
||||
|
||||
commands = with pkgs; [
|
||||
(devos nix)
|
||||
(devos agenix)
|
||||
|
|
Loading…
Reference in a new issue