Compare commits

...

3 commits

Author SHA1 Message Date
irl
784a2b72ed feat: vim lsp setup 2025-07-07 21:55:13 +01:00
irl
671533f47c feat: use pipes to create homeConfigurations 2025-07-07 21:54:52 +01:00
irl
de5a9787f6 feat: add timeout i needed for some reason 2025-07-07 14:36:00 +01:00
5 changed files with 126 additions and 32 deletions

View file

@ -36,11 +36,6 @@
sops-nix,
}@inputs:
let
homeRoles = [
"desktop"
"minimal"
"server"
];
outputs = inputs.self;
overlays = [
apple-silicon.overlays.apple-silicon-overlay
@ -74,23 +69,35 @@
};
};
homeManagerModules = import ./modules/home-manager;
homeConfigurations = nixpkgs.lib.foldl' (c: e:
c // {
"irl-${e.role}-${e.system}" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
inherit overlays;
system = e.system;
};
extraSpecialArgs = {
inherit outputs;
};
modules = [
./home-manager/irl.nix
{ role = "${e.role}"; }
];
};
homeConfigurations =
{
role = [
"desktop"
"minimal"
"server"
];
system = supportedSystems;
}
) { } (nixpkgs.lib.cartesianProduct { role = homeRoles; system = supportedSystems; });
|> nixpkgs.lib.cartesianProduct
|> nixpkgs.lib.foldl' (
c: e:
c
// {
"irl-${e.role}-${e.system}" = home-manager.lib.homeManagerConfiguration {
pkgs = import nixpkgs {
inherit overlays;
system = e.system;
};
extraSpecialArgs = {
inherit outputs;
};
modules = [
./home-manager/irl.nix
{ role = "${e.role}"; }
];
};
}
) { };
}
// flake-utils.lib.eachSystem supportedSystems (system: {
formatter = nixpkgs.legacyPackages.${system}.nixfmt-tree;

View file

@ -11,26 +11,48 @@
options.role = lib.mkOption {
description = "Home role to set up";
default = "minimal";
type = with lib.types; enum ["desktop" "minimal" "server"];
type =
with lib.types;
enum [
"desktop"
"minimal"
"server"
];
};
config = {
feature.cli.enable = builtins.elem config.role ["desktop" "minimal" "server"];
feature.cli.enable = builtins.elem config.role [
"desktop"
"minimal"
"server"
];
feature.firefox.enable = config.role == "desktop";
feature.git.enable = builtins.elem config.role ["desktop" "server"];
feature.git.enable = builtins.elem config.role [
"desktop"
"server"
];
feature.ops.enable = config.role == "desktop";
feature.tmux.enable = builtins.elem config.role ["desktop" "server"];
feature.vim.enable = builtins.elem config.role ["desktop" "minimal" "server"];
feature.tmux.enable = builtins.elem config.role [
"desktop"
"server"
];
feature.vim.enable = builtins.elem config.role [
"desktop"
"minimal"
"server"
];
home.username = "irl";
home.homeDirectory =
if lib.strings.hasSuffix "darwin" pkgs.system then "/Users/irl" else "/home/irl";
home.file.".config/nix/nix.conf".text = ''
experimental-features = nix-command flakes pipe-operators
'';
home.packages = with pkgs; [
neofetch
];
home.shellAliases = {
hms =
"home-manager switch --flake ~/.config/nix-configs#irl-${config.role}-${pkgs.system}";
hms = "home-manager switch --flake ~/.config/nix-configs#irl-${config.role}-${pkgs.system}";
drs = "sudo darwin-rebuild switch --flake ~/.config/nix-configs";
};
home.stateVersion = "25.05";

View file

@ -1,3 +1,7 @@
"$schema" = 'https://starship.rs/config-schema.json'
command_timeout = 800
[shell]
disabled = false
format = '[$indicator]($style)'

View file

@ -4,11 +4,19 @@ vim.g.loaded_netrwPlugin = 1
vim.g.mapleader = " "
vim.opt.termguicolors = true
vim.opt.tabstop = 4
vim.opt.softtabstop = 4
vim.opt.shiftwidth = 4
vim.opt.expandtab = true
vim.cmd.colorscheme "catppuccin"
vim.opt.number = true
vim.opt.relativenumber = true
vim.opt.scrolloff = 8
-- Custom bindings
vim.cmd.colorscheme "catppuccin-mocha"
-- Custom bindings for buffer navigation
vim.keymap.set("n", "<leader>n", "<cmd>bn<CR>", { noremap = true, silent = true })
vim.keymap.set("n", "<leader>p", "<cmd>bp<CR>", { noremap = true, silent = true })
@ -21,9 +29,60 @@ require("lualine").setup{}
-- Telescope (anything search)
vim.keymap.set("n", "<leader>b", "<cmd>Telescope buffers<CR>", { noremap = true, silent = true })
vim.keymap.set("n", "<leader>f", "<cmd>Telescope find_files<CR>", { noremap = true, silent = true })
vim.keymap.set("n", "<leader>g", "<cmd>Telescope git_files<CR>", { noremap = true, silent = true })
-- Tree (file manager)
require("nvim-tree").setup()
vim.keymap.set("n", "<leader>t", "<cmd>NvimTreeToggle<CR>", { noremap = true, silent = true })
-- lspconfig (LSPs)
vim.lsp.enable("nil")
vim.lsp.enable("lua_ls")
vim.lsp.enable("nil_ls")
vim.lsp.enable("pyright")
vim.lsp.enable("rust-analyzer")
vim.lsp.enable("rust_analyzer")
vim.keymap.set("n", "<leader>o", vim.lsp.buf.format)
vim.api.nvim_create_autocmd('LspAttach', {
desc = 'LSP actions',
callback = function()
local bufmap = function(mode, lhs, rhs)
local opts = {buffer = true}
vim.keymap.set(mode, lhs, rhs, opts)
end
-- Displays hover information about the symbol under the cursor
bufmap('n', 'K', vim.lsp.buf.hover)
-- Jump to the definition
bufmap('n', 'gd', vim.lsp.buf.definition)
-- Jump to declaration
bufmap('n', 'gD', vim.lsp.buf.declaration)
-- Lists all the implementations for the symbol under the cursor
bufmap('n', 'gi', vim.lsp.buf.implementation)
-- Jumps to the definition of the type symbol
bufmap('n', 'go', vim.lsp.buf.type_definition)
-- Lists all the references
bufmap('n', 'gr', vim.lsp.buf.references)
-- Displays a function's signature information
bufmap('n', '<C-k>', vim.lsp.buf.signature_help)
-- Renames all references to the symbol under the cursor
bufmap('n', '<leader>R', vim.lsp.buf.rename)
-- Show diagnostics in a floating window
bufmap('n', 'gl', vim.diagnostic.open_float)
-- Move to the previous diagnostic
bufmap('n', '[d', vim.diagnostic.goto_prev)
-- Move to the next diagnostic
bufmap('n', ']d', vim.diagnostic.goto_next)
end
})

View file

@ -14,6 +14,7 @@ in
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
lua-language-server
nil
pyright
rust-analyzer
@ -29,6 +30,7 @@ in
bufferline-nvim
catppuccin-nvim
lualine-nvim
nvim-tree-lua
nvim-lspconfig
telescope-nvim
nvim-web-devicons