john/jsl-home
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restructured

Browse Source
This commit is contained in:
John Lancaster
2025-07-02 17:58:30 -05:00
parent aa6e9a515f
commit e2fa10ae0d
6 changed files with 64 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
flake.nix
View File

@@ -21,7 +21,6 @@
imports = [ imports = [
./nixosModules/options.nix ./nixosModules/options.nix
./home.nix ./home.nix
./git.nix
inputs._1password-shell-plugins.hmModules.default inputs._1password-shell-plugins.hmModules.default
]; ];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [

60
home.nix
View File

@@ -1,9 +1,11 @@
{ config, pkgs, lib, inputs, ... }: { config, pkgs, lib, inputs, ... }:
{ {
# imports = [ imports = [
# inputs._1password-shell-plugins.hmModules.default ./homeManagerModules/git.nix
# ]; ./homeManagerModules/shell.nix
# inputs._1password-shell-plugins.hmModules.default
];
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
# manage. # manage.
home.username = config.user; home.username = config.user;
@@ -19,7 +21,7 @@
busybox busybox
gnugrep gnugrep
dig dig
eza # eza
gdu gdu
lazygit lazygit
btop btop
@@ -28,10 +30,6 @@
nix flake update --flake ~/.config/home-manager nix flake update --flake ~/.config/home-manager
nix run home-manager -- switch --flake ~/.config/home-manager nix run home-manager -- switch --flake ~/.config/home-manager
'') '')
(writeShellScriptBin "test-hm" ''
echo "${config.profile}"
'')
# # It is sometimes useful to fine-tune packages, for example, by applying # # It is sometimes useful to fine-tune packages, for example, by applying
# # overrides. You can do that directly here, just don't forget the # # overrides. You can do that directly here, just don't forget the
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
@@ -77,27 +75,27 @@
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.zsh = lib.mkIf config.shell { # programs.zsh = lib.mkIf config.shell {
enable = true; # enable = true;
enableCompletion = true; # enableCompletion = true;
autosuggestion.enable = true; # autosuggestion.enable = true;
syntaxHighlighting.enable = true; # syntaxHighlighting.enable = true;
oh-my-zsh = { # oh-my-zsh = {
enable = true; # enable = true;
theme = "risto"; # theme = "risto";
plugins = [ # plugins = [
"sudo" # "sudo"
"dotenv" # "dotenv"
"git" # "git"
"ssh" # "ssh"
"ssh-agent" # "ssh-agent"
] ++ lib.optional config._1password "1password"; # ] ++ lib.optional config._1password "1password";
}; # };
shellAliases.ls = "${pkgs.eza}/bin/eza -lgos type --no-time"; # shellAliases.ls = "${pkgs.eza}/bin/eza -lgos type --no-time";
# initContent = lib.mkIf config._1password '' # # initContent = lib.mkIf config._1password ''
# source ${config.home.homeDirectory}/.config/op/plugins.sh # # source ${config.home.homeDirectory}/.config/op/plugins.sh
# ''; # # '';
}; # };
programs.ssh = lib.mkIf config.ssh { programs.ssh = lib.mkIf config.ssh {
enable = true; enable = true;
@@ -115,6 +113,10 @@
hostname = "192.168.1.130"; hostname = "192.168.1.130";
user = "root"; user = "root";
}; };
"nix-test" = {
hostname = "192.168.1.36";
user = "root";
};
}) })
(lib.mkIf (config.profile == "work") { (lib.mkIf (config.profile == "work") {
"ubuntu-nvidia" = { "ubuntu-nvidia" = {

0
git.nix → homeManagerModules/git.nix
View File

30
homeManagerModules/shell.nix Normal file
View File

@@ -0,0 +1,30 @@
{ config, pkgs, lib, inputs, ... }:
{
home.packages = with pkgs; [
eza
(writeShellScriptBin "test-pkgs" ''
echo "Hello from ~/.config/home-manager/home.nix!"
'')
];
programs.zsh = lib.mkIf config.shell {
enable = true;
enableCompletion = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
oh-my-zsh = {
enable = true;
theme = "risto";
plugins = [
"sudo"
"dotenv"
"git"
"ssh"
"ssh-agent"
] ++ lib.optional config._1password "1password";
};
shellAliases.ls = "${pkgs.eza}/bin/eza -lgos type --no-time";
# initContent = lib.mkIf config._1password ''
# source ${config.home.homeDirectory}/.config/op/plugins.sh
# '';
};
}

3
personal_keys Normal file
View File

@@ -0,0 +1,3 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDIaHS9CLiDc6T1tja0fBwwv5qc6iwuckWN6w8MNo5yiR8LPWyrfueowNJkL4HMqu6OEuggtdybGw1Do4sW5o+toHCyWfZf3khI1l15opPXuVpD4CWED+SpJiZ0wBgRaCaWhfxLI+s4JOhjOO2OjiClPX3HfxIHyTpRiR78lOMcIieHSnzrAV2MatYKf6lL2ckOsIPwxo/OVM+1ljjX+HLq9IxGUCpWOnF4nF1rq3gKL2JUh2KsrgrzE3NB7EFuqKm8F0tF2rG3JjSvlwox0h06drKD02lpZWXPOBRlcyFDpNXymmc2bpG0S2Bbj5g+pqNBB0jO0h3kzWvYYqrtU/ElObg1cXhyi0PFOhhptlbhbK0Ao8B+pAbSZ661nMT3jpRWLVbnJrRFnXXdjX08r5eseQ3k4CFpv+g64n7yg3IMo9f8gA9P/hOexR+qu5AQ1Ad/tvkp6pPXnR/zsUnbe4p2A9MaNJm4E1zxbs5VGlXynNikXwDL+spkrnjwdfUULTk= john@JOHN-PC
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFn5ilhqaeDsOWSk7y29se2NvxGm8djlfL3RGLokj0q6 john@john-p14s
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHh9SBuxU2dOJHnpGZAE4cwe0fXcTBBAx+JmRsmIX+Tk8zooeM32vbNxxSXiZNpBGH5wzHNb534dWexGGG3sOaONmcL7SCoPIvaAdnIn5VsiznerLrzppSbx3Qn8eyF97WAGCcOcIUNmTIDDx1m6zG762WQnoaUEy0Ul5IR7ET5GQxP3p5Qwx8yqfixKDwarvV421sUIxYt9gee31jS9jcI3MFd6EL57hWle95Z8BGpR/Q7sXDBTZQWMZauh5NPwLMZS7k3bHgxXZ7WNOw/J/yts1ckBbvIFJSRNnMuWD0oGnDTL6aivGi+Eiswp0fpKzYGzquB3/wr3VU4G1JcMM5 JuiceSSH

0
work_keys Normal file
View File