This commit is contained in:
2023-05-04 14:08:51 +00:00
parent 9d851a27fd
commit 076bca4e45
4 changed files with 152 additions and 129 deletions

View File

@@ -1,7 +1,7 @@
# This is your home-manager configuration file
# Use this to configure your home environment (it replaces ~/.config/nixpkgs/home.nix)
{ inputs, outputs, lib, config, pkgs, hostName, ... }:
{ inputs, outputs, lib, config, pkgs, hostName, ... }:
# let
# getEnv_name = builtins.getEnv "name";
# hostname = builtins.getEnv "hostname";
@@ -10,19 +10,19 @@
imports = [
../../global.nix
];
home.username = "sstent";
home.homeDirectory = "/home/sstent";
home.stateVersion = "23.05";
home.username = "sstent";
home.homeDirectory = "/home/sstent";
home.stateVersion = "23.05";
sops = {
age.sshKeyPaths = [ "/home/sstent/.ssh/id_ed25519" ];
defaultSopsFile = "${config._secretstore}/user-secrets.yaml";
secrets = {
mrconfig = {
sopsFile = "${config._secretstore}/user_dotfiles/mrconfig"; # optionally define per-secret files
format = "binary";
path = "${config.home.homeDirectory}/.mrconfig";
# path = "${config.home.homeDirectory}/${getEnv_name}";
sopsFile = "${config._secretstore}/user_dotfiles/mrconfig"; # optionally define per-secret files
format = "binary";
path = "${config.home.homeDirectory}/.mrconfig";
# path = "${config.home.homeDirectory}/${getEnv_name}";
};
"ssh/id_rsa" = {
# owner = "${config.home.username}";
@@ -49,43 +49,43 @@
# home.file."/home/sstent/.config/beets/test".source = config.lib.file.mkOutOfStoreSymlink /run/user/1000/secrets/test;
# home.file."/home/sstent/.config/beets/test".source = config.lib.file.mkOutOfStoreSymlink /run/user/1000/secrets/test;
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
home.packages = with pkgs; [
autossh
# azure-cli
ansible
# sshpass
(import ./python-packages.nix { pkgs = pkgs; })
pyinfra
sshpass
nmap
nomad_1_4
consul
terraform
wget
curl
p7zip
#git-run
mr
perl
# beets
# qemu_kvm
# nixos-generators
nixpkgs-fmt
# deploy-rs
];
custom = {
ssh-proxy.enable = false;
beets.enable = true;
keybase.enable = true;
};
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
home.packages = with pkgs; [
autossh
azure-cli
ansible
# sshpass
(import ./python-packages.nix { pkgs = pkgs; })
pyinfra
sshpass
nmap
nomad_1_4
consul
terraform
wget
curl
p7zip
#git-run
mr
perl
# beets
# qemu_kvm
# nixos-generators
nixpkgs-fmt
# deploy-rs
];
# home.file.".mrconfig".source = config.lib.file.mkOutOfStoreSymlink "${config._secrets}/mrconfig";
programs = {
custom = {
ssh-proxy.enable = false;
beets.enable = true;
keybase.enable = true;
};
# home.file.".mrconfig".source = config.lib.file.mkOutOfStoreSymlink "${config._secrets}/mrconfig";
programs = {
dircolors.enable = true;
go.enable = true;
gpg.enable = true;
@@ -95,6 +95,7 @@ programs = {
man.enable = true;
nix-index.enable = true;
yt-dlp.enable = true;
<<<<<<< HEAD
zsh = {
enable = true;
enableAutosuggestions = true;
@@ -130,18 +131,21 @@ programs = {
];
};
=======
>>>>>>> c466ca6 (sync)
bash = {
enable = true;
historyControl = ["ignorespace"];
shellOptions = [ "histappend" ];
historyControl = [ "ignorespace" ];
shellOptions = [ "histappend" ];
sessionVariables = {
DOCKER_HOST="tcp://192.168.1.223:2375";
NOMAD_ADDR="http://192.168.1.250:4646";
TERM="xterm-256color";
ANSIBLE_HOST_KEY_CHECKING="False";
HSTR_CONFIG="hicolor";
PROMPT_COMMAND="history -a;"; # ensure synchronization between bash memory and history file
SSH_AUTH_SOCK="/home/sstent/.ssh/wsl-ssh-agent.sock";
DOCKER_HOST = "tcp://192.168.1.223:2375";
NOMAD_ADDR = "http://192.168.1.250:4646";
TERM = "xterm-256color";
ANSIBLE_HOST_KEY_CHECKING = "False";
HSTR_CONFIG = "hicolor";
PROMPT_COMMAND = "history -a;"; # ensure synchronization between bash memory and history file
SSH_AUTH_SOCK = "/home/sstent/.ssh/wsl-ssh-agent.sock";
};
bashrcExtra = ''
if [ -e /home/sstent/.nix-profile/etc/profile.d/nix.sh ]; then . /home/sstent/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
@@ -149,83 +153,83 @@ programs = {
export PATH=$PATH:/bin #Fix for wslpath
'';
};
git = {
enable = true;
userName = "sstent";
userEmail = "stuart.stent@gmail.com";
extraConfig = { pull.rebase = true; };
};
ssh = {
enable = true;
matchBlocks = {
"*" = {
identityFile = "~/.ssh/id_rsa";
};
"github.com" = {
user = "git";
identityFile = "~/.ssh/id_rsa_git";
};
"odroid*" = {
user = "root";
git = {
enable = true;
userName = "sstent";
userEmail = "stuart.stent@gmail.com";
extraConfig = { pull.rebase = true; };
};
ssh = {
enable = true;
matchBlocks = {
"*" = {
identityFile = "~/.ssh/id_rsa";
};
"github.com" = {
user = "git";
identityFile = "~/.ssh/id_rsa_git";
};
"odroid*" = {
user = "root";
};
};
};
};
};
};
}
#######If Gnome
# config = lib.mkIf config.mymods.gnome.enable {
# programs.bash.enable = true;
# programs.firefox.enable = true;
# programs.gnome-terminal.enable = true;
# programs.gnome-terminal.profile = {
# "f2afd3c7-cb35-4d08-b6c2-523b444be64d" = {
# visibleName = "Stu";
# showScrollbar = true;
# default = true;
# font = "DejaVu Sans Mono 12";
# colors = {
# backgroundColor = "rgb(23,20,33)";
# foregroundColor = "rgb(208,207,204)";
# palette = [
# "#272224"
# "#FF473D"
# "#3DCCB2"
# "#FF9600"
# "#3B7ECB"
# "#F74C6D"
# "#00B5FC"
# "#3E3E3E"
# "#52494C"
# "#FF6961"
# "#85E6D4"
# "#FFB347"
# "#779ECB"
# "#F7A8B8"
# "#55CDFC"
# "#EEEEEC"
# ];
# };
# };
# };
# xdg.configFile."gnome-initial-setup-done".text = "yes";
# xdg.configFile."gtk-3.0/bookmarks".text = ''
# file:///mnt/Public Public
# '';
# dconf.settings = {
# # ...
# "org/gnome/shell" = {
# favorite-apps = [
# "firefox.desktop"
# "org.gnome.Terminal.desktop"
# "org.gnome.Nautilus.desktop"
# ];
# };
# "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; };
#######If Gnome
# config = lib.mkIf config.mymods.gnome.enable {
# programs.bash.enable = true;
# programs.firefox.enable = true;
# programs.gnome-terminal.enable = true;
# programs.gnome-terminal.profile = {
# "f2afd3c7-cb35-4d08-b6c2-523b444be64d" = {
# visibleName = "Stu";
# showScrollbar = true;
# default = true;
# font = "DejaVu Sans Mono 12";
# colors = {
# backgroundColor = "rgb(23,20,33)";
# foregroundColor = "rgb(208,207,204)";
# palette = [
# "#272224"
# "#FF473D"
# "#3DCCB2"
# "#FF9600"
# "#3B7ECB"
# "#F74C6D"
# "#00B5FC"
# "#3E3E3E"
# "#52494C"
# "#FF6961"
# "#85E6D4"
# "#FFB347"
# "#779ECB"
# "#F7A8B8"
# "#55CDFC"
# "#EEEEEC"
# ];
# };
# };
# };
# xdg.configFile."gnome-initial-setup-done".text = "yes";
# xdg.configFile."gtk-3.0/bookmarks".text = ''
# file:///mnt/Public Public
# '';
# dconf.settings = {
# # ...
# "org/gnome/shell" = {
# favorite-apps = [
# "firefox.desktop"
# "org.gnome.Terminal.desktop"
# "org.gnome.Nautilus.desktop"
# ];
# };
# "org/gnome/desktop/interface" = { color-scheme = "prefer-dark"; };
# };
# };
# };
# };