daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Compare commits

base: daniel:a09022e1296c235a900210b6396fc8930b7a86c7
Branches Tags
daniel:master
..
compare: daniel:4ff6010696b575d2c63e527c40da0849a1144c2d
Branches Tags
daniel:master

2 commits
a09022e129 ... 4ff6010696

Author SHA1 Message Date
Daniel Kempkens
4ff6010696
Update deps
All checks were successful
Build / build-arm64-linux (push) Successful in 9m15s
Details
Build / build-amd64-linux (push) Successful in 25m9s
Details
2023-10-01 17:59:45 +02:00
Daniel Kempkens
5f9bbb9891
darwin: Use mkalias to link apps 2023-10-01 17:34:28 +02:00
6 changed files with 136 additions and 74 deletions
Show stats Expand all files Collapse all files

39
flake.lock
View file

@ -313,6 +313,26 @@
"type": "github" "type": "github"
} }
}, },
"mkalias": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1678761502,
"narHash": "sha256-tL3C/b2BPOGQpV287wECDCDWmKwwPvezAAN3qz7N07M=",
"owner": "reckenrode",
"repo": "mkalias",
"rev": "8a5478cdb646f137ebc53cb9d235f8e5892ea00a",
"type": "github"
},
"original": {
"owner": "reckenrode",
"repo": "mkalias",
"type": "github"
}
},
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
@ -381,11 +401,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1695887975, "lastModified": 1696161939,
"narHash": "sha256-u3+5FR12dI305jCMb0fJNQx2qwoQ54lv1tPoEWp0hmg=", "narHash": "sha256-HI1DxS//s46/qv9dcW06TzXaBjxL2DVTQP8R1QsnHzM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "adcfd6aa860d1d129055039696bc457af7d50d0e", "rev": "0ab3ee718e964fb42dc57ace6170f19cb0b66532",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -413,11 +433,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1695978539, "lastModified": 1696009558,
"narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", "narHash": "sha256-/1nNL8lCF0gn38XaFyu2ufpWcBFwCDZyYUxdZkM6GxU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd9b686c0168041aea600222be0805a0de6e6ab8", "rev": "c182df2e68bd97deb32c7e4765adfbbbcaf75b60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -506,11 +526,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1695576016, "lastModified": 1696158581,
"narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", "narHash": "sha256-h0vY4E7Lx95lpYQbG2w4QH4yG5wCYOvPJzK93wVQbT0=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", "rev": "033453f85064ccac434dfd957f95d8457901ecd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -528,6 +548,7 @@
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-root": "flake-root", "flake-root": "flake-root",
"home-manager": "home-manager", "home-manager": "home-manager",
"mkalias": "mkalias",
"nifoc-overlay": "nifoc-overlay", "nifoc-overlay": "nifoc-overlay",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",

5
flake.nix
View file

