mirror of
https://github.com/sstent/vmimages.git
synced 2025-12-05 21:51:48 +00:00
sync
This commit is contained in:
14
README.md
14
README.md
@@ -2,7 +2,17 @@
|
||||
|
||||
|
||||
|
||||
for file in secrets/user_dotfiles/sstent@StuPC/keybase/*; do sops -e --input-type binary -i $file; done
|
||||
`for file in secrets/user_dotfiles/sstent@StuPC/keybase/*; do sops -e --input-type binary -i $file; done`
|
||||
|
||||
|
||||
home-manager remove-generations {1..54}
|
||||
`home-manager remove-generations {1..54}`
|
||||
|
||||
# python reqs from poetry (project.toml)
|
||||
`poetry export --without-hashes --format=requirements.txt > requirements.txt`
|
||||
|
||||
# Python From requirements.txt
|
||||
`nix-shell -p '(callPackage (fetchTarball https://github.com/DavHau/mach-nix/tarball/master) {}).mach-nix'`
|
||||
|
||||
`mach-nix env ./env -r requirements.txt`
|
||||
|
||||
`nix-shell ./env`
|
||||
@@ -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"; };
|
||||
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
# };
|
||||
|
||||
|
||||
@@ -12,6 +12,10 @@ in {
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [
|
||||
pkgs.ffmpeg # for replaygain
|
||||
];
|
||||
|
||||
|
||||
sops = {
|
||||
secrets.discogs_json = {
|
||||
@@ -147,7 +151,12 @@ in {
|
||||
"inline"
|
||||
"discogs"
|
||||
"mbcollection"
|
||||
"replaygain"
|
||||
"info"
|
||||
];
|
||||
replaygain = {
|
||||
backend = "ffmpeg";
|
||||
};
|
||||
rewrite = {
|
||||
"artist Björk & Tríó Guðmundar Ingólfssonar" = "Björk";
|
||||
"artist Brant Bjork and The Low Desert Punk Band" = "Brant Bjork";
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"data": "ENC[AES256_GCM,data:kWL5nhaq1F5KzKpY5g85V68p2TcndKuIi9WmyQwL/A5p0/2BaAZnX/6V1lACVmdzRll147fjIjjTDexbPJCVIpGaTKepFf16cu7YTg5I80bNagaBfo+JmqFZd62lEfypKupedx0HYwc3QWwhiUATsfwDa2xTTjQTXln0nJHJFwmnE4iHpEpUNhSoOPVUj4qtbnD2XMD9ykSNXXDAyNTVRUJaBbo8pooh7PCDeYT9xdZntTXd+2+tP9DUqq8W8T03Gq5YKbjXu1ww4dzaFAoiqD371GzRs+1wPd2skM7VdmhBJg9F0JpRFFWlzGanPmODVxDd2jsQzeBK9uInjugdNEcAnqf7RMqYRMWE3FRGepfp6YWVneLmRseccG4xAatNPB0sEDN/NqCSn3H7WN2p4zoE5frfGJzJxSaAMR/D+9uzqvXKXnxr1wepwBcz+Fef0iWcDHGHtO3v01IjHcA/6FOTJFsRrvf4eTpw4aqMR606u6/lprifw0IXZ96lrFPozVDi0qFczEmX1aNfCAZCAdtaM1mU5OmX7nNJZ+g3lV/ZCLYpvHRuv2BLe08qr2/Qui1kN+3V6RaZ5tmYU0aZAI0N+4K/yt8uIukS5nnaLgX5cEmEr66nV7rNLudWadIYVgIum3i+Nz29nxcMZE2Hc0b298J+bNVSL/MsOF4v/vN7pgLar8MjD3WJtAVBe4Stfp0Mw2ngCdD57zNprGSIDGYMnX/VkPeJ2KhebwWza9xP0iOdNNRJMIzI35MX/gJuIeLJQJ77dxfzVhSZ5BB3W50NCaM3AZNeDIhoXXvBKcU1fypO2KTpFIsMBVeCOY1ee7U5YFh2Rqrb6MGTDeRdsJ7gfK2jEUYCjvb+kIZUdFjJ3EtdVakSYWpmrvGPYkxFeVUx2hgelZtFxhWwN6BVM+bkGiwfSq1Ex4xgOZcPJ7s5wAu9cYK6t6ibY+lxpnwZLHrHJIyCscsyD+twTD6VzA0gkXqPzh4HpmWXYNbcoVeN5BitA8gUWDSO86kHPaXO7OnSvpOwU/U5VRYBeLSh+1LUKWY28nIQ1B9DwCLri5VNkrLRVsk3zEAFoD+Afz9tfDPrGvyFMCM0WMAiqhMt/TNWhXdMmAlt4B77We9FvV7Nz/PSMQ0eowItAkyXgnOazs2/fQHoFAGIl+8pkY0xRq9S+nPHKiueB+6w+9qOZOhmKrvBRgY7lNQLNdCyIfRcSszS8e9TwN86I7PCBT4dPtKEidKowlrZU9k40Fz0M3hP8tAb2/YjYStXE1Dr5OSppOUknl3/XPyQW5+ZYtGMv550+YwlYKY+Nitj8G1PTT8tDBzz1CYt9EaXrJHJFpCr9LizGn8lr5GekhUZQUvdfWsG+LcR9bCzAIRx,iv:gCGBCu+4FdMj3g8pWXms/lW69s6WXZUM0e943krVvWI=,tag:YMHLTZ6upjlblY5+qwPH0w==,type:str]",
|
||||
"data": "ENC[AES256_GCM,data:FPFwVL3VY3xVfqZ6SCaEUIdVnSSzOAs1moKbWsWi5hn0BciVTQoxftKIYX/3zJcGY9LONzsl949VcRNdRpl8hMngLPQ9I3h80g9FDBLYzjbB/cwypnuuJA67up/rbFQoQBAhhCjK1jRh7FQTokD8ecqOj5AO/0REpVMul6IOqZMcFp4JfMKpTNsf17RqaaMH3eBGpYyKZ0rUU5NhaLc9FqBNjJYkxlGWSDdw9rJup47QwwyFPe+FbLq7cGf2Tq4WmGVvwcbiX/Ngo3nWWSod0pcXQ+6r6l9HqUupK73gmbAUQt85LOY19bTlmdUxM2/SOIPurSuJtZhpWWBEwdfGwYCc6CsPLj5aGU3eFS17tL5Nm5JVwd7rSQ+tj2MNtlCQfscfVvTg0+u/eUf79kLceE+azeFtbwA8U69aB5MBIQ+Y+cQVytISAxjJLFabGzc0PKVH0MANbKPzoXnme71ADojgWl1pPhnJBe6C37qBtm3IihTPJXa5vNfMj6iZxGroOVsEvdXfXbUGH9/1zyYXhBEcy2BGQDjWOMMbwMWNaMCcP3k3Cq5haEhy08xvIUhPakeDzzjJLvPi82kDmtKaD0pVY9Ym/8VPlIhmyrhoKC/pJhsd8O9KuCRTMp/tP6Pgf0pSOYhfC7Wvm4XVczwbcebLBXOlDpJXoOa6F4fqUDUo0Z0y6tAwjUfhuz5D074GlefQSJL7pC31d4dCAlFVykXKKKktFkRGSHIy8l3964htw+Xa78VyvCPZrKfWU0usaOFdZ1/5DHpq9nV1VLYESCygktEmseFhpDX4G5SLztB6txSy+dlSTwj1ARWdWCFuLDPLsuoF9k1zUNmAVJxpYTs7sDGaeyLnMz/hnumbY0EaaGXlY6YYfxX4286/eXQajpixy8peeYCGoNTwRkRPkur7Hids3K4SktcB1jXEuZWEnNe0LfrhePMI5VKW1M2QIJVJmG8GXvKdW298WKCVq3SL+EWn5dQnPHNuPEYv35cRnmshBfCJAS+kUkR+l97yN+QPWNtaJsdC1fRsA/zvtofyV89yNzqvnqXnbbBU6gahdTwgnc06kOridDDQlb3W4nU+RdnLfINnTLdZ5h1f+S1mn+EOpIVJ6+zJcqVVt2RdfrC3x4Nly8R08Q2bVG5OJCYasxOAiJH0IwO8nsjUusH4nehUUqJ66Gzg3k4OMydw2zh4iJJeHVdwa3FCbc71HagbeohTx+XA2DCCRnkQwgI+QkColUIXYx6q5CtzRAe4m6Qpgq8htBEWMnq2a0iAdDRASXxKvVST9TMitnVp6NdjPzRIXUma6x/hNmYo70Mj0qX8zun2Mn8K9qKvO4+oBIaHBdr148TnAVKiLTfht19/qekYea4dVAOMXNwSNWh2AZbhQTO+KMq+bdU+qcvT9t3ddvMjZURAa1F5Vck8V/+GZV+xNwXrhH8y7WxOFA5TrInnpCAKAqJXz35zYrW3k/rEqhaGE9XsKzg0,iv:DxJeRxDb7SkqXvYJpDljssmL/JRy4PnGKIXckeUcSM8=,tag:AqtC4nCe0ewrK/fDBuNiYA==,type:str]",
|
||||
"sops": {
|
||||
"kms": null,
|
||||
"gcp_kms": null,
|
||||
@@ -15,8 +15,8 @@
|
||||
"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFaC9WNUNZTG1GYnJIK203\nYW1tNXVwdGh6WXVZTEJCVm9mMkFjeG1pTG1jCmltdU1YeThoTkZsVmpvRVpTTVlK\ncllNbUpZaTZjNkNCbnJYMUxxVkVxcVkKLS0tIDNocDd0V3JoWTNndzV5V3VYaWFY\nQnBXQWVPSmljV0ZIMTQ3aUZYNlZ5K1EK+J13LdXi47ylyZDDNDHtor48dqp6nC7H\ne5M/VESLNcw9l0cbORSSfbAnlFC8Pp8o9IWB/iCW9GDHwVdM5oDG7Q==\n-----END AGE ENCRYPTED FILE-----\n"
|
||||
}
|
||||
],
|
||||
"lastmodified": "2023-02-26T17:30:05Z",
|
||||
"mac": "ENC[AES256_GCM,data:CCD1HSLYfT+9Ia03bNPSfBrLtmagcr/krC57k5X8nUfYY4tuIjXNC4i5KMQ9EEviMS3oz24HwvqXq1TOF/dCsBGKLSHgwCYPw7kSJFok6iXBdalwovfjQF/sGub83D6r+3MYfpLshq84C9WGRD1AVhZzJMFK1QM47iKLzEXutLE=,iv:FBwx5cdsSM5IATMbu4lrTs05iSjA4c0pn/qjs4g68rU=,tag:ONon6HUv1yr5scVoNsTD4w==,type:str]",
|
||||
"lastmodified": "2023-03-09T17:27:24Z",
|
||||
"mac": "ENC[AES256_GCM,data:6IBw0m1ascgNp7Bd9w5bnvm0jyIrqX4ymIhoyuBDYgl/LeKwMsJWboSaP7Gmy6Y30drbo91QovA1VT+4AfggDG4UgPiLddx8Bv8ybavXGFlNiV9cQSKo2Y3I4E2tR7Q0zdoTQ2AUmXDuLVjBS7gtxBDTzkEgT6Sln1+TH1F9O6I=,iv:BYtss6rtT5s7S+edttY0u8XgnIuX6NNk2OiuC+TXKog=,tag:3ppc6QRUJ5eJgP/ttvyDuw==,type:str]",
|
||||
"pgp": null,
|
||||
"unencrypted_suffix": "_unencrypted",
|
||||
"version": "3.7.3"
|
||||
|
||||
Reference in New Issue
Block a user