diff --git a/.gitignore b/.gitignore index e69de29..16873f6 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +plugins/ diff --git a/nix/common.nix b/nix/common.nix index c5a0206..8822d8b 100644 --- a/nix/common.nix +++ b/nix/common.nix @@ -48,9 +48,10 @@ # EDITOR = "nvim"; #}; - #home.shellAliases = { - # "ll" = "ls -la"; - #}; + # home.shellAliases = { + # "t" = "tmuxp"; + # "tl" = "tmuxp load"; + # }; news.display = "silent"; diff --git a/nix/flake.nix b/nix/flake.nix index 4c8d414..ff9a481 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -11,7 +11,8 @@ outputs = { nixpkgs, home-manager, ... }: let - system = "x86_64-darwin"; + #system = "x86_64-darwin"; + system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; in { homeConfigurations = { @@ -24,7 +25,7 @@ ./user/task.nix ]; }; - "work" = home-manager.lib.homeManagerConfiguration { + "pan" = home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ diff --git a/nix/user/git.nix b/nix/user/git.nix index 4fab21b..b40f724 100644 --- a/nix/user/git.nix +++ b/nix/user/git.nix @@ -24,5 +24,10 @@ push.default = "matching"; init.defaultBranch = "main"; }; + + ignores = [ + ".direnv/" + ".envrc" + ]; }; } diff --git a/nix/user/profiles/work.nix b/nix/user/profiles/work.nix index d340c3c..91f070d 100644 --- a/nix/user/profiles/work.nix +++ b/nix/user/profiles/work.nix @@ -1,8 +1,8 @@ { config, pkgs, ... }: { - home.username = "moustachioed"; - home.homeDirectory = "/Users/moustachioed"; + home.username = "pan"; + home.homeDirectory = "/home/pan"; home.stateVersion = "23.11"; # Please read the comment before changing. @@ -10,4 +10,14 @@ userName = "Martin Pander"; userEmail = "martin.pander@knowtion.de"; }; + + home.packages = with pkgs; [ + yaml-language-server + marksman + ]; + + programs.zsh.profileExtra = '' + source $HOME/.profile + ''; + } diff --git a/nix/user/tmux.nix b/nix/user/tmux.nix index b61c458..3799805 100644 --- a/nix/user/tmux.nix +++ b/nix/user/tmux.nix @@ -9,7 +9,6 @@ escapeTime = 0; terminal = "screen-256color"; tmuxp.enable = true; - # newSession = true; extraConfig = '' set -g display-time 1500 @@ -58,4 +57,9 @@ set -g pane-border-style "bg=#eeeeee,fg=#999999" ''; }; + + home.shellAliases = { + "o" = "tmuxp"; + "ol" = "tmuxp load"; + }; } diff --git a/nvim/base.lua b/nvim/base.lua index 676de54..fe83b24 100644 --- a/nvim/base.lua +++ b/nvim/base.lua @@ -39,8 +39,6 @@ vim.opt.scrolloff = 8 vim.opt.background = 'light' vim.opt.wrap = true vim.opt.showbreak = '..' --- vim.opt.clipboard = vim.opt.clipboard + 'unnamedplus' --- vim.opt.clipboard = 'unnamedplus' vim.opt.errorbells = false vim.opt.visualbell = false vim.opt.title = true @@ -49,10 +47,19 @@ vim.opt.syntax = 'on' vim.opt.encoding = 'utf-8' 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('colorscheme lucius') @@ -60,7 +67,7 @@ vim.cmd('filetype plugin indent on') ---------------------------- --------- AUTOGROUPs -------- +-------- AUTOGROUPS -------- ---------------------------- vim.api.nvim_create_augroup('VimIntern', { clear = true }) diff --git a/nvim/plugins.lua b/nvim/plugins.lua index a9d433a..74cf673 100644 --- a/nvim/plugins.lua +++ b/nvim/plugins.lua @@ -41,7 +41,6 @@ cmp.setup({ { name = 'buffer', keyword_length = 2 }, }), - formatting = { formatting = { format = lspkind.cmp_format({ -- mode = "symbol_text",