Additions for work machine

This commit is contained in:
Martin Pander
2024-04-10 11:19:24 +02:00
parent e9a52a6f2a
commit d2763cfa8b
8 changed files with 42 additions and 14 deletions

1
.gitignore vendored
View File

@ -0,0 +1 @@
plugins/

View File

@ -49,7 +49,8 @@
#}; #};
# home.shellAliases = { # home.shellAliases = {
# "ll" = "ls -la"; # "t" = "tmuxp";
# "tl" = "tmuxp load";
# }; # };
news.display = "silent"; news.display = "silent";

View File

@ -11,7 +11,8 @@
outputs = { nixpkgs, home-manager, ... }: outputs = { nixpkgs, home-manager, ... }:
let let
system = "x86_64-darwin"; #system = "x86_64-darwin";
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
in { in {
homeConfigurations = { homeConfigurations = {
@ -24,7 +25,7 @@
./user/task.nix ./user/task.nix
]; ];
}; };
"work" = home-manager.lib.homeManagerConfiguration { "pan" = home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
modules = [ modules = [

View File

@ -24,5 +24,10 @@
push.default = "matching"; push.default = "matching";
init.defaultBranch = "main"; init.defaultBranch = "main";
}; };
ignores = [
".direnv/"
".envrc"
];
}; };
} }

View File

@ -1,8 +1,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
home.username = "moustachioed"; home.username = "pan";
home.homeDirectory = "/Users/moustachioed"; home.homeDirectory = "/home/pan";
home.stateVersion = "23.11"; # Please read the comment before changing. home.stateVersion = "23.11"; # Please read the comment before changing.
@ -10,4 +10,14 @@
userName = "Martin Pander"; userName = "Martin Pander";
userEmail = "martin.pander@knowtion.de"; userEmail = "martin.pander@knowtion.de";
}; };
home.packages = with pkgs; [
yaml-language-server
marksman
];
programs.zsh.profileExtra = ''
source $HOME/.profile
'';
} }

View File

@ -9,7 +9,6 @@
escapeTime = 0; escapeTime = 0;
terminal = "screen-256color"; terminal = "screen-256color";
tmuxp.enable = true; tmuxp.enable = true;
# newSession = true;
extraConfig = '' extraConfig = ''
set -g display-time 1500 set -g display-time 1500
@ -58,4 +57,9 @@
set -g pane-border-style "bg=#eeeeee,fg=#999999" set -g pane-border-style "bg=#eeeeee,fg=#999999"
''; '';
}; };
home.shellAliases = {
"o" = "tmuxp";
"ol" = "tmuxp load";
};
} }

View File

@ -39,8 +39,6 @@ vim.opt.scrolloff = 8
vim.opt.background = 'light' vim.opt.background = 'light'
vim.opt.wrap = true vim.opt.wrap = true
vim.opt.showbreak = '..' vim.opt.showbreak = '..'
-- vim.opt.clipboard = vim.opt.clipboard + 'unnamedplus'
-- vim.opt.clipboard = 'unnamedplus'
vim.opt.errorbells = false vim.opt.errorbells = false
vim.opt.visualbell = false vim.opt.visualbell = false
vim.opt.title = true vim.opt.title = true
@ -49,10 +47,19 @@ vim.opt.syntax = 'on'
vim.opt.encoding = 'utf-8' vim.opt.encoding = 'utf-8'
vim.opt.completeopt = 'menu,menuone,noselect' vim.opt.completeopt = 'menu,menuone,noselect'
---------------------------- ----------------------------
-------- COMMANDS -------- -------- CLIPBOARD ---------
---------------------------- ----------------------------
-- if vim.fn.has("wsl") == 1 then
vim.opt.clipboard = vim.opt.clipboard + 'unnamedplus'
end
----------------------------
-------- COMMANDS ----------
----------------------------
vim.cmd('filetype plugin indent on') vim.cmd('filetype plugin indent on')
-- vim.cmd('colorscheme lucius') -- vim.cmd('colorscheme lucius')
@ -60,7 +67,7 @@ vim.cmd('filetype plugin indent on')
---------------------------- ----------------------------
-------- AUTOGROUPs -------- -------- AUTOGROUPS --------
---------------------------- ----------------------------
vim.api.nvim_create_augroup('VimIntern', { clear = true }) vim.api.nvim_create_augroup('VimIntern', { clear = true })

View File

@ -41,7 +41,6 @@ cmp.setup({
{ name = 'buffer', keyword_length = 2 }, { name = 'buffer', keyword_length = 2 },
}), }),
formatting = {
formatting = { formatting = {
format = lspkind.cmp_format({ format = lspkind.cmp_format({
-- mode = "symbol_text", -- mode = "symbol_text",