Skip to content

Commit

Permalink
Add remote builder and more
Browse files Browse the repository at this point in the history
  • Loading branch information
joinemm committed May 13, 2024
1 parent fcf6440 commit beea3bd
Show file tree
Hide file tree
Showing 9 changed files with 72 additions and 4 deletions.
2 changes: 2 additions & 0 deletions home-modules/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,11 @@
nsxiv
via
freecad
krita

# cli apps
glow # render markdown on the cli
nix-output-monitor

# utils
rsync
Expand Down
33 changes: 30 additions & 3 deletions home-modules/neovim.nix
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
];

opts = {
autoindent = true;
number = true;
relativenumber = true;
scrolloff = 8;
shiftwidth = 2;
tabstop = 2;
softtabstop = 2;
scrolloff = 8;
expandtab = true;
autoindent = true;
smartindent = true;
wrap = false;
hlsearch = false;
Expand All @@ -41,9 +41,9 @@
files = {
"ftplugin/sh.lua" = {
opts = {
expandtab = true;
shiftwidth = 4;
tabstop = 4;
softtabstop = 4;
};
};
"ftplugin/markdown.lua" = {
Expand All @@ -53,6 +53,11 @@
linebreak = true;
};
};
"ftplugin/make.lua" = {
opts = {
tabstop = 4;
};
};
};

colorschemes.dracula.enable = true;
Expand Down Expand Up @@ -351,6 +356,28 @@
cmp_autopairs.on_confirm_done()
)
local _border = "rounded"
vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
vim.lsp.handlers.hover, {
border = _border
}
)
vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
vim.lsp.handlers.signature_help, {
border = _border
}
)
vim.diagnostic.config{
float={border=_border}
}
require('lspconfig.ui.windows').default_options = {
border = _border
}
require("smartcolumn").setup()
require'lspconfig'.glslls.setup{
Expand Down
4 changes: 4 additions & 0 deletions home-modules/ssh-work.nix
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@
host = "testagent";
hostname = "172.18.16.60";
}
{
host = "hetzarm";
hostname = "65.21.20.242";
}
{
host = "awsarm";
hostname = "13.51.226.233";
Expand Down
3 changes: 2 additions & 1 deletion home-modules/xmonad/xmonad.hs
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) =
(modm .|. shiftMask, xK_q) ~> spawn "xmonad --restart",
-- Take a screenshot
(modm .|. shiftMask, xK_s) ~> spawn "flameshot gui",
(0, xK_Print) ~> spawn "flameshot gui",
(0, xK_Print) ~> spawn "flameshot screen -c",
(0 .|. shiftMask, xK_Print) ~> spawn "flameshot screen",
-- Window Copying Bindings
-- Pin to all workspaces
(modm, xK_s) ~> windows copyToAll,
Expand Down
1 change: 1 addition & 0 deletions hosts/x1/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
locale
networking
nix
remotebuild
sound
syncthing
users
Expand Down
1 change: 1 addition & 0 deletions hosts/zeus/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
locale
networking
nix
remotebuild
sound
syncthing
transmission
Expand Down
3 changes: 3 additions & 0 deletions modules/bootloader.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@
};
efi.canTouchEfiVariables = true;
};
kernelParams = [
"split_lock_detect=off"
];
};
}
1 change: 1 addition & 0 deletions modules/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
networking = import ./networking.nix;
nginx = import ./nginx.nix;
nix = import ./nix.nix;
remotebuild = import ./remotebuild.nix;
sound = import ./sound.nix;
ssh-access = import ./ssh-access.nix;
syncthing = import ./syncthing.nix;
Expand Down
28 changes: 28 additions & 0 deletions modules/remotebuild.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
nix = {
distributedBuilds = true;

buildMachines = [
{
hostName = "hetzarm";
system = "aarch64-linux";
maxJobs = 80;
speedFactor = 1;
supportedFeatures = ["nixos-test" "benchmark" "big-parallel" "kvm"];
mandatoryFeatures = [];
sshUser = "jrautiola";
sshKey = "/home/joonas/.ssh/id_ed25519";
}
];
};

programs.ssh = {
extraConfig = ''
Host hetzarm
HostName 65.21.20.242
'';
knownHosts = {
"65.21.20.242".publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILx4zU4gIkTY/1oKEOkf9gTJChdx/jR3lDgZ7p/c7LEK";
};
};
}

0 comments on commit beea3bd

Please sign in to comment.