From eab31736ccca20ae095e6914f776f0780f82dde6 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Thu, 21 Nov 2024 19:06:34 -0500 Subject: Switch to bash, misc --- hosts/moyo/container.nix | 53 ++++++++++++++-------------- hosts/sofue/configuration.nix | 27 ++++++++++----- hosts/yashinoki/configuration.nix | 55 ++++++++++++------------------ hosts/yashinoki/hardware-configuration.nix | 3 -- 4 files changed, 67 insertions(+), 71 deletions(-) (limited to 'hosts') diff --git a/hosts/moyo/container.nix b/hosts/moyo/container.nix index d4e503b..d3483b5 100644 --- a/hosts/moyo/container.nix +++ b/hosts/moyo/container.nix @@ -1,23 +1,11 @@ -{ config, lib, pkgs, modulesPath, ... }: -let - inherit (import ../../nix/utils.nix) disks; -in { +{ config, lib, pkgs, modulesPath, ... }: { imports = [ "${modulesPath}/virtualisation/lxc-container.nix" ../../nix/system.nix ]; - system.stateVersion = "24.05"; - boot.isContainer = true; - nix.settings.system-features = [ "gccarch-znver1" ]; -# nixpkgs.hostPlatform = { -# gcc.arch = "znver1"; -# gcc.tune = "znver1"; -# system = "x86_64-linux"; -# }; - users.users.andrew = { isNormalUser = true; uid = 1000; @@ -25,10 +13,17 @@ in { }; nix.settings.trusted-users = [ "andrew" ]; + nix.settings.system-features = [ "gccarch-znver1" ]; + nixpkgs.hostPlatform = { + #gcc.arch = "znver1"; + #gcc.tune = "znver1"; + system = "x86_64-linux"; + }; + networking = { hostName = "the-p"; - dhcpcd.enable = false; useDHCP = false; + dhcpcd.enable = false; useHostResolvConf = false; wireless.enable = false; firewall = { @@ -50,22 +45,30 @@ in { }; }; - environment.shellAliases = { - vi = "nvim"; - top = "htop"; - }; - - programs.zsh.enable = true; - environment.shells = [ pkgs.zsh ]; - environment.pathsToLink = [ "/share/zsh" ]; - users.defaultUserShell = pkgs.zsh; + users.defaultUserShell = pkgs.bashInteractive; environment.systemPackages = with pkgs; [ kitty.terminfo - neovim screen htop - jdk17 + ((vim-full.override { + features = "small"; + guiSupport = "off"; + luaSupport = false; + pythonSupport = false; + rubySupport = false; + cscopeSupport = false; + netbeansSupport = false; + ximSupport = false; + ftNixSupport = false; + sodiumSupport = false; + }).customize { + name = "vi"; + vimrcConfig = { customRC = ""; }; + }) + jdk23 #graalvm-oracle ]; + + system.stateVersion = "25.05"; } diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix index b80b8ac..2765eef 100644 --- a/hosts/sofue/configuration.nix +++ b/hosts/sofue/configuration.nix @@ -6,15 +6,17 @@ in rec { imports = [ "${modulesPath}/virtualisation/lxc-container.nix" ../../nix/system.nix + ../../nix/x86.nix ../../nix/user.nix - ../../nix/scripts.nix ../../nix/audio.nix ../../nix/bluetooth.nix ../../nix/email.nix - ../../nix/gaming.nix ../../nix/amdgpu.nix ../../nix/mesa_git.nix - ../../nix/programs/zsh.nix + ../../nix/gaming.nix + ../../nix/virtualisation.nix + ../../nix/scripts.nix + ../../nix/programs/bash.nix ../../nix/programs/nvim.nix ../../nix/programs/sway.nix ../../nix/programs/kitty.nix @@ -64,18 +66,25 @@ in rec { boot.isContainer = true; nix.settings.system-features = [ "gccarch-znver2" ]; -# nixpkgs.hostPlatform = { -# gcc.arch = "znver2"; -# gcc.tune = "znver2"; -# system = "x86_64-linux"; -# }; + nixpkgs.hostPlatform = { + #gcc.arch = "znver2"; + #gcc.tune = "znver2"; + system = "x86_64-linux"; + }; + + boot.binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ]; + # Only needed in containers. + fileSystems."/proc/sys/fs/binfmt_misc" = { + device = "binfmt_misc"; + fsType = "binfmt_misc"; + }; networking = { hostName = "sofue"; + wireless.enable = false; dhcpcd.enable = false; useDHCP = false; useHostResolvConf = false; - wireless.enable = false; firewall.enable = false; extraHosts = '' 192.168.1.192 iroha diff --git a/hosts/yashinoki/configuration.nix b/hosts/yashinoki/configuration.nix index 8df933e..c7a30b0 100644 --- a/hosts/yashinoki/configuration.nix +++ b/hosts/yashinoki/configuration.nix @@ -5,14 +5,15 @@ let in { imports = [ ./hardware-configuration.nix - ../../nix/scripts.nix ../../nix/user.nix ../../nix/system.nix ../../nix/audio.nix ../../nix/bluetooth.nix ../../nix/email.nix ../../nix/intel.nix - ../../nix/programs/zsh.nix + ../../nix/virtualisation.nix + ../../nix/scripts.nix + ../../nix/programs/bash.nix ../../nix/programs/nvim.nix ../../nix/programs/sway.nix ../../nix/programs/kitty.nix @@ -56,11 +57,12 @@ in { }; nix.settings.system-features = [ "gccarch-skylake" ]; -# nixpkgs.hostPlatform = { -# gcc.arch = "skylake"; -# gcc.tune = "skylake"; -# system = "x86_64-linux"; -# }; + nixpkgs.hostPlatform = { + #gcc.arch = "skylake"; + #gcc.tune = "skylake"; + system = "x86_64-linux"; + }; + boot.binfmt.emulatedSystems = [ "armv7l-linux" "aarch64-linux" ]; boot.kernelPackages = pkgs.linuxPackages_latest; boot.supportedFilesystems = [ ]; @@ -96,17 +98,19 @@ in { networking = { hostName = "yashinoki"; - useNetworkd = true; - wireless = { + nameservers = [ + "9.9.9.9" + "149.112.112.112" + "1.1.1.1" + "1.0.0.1" + ]; + useDHCP = false; + dhcpcd.enable = false; + networkmanager = { enable = true; - userControlled.enable = true; - fallbackToWPA2 = false; - networks."Verizon_TMKS9N" = { - pskRaw = "794b2c76b39a7f83d08e028e20fb980cef890424ae0b69acdf2e37c590a9fb6a"; - authProtocols = [ "WPA-PSK" "WPA-EAP" "FT-PSK" "FT-EAP" ]; - }; + dns = "none"; + wifi.powersave = true; }; - nameservers = [ "9.9.9.9" "149.112.112.112" ]; firewall = { enable = true; allowedTCPPorts = []; @@ -119,24 +123,7 @@ in { 173.62.191.72 boomerang ''; }; - systemd.network = { - enable = true; - networks."wlp3s0" = { - enable = true; - name = "wlp3s0"; - dhcpV6Config.UseDNS = false; - dhcpV4Config.UseDNS = false; - }; - }; - services.resolved = { - enable = true; - dnssec = "true"; - domains = [ "~." ]; - fallbackDns = [ "1.1.1.1" "1.0.0.1" ]; - extraConfig = '' - DNSOverTLS=yes - ''; - }; + users.users.andrew.extraGroups = [ "networkmanager" ]; fileSystems."/home/andrew/c" = { device = "192.168.1.206:/home/andrew/c"; diff --git a/hosts/yashinoki/hardware-configuration.nix b/hosts/yashinoki/hardware-configuration.nix index 678dcb5..fe5e08d 100644 --- a/hosts/yashinoki/hardware-configuration.nix +++ b/hosts/yashinoki/hardware-configuration.nix @@ -33,8 +33,5 @@ [ { device = "/dev/yashinoki-vg0/swap"; } ]; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } -- cgit v1.2.3-101-g0448