Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 1 addition & 22 deletions .config/nix/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 5 additions & 9 deletions .config/nix/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@
url = "github:nix-community/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs";
};
# a tree-wide formatter
treefmt-nix = {
type = "github";
owner = "numtide";
repo = "treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
};

outputs =
Expand All @@ -59,11 +52,14 @@
};
# Custom packages and modifications, exported as overlays
overlays = import ./parts/overlays { inherit inputs; };
# Custom packages; acessible via 'nix build', 'nix shell', etc
# Custom packages; accessible via 'nix build', 'nix shell', etc
packages = helper.forAllSystems (system: import ./parts/pkgs nixpkgs.legacyPackages.${system});
# Formatter for .nix files, available via 'nix fmt'
formatter = helper.forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);

imports = [ ./parts/templates ];
imports = [
./parts/templates
./parts/programs
];
};
}
7 changes: 1 addition & 6 deletions .config/nix/home-manager/_mixins/features/gnu/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
config,
flakePath,
pkgs,
...
}:
{ pkgs, ... }:

{
home.packages = with pkgs; [
Expand Down
7 changes: 1 addition & 6 deletions .config/nix/home-manager/_mixins/features/gpg/default.nix
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
config,
flakePath,
pkgs,
...
}:
{ pkgs, ... }:

{
home.packages = with pkgs; [ gnupg ];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
-- Add any additional autocmds here
-- Show linters for the current buffer's file type
vim.api.nvim_create_user_command("LintInfo", function()
local filetype = vim.bo.filetype
local linters = require("lint").linters_by_ft[filetype]
local filetype = vim.bo.filetype
local linters = require("lint").linters_by_ft[filetype]

if linters then
print("Linters for " .. filetype .. ": " .. table.concat(linters, ", "))
else
print("No linters configured for filetype: " .. filetype)
end
if linters then
print("Linters for " .. filetype .. ": " .. table.concat(linters, ", "))
else
print("No linters configured for filetype: " .. filetype)
end
end, {})
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua
-- Add any additional keymaps here
vim.keymap.set("n", "gd", function()
if require("obsidian").util.cursor_on_markdown_link() then
return "<cmd>ObsidianFollowLink<CR>"
else
return "gd"
end
if require("obsidian").util.cursor_on_markdown_link() then
return "<cmd>ObsidianFollowLink<CR>"
else
return "gd"
end
end, { noremap = false, expr = true })
Original file line number Diff line number Diff line change
Expand Up @@ -3,46 +3,47 @@ local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
if not (vim.uv or vim.loop).fs_stat(lazypath) then
-- bootstrap lazy.nvim
-- stylua: ignore
vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable", lazypath })
vim.fn.system({ "git", "clone", "--filter=blob:none", "https://github.com/folke/lazy.nvim.git", "--branch=stable",
lazypath })
end
vim.opt.rtp:prepend(lazypath)

require("lazy").setup({
spec = {
-- add LazyVim and import its plugins
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
-- import any extras modules here
-- { import = "lazyvim.plugins.extras.lang.typescript" },
-- { import = "lazyvim.plugins.extras.lang.json" },
-- { import = "lazyvim.plugins.extras.ui.mini-animate" },
-- import/override with your plugins
{ import = "plugins" },
{ import = "plugins.lang" },
},
defaults = {
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
-- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
lazy = false,
-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
-- have outdated releases, which may break your Neovim install.
version = false, -- always use the latest git commit
-- version = "*", -- try installing the latest stable version for plugins that support semver
},
install = { colorscheme = { "solarized" } },
checker = { enabled = true }, -- automatically check for plugin updates
performance = {
rtp = {
-- disable some rtp plugins
disabled_plugins = {
"gzip",
-- "matchit",
-- "matchparen",
-- "netrwPlugin",
"tarPlugin",
"tohtml",
"tutor",
"zipPlugin",
},
},
},
spec = {
-- add LazyVim and import its plugins
{ "LazyVim/LazyVim", import = "lazyvim.plugins" },
-- import any extras modules here
-- { import = "lazyvim.plugins.extras.lang.typescript" },
-- { import = "lazyvim.plugins.extras.lang.json" },
-- { import = "lazyvim.plugins.extras.ui.mini-animate" },
-- import/override with your plugins
{ import = "plugins" },
{ import = "plugins.lang" },
},
defaults = {
-- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
-- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default.
lazy = false,
-- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
-- have outdated releases, which may break your Neovim install.
version = false, -- always use the latest git commit
-- version = "*", -- try installing the latest stable version for plugins that support semver
},
install = { colorscheme = { "solarized" } },
checker = { enabled = true }, -- automatically check for plugin updates
performance = {
rtp = {
-- disable some rtp plugins
disabled_plugins = {
"gzip",
-- "matchit",
-- "matchparen",
-- "netrwPlugin",
"tarPlugin",
"tohtml",
"tutor",
"zipPlugin",
},
},
},
})
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
return {
{
"stevearc/aerial.nvim",
},
{
"stevearc/aerial.nvim",
},
}
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
return {
-- add solarized
{ "shaunsingh/solarized.nvim" },
{
"LazyVim/LazyVim",
opts = {
background = "light",
colorscheme = "solarized",
},
},
{
"nvim-lualine/lualine.nvim",
event = "VeryLazy",
opts = function()
return {
theme = "solarized_light",
}
end,
},
-- add solarized
{ "shaunsingh/solarized.nvim" },
{
"LazyVim/LazyVim",
opts = {
background = "light",
colorscheme = "solarized",
},
},
{
"nvim-lualine/lualine.nvim",
event = "VeryLazy",
opts = function()
return {
theme = "solarized_light",
}
end,
},
}
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
return {
{
"mfussenegger/nvim-lint",
opts = {
linters_by_ft = {
nix = { "statix", "deadnix" },
},
},
},
{
"stevearc/conform.nvim",
-- opts will be merged with the parent spec
opts = {
formatters_by_ft = {
nix = { "nix_fmt", "nixfmt", stop_after_first = true },
},
formatters = {
nix_fmt = {
command = "nix fmt",
},
},
},
},
{
"mfussenegger/nvim-lint",
opts = {
linters_by_ft = {
nix = { "statix", "deadnix" },
},
},
},
{
"stevearc/conform.nvim",
-- opts will be merged with the parent spec
opts = {
formatters_by_ft = {
nix = { "nix_fmt", "nixfmt", stop_after_first = true },
},
formatters = {
nix_fmt = {
command = "nix fmt",
},
},
},
},
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
return {
-- use mini.starter instead of alpha
{
"echasnovski/mini.starter",
config = function(_, opts)
local logo = table.concat({
"Hello, DoomHammer!",
" ____ _ _ __ ___",
"| _ \\ ___| | | | __ \\ \\ / (_)_ __ ___",
"| | | |/ _ \\ |_| |/ _` \\ \\ / /| | '_ ` _ \\",
"| |_| | __/ _ | (_| |\\ v / | | | | | | |",
"|____/ \\___|_| |_|\\__,_| \\_/ |_|_| |_| |_|",
}, "\n")
opts.header = logo
require("mini.starter").setup(opts)
end,
},
-- use mini.starter instead of alpha
{
"echasnovski/mini.starter",
config = function(_, opts)
local logo = table.concat({
"Hello, DoomHammer!",
" ____ _ _ __ ___",
"| _ \\ ___| | | | __ \\ \\ / (_)_ __ ___",
"| | | |/ _ \\ |_| |/ _` \\ \\ / /| | '_ ` _ \\",
"| |_| | __/ _ | (_| |\\ v / | | | | | | |",
"|____/ \\___|_| |_|\\__,_| \\_/ |_|_| |_| |_|",
}, "\n")
opts.header = logo
require("mini.starter").setup(opts)
end,
},
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
return {
{
"hrsh7th/nvim-cmp",
dependencies = { "hrsh7th/cmp-emoji" },
---@param opts cmp.ConfigSchema
opts = function(_, opts)
table.insert(opts.sources, { name = "emoji" })
end,
},
{
"hrsh7th/nvim-cmp",
dependencies = { "hrsh7th/cmp-emoji" },
---@param opts cmp.ConfigSchema
opts = function(_, opts)
table.insert(opts.sources, { name = "emoji" })
end,
},
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
return {
-- add pyright to lspconfig
{
"neovim/nvim-lspconfig",
---@class PluginLspOpts
opts = {
---@type lspconfig.options
servers = {
-- pyright will be automatically installed with mason and loaded with lspconfig
pyright = {},
},
},
},
-- add pyright to lspconfig
{
"neovim/nvim-lspconfig",
---@class PluginLspOpts
opts = {
---@type lspconfig.options
servers = {
-- pyright will be automatically installed with mason and loaded with lspconfig
pyright = {},
},
},
},
}
Loading