Compare commits

..

5 Commits

Author SHA1 Message Date
707e3a3738 add swedish us layout 2023-10-18 23:26:21 +02:00
9438e80797 fix ssh 2023-10-18 23:25:59 +02:00
c71ab8ea85 openssh 2023-10-18 18:56:29 +02:00
30ab66549f lsp fixes 2023-10-18 18:55:59 +02:00
e54fe9162c direnv 2023-10-16 23:09:51 +02:00
3 changed files with 51 additions and 7 deletions

View File

@ -100,7 +100,6 @@ in
videos = "${homeDir}/vid"; videos = "${homeDir}/vid";
}; };
programs = { programs = {
bash = { bash = {
enable = true; enable = true;
@ -158,18 +157,22 @@ in
require('Comment').setup() require('Comment').setup()
local lspcfg = require('lspconfig') local lspcfg = require('lspconfig')
lspcfg.typst_lsp.setup({ lspcfg.typst_lsp.setup({
cmd = { '${pkgs.typst-lsp}/bin/typst-lsp' } cmd = { '${pkgs.typst-lsp}/bin/typst-lsp' },
}) })
lspcfg.hls.setup({ lspcfg.hls.setup({
cmd = { '${hls_wrapper}', 'lsp' } cmd = { '${hls_wrapper}', 'lsp' },
}) })
lspcfg.pyright.setup({ lspcfg.pyright.setup({
cmd = { '${pkgs.nodePackages.pyright}/bin/pyright-langserver', '--stdio' } cmd = { '${pkgs.nodePackages.pyright}/bin/pyright-langserver', '--stdio' },
}) })
vim.api.nvim_create_autocmd('LspAttach', { vim.api.nvim_create_autocmd('LspAttach', {
callback = function(args) callback = function(args)
vim.keymap.set('n', 'K', vim.lsp.buf.hover, { buffer = args.buf }) local opts = { buffer = args.buf }
vim.keymap.set('n', 'K', vim.lsp.buf.hover, opts)
vim.keymap.set('n', '<localleader>r', vim.lsp.buf.rename, opts)
vim.keymap.set('n', '<localleader>a', vim.lsp.buf.code_action, opts)
vim.keymap.set('i', '<C-n>', vim.lsp.omnifunc, opts)
end, end,
}) })
@ -300,6 +303,11 @@ in
}; };
}; };
direnv = {
enable = true;
nix-direnv.enable = true;
};
alacritty = { alacritty = {
enable = true; enable = true;
settings = { settings = {
@ -342,5 +350,19 @@ in
''; in "${tmux-menu}"; ''; in "${tmux-menu}";
}; };
}; };
ssh = {
enable = true;
matchBlocks = {
remarkable = {
hostname = "10.11.99.1";
user = "root";
};
lazarus = {
hostname = "rachel.cafe";
user = "deppy";
};
};
};
}; };
} }

View File

@ -63,6 +63,14 @@
networking.nameservers = [ "8.8.8.8" ]; networking.nameservers = [ "8.8.8.8" ];
networking.resolvconf.dnsExtensionMechanism = false; networking.resolvconf.dnsExtensionMechanism = false;
services.openssh = {
enable = true;
settings = {
PasswordAuthentication = true;
PermitRootLogin = "no";
};
};
# [NFS] # [NFS]
fileSystems."/home/rachel/music" = { fileSystems."/home/rachel/music" = {
device = "rachel.cafe:/srv/music"; device = "rachel.cafe:/srv/music";
@ -101,8 +109,13 @@
enable = true; enable = true;
desktopManager.plasma5.enable = true; desktopManager.plasma5.enable = true;
displayManager.startx.enable = true; displayManager.startx.enable = true;
layout = "us,se";
xkbOptions = "grp:alt_caps_toggle"; xkbOptions = "grp:alt_caps_toggle";
layout = "sus";
extraLayouts.sus = {
description = "Swedish US";
languages = [ "se" ];
symbolsFile = ../shared/sus.xkb;
};
libinput = { libinput = {
enable = true; enable = true;
touchpad = { touchpad = {
@ -145,7 +158,7 @@
# [SECURITY / FIREWALL] # [SECURITY / FIREWALL]
networking.firewall.enable = true; networking.firewall.enable = true;
networking.firewall.allowedTCPPorts = [ ]; networking.firewall.allowedTCPPorts = [ 22 ];
networking.firewall.allowedUDPPorts = [ ]; networking.firewall.allowedUDPPorts = [ ];
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;

9
shared/sus.xkb Normal file
View File

@ -0,0 +1,9 @@
xkb_symbols "sus" {
include "pc"
include "se(us)"
key <AD11> {[ bracketleft, braceleft, aring, Aring ]};
key <AC10> {[ semicolon, colon, odiaeresis, Odiaeresis ]};
key <AC11> {[ apostrophe, quatedbl, adiaeresis, Adiaeresis ]};
};