Compare commits
No commits in common. "6c1d177e0329c227006afcc3e1c10f30ea8463cf" and "2c7afc146c5987f64bb0352eb34396e680834982" have entirely different histories.
6c1d177e03
...
2c7afc146c
|
@ -47,11 +47,6 @@
|
||||||
myHome = {
|
myHome = {
|
||||||
username = "nixos";
|
username = "nixos";
|
||||||
homeDirectory = "/home/nixos";
|
homeDirectory = "/home/nixos";
|
||||||
shellInitExtra = ''
|
|
||||||
# x11 output for WSL
|
|
||||||
export DISPLAY=$(ip route list default | awk '{print $3}'):0
|
|
||||||
export LIBGL_ALWAYS_INDIRECT=1
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
@ -65,11 +60,6 @@
|
||||||
myHome = {
|
myHome = {
|
||||||
username = "ubuntu_admin";
|
username = "ubuntu_admin";
|
||||||
homeDirectory = "/home/ubuntu_admin";
|
homeDirectory = "/home/ubuntu_admin";
|
||||||
shellInitExtra = ''
|
|
||||||
# x11 output for WSL
|
|
||||||
export DISPLAY=$(ip route list default | awk '{print $3}'):0
|
|
||||||
export LIBGL_ALWAYS_INDIRECT=1
|
|
||||||
'';
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -23,13 +23,6 @@
|
||||||
pkgs.rust-analyzer
|
pkgs.rust-analyzer
|
||||||
pkgs.stdenv.cc.cc.lib
|
pkgs.stdenv.cc.cc.lib
|
||||||
pkgs.yq
|
pkgs.yq
|
||||||
pkgs.python39Full
|
|
||||||
pkgs.xorg.xclock
|
|
||||||
pkgs.logseq
|
|
||||||
# pkgs.python310
|
|
||||||
# pkgs.python310.numpy
|
|
||||||
# pkgs.python310Packages.tensorflow
|
|
||||||
# pkgs.python310Packages.scikit-learn
|
|
||||||
] ++ (myHome.packages or [ ]);
|
] ++ (myHome.packages or [ ]);
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
|
||||||
|
@ -55,7 +48,7 @@
|
||||||
};
|
};
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraConfig = builtins.readFile ../tmux/tmux.conf;
|
extraConfig = builtins.readFile ../tmux/.tmux.conf;
|
||||||
};
|
};
|
||||||
programs.exa = {
|
programs.exa = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -76,11 +69,6 @@
|
||||||
# https://github.com/nix-community/home-manager/pull/3287
|
# https://github.com/nix-community/home-manager/pull/3287
|
||||||
# extraConfig = builtins.readFile ../neovim/init.lua;
|
# extraConfig = builtins.readFile ../neovim/init.lua;
|
||||||
};
|
};
|
||||||
programs.bash = {
|
|
||||||
enable = true;
|
|
||||||
enableCompletion = true;
|
|
||||||
initExtra = myHome.shellInitExtra or "";
|
|
||||||
};
|
|
||||||
programs.zsh = {
|
programs.zsh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableCompletion = true;
|
enableCompletion = true;
|
||||||
|
@ -97,7 +85,6 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = [ "git" "sudo" "command-not-found" "gitignore" "ripgrep" "rust" ];
|
plugins = [ "git" "sudo" "command-not-found" "gitignore" "ripgrep" "rust" ];
|
||||||
};
|
};
|
||||||
initExtra = myHome.shellInitExtra or "";
|
|
||||||
};
|
};
|
||||||
programs.git = {
|
programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
35
ssh/config
35
ssh/config
|
@ -1,45 +1,18 @@
|
||||||
Host *
|
|
||||||
IdentityFile ~/.ssh/id_rsa
|
|
||||||
|
|
||||||
# felia mirror on windows
|
|
||||||
Host felia-win
|
Host felia-win
|
||||||
HostName felia.coati-celsius.ts.net
|
HostName felia.coati-celsius.ts.net
|
||||||
Port 2222
|
Port 2222
|
||||||
User _nhitrl
|
User _nhitrl
|
||||||
|
IdentityFile ~/.ssh/id_rsa
|
||||||
|
|
||||||
# Ubuntu 12c 32G-RAM
|
|
||||||
Host felia
|
Host felia
|
||||||
HostName felia.coati-celsius.ts.net
|
HostName felia.coati-celsius.ts.net
|
||||||
User ubuntu_admin
|
|
||||||
Port 22
|
Port 22
|
||||||
|
User ubuntu_admin
|
||||||
|
IdentityFile ~/.ssh/id_rsa
|
||||||
|
|
||||||
# 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
|
IdentityFile ~/.ssh/id_rsa
|
||||||
|
|
||||||
# AMZ Linux aarch64 hungtr@AMZ
|
|
||||||
Host nioma
|
|
||||||
HostName ec2.pegasust.com
|
|
||||||
User ec2-user
|
|
||||||
IdentityFile ~/.ssh/free-aws.pem
|
|
||||||
Port 22
|
|
||||||
|
|
||||||
# Ubuntu 22.04 LTS Pegasust@Linode
|
|
||||||
Host ocolo-lab
|
|
||||||
HostName ocolo.pegasust.com
|
|
||||||
User root
|
|
||||||
Port 22
|
|
||||||
|
|
||||||
# NixOS Pegasust@Linode
|
|
||||||
Host nyx
|
|
||||||
HostName nyx.pegasust.com
|
|
||||||
User nyx
|
|
||||||
Port 22
|
|
||||||
|
|
||||||
Host ocolo-lab-2
|
|
||||||
HostName 139.144.18.164
|
|
||||||
User root
|
|
||||||
Port 22
|
Port 22
|
||||||
|
|
||||||
|
|
|
@ -86,13 +86,4 @@ format = 'via [$symbol]($style)'
|
||||||
[git_status]
|
[git_status]
|
||||||
disabled = true
|
disabled = true
|
||||||
|
|
||||||
[shell]
|
|
||||||
zsh_indicator = "%"
|
|
||||||
fish_indicator = ""
|
|
||||||
powershell_indicator = "_"
|
|
||||||
unknown_indicator = "mystery shell"
|
|
||||||
style = "cyan bold"
|
|
||||||
disabled = false
|
|
||||||
|
|
||||||
[username]
|
|
||||||
show_always=true
|
|
||||||
|
|
|
@ -8,7 +8,7 @@ set -g display-time 1500
|
||||||
unbind C-b
|
unbind C-b
|
||||||
set -g prefix C-a
|
set -g prefix C-a
|
||||||
|
|
||||||
bind r source-file ~/.config/tmux/tmux.conf \; display "tmux.conf reloaded at ~/.tmux.conf"
|
bind r source-file ~/.tmux.conf \; display "tmux.conf reloaded at ~/.tmux.conf"
|
||||||
set -g base-index 1 # rebind to start from 0
|
set -g base-index 1 # rebind to start from 0
|
||||||
setw -g pane-base-index 1
|
setw -g pane-base-index 1
|
||||||
set-option -g renumber-windows on
|
set-option -g renumber-windows on
|
||||||
|
@ -16,5 +16,3 @@ set-option -g renumber-windows on
|
||||||
# status bar
|
# status bar
|
||||||
set -g status-style 'bg=#333333 fg=#5eacd3'
|
set -g status-style 'bg=#333333 fg=#5eacd3'
|
||||||
|
|
||||||
# Keybinds
|
|
||||||
set-window-option -g mode-keys vi
|
|
Loading…
Reference in New Issue