@ -62,6 +62,11 @@
url = "github:serokell/deploy-rs"; url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
mkalias = {
url = "github:reckenrode/mkalias";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = inputs@{ flake-parts, ... }: outputs = inputs@{ flake-parts, ... }:

34
home/hosts/Styx.nix
View file

@ -1,4 +1,4 @@
{ pkgs, ... }: { pkgs, lib, config, ... }:
{ {
imports = [ imports = [
@ -42,6 +42,8 @@
../programs/yt-dlp.nix ../programs/yt-dlp.nix
]; ];
disabledModules = [ "targets/darwin/linkapps.nix" ];
home = { home = {
stateVersion = "22.11"; stateVersion = "22.11";
@ -75,5 +77,35 @@
xxHash xxHash
xz xz
]; ];
activation.aliasApplications = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin (
let
apps = pkgs.buildEnv {
name = "home-manager-applications";
paths = config.home.packages;
pathsToLink = "/Applications";
};
lastAppsFile = "${config.xdg.stateHome}/nix/.apps";
in
lib.hm.dag.entryAfter [ "writeBoundary" ] ''
last_apps=$(cat "${lastAppsFile}" 2>/dev/null || echo "")
next_apps=$(readlink -f ${apps}/Applications/* | sort)
if [ "$last_apps" != "$next_apps" ]; then
echo "Apps have changed. Updating macOS aliases..."
apps_path="$HOME/Applications/Home Manager Apps"
$DRY_RUN_CMD mkdir -p "$apps_path"
$DRY_RUN_CMD ${pkgs.fd}/bin/fd \
-t l -d 1 . ${apps}/Applications \
-x $DRY_RUN_CMD "${pkgs.mkalias}/bin/mkalias" \
-L {} "$apps_path/{/}"
[ -z "$DRY_RUN_CMD" ] && echo "$next_apps" > "${lastAppsFile}"
fi
''
);
}; };
} }

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

@ -3,10 +3,10 @@
let let
inherit (pkgs) fetchFromGitHub; inherit (pkgs) fetchFromGitHub;
inherit (pkgs) fetchFromSourcehut; inherit (pkgs) fetchFromSourcehut;
inherit (pkgs.vimUtils) buildVimPluginFrom2Nix; inherit (pkgs.vimUtils) buildVimPlugin;
in in
{ {
popup-nvim = buildVimPluginFrom2Nix { popup-nvim = buildVimPlugin {
pname = "popup.nvim"; pname = "popup.nvim";
version = "2021-11-18"; version = "2021-11-18";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -17,7 +17,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
plenary-nvim = buildVimPluginFrom2Nix { plenary-nvim = buildVimPlugin {
pname = "plenary.nvim"; pname = "plenary.nvim";
version = "2023-09-12"; version = "2023-09-12";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -28,7 +28,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-web-devicons = buildVimPluginFrom2Nix { nvim-web-devicons = buildVimPlugin {
pname = "nvim-web-devicons"; pname = "nvim-web-devicons";
version = "2023-09-25"; version = "2023-09-25";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -39,7 +39,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
wezterm-nvim = buildVimPluginFrom2Nix { wezterm-nvim = buildVimPlugin {
pname = "wezterm.nvim"; pname = "wezterm.nvim";
version = "2023-09-14"; version = "2023-09-14";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -50,7 +50,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-osc52 = buildVimPluginFrom2Nix { nvim-osc52 = buildVimPlugin {
pname = "nvim-osc52"; pname = "nvim-osc52";
version = "2023-05-15"; version = "2023-05-15";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -61,7 +61,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
yanky-nvim = buildVimPluginFrom2Nix { yanky-nvim = buildVimPlugin {
pname = "yanky.nvim"; pname = "yanky.nvim";
version = "2023-09-28"; version = "2023-09-28";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -72,7 +72,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
cutlass-nvim = buildVimPluginFrom2Nix { cutlass-nvim = buildVimPlugin {
pname = "cutlass.nvim"; pname = "cutlass.nvim";
version = "2023-05-01"; version = "2023-05-01";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -83,7 +83,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
substitute-nvim = buildVimPluginFrom2Nix { substitute-nvim = buildVimPlugin {
pname = "substitute.nvim"; pname = "substitute.nvim";
version = "2023-07-20"; version = "2023-07-20";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -94,7 +94,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
leap-nvim = buildVimPluginFrom2Nix { leap-nvim = buildVimPlugin {
pname = "leap.nvim"; pname = "leap.nvim";
version = "2023-07-23"; version = "2023-07-23";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -105,7 +105,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
dracula-nvim = buildVimPluginFrom2Nix { dracula-nvim = buildVimPlugin {
pname = "dracula.nvim"; pname = "dracula.nvim";
version = "2023-07-29"; version = "2023-07-29";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -116,7 +116,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPlugin {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-10-01"; version = "2023-10-01";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -127,7 +127,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
vim-just = buildVimPluginFrom2Nix { vim-just = buildVimPlugin {
pname = "vim-just"; pname = "vim-just";
version = "2023-08-02"; version = "2023-08-02";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -138,7 +138,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
rainbow-delimiters-nvim = buildVimPluginFrom2Nix { rainbow-delimiters-nvim = buildVimPlugin {
pname = "rainbow-delimiters.nvim"; pname = "rainbow-delimiters.nvim";
version = "2023-09-28"; version = "2023-09-28";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -149,7 +149,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
playground = buildVimPluginFrom2Nix { playground = buildVimPlugin {
pname = "playground"; pname = "playground";
version = "2023-09-15"; version = "2023-09-15";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -160,7 +160,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
telescope-nvim = buildVimPluginFrom2Nix { telescope-nvim = buildVimPlugin {
pname = "telescope.nvim"; pname = "telescope.nvim";
version = "2023-09-29"; version = "2023-09-29";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -171,7 +171,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
telescope-fzf-native-nvim = buildVimPluginFrom2Nix { telescope-fzf-native-nvim = buildVimPlugin {
pname = "telescope-fzf-native.nvim"; pname = "telescope-fzf-native.nvim";
version = "2023-09-10"; version = "2023-09-10";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -185,7 +185,7 @@ in
make make
''; '';
}; };
project-nvim = buildVimPluginFrom2Nix { project-nvim = buildVimPlugin {
pname = "project.nvim"; pname = "project.nvim";
version = "2023-04-04"; version = "2023-04-04";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -196,7 +196,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
todo-comments-nvim = buildVimPluginFrom2Nix { todo-comments-nvim = buildVimPlugin {
pname = "todo-comments.nvim"; pname = "todo-comments.nvim";
version = "2023-07-28"; version = "2023-07-28";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -207,7 +207,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
telescope-ui-select-nvim = buildVimPluginFrom2Nix { telescope-ui-select-nvim = buildVimPlugin {
pname = "telescope-ui-select.nvim"; pname = "telescope-ui-select.nvim";
version = "2022-04-30"; version = "2022-04-30";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -218,7 +218,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
telescope-toggleterm-nvim = buildVimPluginFrom2Nix { telescope-toggleterm-nvim = buildVimPlugin {
pname = "telescope-toggleterm.nvim"; pname = "telescope-toggleterm.nvim";
version = "2022-02-10"; version = "2022-02-10";
src = fetchFromSourcehut { src = fetchFromSourcehut {
@ -229,7 +229,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
telescope-undo-nvim = buildVimPluginFrom2Nix { telescope-undo-nvim = buildVimPlugin {
pname = "telescope-undo.nvim"; pname = "telescope-undo.nvim";
version = "2023-06-03"; version = "2023-06-03";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -240,18 +240,18 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPlugin {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-10-01"; version = "2023-10-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "7ec2ab0cb8f529708dba55964fb0a59d3cc21853"; rev = "eb1b53162755888ff75e495797071644d983bff7";
sha256 = "0fzmjwgl8icpi85348nsl7mzd04b1zhjgcqqzpb03j6l29bb2vqk"; sha256 = "04kgsf3rhr0wk3vyx6lawlxj5icvaryx925flh72f234vkhigmq2";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-jdtls = buildVimPluginFrom2Nix { nvim-jdtls = buildVimPlugin {
pname = "nvim-jdtls"; pname = "nvim-jdtls";
version = "2023-09-19"; version = "2023-09-19";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -262,7 +262,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
lspkind-nvim = buildVimPluginFrom2Nix { lspkind-nvim = buildVimPlugin {
pname = "lspkind.nvim"; pname = "lspkind.nvim";
version = "2023-05-05"; version = "2023-05-05";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -273,7 +273,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-navic = buildVimPluginFrom2Nix { nvim-navic = buildVimPlugin {
pname = "nvim-navic"; pname = "nvim-navic";
version = "2023-09-18"; version = "2023-09-18";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -284,7 +284,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
vim-illuminate = buildVimPluginFrom2Nix { vim-illuminate = buildVimPlugin {
pname = "vim-illuminate"; pname = "vim-illuminate";
version = "2023-09-26"; version = "2023-09-26";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -295,7 +295,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-lint = buildVimPluginFrom2Nix { nvim-lint = buildVimPlugin {
pname = "nvim-lint"; pname = "nvim-lint";
version = "2023-09-30"; version = "2023-09-30";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -306,7 +306,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
comment-nvim = buildVimPluginFrom2Nix { comment-nvim = buildVimPlugin {
pname = "comment.nvim"; pname = "comment.nvim";
version = "2023-08-07"; version = "2023-08-07";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -317,7 +317,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
LuaSnip = buildVimPluginFrom2Nix { LuaSnip = buildVimPlugin {
pname = "LuaSnip"; pname = "LuaSnip";
version = "2023-09-25"; version = "2023-09-25";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -328,7 +328,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
friendly-snippets = buildVimPluginFrom2Nix { friendly-snippets = buildVimPlugin {
pname = "friendly-snippets"; pname = "friendly-snippets";
version = "2023-10-01"; version = "2023-10-01";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -339,7 +339,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-cmp = buildVimPluginFrom2Nix { nvim-cmp = buildVimPlugin {
pname = "nvim-cmp"; pname = "nvim-cmp";
version = "2023-08-26"; version = "2023-08-26";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -350,7 +350,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
cmp-nvim-lsp = buildVimPluginFrom2Nix { cmp-nvim-lsp = buildVimPlugin {
pname = "cmp-nvim-lsp"; pname = "cmp-nvim-lsp";
version = "2023-06-23"; version = "2023-06-23";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -361,7 +361,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { cmp-nvim-lsp-signature-help = buildVimPlugin {
pname = "cmp-nvim-lsp-signature-help"; pname = "cmp-nvim-lsp-signature-help";
version = "2023-02-03"; version = "2023-02-03";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -372,7 +372,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
cmp_luasnip = buildVimPluginFrom2Nix { cmp_luasnip = buildVimPlugin {
pname = "cmp_luasnip"; pname = "cmp_luasnip";
version = "2022-10-28"; version = "2022-10-28";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -383,7 +383,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
cmp-path = buildVimPluginFrom2Nix { cmp-path = buildVimPlugin {
pname = "cmp-path"; pname = "cmp-path";
version = "2022-10-03"; version = "2022-10-03";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -394,7 +394,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
cmp-buffer = buildVimPluginFrom2Nix { cmp-buffer = buildVimPlugin {
pname = "cmp-buffer"; pname = "cmp-buffer";
version = "2022-08-10"; version = "2022-08-10";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -405,7 +405,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
cmp-treesitter = buildVimPluginFrom2Nix { cmp-treesitter = buildVimPlugin {
pname = "cmp-treesitter"; pname = "cmp-treesitter";
version = "2023-04-06"; version = "2023-04-06";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -416,7 +416,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
cmp-cmdline = buildVimPluginFrom2Nix { cmp-cmdline = buildVimPlugin {
pname = "cmp-cmdline"; pname = "cmp-cmdline";
version = "2023-06-08"; version = "2023-06-08";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -427,7 +427,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
cmp-nvim-lsp-document-symbol = buildVimPluginFrom2Nix { cmp-nvim-lsp-document-symbol = buildVimPlugin {
pname = "cmp-nvim-lsp-document-symbol"; pname = "cmp-nvim-lsp-document-symbol";
version = "2023-04-01"; version = "2023-04-01";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -438,7 +438,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
core-nvim = buildVimPluginFrom2Nix { core-nvim = buildVimPlugin {
pname = "core.nvim"; pname = "core.nvim";
version = "2023-09-09"; version = "2023-09-09";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -449,7 +449,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
format-nvim = buildVimPluginFrom2Nix { format-nvim = buildVimPlugin {
pname = "format.nvim"; pname = "format.nvim";
version = "2023-09-17"; version = "2023-09-17";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -460,7 +460,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-autopairs = buildVimPluginFrom2Nix { nvim-autopairs = buildVimPlugin {
pname = "nvim-autopairs"; pname = "nvim-autopairs";
version = "2023-09-23"; version = "2023-09-23";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -471,7 +471,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-ts-autotag = buildVimPluginFrom2Nix { nvim-ts-autotag = buildVimPlugin {
pname = "nvim-ts-autotag"; pname = "nvim-ts-autotag";
version = "2023-06-16"; version = "2023-06-16";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -482,7 +482,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
vim-matchup = buildVimPluginFrom2Nix { vim-matchup = buildVimPlugin {
pname = "vim-matchup"; pname = "vim-matchup";
version = "2023-09-02"; version = "2023-09-02";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -493,7 +493,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-treesitter-textobjects = buildVimPluginFrom2Nix { nvim-treesitter-textobjects = buildVimPlugin {
pname = "nvim-treesitter-textobjects"; pname = "nvim-treesitter-textobjects";
version = "2023-08-30"; version = "2023-08-30";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -504,7 +504,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-surround = buildVimPluginFrom2Nix { nvim-surround = buildVimPlugin {
pname = "nvim-surround"; pname = "nvim-surround";
version = "2023-08-18"; version = "2023-08-18";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -515,7 +515,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
heirline-nvim = buildVimPluginFrom2Nix { heirline-nvim = buildVimPlugin {
pname = "heirline.nvim"; pname = "heirline.nvim";
version = "2023-09-03"; version = "2023-09-03";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -526,7 +526,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
indent-blankline-nvim = buildVimPluginFrom2Nix { indent-blankline-nvim = buildVimPlugin {
pname = "indent-blankline.nvim"; pname = "indent-blankline.nvim";
version = "2023-10-01"; version = "2023-10-01";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -537,7 +537,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
virt-column-nvim = buildVimPluginFrom2Nix { virt-column-nvim = buildVimPlugin {
pname = "virt-column.nvim"; pname = "virt-column.nvim";
version = "2023-09-19"; version = "2023-09-19";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -548,7 +548,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
toggleterm-nvim = buildVimPluginFrom2Nix { toggleterm-nvim = buildVimPlugin {
pname = "toggleterm.nvim"; pname = "toggleterm.nvim";
version = "2023-09-25"; version = "2023-09-25";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -559,7 +559,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
urlview-nvim = buildVimPluginFrom2Nix { urlview-nvim = buildVimPlugin {
pname = "urlview.nvim"; pname = "urlview.nvim";
version = "2023-09-19"; version = "2023-09-19";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -570,18 +570,18 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
gitsigns-nvim = buildVimPluginFrom2Nix { gitsigns-nvim = buildVimPlugin {
pname = "gitsigns.nvim"; pname = "gitsigns.nvim";
version = "2023-10-01"; version = "2023-10-01";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "e2ca739be75447fb5ccc9bfeb64f7afbc2cee5e6"; rev = "19654d963e4f1d6d6543f38ab9802092393508c2";
sha256 = "0x9mwarz61xggw4xdxllzgardi2qxp33bk24x59rqpkb8135bjrz"; sha256 = "1w2kjiiz5ac0qkp6q33gk70lghahxm41f0hjf6mkbk0x74aqj7ks";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nui-nvim = buildVimPluginFrom2Nix { nui-nvim = buildVimPlugin {
pname = "nui.nvim"; pname = "nui.nvim";
version = "2023-09-06"; version = "2023-09-06";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -592,7 +592,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
nvim-notify = buildVimPluginFrom2Nix { nvim-notify = buildVimPlugin {
pname = "nvim-notify"; pname = "nvim-notify";
version = "2023-09-28"; version = "2023-09-28";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -603,7 +603,7 @@ in
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
noice-nvim = buildVimPluginFrom2Nix { noice-nvim = buildVimPlugin {
pname = "noice.nvim"; pname = "noice.nvim";
version = "2023-09-25"; version = "2023-09-25";
src = fetchFromGitHub { src = fetchFromGitHub {

8
home/programs/nvim/update-plugins.sh
View file

@ -1,5 +1,6 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell update-shell.nix -i bash #!nix-shell update-shell.nix -i bash
# shellcheck shell=bash disable=SC2154
set -eEuo pipefail set -eEuo pipefail
@ -22,7 +23,7 @@ rm -f "$nix_new_file"
echo 'let' echo 'let'
echo 'inherit (pkgs) fetchFromGitHub;' echo 'inherit (pkgs) fetchFromGitHub;'
echo 'inherit (pkgs) fetchFromSourcehut;' echo 'inherit (pkgs) fetchFromSourcehut;'
echo 'inherit (pkgs.vimUtils) buildVimPluginFrom2Nix;' echo 'inherit (pkgs.vimUtils) buildVimPlugin;'
echo 'in' echo 'in'
echo '{' echo '{'
} >>"$nix_new_file" } >>"$nix_new_file"
@ -31,7 +32,7 @@ for plugin in "${plugin_array[@]}"; do
raw_src="$(echo "$plugin" | dasel -r json -w - '.src')" raw_src="$(echo "$plugin" | dasel -r json -w - '.src')"
owner="$(echo "$raw_src" | awk -F'/' '{ print $(NF-1) }')" owner="$(echo "$raw_src" | awk -F'/' '{ print $(NF-1) }')"
repo="$(echo "$raw_src" | awk -F'/' '{ print $(NF) }')" repo="$(echo "$raw_src" | awk -F'/' '{ print $(NF) }')"
name="$(echo "$repo" | tr [.] '-')" name="$(echo "$repo" | tr '.' '-')"
echo "Updating ${owner}/${repo} ..." echo "Updating ${owner}/${repo} ..."
@ -58,6 +59,7 @@ for plugin in "${plugin_array[@]}"; do
nix_prefetch_flags+=" --branch-name $branch" nix_prefetch_flags+=" --branch-name $branch"
fi fi
# shellcheck disable=SC2086
src_json="$(nix-prefetch-git $nix_prefetch_flags "$clone_src")" src_json="$(nix-prefetch-git $nix_prefetch_flags "$clone_src")"
src="{ src="{
owner = \"${owner}\"; owner = \"${owner}\";
@ -90,7 +92,7 @@ for plugin in "${plugin_array[@]}"; do
# ;; # ;;
*) *)
{ {
echo "${name} = buildVimPluginFrom2Nix {" echo "${name} = buildVimPlugin {"
echo "pname = \"${repo}\";" echo "pname = \"${repo}\";"
} >>"$nix_new_file" } >>"$nix_new_file"
close_block="};" close_block="};"

4
system/flakes/Styx.nix
View file

@ -4,8 +4,9 @@ let
default-system = "aarch64-darwin"; default-system = "aarch64-darwin";
overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; }; overlay-x86 = _: _: { pkgs-x86 = import nixpkgs { system = "x86_64-darwin"; }; };
overlay-agenix = inputs.agenix.overlays.default; overlay-agenix = agenix.overlays.default;
overlay-attic = inputs.attic.overlays.default; overlay-attic = inputs.attic.overlays.default;
overlay-mkalias = _: _: { inherit (inputs.mkalias.packages.${default-system}) mkalias; };
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = { nixpkgsConfig = {
@ -13,6 +14,7 @@ let
overlay-x86 overlay-x86
overlay-agenix overlay-agenix
overlay-attic overlay-attic
overlay-mkalias
overlay-nifoc overlay-nifoc
]; ];