diff --git a/flake.nix b/flake.nix index a8b0f23..46c0772 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,6 @@ outputs = inputs: { nixosConfigurations = { - nixos-vm = inputs.nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ @@ -27,7 +26,16 @@ ./modules/environment.nix ]; specialArgs = { inherit inputs; }; + }; + algiz = inputs.nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./hosts/algiz/configuration.nix + ./hosts/algiz/motd.nix + ./modules/environment.nix + ]; + specialArgs = { inherit inputs; }; }; - }; }; +}; } diff --git a/hosts/algiz/README.md b/hosts/algiz/README.md new file mode 100644 index 0000000..e15bc4f --- /dev/null +++ b/hosts/algiz/README.md @@ -0,0 +1,21 @@ +sudo -u git ssh-keygen -t rsa -b 4096 -C "Gitea Host Key" +sudo -u git cat /home/git/.ssh/id_rsa.pub | sudo -u git tee -a /home/git/.ssh/authorized_keys +sudo -u git chmod 600 /home/git/.ssh/authorized_keys + + +Should Look like this +``` +# SSH pubkey from git user +ssh-rsa + +# other keys from users +command="/usr/local/bin/gitea --config=/data/gitea/conf/app.ini serv key-1",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty +``` + + +Nixify this step.... +cat <<"EOF" | sudo tee /usr/local/bin/gitea +#!/bin/sh +ssh -p 2222 -o StrictHostKeyChecking=no git@127.0.0.1 "SSH_ORIGINAL_COMMAND=\"$SSH_ORIGINAL_COMMAND\" $0 $@" +EOF +sudo chmod +x /usr/local/bin/gitea diff --git a/hosts/algiz/configuration.nix b/hosts/algiz/configuration.nix new file mode 100644 index 0000000..d2c4228 --- /dev/null +++ b/hosts/algiz/configuration.nix @@ -0,0 +1,114 @@ +{ inputs, lib, config, pkgs, ... }: +{ + # TODO: put in hardware-configuration.nix + imports = [ + ./hardware-configuration.nix + ]; + security.sudo.wheelNeedsPassword = false; + users.defaultUserShell = pkgs.zsh; + users.extraUsers = { + daylin = { + isNormalUser = true; + extraGroups = [ "wheel" "docker" ]; + useDefaultShell = true; + initialPassword = "nix"; + }; + git = { + isNormalUser = true; + }; + }; + + services.resolved.enable = true; + nixpkgs.config.allowUnfree = true; + + boot.kernelPackages = pkgs.linuxPackages_latest; + + services.cron = { + enable = true; + systemCronJobs = [ + # update repos + "0 * * * * make -C /home/daylin/git soft-repos" + # update container so home page is semi-accurate + "0 2 * * * make -C /home/daylin/git update-soft-serve" + ]; + }; + + networking.hostName = "algiz"; + time.timeZone = "America/Chicago"; + programs.zsh.enable = true; + virtualisation.docker.enable = true; + + programs.nix-ld.enable = true; + programs.nix-ld.libraries = with pkgs; [ + stdenv.cc.cc + curl # for choosenim + ]; + + environment.systemPackages = with pkgs; [ + zsh + + tmux + wget + unzip + less + gnumake + gcc + gnupg + + curl + + git + + vim + neovim + + starship + atuin + chezmoi + bat + fzf + delta + ripgrep + lsd + + gh + lazygit + + nixpkgs-fmt + lazydocker + + python3 + micromamba + + nodejs + go + rustup + ]; + + + # Use the GRUB 2 boot loader. + boot.loader.grub.enable = true; + boot.loader.grub.version = 2; + boot.loader.grub.device = "/dev/vda"; # or "nodev" for efi only + + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + services.openssh.permitRootLogin = "no"; + users.mutableUsers = false; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "22.11"; # Did you read the comment? +} + diff --git a/hosts/algiz/configuration.nix2 b/hosts/algiz/configuration.nix2 new file mode 100644 index 0000000..25b6599 --- /dev/null +++ b/hosts/algiz/configuration.nix2 @@ -0,0 +1,123 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the GRUB 2 boot loader. + boot.loader.grub.enable = true; + boot.loader.grub.version = 2; + # boot.loader.grub.efiSupport = true; + # boot.loader.grub.efiInstallAsRemovable = true; + # boot.loader.efi.efiSysMountPoint = "/boot/efi"; + # Define on which hard drive you want to install Grub. + boot.loader.grub.device = "/dev/vda"; # or "nodev" for efi only + + networking.hostName = "algiz"; # Define your hostname. + + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkbOptions in tty. + # }; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + + + + + # Configure keymap in X11 + # services.xserver.layout = "us"; + # services.xserver.xkbOptions = { + # "eurosign:e"; + # "caps:escape" # map caps to escape. + # }; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + # users.users.alice = { + # isNormalUser = true; + # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # firefox + # thunderbird + # ]; + # }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + # environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + # ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + services.openssh.enable = true; + services.openssh.permitRootLogin = "no"; + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + users.mutableUsers = false; + + users.users.nixos = { + isNormalUser = true; + initialPassword = "ChangeMeVultr"; + extraGroups = ["wheel"]; +}; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It‘s perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "22.11"; # Did you read the comment? + +} + diff --git a/hosts/algiz/hardware-configuration.nix b/hosts/algiz/hardware-configuration.nix new file mode 100644 index 0000000..9844fb9 --- /dev/null +++ b/hosts/algiz/hardware-configuration.nix @@ -0,0 +1,31 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = [ ]; + + boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/eb6cbf1e-e4a7-4312-a1af-4f78ad9cf138"; + fsType = "btrfs"; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.ens3.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + virtualisation.hypervGuest.enable = true; +} diff --git a/hosts/algiz/motd.nix b/hosts/algiz/motd.nix new file mode 100644 index 0000000..accae4f --- /dev/null +++ b/hosts/algiz/motd.nix @@ -0,0 +1,17 @@ +{ ... }: { + users.motd = '' +  + ⠀⠀⢀⡀⠀⠀⢀⡀⠀⠀⢀⡀⠀⠀ + ⠀⠀⠙⢿⣄⠀⢸⡇⠀⣠⡿⠋⠀⠀ + ⠀⠀⠀⠀⠙⢷⣼⣧⡾⠋⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⢻⡟⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⢸⡇⠀⠀⠀⠀⠀⠀ + ⠀⠀⠀⠀⠀⠀⠈⠁⠀⠀⠀⠀⠀⠀ algiz + ''; +} + + diff --git a/utils/generating-rune.sh b/utils/generating-rune.sh index 34e4ce6..7eefa80 100755 --- a/utils/generating-rune.sh +++ b/utils/generating-rune.sh @@ -1,16 +1,18 @@ -#!/usr/bin/env bash +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p ascii-image-converter + set -e declare -A IMG_SRC IMG_SRC=( [jeran]=https://upload.wikimedia.org/wikipedia/commons/0/01/Runic_letter_jeran.png [othalan]=https://upload.wikimedia.org/wikipedia/commons/1/16/Runic_letter_othalan.png + [algiz]=https://upload.wikimedia.org/wikipedia/commons/1/14/Runic_letter_algiz.png ) - if [[ $# -eq 0 ]]; then echo please provide rune name echo options: - for i in "${!IMG_SRC[@]}";do + for i in "${!IMG_SRC[@]}"; do echo $i done exit 1