natto1784/dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

arrange users marisa:spark and satori:bat

Browse Source 
Signed-off-by: natto1784 <natto@weirdnatto.in>
This commit is contained in:
Amneesh Singh
2023-03-08 10:08:50 +05:30
parent 5652340dae
commit f31eb4c876
12 changed files with 90 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
home/default.nix
View File

@@ -1,4 +1,11 @@
{ self, inputs, globalArgs, ... }:
let
commonModules = [
./modules/zsh.nix
./modules/programs.nix
globalArgs
];
in
{
flake.homeConfigurations = {
natto = inputs.home-manager.lib.homeManagerConfiguration {
@@ -6,8 +13,29 @@
./natto
./modules/secret.nix
inputs.hyprland.homeManagerModules.default
globalArgs
];
] ++ commonModules;
pkgs = self.legacyPackages.x86_64-linux;
};
spark = inputs.home-manager.lib.homeManagerConfiguration {
modules = [{
home = {
homeDirectory = "/home/spark";
username = "spark";
stateVersion = "22.11";
};
}] ++ commonModules;
pkgs = self.legacyPackages.aarch64-linux;
};
bat = inputs.home-manager.lib.homeManagerConfiguration {
modules = [{
home = {
homeDirectory = "/home/bat";
username = "bat";
stateVersion = "22.11";
};
}] ++ commonModules;
pkgs = self.legacyPackages.x86_64-linux;
};
};

8
home/modules/programs.nix Normal file
View File

@@ -0,0 +1,8 @@
{ config, ... }:
{
programs = {
home-manager.enable = true;
password-store.enable = true;
direnv.enable = true;
};
}

23
home/modules/zsh.nix Normal file
View File

@@ -0,0 +1,23 @@
{ config, ... }:
{
programs.zsh = {
enable = true;
autocd = true;
history = rec {
expireDuplicatesFirst = true;
size = 30000;
save = size;
};
enableAutosuggestions = true;
enableCompletion = true;
enableSyntaxHighlighting = true;
prezto = {
enable = true;
prompt.theme = "pure";
autosuggestions.color = "fg=yellow,bold";
};
initExtra = ''
unsetopt extendedGlob
'';
};
}

3
home/natto/programs.nix
View File

@@ -1,7 +1,6 @@
{ pkgs, config, colors, ... }:
{
programs = {
home-manager.enable = true;
firefox = {
enable = true;
profiles.natto = {
@@ -22,8 +21,6 @@
};
};
go.enable = true;
password-store.enable = true;
direnv.enable = true;
foot = {
enable = true;
settings = {

27
home/natto/zsh.nix
View File

@@ -1,29 +1,12 @@
{ config, ... }:
{ config, lib, ... }:
let
secretPath = "${config.home.homeDirectory}/.zshenv_secret";
in
{
programs.zsh = {
enable = true;
autocd = true;
history = rec {
expireDuplicatesFirst = true;
size = 30000;
save = size;
};
enableAutosuggestions = true;
enableCompletion = true;
enableSyntaxHighlighting = true;
prezto = {
enable = true;
prompt.theme = "pure";
autosuggestions.color = "fg=yellow,bold";
};
initExtra = ''
. ${secretPath};
unsetopt extendedGlob
'';
};
programs.zsh.initExtra = lib.mkForce ''
. ${secretPath};
unsetopt extendedGlob
'';
age.secrets.zshenv_secret = {
file = ./secrets/.zshenv_secret;

10
hosts/marisa/default.nix
View File

@@ -1,4 +1,4 @@
{ config, ... }:
{ config, pkgs, network, ... }:
{
imports = [
./networking.nix
@@ -7,6 +7,14 @@
./services.nix
];
users.users.spark = {
isNormalUser = true;
shell = pkgs.zsh;
home = "/home/spark";
extraGroups = [ "wheel" ];
openssh.authorizedKeys.keys = network.commonSSHKeys;
};
time.timeZone = "Asia/Kolkata";
system.stateVersion = "21.05";
}

5
hosts/marisa/networking.nix
View File

@@ -26,23 +26,22 @@
enable = false;
iwd.enable = true;
};
interfaces = {
eth0 = {
useDHCP = false;
ipv4.addresses = [{
prefixLength = 24;
address = "192.168.1.159";
}];
};
wlan0 = {
useDHCP = false;
ipv4.addresses = [{
prefixLength = 24;
address = "192.168.1.159";
}];
};
};
wireguard.interfaces.wg0 = with network.address.wireguard.ips; {
wireguard.interfaces.wg0 = with network.addresses.wireguard.ips; {
ips = [ marisa ];
listenPort = 17840;
privateKeyFile = "/var/secrets/wg.key";

9
hosts/marisa/services.nix
View File

@@ -38,14 +38,7 @@
extraConfigFiles = lib.singleton "/run/consul/consul.json";
};
};
users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHingN2Aho+KGgEvBMjtoez+W1svl9uVoa4vG0d646j"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPX1HDzWpoaOcU8GDEGuDzXgxkCpyeqxRR6gLs/8JgHw"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOSQnDNrNP69tIK7U2D7qaMjycfIjpgx0at4U2D5Ufib"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK5V/hdkTTQSkDLXaEwY8xb/T8+sWtw5c6UjYOPaTrO8"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFyKi0HYfkgvEDvjzmDRGwAq2z2KOkfv7scTVSnonBh"
];
security.pki.certificateFiles = [ ../../cert.pem ../../consul-agent-ca.pem ];
security.pki.certificateFiles = [ ../../cert.pem ../../consul-agent-ca.pem ];
}

3
hosts/modules/minimal.nix
View File

@@ -6,7 +6,7 @@
enable = true;
extraRules = [
{
users = [ ];
users = [ "wheel" ];
keepEnv = true;
persist = true;
}
@@ -18,6 +18,7 @@
git
htop
vim
tmux
wireguard-tools
rnix-lsp
nmap

3
hosts/remilia/default.nix
View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... }:
{ config, pkgs, network, ... }:
{
imports = [
./networking.nix
@@ -15,6 +15,7 @@
shell = pkgs.zsh;
home = "/home/bat";
extraGroups = [ "wheel" ];
openssh.authorizedKeys.keys = network.commonSSHKeys;
};
system.stateVersion = "21.11";

6
hosts/remilia/services.nix
View File

@@ -77,12 +77,6 @@ in
};
};
users.users.root.openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHingN2Aho+KGgEvBMjtoez+W1svl9uVoa4vG0d646j"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILCH975XCps+VCzo8Fpp5BkbtiFmj9y3//FBVYlQ7/yo"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMu+SbTrfE62nT7gkZCwiOVOlI2TkVz+RJQ49HbnHvnQ"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFyKi0HYfkgvEDvjzmDRGwAq2z2KOkfv7scTVSnonBh"
];
security.acme = {
acceptTerms = true;
certs = {

8
lib/network.nix
View File

@@ -14,4 +14,12 @@
natto = "weirdnatto.in";
};
};
commonSSHKeys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJHingN2Aho+KGgEvBMjtoez+W1svl9uVoa4vG0d646j"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPX1HDzWpoaOcU8GDEGuDzXgxkCpyeqxRR6gLs/8JgHw"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOSQnDNrNP69tIK7U2D7qaMjycfIjpgx0at4U2D5Ufib"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK5V/hdkTTQSkDLXaEwY8xb/T8+sWtw5c6UjYOPaTrO8"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFyKi0HYfkgvEDvjzmDRGwAq2z2KOkfv7scTVSnonBh"
];
}