erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Formatting

Browse source
This commit is contained in:
Erwin Boskma 2022-08-18 16:37:26 +02:00
parent 58823d7d38
commit a4c2a4dcf5
Signed by: erwin
GPG key ID: 270B20D17394F7E5
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home-manager/modules/emacs/default.nix
View file

@ -39,7 +39,7 @@ in
type = types.package; type = types.package;
default = emacsWayland; default = emacsWayland;
}; };
daemon = mkOption { daemon = mkOption {
description = "Whether to enable emacs daemon"; description = "Whether to enable emacs daemon";
type = types.bool; type = types.bool;

2
home-manager/modules/sway/default.nix
View file

@ -26,7 +26,7 @@ in
assigns = { assigns = {
"1" = [{ app_id = "firefox"; }]; "1" = [{ app_id = "firefox"; }];
"2" = [{ app_id = "Alacritty"; } { app_id = "foot"; }]; "2" = [{ app_id = "Alacritty"; } { app_id = "foot"; }];
"3" = [{ class = "Code"; } {app_id = "emacs";}]; "3" = [{ class = "Code"; } { app_id = "emacs"; }];
}; };
bars = [ ]; bars = [ ];

4
machines/loki/configuration.nix
View file

@ -8,8 +8,8 @@ in
eboskma = { eboskma = {
users = { users = {
erwin = { erwin = {
enable = true; enable = true;
home-manager = true; home-manager = true;
}; };
builder.enable = true; builder.enable = true;
}; };

18
modules/nix-common/default.nix
View file

@ -13,7 +13,7 @@ in
}; };
imports = [ imports = [
(mkRemovedOptionModule ["eboskma" "nix-common" "disable-cache" ] (mkRemovedOptionModule [ "eboskma" "nix-common" "disable-cache" ]
"The option `disable-cache` is no longer used") "The option `disable-cache` is no longer used")
]; ];
@ -46,7 +46,7 @@ in
substituters = [ substituters = [
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://marcus7070.cachix.org" "https://marcus7070.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
@ -62,12 +62,12 @@ in
}; };
programs.ssh.extraConfig = mkIf cfg.remote-builders '' programs.ssh.extraConfig = mkIf cfg.remote-builders ''
Host loki Host loki
HostName 10.0.0.4 HostName 10.0.0.4
Port 22 Port 22
User builder User builder
IdentitiesOnly yes IdentitiesOnly yes
IdentityFile /root/.ssh/id_builder IdentityFile /root/.ssh/id_builder
''; '';
}; };
} }

4
users/builder/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, lib, ...}: { pkgs, config, lib, ... }:
with lib; with lib;
let let
cfg = config.eboskma.users.builder; cfg = config.eboskma.users.builder;
@ -18,7 +18,7 @@ in
openssh.authorizedKeys.keys = authorizedKeys; openssh.authorizedKeys.keys = authorizedKeys;
}; };
users.groups.builder = {}; users.groups.builder = { };
nix.settings.trusted-users = [ "builder" ]; nix.settings.trusted-users = [ "builder" ];
}; };