moritz/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: moritz:55ccb1d06c3c95d64e418b309038a1203b032c33
Branches Tags
moritz:nixos
..
compare: moritz:7d5ffb31f3757ab76dbcc9fe07a1601f9a37972b
Branches Tags
moritz:nixos

No commits in common. "55ccb1d06c3c95d64e418b309038a1203b032c33" and "7d5ffb31f3757ab76dbcc9fe07a1601f9a37972b" have entirely different histories.
55ccb1d06c ... 7d5ffb31f3

5 changed files with 22 additions and 56 deletions
Show stats Expand all files Collapse all files

17
flake.lock
View file

@ -82,22 +82,6 @@
"type": "github"
}
},
"copilot-lua": {
"flake": false,
"locked": {
"lastModified": 1677479736,
"narHash": "sha256-n/SCrzzzL5WUHJk0sCXbgGusk/dQuy8DI9Pqdh+lVeQ=",
"owner": "zbirenbaum",
"repo": "copilot.lua",
"rev": "b41d4c9c7d4f5e0272bcf94061b88e244904c56f",
"type": "github"
},
"original": {
"owner": "zbirenbaum",
"repo": "copilot.lua",
"type": "github"
}
},
"crane": {
"inputs": {
"flake-compat": [
@ -829,7 +813,6 @@
"arkenfox-userjs": "arkenfox-userjs",
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
"attic": "attic",
"copilot-lua": "copilot-lua",
"emacs": "emacs",
"flake-utils": "flake-utils_3",
"forgit-git": "forgit-git",

5
flake.nix
View file

@ -83,11 +83,6 @@
inputs.nixpkgs-stable.follows = "stable";
inputs.flake-utils.follows = "flake-utils";
};
copilot-lua = {
url = "github:zbirenbaum/copilot.lua";
flake = false;
};
};
outputs =

20
modules/programs/nvim/default.nix
View file

@ -8,6 +8,26 @@
with lib;
let
cfg = config.my.programs.vim;
mkDate = longDate: (lib.concatStringsSep "-" [
(builtins.substring 0 4 longDate)
(builtins.substring 4 2 longDate)
(builtins.substring 6 2 longDate)
]);
mkVersionInput = input: mkDate (input.lastModifiedDate or "19700101") + "_" + (input.shortRev or "dirty");
nvim-treesitter-textsubjects = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textsubjects";
version = mkVersionInput inputs.nvim-treesitter-textsubjects;
src = inputs.nvim-treesitter-textsubjects;
};
smartcolumn-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "smartcolumn-nvim";
version = mkVersionInput inputs.smartcolumn-nvim;
src = inputs.smartcolumn-nvim;
};
in
{
options.my.programs.vim = {

6
modules/programs/nvim/init.lua
View file

@ -323,7 +323,7 @@ local function lspconfig_setup(lsp, options)
lspconfig[lsp].setup(final_options)
end
local servers = { "nil_ls", "pylsp", "rust_analyzer", "ruff_lsp" }
local servers = { "nil_ls", "pylsp", "rust_analyzer" }
for _, lsp in ipairs(servers) do
lspconfig_setup(lsp, {})
end
@ -434,10 +434,6 @@ require("copilot").setup({
suggestion = { enabled = false },
panel = { enabled = false },
})
vim.api.nvim_create_autocmd("VimEnter", {
desc = "Disable Copilot by default on startup",
command = "Copilot disable",
})
require("copilot_cmp").setup()
local orgmode = require("orgmode")

30
overlays/default.nix
View file

@ -1,13 +1,4 @@
{ inputs }: final: prev:
let
mkDate = longDate: (prev.lib.concatStringsSep "-" [
(builtins.substring 0 4 longDate)
(builtins.substring 4 2 longDate)
(builtins.substring 6 2 longDate)
]);
mkVersionInput = input: "unstable" + mkDate (input.lastModifiedDate or "19700101") + "_" + (input.shortRev or "dirty");
in
{
{ inputs }: final: prev: {
agenix = inputs.agenix.packages.${prev.system}.default;
attic = inputs.attic.packages.${prev.system}.default;
hyprpaper = inputs.hyprpaper.packages.${prev.system}.default;
@ -32,25 +23,6 @@ in
mesonFlags = old.mesonFlags or [ ] ++ [ "-Dexperimental=true" ];
});
vimPlugins = prev.vimPlugins // {
nvim-treesitter-textsubjects = prev.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-treesitter-textsubjects";
version = mkVersionInput inputs.nvim-treesitter-textsubjects;
src = inputs.nvim-treesitter-textsubjects;
};
smartcolumn-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
pname = "smartcolumn-nvim";
version = mkVersionInput inputs.smartcolumn-nvim;
src = inputs.smartcolumn-nvim;
};
copilot-lua = prev.vimPlugins.copilot-lua.overrideAttrs (old: {
version = mkVersionInput inputs.copilot-lua;
src = inputs.copilot-lua;
});
};
master = import inputs.master {
inherit (prev) system;
config.allowUnfree = true;