matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: move common/home to nixosModules/shell

Browse source
This commit is contained in:
matt1432 2024-11-22 17:58:24 -05:00
parent ae24ae1400
commit 66f415ff5f
30 changed files with 393 additions and 314 deletions

2
devices/android/default.nix
View file

@ -4,6 +4,8 @@
pkgs,
...
}: {
imports = [./nix-on-droid.nix];
vars.mainUser = "nix-on-droid";
environment.variables.FLAKE = "/data/data/com.termux.nix/files/home/.nix";

85
devices/android/nix-on-droid.nix Normal file
View file

@ -0,0 +1,85 @@
{
config,
lib,
self,
...
}: {
imports = [
../../common/vars
../../common/modules/global.nix
../../common/packages.nix
self.nixosModules.tmux
{programs.tmux.enableCustomConf = true;}
];
nix = {
# Edit nix.conf
extraOptions = ''
experimental-features = nix-command flakes
keep-outputs = true
keep-derivations = true
warn-dirty = false
'';
substituters = [
# Nix-community
"https://nix-community.cachix.org"
];
trustedPublicKeys = [
# Nix-community
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
# Global hm settings
home-manager.config = {
imports = [
# Make the vars be the same on Nix and HM
{
options.vars = lib.mkOption {
type = lib.types.attrs;
readOnly = true;
default = config.vars;
};
}
self.homeManagerModules.neovim
{programs.neovim.enable = true;}
self.homeManagerModules.shell
{programs.bash.enable = true;}
{
programs.bash.sessionVariables = {
FLAKE = config.environment.variables.FLAKE;
};
programs.bash.shellAliases = {
# Make ping work on nix-on-droid
# https://github.com/nix-community/nix-on-droid/issues/185#issuecomment-1659294700
ping = "/android/system/bin/linker64 /android/system/bin/ping";
# SSH
# Desktop
pc = "ssh -t matt@100.64.0.6 'tmux -2u new -At phone'";
# NAS
nos = "ssh -t matt@100.64.0.4 'tmux -2u new -At phone'";
# Experimenting server
servivi = "ssh -t matt@100.64.0.7 'tmux -2u new -At phone'";
# Home-assistant
homie = "ssh -t matt@100.64.0.10 'tmux -2u new -At phone'";
# Cluster nodes
thingone = "ssh -t matt@100.64.0.8 'tmux -2u new -At phone'";
thingtwo = "ssh -t matt@100.64.0.9 'tmux -2u new -At phone'";
};
}
];
home.stateVersion = "23.05";
};
}

18
devices/bbsteamie/default.nix
View file

@ -24,10 +24,7 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars = {
mainUser = "mariah";
promptMainColor = "pink";
};
vars.mainUser = "mariah";
users.users.${mainUser} = {
isNormalUser = true;
@ -58,4 +55,17 @@ in {
};
services.kmscon.enable = true;
home-manager.users.${mainUser} = {
imports = [
self.homeManagerModules.shell
];
programs = {
bash = {
enable = true;
promptMainColor = "pink";
};
};
};
}

22
devices/binto/default.nix
View file

@ -25,10 +25,7 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars = {
mainUser = "matt";
promptMainColor = "purple";
};
vars.mainUser = "matt";
users.users.${mainUser} = {
isNormalUser = true;
@ -79,12 +76,21 @@ in {
home-manager.users.${mainUser} = {
imports = [
self.homeManagerModules.firefox
self.homeManagerModules.neovim
self.homeManagerModules.shell
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
programs = {
bash = {
enable = true;
promptMainColor = "purple";
};
neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
};
}

35
devices/cluster/default.nix
View file

@ -25,15 +25,7 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars = {
mainUser = "matt";
promptMainColor =
if deviceName == "thingone"
then "green"
else if deviceName == "thingtwo"
then "red"
else "purple";
};
vars.mainUser = "matt";
users.users.${mainUser} = {
isNormalUser = true;
@ -71,12 +63,27 @@ in {
services.kmscon.enable = true;
home-manager.users.${mainUser} = {
imports = [];
imports = [
self.homeManagerModules.neovim
self.homeManagerModules.shell
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
programs = {
bash = {
enable = true;
promptMainColor =
if deviceName == "thingone"
then "green"
else if deviceName == "thingtwo"
then "red"
else "purple";
};
neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
};
}

25
devices/homie/default.nix
View file

@ -24,10 +24,7 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars = {
mainUser = "matt";
promptMainColor = "yellow";
};
vars.mainUser = "matt";
users.users.${mainUser} = {
isNormalUser = true;
@ -58,12 +55,22 @@ in {
services.kmscon.enable = true;
home-manager.users.${mainUser} = {
imports = [];
imports = [
self.homeManagerModules.neovim
self.homeManagerModules.shell
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
programs = {
bash = {
enable = true;
promptMainColor = "yellow";
};
neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
};
}

25
devices/nos/default.nix
View file

@ -24,10 +24,7 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars = {
mainUser = "matt";
promptMainColor = "orange";
};
vars.mainUser = "matt";
users.users.${mainUser} = {
isNormalUser = true;
@ -58,12 +55,22 @@ in {
services.kmscon.enable = true;
home-manager.users.${mainUser} = {
imports = [];
imports = [
self.homeManagerModules.neovim
self.homeManagerModules.shell
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
programs = {
bash = {
enable = true;
promptMainColor = "orange";
};
neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
};
}

25
devices/servivi/default.nix
View file

@ -24,10 +24,7 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars = {
mainUser = "matt";
promptMainColor = "blue";
};
vars.mainUser = "matt";
users.users = {
${mainUser} = {
@ -72,12 +69,22 @@ in {
services.kmscon.enable = true;
home-manager.users.${mainUser} = {
imports = [];
imports = [
self.homeManagerModules.neovim
self.homeManagerModules.shell
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
programs = {
bash = {
enable = true;
promptMainColor = "blue";
};
neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
};
}

22
devices/wim/default.nix
View file

@ -28,10 +28,7 @@ in {
# ------------------------------------------------
# User Settings
# ------------------------------------------------
vars = {
mainUser = "matt";
promptMainColor = "purple";
};
vars.mainUser = "matt";
users.users.${mainUser} = {
isNormalUser = true;
@ -98,12 +95,21 @@ in {
home-manager.users.${mainUser} = {
imports = [
self.homeManagerModules.firefox
self.homeManagerModules.neovim
self.homeManagerModules.shell
];
programs.neovim = {
enable = true;
enableIde = true;
user = mainUser;
programs = {
bash = {
enable = true;
promptMainColor = "purple";
};
neovim = {
enable = true;
enableIde = true;
user = mainUser;
};
};
};
}