Merge remote-tracking branch 'gitea/master'

nix-components
pegasust 2022-11-14 18:44:53 +00:00
commit 86e1110060
12 changed files with 69 additions and 37 deletions

View File

@ -34,8 +34,9 @@ My main text editor. It's based on `vim`, but stays loyal to `lua` ecosystem
Terminal multiplexor. Allows creating persistent sessions and multiple terminal windows
from one terminal.
- Config file: `./tmux/.tmux.conf`
- Command: `ln [-s] $PWD/tmux/.tmux.conf ~/.tmux.conf`
- Config file: `./tmux/tmux.conf`
- Command: `ln [-s] $PWD/tmux/tmux.conf ~/.tmux.conf`
- Or `ln [-s] $PWD/tmux/tmux.conf ~/.config/tmux/tmux.conf` (hardcoded, `$XDG_CONFIG_HOME` is ignored)
#### Notes

View File

@ -47,10 +47,13 @@
enable = true;
# settings = myLib.fromYaml (builtins.readFile ../alacritty/alacritty.yml);
};
# nix: Propagates the environment with packages and vars when enter (children of)
# a directory with shell.nix-compatible and .envrc
programs.direnv = {
enable = true;
nix-direnv.enable = true;
};
# z <path> as smarter cd
programs.zoxide = {
enable = true;
enableZshIntegration = true;

5
ssh/authorized_keys Normal file
View File

@ -0,0 +1,5 @@
sh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCgmng5xL/auvI2F8ufFAfId2Ey55ONHjgnKKSEWLVWkPMutXT3BCnSglNAuEVRLX2zfzg3beQd80AHTow+qro5QWI/rYfeL1QPNEwoThbRFcvtWLTlgzBGA4ejjpIF9sCPNp0sXrrQRfxRP7w4b23BcRJQcsDoaEtKGKJZ2GQIoOafkYypwcunANb54EAouZTfHEPKDr26Gfw8usc2Sae32G/80QLBF2jGabyexJjNE3F6hdJTwq5iiqIVdSr4ue82zo3M8jBdtCMDGaOliI5RWSa9iuX9o2scCGDU69Gkw7ma+JHOP/e9Z8sUz03TkjPbEnGi3EC3YAHEoDzmwqTi07hppCuzacLB5NZ9UZ1g5PzBIZR8TJTONngT08EQyGrkNv2sUnn0dtBqve5tHR04NuXy65ym7Iwl2DDVbAL0NlM4gKWzOGZ2CnSLT0WmkG2sQKU37NmS2pBJ8RXJBatUFe4vQVzqlFj39iRGIBV5XR0I9xcxDfCxBHFs3aIqAqE= hwtr@hwtr-prince
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAW4E8L/zGkcqixJo1102ddqeexoBMHIhXRXpWR3dTmJtbaaVbo4+rHRsjHPvHif9CRfi+BQ8CHG3zmBjH7DZPZIRCVtkms1EDe1k/G3fEnfgYc6gboJfoTdLkVjNOtdStTi03dCA/riQqUKc7/v16R5ZXIAmNCnmMHelObCSDPzYg8psZAUk1ZZY//pnhp9JRPsC2JxsshN7HCNIED9aFgrJkvUt+wUVGjVHzyQwyR6J7m1yyoivTwdmYdulG7OriLeeNq8vkoDmLGgLSC+zKehzJYOZsH3EKuxuZjQ3J9tK/NseQOhsQglRHE/OvphMwT/J96gl9dZR/LQXp4S6hwLccTzFfs8rLaTOIK6CEpqBUuBonot/1vJP5j5E73hfkHwZO7TQKwfXtpRCxCl5Nm3cB2Y3kz5mArDiwWioVsX4qd0XR0F9MFtuTVTn2f4K/Gwr9P3XMkLWXU1+1KbQiWIg+Zf5DpQgBW5HWryZzsMcjyMC2I2BJCl6Q+V8ofSM= nixos@Felia
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD49VHCU8S6zqNsaS0SFiVqULmOWtyVOIeteYSOznzTHJ0dVjXnamuj/uVsSXRkYIIdAkABWQm9WKELUC2SBBE7DgDj+Izv3cO7QkAJ9v1cxV1P1efrTytz8XtyX++XYygxXCwZ5zyqxhSF5ZW+FO0CNRx1cNisAhF6AMzoXRsyF1dqNioitXTN0xh0xx2mR0Bb3zy1kYNZVwn1uBYyd4Hz6CBgJ7Xi6d/STXWcmc0XnEJTllNSQNEpI6vJjL62JmUPubqDjVKh4awiPRPiw9By1FGaGVtHhOZ+8AvVMTps07GNVJ+XZi1DJLmeItpiCwYsWh96HCp3lup0onLzubpP pi@raspberrypi
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQClSDhyOeehUOIMdRonTDD9h7kBbzC3c/QG650S7vfhLE67UNt5tuUjazQg7pFj3O/5WnyqCpBOMJoPaSZ0S5gGdo4h4xatPUBAGDjMygKhg4VA0x7Lr3Tbc1CF8dyuRKVlB+aIWLIyLHHPL5wDao7tnvmuCGKDyaV8XFaKpzRZqAlpfn8svR90Y4wNFYr1V+F+Y6r8reB1Rph6A9BY4niDKY0MbFhvTj6VJQf++1ji0FziACVpYI9aqAcZ4ngReUtgWiIsnq5UMfrEk0vYBG/3KsYElaRig76Bucz1fBA16iAgQua1hthPifsw8vmaK5k6Q3c2SOdc5PGF6IlTfSGJ root@Fel
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH0Z5noQn3mHy5yiN3n6YyOKRhlQT6fx4NLmI/3d4vY6 root@Fel

View File

@ -38,9 +38,9 @@ Host nyx
User nyx
Port 22
Host ocolo-lab-2
HostName 139.144.18.164
User root
Host lizzi
HostName 172.105.135.218
User hungtr
Port 22
Host lizzi

View File

@ -1,31 +1,12 @@
{ lib, pkgs, config, modulesPath, ... }:
with lib;
let
nixos-wsl = import ./nixos-wsl;
in
{
imports = [
/etc/nixos/hardware-configuration.nix
"${modulesPath}/profiles/minimal.nix"
./hardware-configuration.nix
nixos-wsl.nixosModules.wsl
];
system.stateVersion = "22.05";
wsl = {
enable = true;
automountPath = "/mnt";
defaultUser = "nixos"; # if change defaultUser, make sure uid to be 1000 (first user)
startMenuLaunchers = true;
automountOptions = "drvfs,metadata,uid=1000,gid=100";
# Enable native Docker support
# docker-native.enable = true;
# Enable integration with Docker Desktop (needs to be installed)
docker-desktop.enable = true;
};
# users.users.<defaultUser>.uid = 1000;
# networking.hostName = "nixos";
@ -34,17 +15,38 @@ in
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
users.users.hungtr = {
isNormalUser = true;
home = "/home/hungtr";
description = "pegasust/hungtr";
extraGroups = [ "wheel" "networkmanager" ];
openssh.authorizedKeys.keys = lib.strings.splitString "\n" (builtins.readFile ../ssh/authorized_keys);
};
# Let's just open ssh server in general, even though it may not be
# network-accessible
services.openssh = {
permitRootLogin = "no";
enable = true;
};
# Some basic programs
programs.neovim = {
enable = true;
defaultEditor = true;
};
programs.git = {
enable = true;
# more information should be configured under user level
};
environment.systemPackages = [
pkgs.gnumake
pkgs.wget
pkgs.inetutils
pkgs.mtr
pkgs.sysstat
];
}

View File

@ -12,37 +12,57 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/sdd";
{
device = "/dev/sde";
fsType = "ext4";
};
fileSystems."/mnt/wsl" =
{
device = "tmpfs";
fsType = "tmpfs";
};
fileSystems."/mnt/wsl/docker-desktop/shared-sockets/guest-services" =
{
device = "none";
fsType = "tmpfs";
};
fileSystems."/usr/lib/wsl/drivers" =
{ device = "drivers";
{
device = "drivers";
fsType = "drvfs";
};
fileSystems."/usr/lib/wsl/lib" =
{ device = "lib";
{
device = "lib";
fsType = "drvfs";
};
fileSystems."/mnt/wsl" =
{ device = "tmpfs";
{
device = "tmpfs";
fsType = "tmpfs";
};
fileSystems."/mnt/c" =
{ device = "C:";
{
device = "C:";
fsType = "drvfs";
};
fileSystems."/mnt/d" =
{ device = "D:";
{
device = "D:";
fsType = "drvfs";
};
fileSystems."/mnt/f" =
{ device = "F:";
{
device = "F:";
fsType = "drvfs";
};

View File

@ -0,0 +1,3 @@
# Machine-specific profile
- Currently only contains machine-specific details such as the `hardware-configuration.nix`

View File

@ -6,13 +6,11 @@ let
in
{
imports = [
./hardware-configuration.nix
/etc/nixos/hardware-configuration.nix
nixos-wsl.nixosModules.wsl
configuration.nix
./configuration.nix
];
system.stateVersion = "22.05";
wsl = {
enable = true;
automountPath = "/mnt";

View File

@ -8,7 +8,7 @@ set -g display-time 1500
unbind C-b
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
setw -g pane-base-index 1
set-option -g renumber-windows on