Skip to content

Commit

Permalink
- feat(daf): add dafbox to ssh conf
Browse files Browse the repository at this point in the history
- clean(dafpi): cleanup configuration

- clean(flake): remove steeve user
  • Loading branch information
CaptainSpof committed Jan 4, 2022
1 parent de34b3d commit 1a82e58
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 64 deletions.
6 changes: 2 additions & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
users = digga.lib.rakeLeaves ./users;
};
suites = with profiles; rec {
base = [ core cli.common users.daf users.steeve ];
base = [ core cli.common users.daf ];
plasma = [ desktop.plasma ];
workstation = [ base plasma ];
};
Expand All @@ -123,14 +123,12 @@
importables = rec {
profiles = digga.lib.rakeLeaves ./users/profiles;
suites = with profiles; rec {
base = [ direnv git zoxide zsh starship ];
base = [ direnv git ssh starship zoxide zsh ];
graphical = [ alacritty ];
};
};
users = {
# nixos = { suites, ... }: { imports = suites.base; };
daf = { suites, ... }: { imports = suites.base; };
steeve = { suites, ... }: { imports = suites.base; };
}; # digga.lib.importers.rakeLeaves ./users/hm;
};

Expand Down
58 changes: 0 additions & 58 deletions hosts/dafpi/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -27,69 +27,11 @@
networking.interfaces.eth0.useDHCP = true;
networking.interfaces.wlan0.useDHCP = true;

# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";

# Select internationalisation properties.
# i18n.defaultLocale = "en_US.UTF-8";
# console = {
# font = "Lat2-Terminus16";
# keyMap = "us";
# };

# Enable the X11 windowing system.
# services.xserver.enable = true;

# Configure keymap in X11
services.xserver.layout = "fr";
services.xserver.xkbVariant = "bepo";

console.useXkbConfig = true;
# services.xserver.xkbOptions = "eurosign:e";

# Enable CUPS to print documents.
# services.printing.enable = true;

# Enable sound.
# sound.enable = true;
# hardware.pulseaudio.enable = true;

# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;

# Define a user account. Don't forget to set a password with ‘passwd’.
# users.users.jane = {
# isNormalUser = true;
# extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
# };

# List packages installed in system profile. To search, run:
# $ nix search wget
# environment.systemPackages = with pkgs; [
# vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
# wget
# firefox
# ];

# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };

# List services that you want to enable:

# Enable the OpenSSH daemon.
# services.openssh.enable = true;

# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ ... ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;

# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
Expand Down
4 changes: 4 additions & 0 deletions hosts/dafpi/default.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
{ suites, profiles, ... }: {
imports = [ ./configuration.nix profiles.network ] ++ suites.base;

home-manager.users.daf = { suites, ... }: {
imports = suites.graphical;
};

bud.enable = true;
bud.localFlakeClone = "/home/daf/.config/dafos";
}
6 changes: 4 additions & 2 deletions users/daf/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ self, hmUsers, config, ... }:
{ self, hmUsers, config, pkgs, ... }:
{
home-manager.users = { inherit (hmUsers) daf; };

Expand All @@ -16,8 +16,10 @@
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOkMUUwRW95/DuanXq8qh3Jfjo5RIkKUvx3NPGc6P8A0 daf@dafbox"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7YCmRYdXWhNTGWWklNYrQD5gUBTFhvzNiis5oD1YwV daf@daftop"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILGBJKhslXRQ4Bt8Nu3/YK799UsUpzpP6sDVkVw36nLR daf@dafpi"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII2j9R7kk4o0FiCN0HED4gjzFun8TnybrsCAVTgGxwqb root@nixos"
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDaCrVCrtF7kJjqILLTpE/pBr9XoyRbPXN/wgHIHO3FPQc1lKelJG0q/k31jA4WxyYpdMivJFMkewWwCnM8l52qgdUrJkVZMYXPXVpRGwxkXJs4B4Ud7TjFvUAzQXNQIpKRGky9PneVb0x20DRt4Ddm05Mqv4MaCP8ys5ava0nb2zgBhXx9xW18ZKds+gOLUn5/+y4ppdOSBu8rdnfy2+aYEJTX+H0Hg1qNkwyK2+C0JpfFH3fQ2k0UBq/s3rn3+yiHQRvo7ZO5WT3cVA0tOx2CJt4L6nLP2D7C4y8VIbsQYDcjy8Bb+CdE82gYCQQu1F8xUCcdZdk/Zs1Qqpp+7mDXduI0xVMQEK/XEDzaYDK//9/JH3t5k0UuZWmmFuDssr6uDl5zw/qzLp898JxJO3HVIcswvM9SJGMGpL7MRxzGoRJjsaYhKehTOhOEyIlyZscbD8k3mGjGB8BNGnmBs1w+79upS2TfPx9pEEZyFNl354A/fd6piNreI0XFZMew3Sllq/aoq6eu1gel0s1oonvoHrdlJ7zlj/brkT4INh7iGRIh6dHk6ias0NhnjTLlu71sEQQh1x6MY3Qkvwn4lQOF4pSr2C2YS5m7M6cijRDnglfVngs/xWcwYaDpUSP2Mfmd28EG0LlOkUsLOIvYChSY0ePKsGaIu8AXp5qR6MNF3w== root@nixos"
];
shell = "/etc/profiles/per-user/daf/bin/zsh";
shell = pkgs.zsh;
# passwordFile = "/run/secrets/daf";
};
# TODO: find a way to set options per user
Expand Down
5 changes: 5 additions & 0 deletions users/profiles/ssh/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@
hostname = "github.com";
identityFile = "~/.ssh/[email protected]";
};
"dafbox" = {
hostname = "dafbox";
user = "daf";
identityFile = "~/.ssh/[email protected]";
};
"daftop" = {
hostname = "daftop";
user = "daf";
Expand Down

0 comments on commit 1a82e58

Please sign in to comment.