mirror of
https://git.oat.zone/dark-firepit/dotfiles
synced 2024-11-22 17:01:57 +01:00
fish works now, also the fucking build result wont show
This commit is contained in:
parent
7a6a22200c
commit
35452b7be0
@ -1,7 +1,7 @@
|
||||
{
|
||||
"aether@subsurface" = {
|
||||
ssh = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC4lh7dN9Ohh2/WoGiZ4WlpVb01YPNto/9ungOAk6TH+65wkxMjY4a+1OsO8Znguj46tXVErn8xv2ZVX0K7ql0hzypPkP2Dvvim99tz6FKSf9Nwj6RRtIKPoYkJjtGYAqLJl8JPy50HkFXkDVQ/z4d4iwpneSODIJdkUFSzZR91jz9FX+4t2h+2xtuuRDI43+gHRqvwPP8XaE0srtMzZoQDUBKhwOynoo2vZnyd3O7kkpD9T+jzYEeLKppHdaoYN5UxZ4L0xnig0WFZiBH36/YGXA8gT56FHRw5GKhwWwfSvliEw63/6IxiVZBuM1Mj7syg2Ndhhmmay05QqvyTrdHA9veyzJG5l0HlnCmXe7ss9lVQnxxPfbHbnDZUhH1ax01sQUeTK3Bs3AvbsTLyXBbd4NCY5ovz85MqzM/Q84B1zX1i8KbFEBh0xkumNsPAXzY8ar+tq5rFa23bY9qF4s6CMv++JEXSJJufcf3BS2dBlw0lTGBn7UEO9FHHsU3xKCc= aether@subsurface";
|
||||
wg = "XEVSwNNPR7RTt/O0ihYmv3nopbPmqkCMGrVRCixnPWw="
|
||||
wg = "XEVSwNNPR7RTt/O0ihYmv3nopbPmqkCMGrVRCixnPWw=";
|
||||
};
|
||||
"oatmealine@beppy" = {
|
||||
ssh = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDbJDo79TD9RV77MnArQwS94wzBo+6l6dYQnaNdPk2xo019+tc7GyuQ+GHyh4qewIUQOwe3Ddj4YxJN9IS3E360/6RdaNDxn3hUp2jh/x9SOjh0W86FJfdHEQViNeFVSXJv+QBZT9ibR9IbOHYezhD6gtz15pNhEqhQyqw2hJuQzxLvnictTc4lPQnWN9I8ga+OVSh7Uauu5OKbUOyRRj1Er/hasNviCaGBJnLDYjSqTDRvEbdYlfuhrYITJ+viZOQq7Nczs6dbsl627FCvhr5vQi+/vvpx9DKHDvpGvbEglOmOwgffSkaOIIx/pNHTsRccX7c3/im6z4pCDj4bEuiqqawv2C6DV0aM01bW8cchOJrmSQGTygTrJuuVPHp4IRIZNvQGS+97j4u+d7ofricLR1RoxJcQibvRA9rhhYI2FhwrAweuuLktjSj5RkQnypd9kjOuH+nhgLZunreNoyPNDCmcOBA7BA0rD2pCIKB9SzlelMjVuvy0PA8uWfNFfxGU+m3BH7lQS/A6V+NeYrMGiZ+u+t9Pgr6kAoR7mAUO+obIdMM/lOp1/zGBY8lk2Aq3GQcyGVNi18VR0uA+NMaJYXA1JzSiPCz7cQn1pKIAKiDEnzicf5MxDHIi5F1iQ/Lc+NftgmDXZEAHDY1bQepScOttaOZQZLpYP/eWwlEQJQ== oatmealine@beppy";
|
||||
|
@ -46,6 +46,7 @@ in {
|
||||
modules = {
|
||||
# theme.active = "still";
|
||||
shell.zsh.enable = true;
|
||||
shell.fish.enable = true;
|
||||
security = {
|
||||
isLocalMachine = false;
|
||||
};
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
with lib;
|
||||
let
|
||||
peerKeys = import ../authorizedKeys.nix;
|
||||
peerKeys = import ./authorizedKeys.nix;
|
||||
in {
|
||||
ips = [ "10.100.0.1/24" ];
|
||||
|
||||
@ -11,7 +11,7 @@ in {
|
||||
listenPort = 51820;
|
||||
|
||||
peers = genList (n: {
|
||||
publicKey = elemAt (attrValues peerKeys) n;
|
||||
allowedIPs = [ "10.100.0.${n+2}/32" ];
|
||||
publicKey = (elemAt (attrValues peerKeys) n).wg;
|
||||
allowedIPs = [ "10.100.0.${toString (n+2)}/32" ];
|
||||
}) (length (attrValues peerKeys));
|
||||
}
|
||||
|
@ -46,7 +46,7 @@ in {
|
||||
}] ++
|
||||
|
||||
(mapAttrsToList (iname: iattrs: {
|
||||
firewall.allowedUDPPorts = iattrs.listenPort;
|
||||
firewall.allowedUDPPorts = [ iattrs.listenPort ];
|
||||
|
||||
wireguard.interfaces.${iname} = mkMerge [ iattrs {
|
||||
postSetup = ''
|
||||
|
@ -3,31 +3,17 @@
|
||||
with lib;
|
||||
let
|
||||
cfg = config.modules.shell.fish;
|
||||
cfgDir = config.configDir;
|
||||
in {
|
||||
/*
|
||||
options.modules.shell.fish = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
default = false;
|
||||
};
|
||||
executable = mkOption {
|
||||
type = types.str;
|
||||
default = "${pkgs.fish}/bin/fish";
|
||||
};
|
||||
};
|
||||
|
||||
config = cfg.enable {
|
||||
config = mkIf cfg.enable {
|
||||
home._.programs.fish = {
|
||||
enable = true;
|
||||
};
|
||||
|
||||
home.configFile = {
|
||||
"fish" = {
|
||||
source = "${cfgDir}/fish";
|
||||
target = "$HOME/.config/fish";
|
||||
};
|
||||
};
|
||||
};
|
||||
*/
|
||||
}
|
||||
|
@ -1,7 +1,9 @@
|
||||
{ options, config, lib, pkgs, ... }:
|
||||
|
||||
with lib;
|
||||
{
|
||||
let
|
||||
|
||||
in {
|
||||
options = {
|
||||
defaultUsers = mkOption {
|
||||
type = types.attrs;
|
||||
@ -35,8 +37,8 @@ with lib;
|
||||
home-manager.useUserPackages = true;
|
||||
|
||||
user = {
|
||||
packages = with pkgs; [ curl ];
|
||||
extraGroups = [ "wheel" ];
|
||||
packages = with pkgs; [ wget ];
|
||||
extraGroups = [ ];
|
||||
};
|
||||
|
||||
home._ = {
|
||||
@ -56,16 +58,22 @@ with lib;
|
||||
};
|
||||
};
|
||||
|
||||
users.users = mapAttrs (user: prop: mkMerge [(mkAliasDefinitions options.user) {
|
||||
packages = prop.packages;
|
||||
extraGroups = prop.extraGroups;
|
||||
shell = trace "penis" pkgs."${config.defaultUsers."${user}".shell}";
|
||||
home = "/home/${user}";
|
||||
isNormalUser = true;
|
||||
group = user;
|
||||
}]) config.defaultUsers;
|
||||
users.users = mapAttrs (user: prop: mkMerge [
|
||||
(mkAliasDefinitions options.user)
|
||||
|
||||
home-manager.users = mapAttrs (user: prop: mkAliasDefinitions options.home._
|
||||
) config.defaultUsers;
|
||||
{
|
||||
packages = prop.packages;
|
||||
extraGroups = prop.extraGroups;
|
||||
shell = pkgs."${config.defaultUsers."${user}".shell}";
|
||||
home = "/home/${user}";
|
||||
isNormalUser = true;
|
||||
group = user;
|
||||
}
|
||||
]) config.defaultUsers;
|
||||
|
||||
home-manager.users = mapAttrs (user: prop: mkMerge [
|
||||
(mkAliasDefinitions options.home._)
|
||||
# (import "${prop.homeDir}/.home/")
|
||||
]) config.defaultUsers;
|
||||
};
|
||||
}
|
||||
|
2
result
2
result
@ -1 +1 @@
|
||||
/nix/store/53jxaagbfh45fzhwbdj0wyv9wvc8g94q-nixos-system-dark-firepit-21.11.20220421.9887f02
|
||||
/nix/store/js0sdyhi0319gwr76gj56q52dci2n9y0-nixos-system-dark-firepit-21.11.20220421.9887f02
|
Loading…
Reference in New Issue
Block a user