Compare commits

...

2 commits

Author SHA1 Message Date
caandt c9b8534970 nvim 2025-01-28 14:19:44 -06:00
caandt b1d8d4eec2 iyokan 2025-01-28 13:02:46 -06:00
9 changed files with 84 additions and 33 deletions

View file

@ -1,6 +1,10 @@
{lib, ...}: { {
pkgs,
lib,
...
}: {
imports = [ imports = [
../common ../../system
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
@ -11,13 +15,21 @@
deviceSection = ''Option "TearFree" "true"''; deviceSection = ''Option "TearFree" "true"'';
}; };
hardware.nvidia.open = false; hardware.nvidia.open = false;
nixpkgs.config.allowUnfreePredicate = pkg: nixpkgs.config.allowUnfree = true;
builtins.elem (lib.getName pkg) [
"nvidia-x11"
"nvidia-settings"
];
users.users.caandt = { users.users.caandt = {
isNormalUser = true; isNormalUser = true;
extraGroups = ["wheel"]; extraGroups = ["wheel"];
}; };
environment.systemPackages = [pkgs.nvtopPackages.nvidia];
services.openssh = {
enable = true;
ports = [22];
settings = {
PasswordAuthentication = true;
AllowUsers = null;
UseDns = true;
X11Forwarding = false;
PermitRootLogin = "no";
};
};
} }

View file

@ -1,7 +1,33 @@
{...}: { {
config,
pkgs,
...
}: {
imports = [ imports = [
../../../../user ../../../../user
]; ];
home.packages = with pkgs; [
sshfs
graphviz
(symlinkJoin {
name = "pyenv";
paths = [pyenv];
buildInputs = [makeWrapper];
postBuild = ''
wrapProgram $out/bin/pyenv \
--set PYENV_ROOT "${config.home.homeDirectory}/.local/pyenv" \
--set CPPFLAGS "-I${pkgs.zlib.dev}/include -I${pkgs.libffi.dev}/include -I${pkgs.readline.dev}/include -I${pkgs.bzip2.dev}/include -I${pkgs.openssl.dev}/include" \
--set CXXFLAGS "-I${pkgs.zlib.dev}/include -I${pkgs.libffi.dev}/include -I${pkgs.readline.dev}/include -I${pkgs.bzip2.dev}/include -I${pkgs.openssl.dev}/include" \
--set CFLAGS "-I${pkgs.openssl.dev}/include" \
--set LDFLAGS "-L${pkgs.zlib.out}/lib -L${pkgs.libffi.out}/lib -L${pkgs.readline.out}/lib -L${pkgs.bzip2.out}/lib -L${pkgs.openssl.out}/lib" \
--set CONFIGURE_OPTS "-with-openssl=${pkgs.openssl.dev}" \
--set PYENV_VIRTUALENV_DISABLE_PROMPT "1"
'';
})
];
xresources.properties."Xft.dpi" = 110;
home.username = "caandt"; home.username = "caandt";
} }

View file

@ -21,6 +21,8 @@
catppuccin-nvim catppuccin-nvim
tokyonight-nvim tokyonight-nvim
gitsigns-nvim gitsigns-nvim
neo-tree-nvim
undotree
]; ];
extraPackages = with pkgs; [ extraPackages = with pkgs; [
python3Packages.jedi-language-server python3Packages.jedi-language-server

View file

@ -1,4 +1,3 @@
require('u.bindings')
require('u.options') require('u.options')
require('u.lsp') require('u.bindings')
require('u.cmp') require('u.plugins')

View file

@ -1,4 +1,3 @@
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>') vim.keymap.set('n', '<esc>', '<cmd>nohlsearch<cr>')
vim.keymap.set('n', '<leader>t', '<cmd>Neotree toggle<cr>')
require('mini.move').setup() vim.keymap.set('n', '<leader>u', '<cmd>UndotreeToggle<cr>')
require('mini.ai').setup()

View file

@ -50,23 +50,7 @@ vim.api.nvim_create_autocmd('TextYankPost', {
vim.highlight.on_yank() vim.highlight.on_yank()
end, end,
}) })
local statusline = require('mini.statusline')
statusline.setup()
statusline.section_location = function()
return '%2l:%-2v'
end
vim.cmd.colorscheme 'tokyonight-storm' vim.cmd.colorscheme 'tokyonight-storm'
require('gitsigns').setup({ vim.g.loaded_netrwPlugin = 1
signs = { vim.g.loaded_netrw = 1
add = { text = '+' },
change = { text = '*' },
},
})
require('nvim-treesitter.configs').setup({
highlight = {
enable = true
}
})

View file

@ -0,0 +1,29 @@
require('u.plugins.lsp')
require('u.plugins.cmp')
local statusline = require('mini.statusline')
statusline.setup()
statusline.section_location = function()
return '%2l:%-2v'
end
require('gitsigns').setup({
signs = {
add = { text = '+' },
change = { text = '*' },
},
})
require('nvim-treesitter.configs').setup({
highlight = {
enable = true
}
})
require('neo-tree').setup({
close_if_last_window = true,
})
require('mini.move').setup()
require('mini.ai').setup()
require('mini.jump2d').setup()
require('mini.comment').setup()