jfrikker/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip

Browse Source
This commit is contained in:
Joe Frikker
2023-12-19 17:24:00 -05:00
parent 0b3705a219
commit 2a9c0ccfe1
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
home-manager/home-fish.nix
View File

@@ -2,7 +2,6 @@ pkgs:
{ {
enable = true; enable = true;
shellAliases = { shellAliases = {
cd = "z";
du = "dust"; du = "dust";
http = "xh"; http = "xh";
https = "xh"; https = "xh";

2
home-manager/home-tmux.nix
View File

@@ -21,7 +21,7 @@ set -g @thumbs-unique enabled
''; '';
} }
]; ];
shell = pkgs.fish + "/bin/fish"; shell = pkgs.zsh + "/bin/zsh";
shortcut = "Space"; shortcut = "Space";
tmuxinator.enable = true; tmuxinator.enable = true;
extraConfig = '' extraConfig = ''

19
home-manager/home.nix
View File

@@ -49,7 +49,7 @@
pkgs.awscli pkgs.awscli
pkgs.bashInteractive pkgs.bashInteractive
pkgs.du-dust pkgs.du-dust
pkgs.emacs29 # pkgs.emacs29
pkgs.fd pkgs.fd
pkgs.fend pkgs.fend
pkgs.gh pkgs.gh
@@ -62,16 +62,16 @@
# pkgs.inconsolata-nerdfont # pkgs.inconsolata-nerdfont
pkgs.jdt-language-server pkgs.jdt-language-server
pkgs.just pkgs.just
pkgs.jsonnet # pkgs.jsonnet
pkgs.kubectl pkgs.kubectl
pkgs.maven # pkgs.maven
pkgs.mysql-client pkgs.mysql-client
# pkgs.neovide # pkgs.neovide
pkgs.neovim pkgs.neovim
pkgs.nodejs-16_x # pkgs.nodejs-16_x
pkgs.nodePackages.typescript-language-server pkgs.nodePackages.typescript-language-server
# pkgs.postgresql # pkgs.postgresql
(pkgs.python3.withPackages (p: [p.ipython p.pyyaml p.boto3])) # (pkgs.python3.withPackages (p: [p.ipython p.pyyaml p.boto3]))
pkgs.ripgrep pkgs.ripgrep
pkgs.rlwrap pkgs.rlwrap
# pkgs.rust-analyzer # pkgs.rust-analyzer
@@ -85,7 +85,7 @@
pkgs.tokei pkgs.tokei
pkgs.xh pkgs.xh
# pkgs.xonsh # pkgs.xonsh
pkgs.yarn # pkgs.yarn
# pkgs.zellij # pkgs.zellij
]; ];
@@ -112,14 +112,15 @@
# programs.gh.enable = true; # programs.gh.enable = true;
programs.git.enable = true; programs.git.enable = true;
programs.git.delta.enable = true; programs.git.delta.enable = true;
programs.java.enable = true; # programs.java.enable = true;
programs.java.package = pkgs.jdk17; # programs.java.package = pkgs.jdk17;
programs.jq.enable = true; programs.jq.enable = true;
programs.k9s.enable = true; programs.k9s.enable = true;
programs.lazygit.enable = true; programs.lazygit.enable = true;
programs.starship = import ./home-starship.nix pkgs; programs.starship = import ./home-starship.nix pkgs;
programs.tmux = import ./home-tmux.nix pkgs; programs.tmux = import ./home-tmux.nix pkgs;
programs.zoxide.enable = true; # programs.zoxide.enable = true;
programs.zsh = import ./home-zsh.nix;
# programs.neovim = import ./home-neovim.nix pkgs; # programs.neovim = import ./home-neovim.nix pkgs;
} }

2
nvim/lua/config/options.lua
View File

@@ -10,3 +10,5 @@ opt.tabstop = 4
opt.sidescrolloff = 0 opt.sidescrolloff = 0
opt.shiftwidth = 4 opt.shiftwidth = 4
opt.relativenumber = false opt.relativenumber = false
vim.g.autoformat = false

2
nvim/lua/plugins/lsp.lua
View File

@@ -6,7 +6,7 @@ return {
-- { "mfussenegger/nvim-jdtls" }, -- { "mfussenegger/nvim-jdtls" },
-- }, -- },
opts = { opts = {
autoformat = false, -- autoformat = false,
-- servers = { -- servers = {
-- jdtls = {}, -- jdtls = {},
-- }, -- },

10
nvim/lua/plugins/plugins.lua
View File

@@ -32,6 +32,14 @@ return {
enabled = false, enabled = false,
}, },
-- { -- {
-- "L3MON4D3/LuaSnip",
-- enabled = false,
-- },
{
"rafamadriz/friendly-snippets",
enabled = false,
},
-- {
-- "ggandor/leap-spooky.nvim", -- "ggandor/leap-spooky.nvim",
-- enabled = true, -- enabled = true,
-- opts = { -- opts = {
@@ -92,7 +100,7 @@ return {
local cmp = require("cmp") local cmp = require("cmp")
opts.sources = cmp.config.sources({ opts.sources = cmp.config.sources({
{ name = "nvim_lsp" }, { name = "nvim_lsp" },
{ name = "luasnip" }, -- { name = "luasnip" },
}) })
return opts return opts
end, end,