Compare commits

..

No commits in common. "122693e9c8d317ecd81fbd62f23980dbf7fb9cf3" and "ffe82f65f83b12596150b8e5fd1fd563a1bbf617" have entirely different histories.

6 changed files with 13 additions and 133 deletions

View File

@ -144,11 +144,11 @@
"systems": "systems_8" "systems": "systems_8"
}, },
"locked": { "locked": {
"lastModified": 1695195896, "lastModified": 1688380630,
"narHash": "sha256-pq9q7YsGXnQzJFkR5284TmxrLNFc0wo4NQ/a5E93CQU=", "narHash": "sha256-8ilApWVb1mAi4439zS3iFeIT0ODlbrifm/fegWwgHjA=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "05d40d17bf3459606316e3e9ec683b784ff28f16", "rev": "f9238ec3d75cefbb2b42a44948c4e8fb1ae9a205",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,16 +1,12 @@
# Font configuration # Font configuration
font_family FiraCode Nerd Font Mono font_family Hack Nerd Font Mono
bold_font FiraCode Nerd Font Mono Bold bold_font Hack Nerd Font Mono Bold
italic_font FiraCode Nerd Font Mono Italic italic_font Hack Nerd Font Mono Italic
bold_italic_font FiraCode Nerd Font Mono Bold Italic bold_italic_font Hack Nerd Font Mono Bold Italic
font_size 11.0 font_size 11.0
# firacode-specific
modify_font cell_height -6px
modify_font baseline 2
sync_to_monitor no sync_to_monitor no
# if I'm hovering over the font, don't perform ligature, thanks. disable_ligatures never
disable_ligatures cursor
# NO BELLS! # NO BELLS!
enable_audio_bell no enable_audio_bell no

View File

@ -3,30 +3,18 @@ Host felia-win
HostName felia.coati-celsius.ts.net HostName felia.coati-celsius.ts.net
Port 2222 Port 2222
User _nhitrl User _nhitrl
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
# Ubuntu 12c 32G-RAM # Ubuntu 12c 32G-RAM
Host felia Host felia
HostName felia.coati-celsius.ts.net HostName felia.coati-celsius.ts.net
User ubuntu_admin User ubuntu_admin
Port 22 Port 22
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
# 2c 16G-RAM 200G drive # 2c 16G-RAM 200G drive
Host fel Host fel
HostName fel.coati-celsius.ts.net HostName fel.coati-celsius.ts.net
User user User user
Port 22 Port 22
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
# AMZ Linux aarch64 hungtr@AMZ # AMZ Linux aarch64 hungtr@AMZ
Host nioma Host nioma
@ -34,56 +22,32 @@ Host nioma
User ec2-user User ec2-user
IdentityFile ~/.ssh/free-aws.pem IdentityFile ~/.ssh/free-aws.pem
Port 22 Port 22
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
# NixOS Pegasust-gh@Linode # NixOS Pegasust-gh@Linode
Host nyx Host nyx
HostName nyx.pegasust.com HostName nyx.pegasust.com
User hungtr User hungtr
Port 22 Port 22
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host lizzi Host lizzi
HostName 172.105.135.218 HostName 172.105.135.218
User hungtr User hungtr
Port 22 Port 22
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host pixi Host pixi
HostName 139.144.60.254 HostName 139.144.60.254
User hungtr User hungtr
Port 22 Port 22
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host mokoi Host mokoi
HostName 129.146.98.121 HostName 129.146.98.121
User ubuntu_admin User ubuntu_admin
Port 22 Port 22
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host noami Host noami
HostName 10.100.200.230 HostName 10.100.200.230
User htran User htran
Port 22 Port 22
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host sr1 Host sr1
HostName 10.30.76.46 HostName 10.30.76.46
@ -92,10 +56,6 @@ Host sr1
StrictHostKeyChecking no StrictHostKeyChecking no
HostKeyAlgorithms=+ssh-dss,ssh-rsa HostKeyAlgorithms=+ssh-dss,ssh-rsa
KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host bgp1 Host bgp1
HostName 10.111.100.113 HostName 10.111.100.113
@ -106,8 +66,6 @@ Host bgp1
IdentityFile ~/.ssh/id_rsa IdentityFile ~/.ssh/id_rsa
HostKeyAlgorithms=+ssh-dss,ssh-rsa HostKeyAlgorithms=+ssh-dss,ssh-rsa
KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1
SendEnv TERM
SetEnv TERM=xterm-256color
Host bgp2 Host bgp2
HostName 10.111.100.114 HostName 10.111.100.114
@ -118,10 +76,9 @@ Host bgp2
IdentityFile ~/.ssh/id_rsa IdentityFile ~/.ssh/id_rsa
HostKeyAlgorithms=+ssh-dss,ssh-rsa HostKeyAlgorithms=+ssh-dss,ssh-rsa
KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1
SendEnv TERM
SetEnv TERM=xterm-256color
Host 10.111.100.* Host 10.111.100.*
HostName 10.111.100.*
User htran User htran
Port 22 Port 22
StrictHostKeyChecking no StrictHostKeyChecking no
@ -129,19 +86,6 @@ Host 10.111.100.*
IdentityFile ~/.ssh/id_rsa IdentityFile ~/.ssh/id_rsa
HostKeyAlgorithms=+ssh-dss,ssh-rsa HostKeyAlgorithms=+ssh-dss,ssh-rsa
KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1
SendEnv TERM
SetEnv TERM=xterm-256color
Host 10.111.101.*
User htran
Port 22
StrictHostKeyChecking no
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
HostKeyAlgorithms=+ssh-dss,ssh-rsa
KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1
SendEnv TERM
SetEnv TERM=xterm-256color
Host d1-30 Host d1-30
HostName 10.111.103.60 HostName 10.111.103.60
@ -151,8 +95,6 @@ Host d1-30
UserKnownHostsFile /dev/null UserKnownHostsFile /dev/null
IdentityFile ~/.ssh/id_ed25519 IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa IdentityFile ~/.ssh/id_rsa
SendEnv TERM
SetEnv TERM=xterm-256color
Host d3l-3 Host d3l-3
HostName 10.111.103.65 HostName 10.111.103.65
@ -162,72 +104,42 @@ Host d3l-3
UserKnownHostsFile /dev/null UserKnownHostsFile /dev/null
IdentityFile ~/.ssh/id_ed25519 IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa IdentityFile ~/.ssh/id_rsa
SendEnv TERM
SetEnv TERM=xterm-256color
Host dev0 Host dev0
HostName 10.100.200.230 HostName 10.100.200.230
User htran User htran
Port 22 Port 22
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
SendEnv TERM
SetEnv TERM=xterm-256color
Host dev2 Host dev2
HostName 10.100.200.210 HostName 10.100.200.210
User htran User htran
Port 22 Port 22
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
SendEnv TERM
SetEnv TERM=xterm-256color
Host dev1 Host dev1
HostName 10.100.200.220 HostName 10.100.200.220
User htran User htran
Port 22 Port 22
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
SendEnv TERM
SetEnv TERM=xterm-256color
Host ztp-egi Host ztp-egi
HostName 10.23.27.201 HostName 10.23.27.201
User root User root
Port 22 Port 22
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
SendEnv TERM
SetEnv TERM=xterm-256color
Host goat Host goat
HostName 10.133.32.100 HostName 10.133.32.100
User "EGN NOC" User "EGN NOC"
Port 22 Port 22
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
SendEnv TERM
SetEnv TERM=xterm-256color
Host portal2 Host portal2
HostName portal2.egihosting.com HostName portal2.egihosting.com
User root User root
Port 22 Port 22
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
SendEnv TERM
SetEnv TERM=xterm-256color
Host egn-rest-api Host egn-rest-api
HostName egn-rest-api.egihosting.com HostName egn-rest-api.egihosting.com
User root User root
Port 22 Port 22
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
SendEnv TERM
SetEnv TERM=xterm-256color
Host gl-egi Host gl-egi
HostName gitlab.egihosting.com HostName gitlab.egihosting.com
@ -253,33 +165,6 @@ Host *.egihosting.com
IdentityFile ~/.ssh/id_ed25519 IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa IdentityFile ~/.ssh/id_rsa
Host grafana-egi
HostName grafana.egihosting.com
User nokia
Port 22
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host syslog-egi
HostName syslog.egihosting.com
User root
Port 22
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host geofeed-egi
HostName geofeed.egihosting.com
User root
Port 22
SendEnv TERM
SetEnv TERM=xterm-256color
IdentityFile ~/.ssh/id_ed25519
IdentityFile ~/.ssh/id_rsa
Host gh Host gh
HostName github.com HostName github.com
User git User git

View File

@ -96,7 +96,6 @@ in {
{ {
nix-rebuild = "sudo nixos-rebuild switch"; nix-rebuild = "sudo nixos-rebuild switch";
hm-switch = "home-manager switch --flake"; hm-switch = "home-manager switch --flake";
hm-switch-u = "home-manager switch --flake .#$${USER}";
} }
// (cfg.shellAliases or {}); // (cfg.shellAliases or {});
history = { history = {

View File

@ -18,9 +18,9 @@ in {
}: { }: {
config.fonts.fontconfig.enable = true; config.fonts.fontconfig.enable = true;
config.home.packages = [ config.home.packages = [
(pkgs.nerdfonts.override {fonts = ["FiraCode"];}) (pkgs.nerdfonts.override {fonts = ["Hack"];})
]; ];
config."${namespace}".alacritty.font.family = "FiraCode Nerd Font Mono"; config."${namespace}".alacritty.font.family = "Hack Nerd Font Mono";
}; };
secrets = { secrets = {
@ -75,7 +75,7 @@ in {
enable = true; enable = true;
config-path = "${inputs.self}//native_configs/alacritty/alacritty.yml"; config-path = "${inputs.self}//native_configs/alacritty/alacritty.yml";
font.size = 11.0; font.size = 11.0;
font.family = "FiraCode Nerd Font Mono"; font.family = "Hack Nerd Font Mono";
}; };
}; };

View File

@ -92,7 +92,7 @@ in {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
enableAutosuggestions = true; # enableAutosuggestions = true;
shellAliases = shellAliases =
{ {
nix-rebuild = "sudo nixos-rebuild switch"; nix-rebuild = "sudo nixos-rebuild switch";