feat: Update to latest nix
This commit is contained in:
@@ -309,7 +309,7 @@ in {
|
|||||||
file = "Catppuccin Mocha.tmTheme";
|
file = "Catppuccin Mocha.tmTheme";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
extraPackages = with pkgs.bat-extras; [batdiff batman batgrep batwatch];
|
extraPackages = with pkgs.bat-extras; [batman batgrep batwatch];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Only for checking markdown previews
|
# Only for checking markdown previews
|
||||||
|
|||||||
116
flake.lock
generated
116
flake.lock
generated
@@ -994,11 +994,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722857853,
|
"lastModified": 1724440431,
|
||||||
"narHash": "sha256-3Zx53oz/MSIyevuWO/SumxABkrIvojnB7g9cimxkhiE=",
|
"narHash": "sha256-9etXEOUtzeMgqg1u0wp+EdwG7RpmrAZ2yX516bMj2aE=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "06939f6b7ec4d4f465bf3132a05367cccbbf64da",
|
"rev": "c8a54057aae480c56e28ef3e14e4960628ac495b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1159,11 +1159,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723015306,
|
"lastModified": 1724435763,
|
||||||
"narHash": "sha256-jQnFEtH20/OsDPpx71ntZzGdRlpXhUENSQCGTjn//NA=",
|
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "b3d5ea65d88d67d4ec578ed11d4d2d51e3de525e",
|
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1202,11 +1202,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722630065,
|
"lastModified": 1724435763,
|
||||||
"narHash": "sha256-QfM/9BMRkCmgWzrPDK+KbgJOUlSJnfX4OvsUupEUZvA=",
|
"narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "afc892db74d65042031a093adb6010c4c3378422",
|
"rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1367,11 +1367,11 @@
|
|||||||
"systems": "systems_5"
|
"systems": "systems_5"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722882121,
|
"lastModified": 1724235914,
|
||||||
"narHash": "sha256-gr4mN6BYKqy9JDr/ygDlMGYvEYBCMTDDDVnGNp/EYuw=",
|
"narHash": "sha256-QEVuZNXkytS1lqAtRMBAriJREcCTOeprxBTisXxpe3s=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlock",
|
"repo": "hyprlock",
|
||||||
"rev": "9393a3e94d837229714e28041427709756033f5a",
|
"rev": "7bb4113a7e9cb62120e96d7c81066f0c055f0db4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1465,11 +1465,11 @@
|
|||||||
"rust-overlay": "rust-overlay_3"
|
"rust-overlay": "rust-overlay_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722868552,
|
"lastModified": 1724148415,
|
||||||
"narHash": "sha256-tP0mOQlxotkJwmZa/ldwafNJoReeqivE7TtbPDSLSrE=",
|
"narHash": "sha256-rwp6EY40+rXihPIszreCvxbowV6+/Am4J6BMekscgR4=",
|
||||||
"owner": "JakeStanger",
|
"owner": "JakeStanger",
|
||||||
"repo": "ironbar",
|
"repo": "ironbar",
|
||||||
"rev": "7de0412399bb7188f3c28cee257c6c85a4f10e8f",
|
"rev": "eff371ee086340c7c92f116604dbd613a9b4285c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1514,11 +1514,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711550423,
|
"lastModified": 1724434153,
|
||||||
"narHash": "sha256-CjTiUIZf8CK0keCNhADg+72ENpbgI63GLqoXO/DUDSI=",
|
"narHash": "sha256-8C8uFnXSBalLD2MUgzzfg4ylvTVecyPJOSUri5jbvkM=",
|
||||||
"owner": "tsirysndr",
|
"owner": "tsirysndr",
|
||||||
"repo": "music-player",
|
"repo": "music-player",
|
||||||
"rev": "2da6ea87848cbdc5e979b902cd83e4fce1cc153c",
|
"rev": "cf01ae4d2dcf5c804559250f2c7f922d870ae26d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1534,11 +1534,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722809356,
|
"lastModified": 1724050807,
|
||||||
"narHash": "sha256-xyNFsF+5cDjMlfbm7NMG33K+oej0T/Iosm3Nukp3+RU=",
|
"narHash": "sha256-Mdmsb/zw3JjVxQKSdiN3wVFnrqT6gunbs2T4EkQxfAI=",
|
||||||
"owner": "musnix",
|
"owner": "musnix",
|
||||||
"repo": "musnix",
|
"repo": "musnix",
|
||||||
"rev": "a2f2e86026043977fdce30ac098a022a71b39392",
|
"rev": "b40964921d0f804f80480d050115bc089fe51128",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1687,7 +1687,7 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1,
|
"lastModified": 1,
|
||||||
"narHash": "sha256-497l3zo03vUgp/9lBZfaI97UJzc/4+kByKW3j4TD29s=",
|
"narHash": "sha256-ty+HIRWkcVfMKJHBP8qDiA0mHSbq7dhKhFk6h57H4pc=",
|
||||||
"path": "./neovim",
|
"path": "./neovim",
|
||||||
"type": "path"
|
"type": "path"
|
||||||
},
|
},
|
||||||
@@ -1741,11 +1741,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722924007,
|
"lastModified": 1724561770,
|
||||||
"narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
|
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
|
||||||
"owner": "LnL7",
|
"owner": "LnL7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
|
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1762,11 +1762,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722924007,
|
"lastModified": 1724561770,
|
||||||
"narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=",
|
"narHash": "sha256-zv8C9RNa86CIpyHwPIVO/k+5TfM8ZbjGwOOpTe1grls=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "91010a5613ffd7ee23ee9263213157a1c422b705",
|
"rev": "ac5694a0b855a981e81b4d9f14052e3ff46ca39e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1780,11 +1780,11 @@
|
|||||||
"nixpkgs": "nixpkgs_7"
|
"nixpkgs": "nixpkgs_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722740924,
|
"lastModified": 1724576102,
|
||||||
"narHash": "sha256-UQPgA5d8azLZuDHZMPmvDszhuKF1Ek89SrTRtqsQ4Ss=",
|
"narHash": "sha256-uM7n5nNL6fmA0bwMJBNll11f4cMWOFa2Ni6F5KeIldM=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "97ca0a0fca0391de835f57e44f369a283e37890f",
|
"rev": "e333d62b70b179da1dd78d94315e8a390f2d12e5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -1992,11 +1992,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722421184,
|
"lastModified": 1724224976,
|
||||||
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
|
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
|
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -2008,11 +2008,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_8": {
|
"nixpkgs_8": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722813957,
|
"lastModified": 1724479785,
|
||||||
"narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=",
|
"narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa",
|
"rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -2066,11 +2066,11 @@
|
|||||||
"treefmt-nix": "treefmt-nix_3"
|
"treefmt-nix": "treefmt-nix_3"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723064649,
|
"lastModified": 1724710305,
|
||||||
"narHash": "sha256-J7p/kv0GHAnvg2HH3vJ3JVz1LEzCtdhcH0prmdYfRog=",
|
"narHash": "sha256-qotbY/mgvykExLqRLAKN4yeufPfIjnMaK6hQQFhE2DE=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "593f5215cb1df010451675c19f2ad5c5481ccee3",
|
"rev": "eac092c876e4c4861c6df0cff93e25b972b1842c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -2174,11 +2174,11 @@
|
|||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723096977,
|
"lastModified": 1724738134,
|
||||||
"narHash": "sha256-/OFbSpsjIl+b5ECPKz7anD/Q8EGFCOIjG9w9NIV61Gk=",
|
"narHash": "sha256-y87Sad5b2k0S4E8pIUlFP3zkzgS4MWu6kC4pmAeMpO8=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "27f59822c315763c64b55fb12f862a54df79b929",
|
"rev": "52d1ce4e4b0588d7bbff6657e2da1acd335b24a7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -2219,11 +2219,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722772237,
|
"lastModified": 1724584782,
|
||||||
"narHash": "sha256-3eCYmzeLngX8eutIsTZAG8DIvT/0DWQQxiszTQz8n0s=",
|
"narHash": "sha256-7FfHv7b1jwMPSu9SPY9hdxStk8E6EeSwzqdvV69U4BM=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "search",
|
"repo": "search",
|
||||||
"rev": "aa5f6246565cc9b1e697d2c9d6ed2c842b17fff6",
|
"rev": "5a08d691de30b6fc28d58ce71a5e420f2694e087",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -2486,11 +2486,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723083652,
|
"lastModified": 1724725307,
|
||||||
"narHash": "sha256-ait+SeO67n8b3lIaBWwuzVX6F1zyTJ0cY6cHWtvhTyc=",
|
"narHash": "sha256-gnu8JrUFQoy7b927EPuwmWpvk8MSroFl07pplmVueYA=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "69e0ad9289fc08ee5a313fb107f00e0f21e7cbb2",
|
"rev": "f56076b216c266cd855b0811ceb86802e834cdb9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -2507,11 +2507,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722997267,
|
"lastModified": 1723774846,
|
||||||
"narHash": "sha256-8Pncp8IKd0f0N711CRrCGTC4iLfBE+/5kaMqyWxnYic=",
|
"narHash": "sha256-m53hVat6XXiKooV1oUDEMnPcdNKqSn/kAW+g8juSq84=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "d720bf3cebac38c2426d77ee2e59943012854cb8",
|
"rev": "519f4892641bc04a6ac7c2d260cc68356f9ae90f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -2833,11 +2833,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1722330636,
|
"lastModified": 1724338379,
|
||||||
"narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
|
"narHash": "sha256-kKJtaiU5Ou+e/0Qs7SICXF22DLx4V/WhG1P6+k4yeOE=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
|
"rev": "070f834771efa715f3e74cd8ab93ecc96fabc951",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -2886,11 +2886,11 @@
|
|||||||
"rust-overlay": "rust-overlay_7"
|
"rust-overlay": "rust-overlay_7"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1723031177,
|
"lastModified": 1723818372,
|
||||||
"narHash": "sha256-bjiFmTOpd42a15NTtn8taQxUzCD+7+XbR+HklijsVO4=",
|
"narHash": "sha256-dxRAONapqZRIlNfDyh/RVh011pdklBEDr92OsJizkAA=",
|
||||||
"owner": "dj95",
|
"owner": "dj95",
|
||||||
"repo": "zjstatus",
|
"repo": "zjstatus",
|
||||||
"rev": "e1e3b566268fbf6c80d6544f38b06368d23b4b46",
|
"rev": "671e0d12737cd8b269ca4408cfc67295ad3760b7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
446
neovim/nvim.nix
446
neovim/nvim.nix
@@ -245,7 +245,7 @@ in rec {
|
|||||||
html.enable = true;
|
html.enable = true;
|
||||||
ast-grep.enable = true;
|
ast-grep.enable = true;
|
||||||
# pylyzer.enable = true;
|
# pylyzer.enable = true;
|
||||||
rust-analyzer.enable = false;
|
# rust-analyzer.enable = false;
|
||||||
};
|
};
|
||||||
onAttach =
|
onAttach =
|
||||||
/*
|
/*
|
||||||
@@ -419,246 +419,246 @@ in rec {
|
|||||||
lua
|
lua
|
||||||
*/
|
*/
|
||||||
''
|
''
|
||||||
function catcher(callback)
|
function catcher(callback)
|
||||||
do
|
do
|
||||||
success, output = pcall(callback)
|
success, output = pcall(callback)
|
||||||
if not success then
|
if not success then
|
||||||
print("Failed to setup: " .. output)
|
print("Failed to setup: " .. output)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
do
|
|
||||||
function setup()
|
|
||||||
require'neotest'.setup({
|
|
||||||
adapters = {
|
|
||||||
require('rustaceanvim.neotest'),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
end
|
|
||||||
success, output = pcall(setup)
|
|
||||||
if not success then
|
|
||||||
print("Failed to setup neotest: " .. output)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
-- catcher(require('rest-nvim').setup)
|
|
||||||
|
|
||||||
-- catcher(require('lspconfig').ast_grep.setup)
|
|
||||||
|
|
||||||
-- require('telescope').load_extension("dap")
|
|
||||||
-- require('telescope').load_extension("rest")
|
|
||||||
require('telescope').load_extension("neorg")
|
|
||||||
|
|
||||||
require("copilot").setup({
|
|
||||||
suggestion = {
|
|
||||||
enabled = true,
|
|
||||||
auto_trigger = true,
|
|
||||||
keymap = {
|
|
||||||
accept = "<C-l>",
|
|
||||||
}
|
|
||||||
},
|
|
||||||
panel = { enabled = true },
|
|
||||||
})
|
|
||||||
|
|
||||||
catcher(require('crates').setup)
|
|
||||||
catcher(require('outline').setup)
|
|
||||||
-- catcher(require('navigator').setup)
|
|
||||||
|
|
||||||
require('FTerm').setup({
|
|
||||||
border = 'single',
|
|
||||||
dimensions = {
|
|
||||||
height = 0.99,
|
|
||||||
width = 0.95,
|
|
||||||
},
|
|
||||||
cmd = "sh -c 'tmux new -As scratch'",
|
|
||||||
blend = 10,
|
|
||||||
})
|
|
||||||
|
|
||||||
local load = {
|
|
||||||
["core.defaults"] = {},
|
|
||||||
["core.completion"] = { config = { engine = "nvim-cmp", name = "[Norg]" } },
|
|
||||||
["core.concealer"] = {
|
|
||||||
config = { icon_preset = "diamond" }
|
|
||||||
},
|
|
||||||
["core.export"] = {},
|
|
||||||
["core.keybinds"] = {
|
|
||||||
-- https://github.com/nvim-neorg/neorg/blob/main/lua/neorg/modules/core/keybinds/keybinds.lua
|
|
||||||
config = {
|
|
||||||
default_keybinds = true,
|
|
||||||
neorg_leader = "<C-m>",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
["core.dirman"] = {
|
|
||||||
config = {
|
|
||||||
default_workspace = "Notes",
|
|
||||||
workspaces = {
|
|
||||||
Notes = "~/Nextcloud/Notes",
|
|
||||||
Work = "~/Nextcloud/Work",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
require('neorg').setup({
|
|
||||||
load = load,
|
|
||||||
})
|
|
||||||
|
|
||||||
require('chatgpt').setup({
|
|
||||||
api_key_cmd = "${apikey}/bin/openapikey",
|
|
||||||
})
|
|
||||||
|
|
||||||
require('octo').setup({
|
|
||||||
use_local_fs = false,
|
|
||||||
enable_builtin = false,
|
|
||||||
default_remote = {"upstream", "origin"};
|
|
||||||
default_merge_method = "squash";
|
|
||||||
})
|
|
||||||
|
|
||||||
local rr_dap = require('nvim-dap-rr')
|
|
||||||
rr_dap.setup({
|
|
||||||
mappings = {
|
|
||||||
continue = "<F7>"
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
local dap = require'dap';
|
|
||||||
dap.configurations.rust = { rr_dap.get_rust_config() }
|
|
||||||
dap.configurations.cpp = { rr_dap.get_config() }
|
|
||||||
|
|
||||||
if not vim.g.neovide then
|
|
||||||
require('neoscroll').setup()
|
|
||||||
require('image').setup({["backend"] = "kitty",["tmux_show_only_in_active_window"] = true})
|
|
||||||
load["core.integrations.image"] = {
|
|
||||||
config = {
|
|
||||||
tmux_show_only_in_active_window = true,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
vim.o.guifont = "Hasklug Nerd Font Mono:h13"
|
|
||||||
vim.g.neovide_cursor_vfx_mode = "railgun"
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
-- do
|
-- do
|
||||||
-- function setup()
|
-- function setup()
|
||||||
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
|
-- require'neotest'.setup({
|
||||||
-- capabilities.textDocument.foldingRange = {
|
-- adapters = {
|
||||||
-- dynamicRegistration = false,
|
-- require('rustaceanvim.neotest'),
|
||||||
-- lineFoldingOnly = true
|
-- }
|
||||||
-- }
|
-- })
|
||||||
-- -- local language_servers = require("lspconfig").util.available_servers() -- or list servers manually like {'gopls', 'clangd'}
|
|
||||||
-- local language_servers = {"nil_ls"};
|
|
||||||
-- for _, ls in ipairs(language_servers) do
|
|
||||||
-- require('lspconfig')[ls].setup({
|
|
||||||
-- capabilities = capabilities
|
|
||||||
-- -- you can add other fields for setting up lsp server in this table
|
|
||||||
-- })
|
|
||||||
-- end
|
|
||||||
-- end
|
-- end
|
||||||
-- success, output = pcall(setup)
|
-- success, output = pcall(setup)
|
||||||
-- if not success then
|
-- if not success then
|
||||||
-- print("Failed to setup lspconfig folds: " .. output)
|
-- print("Failed to setup neotest: " .. output)
|
||||||
-- end
|
-- end
|
||||||
-- end
|
-- end
|
||||||
require('lspconfig.ui.windows').default_options.border = 'single'
|
|
||||||
|
|
||||||
catcher(require('nvim_context_vt').setup)
|
-- catcher(require('rest-nvim').setup)
|
||||||
catcher(function()
|
|
||||||
require('nvim-devdocs').setup({
|
|
||||||
ensure_installed = {"nix", "rust"},
|
|
||||||
float_win = {
|
|
||||||
relative = "editor",
|
|
||||||
height = 80,
|
|
||||||
width = 100,
|
|
||||||
border = "rounded",
|
|
||||||
},
|
|
||||||
after_open = function()
|
|
||||||
vim.o.conceallevel = 3
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
end)
|
|
||||||
|
|
||||||
vim.api.nvim_create_user_command('Reso',
|
-- catcher(require('lspconfig').ast_grep.setup)
|
||||||
function()
|
|
||||||
pcall(vim.cmd'source ~/.config/nvim/init.lua')
|
|
||||||
end,
|
|
||||||
{})
|
|
||||||
|
|
||||||
vim.api.nvim_create_user_command('Sqlfmt',
|
-- require('telescope').load_extension("dap")
|
||||||
function()
|
-- require('telescope').load_extension("rest")
|
||||||
pcall(vim.cmd'%!${pkgs.sleek}/bin/sleek')
|
require('telescope').load_extension("neorg")
|
||||||
end,
|
|
||||||
{})
|
|
||||||
|
|
||||||
local iron = require("iron.core")
|
require("copilot").setup({
|
||||||
iron.setup({
|
suggestion = {
|
||||||
config = {
|
enabled = true,
|
||||||
-- Whether a repl should be discarded or not
|
auto_trigger = true,
|
||||||
scratch_repl = true,
|
keymap = {
|
||||||
-- Your repl definitions come here
|
accept = "<C-l>",
|
||||||
repl_definition = {
|
}
|
||||||
sh = {
|
|
||||||
-- Can be a table or a function that
|
|
||||||
-- returns a table (see below)
|
|
||||||
command = {"${pkgs.zsh}/bin/zsh"}
|
|
||||||
},
|
},
|
||||||
sql = {
|
panel = { enabled = true },
|
||||||
command = function(meta)
|
})
|
||||||
local db = os.getenv("DATABASE_PATH")
|
|
||||||
if db == nil then
|
|
||||||
return { '${pkgs.sqlite}/bin/sqlite3', ':memory:' }
|
|
||||||
else
|
|
||||||
return { '${pkgs.sqlite}/bin/sqlite3', db }
|
|
||||||
end
|
|
||||||
|
|
||||||
end
|
catcher(require('crates').setup)
|
||||||
|
catcher(require('outline').setup)
|
||||||
|
-- catcher(require('navigator').setup)
|
||||||
|
|
||||||
|
require('FTerm').setup({
|
||||||
|
border = 'single',
|
||||||
|
dimensions = {
|
||||||
|
height = 0.99,
|
||||||
|
width = 0.95,
|
||||||
},
|
},
|
||||||
rust = {
|
cmd = "sh -c 'tmux new -As scratch'",
|
||||||
command = {"${pkgs.evcxr}/bin/evcxr"}
|
blend = 10,
|
||||||
|
})
|
||||||
|
|
||||||
|
local load = {
|
||||||
|
["core.defaults"] = {},
|
||||||
|
["core.completion"] = { config = { engine = "nvim-cmp", name = "[Norg]" } },
|
||||||
|
["core.concealer"] = {
|
||||||
|
config = { icon_preset = "diamond" }
|
||||||
},
|
},
|
||||||
|
["core.export"] = {},
|
||||||
|
["core.keybinds"] = {
|
||||||
|
-- https://github.com/nvim-neorg/neorg/blob/main/lua/neorg/modules/core/keybinds/keybinds.lua
|
||||||
|
config = {
|
||||||
|
default_keybinds = true,
|
||||||
|
neorg_leader = "<C-m>",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
["core.dirman"] = {
|
||||||
|
config = {
|
||||||
|
default_workspace = "Notes",
|
||||||
|
workspaces = {
|
||||||
|
Notes = "~/Nextcloud/Notes",
|
||||||
|
Work = "~/Nextcloud/Work",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
require('neorg').setup({
|
||||||
|
load = load,
|
||||||
|
})
|
||||||
|
|
||||||
|
require('chatgpt').setup({
|
||||||
|
api_key_cmd = "${apikey}/bin/openapikey",
|
||||||
|
})
|
||||||
|
|
||||||
|
require('octo').setup({
|
||||||
|
use_local_fs = false,
|
||||||
|
enable_builtin = false,
|
||||||
|
default_remote = {"upstream", "origin"};
|
||||||
|
default_merge_method = "squash";
|
||||||
|
})
|
||||||
|
|
||||||
|
local rr_dap = require('nvim-dap-rr')
|
||||||
|
rr_dap.setup({
|
||||||
|
mappings = {
|
||||||
|
continue = "<F7>"
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
local dap = require'dap';
|
||||||
|
-- dap.configurations.rust = { rr_dap.get_rust_config() }
|
||||||
|
dap.configurations.cpp = { rr_dap.get_config() }
|
||||||
|
|
||||||
|
if not vim.g.neovide then
|
||||||
|
require('neoscroll').setup()
|
||||||
|
require('image').setup({["backend"] = "kitty",["tmux_show_only_in_active_window"] = true})
|
||||||
|
load["core.integrations.image"] = {
|
||||||
|
config = {
|
||||||
|
tmux_show_only_in_active_window = true,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
vim.o.guifont = "Hasklug Nerd Font Mono:h13"
|
||||||
|
vim.g.neovide_cursor_vfx_mode = "railgun"
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
-- do
|
||||||
|
-- function setup()
|
||||||
|
-- local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
|
-- capabilities.textDocument.foldingRange = {
|
||||||
|
-- dynamicRegistration = false,
|
||||||
|
-- lineFoldingOnly = true
|
||||||
|
-- }
|
||||||
|
-- -- local language_servers = require("lspconfig").util.available_servers() -- or list servers manually like {'gopls', 'clangd'}
|
||||||
|
-- local language_servers = {"nil_ls"};
|
||||||
|
-- for _, ls in ipairs(language_servers) do
|
||||||
|
-- require('lspconfig')[ls].setup({
|
||||||
|
-- capabilities = capabilities
|
||||||
|
-- -- you can add other fields for setting up lsp server in this table
|
||||||
|
-- })
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
-- success, output = pcall(setup)
|
||||||
|
-- if not success then
|
||||||
|
-- print("Failed to setup lspconfig folds: " .. output)
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
require('lspconfig.ui.windows').default_options.border = 'single'
|
||||||
|
|
||||||
|
catcher(require('nvim_context_vt').setup)
|
||||||
|
-- catcher(function()
|
||||||
|
-- require('nvim-devdocs').setup({
|
||||||
|
-- ensure_installed = {"nix", "rust"},
|
||||||
|
-- float_win = {
|
||||||
|
-- relative = "editor",
|
||||||
|
-- height = 80,
|
||||||
|
-- width = 100,
|
||||||
|
-- border = "rounded",
|
||||||
|
-- },
|
||||||
|
-- after_open = function()
|
||||||
|
-- vim.o.conceallevel = 3
|
||||||
|
-- end,
|
||||||
|
-- })
|
||||||
|
-- end)
|
||||||
|
|
||||||
|
vim.api.nvim_create_user_command('Reso',
|
||||||
|
function()
|
||||||
|
pcall(vim.cmd'source ~/.config/nvim/init.lua')
|
||||||
|
end,
|
||||||
|
{})
|
||||||
|
|
||||||
|
vim.api.nvim_create_user_command('Sqlfmt',
|
||||||
|
function()
|
||||||
|
pcall(vim.cmd'%!${pkgs.sleek}/bin/sleek')
|
||||||
|
end,
|
||||||
|
{})
|
||||||
|
|
||||||
|
local iron = require("iron.core")
|
||||||
|
-- iron.setup({
|
||||||
|
-- config = {
|
||||||
|
-- -- Whether a repl should be discarded or not
|
||||||
|
-- scratch_repl = true,
|
||||||
|
-- -- Your repl definitions come here
|
||||||
|
-- repl_definition = {
|
||||||
|
-- sh = {
|
||||||
|
-- -- Can be a table or a function that
|
||||||
|
-- -- returns a table (see below)
|
||||||
|
-- command = {"${pkgs.zsh}/bin/zsh"}
|
||||||
|
-- },
|
||||||
|
-- sql = {
|
||||||
|
-- command = function(meta)
|
||||||
|
-- local db = os.getenv("DATABASE_PATH")
|
||||||
|
-- if db == nil then
|
||||||
|
-- return { '${pkgs.sqlite}/bin/sqlite3', ':memory:' }
|
||||||
|
-- else
|
||||||
|
-- return { '${pkgs.sqlite}/bin/sqlite3', db }
|
||||||
|
-- end
|
||||||
|
|
||||||
|
-- end
|
||||||
|
-- },
|
||||||
|
-- rust = {
|
||||||
|
-- command = {"${pkgs.evcxr}/bin/evcxr"}
|
||||||
|
-- },
|
||||||
|
-- },
|
||||||
|
-- -- How the repl window will be displayed
|
||||||
|
-- -- See below for more information
|
||||||
|
-- repl_open_cmd = require('iron.view').right(60),
|
||||||
|
-- },
|
||||||
|
-- -- Iron doesn't set keymaps by default anymore.
|
||||||
|
-- -- You can set them here or manually add keymaps to the functions in iron.core
|
||||||
|
-- keymaps = {
|
||||||
|
-- send_motion = "<space>sc",
|
||||||
|
-- visual_send = "<space>sc",
|
||||||
|
-- send_file = "<space>sf",
|
||||||
|
-- send_line = "<space>sl",
|
||||||
|
-- send_until_cursor = "<space>su",
|
||||||
|
-- send_mark = "<space>sm",
|
||||||
|
-- mark_motion = "<space>mc",
|
||||||
|
-- mark_visual = "<space>mc",
|
||||||
|
-- remove_mark = "<space>md",
|
||||||
|
-- cr = "<space>s<cr>",
|
||||||
|
-- interrupt = "<space>s<space>",
|
||||||
|
-- exit = "<space>sq",
|
||||||
|
-- clear = "<space>cl",
|
||||||
|
-- },
|
||||||
|
-- -- If the highlight is on, you can change how it looks
|
||||||
|
-- -- For the available options, check nvim_set_hl
|
||||||
|
-- highlight = {
|
||||||
|
-- italic = true
|
||||||
|
-- },
|
||||||
|
-- ignore_blank_lines = true, -- ignore blank lines when sending visual select lines
|
||||||
|
-- })
|
||||||
|
|
||||||
|
vim.filetype.add({
|
||||||
|
extension = {
|
||||||
|
http = "http",
|
||||||
},
|
},
|
||||||
-- How the repl window will be displayed
|
})
|
||||||
-- See below for more information
|
|
||||||
repl_open_cmd = require('iron.view').right(60),
|
|
||||||
},
|
|
||||||
-- Iron doesn't set keymaps by default anymore.
|
|
||||||
-- You can set them here or manually add keymaps to the functions in iron.core
|
|
||||||
keymaps = {
|
|
||||||
send_motion = "<space>sc",
|
|
||||||
visual_send = "<space>sc",
|
|
||||||
send_file = "<space>sf",
|
|
||||||
send_line = "<space>sl",
|
|
||||||
send_until_cursor = "<space>su",
|
|
||||||
send_mark = "<space>sm",
|
|
||||||
mark_motion = "<space>mc",
|
|
||||||
mark_visual = "<space>mc",
|
|
||||||
remove_mark = "<space>md",
|
|
||||||
cr = "<space>s<cr>",
|
|
||||||
interrupt = "<space>s<space>",
|
|
||||||
exit = "<space>sq",
|
|
||||||
clear = "<space>cl",
|
|
||||||
},
|
|
||||||
-- If the highlight is on, you can change how it looks
|
|
||||||
-- For the available options, check nvim_set_hl
|
|
||||||
highlight = {
|
|
||||||
italic = true
|
|
||||||
},
|
|
||||||
ignore_blank_lines = true, -- ignore blank lines when sending visual select lines
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.filetype.add({
|
vim.filetype.add({
|
||||||
extension = {
|
filename = {
|
||||||
http = "http",
|
['nurfile'] = "nu",
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.filetype.add({
|
|
||||||
filename = {
|
|
||||||
['nurfile'] = "nu",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
'';
|
'';
|
||||||
# package = pkgs.neovim-unwrapped;
|
# package = pkgs.neovim-unwrapped;
|
||||||
|
|||||||
Reference in New Issue
Block a user