dark-firepit removed. no more crisises

flake.nix

@@ -52,7 +52,7 @@
     vscode-server.url = "github:msteen/nixos-vscode-server";
   };
 
-  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, vscode-server, nix-minecraft, hyprland, hyprpaper, hyprpicker, ... }:
+  outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, vscode-server, nix-minecraft, /* hyprland, hyprpaper, hyprpicker, */ ... }:
     let
       system = "x86_64-linux";
 
@@ -74,7 +74,7 @@
       };
       overlays = mapModules ./overlays import;
       nixosModules = (mapModulesRec ./modules import) ++ [
-        hyprland.nixosModules.default
+        #hyprland.nixosModules.default
         vscode-server.nixosModule
       ];
       nixosConfigurations = mapModules ./hosts (host: mkHost host { inherit system; });

hosts/lucent-firepit/authorizedKeys.nix

@@ -1,37 +1,39 @@
 [
-  {
-    hostname = "aether@subsurface";
+  # Aether
+  { hostname = "aether@subsurface";
     ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFLDtlpOnQFQq9mPMhR1uQnjrTexcof+c+y+ot/7Jgnt aether@subsurface";
     wg = "XEVSwNNPR7RTt/O0ihYmv3nopbPmqkCMGrVRCixnPWw=";
   }
-  {
-    hostname = "oatmealine@void-defragmented";
+  { hostname = "aether@Aethers-Mini.station";
+    ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINmy7rPZky0M8p5+d9smUnSTjG25CIsQPYibKsBxgvdw aether@Aethers-Mini.station";
+  }
+  { hostname = "aether@phone";
+    ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP5LPWVgsFAH9XErXGZB+lzwb/+7EiEb6eatNWoJag5i JuiceSSH";
+  }
+
+  # oatmealine
+  { hostname = "oatmealine@void-defragmented";
     ssh = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDbJDo79TD9RV77MnArQwS94wzBo+6l6dYQnaNdPk2xo019+tc7GyuQ+GHyh4qewIUQOwe3Ddj4YxJN9IS3E360/6RdaNDxn3hUp2jh/x9SOjh0W86FJfdHEQViNeFVSXJv+QBZT9ibR9IbOHYezhD6gtz15pNhEqhQyqw2hJuQzxLvnictTc4lPQnWN9I8ga+OVSh7Uauu5OKbUOyRRj1Er/hasNviCaGBJnLDYjSqTDRvEbdYlfuhrYITJ+viZOQq7Nczs6dbsl627FCvhr5vQi+/vvpx9DKHDvpGvbEglOmOwgffSkaOIIx/pNHTsRccX7c3/im6z4pCDj4bEuiqqawv2C6DV0aM01bW8cchOJrmSQGTygTrJuuVPHp4IRIZNvQGS+97j4u+d7ofricLR1RoxJcQibvRA9rhhYI2FhwrAweuuLktjSj5RkQnypd9kjOuH+nhgLZunreNoyPNDCmcOBA7BA0rD2pCIKB9SzlelMjVuvy0PA8uWfNFfxGU+m3BH7lQS/A6V+NeYrMGiZ+u+t9Pgr6kAoR7mAUO+obIdMM/lOp1/zGBY8lk2Aq3GQcyGVNi18VR0uA+NMaJYXA1JzSiPCz7cQn1pKIAKiDEnzicf5MxDHIi5F1iQ/Lc+NftgmDXZEAHDY1bQepScOttaOZQZLpYP/eWwlEQJQ== oatmealine@beppy";
     wg = "533BncNpHKzJVx5lwdxBg+aUfLGqea9uUYz70C6wxyg=";
   }
-  {
-    hostname = "oatmealine@beppy-phone";
+  { hostname = "oatmealine@beppy-phone";
     ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUgEsAQ7EL5/3STLAk/0qWJddYqfBY71yS9RtRSWd3w JuiceSSH";
     wg = "qT7gX8beM/kW9AYg5dV1e3cLzLDTLxMO2CmnbFpMVj4=";  
   }
-  {
-    hostname = "mayflower@BMW-M550d-xDrive"; # car 5
+  {	hostname = "oatmealine@dark-firepit";
+  	ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKz3Zkhrht1EX32LIbkSvql1p15EXqxTy/4xQKlj0CUx oatmealine@disroot.org";
+  }
+
+  # mayflower
+  { hostname = "mayflower@BMW-M550d-xDrive";
     ssh = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCIeoFll8XBRwu6vbQHUj4LNbvRvLMTdqUP1su9hGxow8olGKIZf/nINkt+/B5w4UumLFnOOROIWVhSH/04oxGVCWdk29ibPo3yYJIAoQrqOXYWCrGpMDd0z2n/0CwyXRAqmQ4rubnUZtnlabYCLh0eWMu9ZRSsSrQ+MiaUHES/vv1MxlLWHoEGfhLzoq7SyIsK88Mirgu9lSeHd/+2JybkQ9kNEWTxnzUPKwOMT0zLGo7vNLmfPhJ1WilQoV4F8skDbbgFNRuLO13ZDn6W2jqZ+zjf3H9khzPivG+oaKfHLMDD/zCwHM3rm3JyJzX7GF9EV73AqbNkzzsf54vKhYRT";
   }
-  {
-    hostname = "aether@phone";
-    ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP5LPWVgsFAH9XErXGZB+lzwb/+7EiEb6eatNWoJag5i JuiceSSH";
-  }
-  {
-    hostname = "lilith@bms-cab";
-    ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFb9uVy1x4XaO1uFOQBuERy6xw8cf7Dh24UT0jJs7g3z lilith@bms-cab";
-  }
-  {
-    hostname = "swag@BMW-M550d-xDrive"; # mayflower 2
+  { hostname = "swag@BMW-M550d-xDrive";
     ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC1fJn2ZY9fhBr4E1Gc91uRWS5r+EZ4OHy3RmuAjx7kr swag@BMW-M550d-xDrive";
   }
-  {
-    hostname = "aether@Aethers-Mini.station";
-    ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHa1Nv8RlnJ4XnyCyMnpixnjNlGwvrj8cpUrFDJ6UhGs aether@Aethers-Mini.station";
+
+  # winter
+  { hostname = "lilith@bms-cab";
+    ssh = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFb9uVy1x4XaO1uFOQBuERy6xw8cf7Dh24UT0jJs7g3z lilith@bms-cab";
   }
 ]

hosts/lucent-firepit/default.nix

@@ -33,7 +33,7 @@ in {
     # aether??? is that... reference.../.??? aether https://www.curseforge.com/minecraft/mc-mods/aether mod  Curseforge minecraft Forge Patreon Chat twitter code license Assets license All rights reserved categories Last Updated apr 17 2021 Game Version 1.12.2 aether
     aether = {
       conf = {
-        packages = with pkgs; [ bat duf broot nftables tmux bottom writefreely helix ];
+        packages = with pkgs; [ bat duf broot helix nil ];
         shell = pkgs.unstable.fish;
         extraGroups = [ "wheel" "nix-users" "dotfiles" ];
         initialHashedPassword = "!";
@@ -46,7 +46,7 @@ in {
 
       homeConf.home = {
         sessionVariables = {
-          EDITOR = "nvim";
+          EDITOR = "hx";
           NIX_REMOTE = "daemon";
         };
       };
@@ -213,6 +213,8 @@ in {
     };
   };
 
+  programs.fish.enable = true;
+
   security.doas = {
     extraRules = [
       { users = [ "aether" ]; noPass = false; persist = true; keepEnv = true; }
@@ -233,13 +235,14 @@ in {
     # temporarily disabled
     enableIPv6 = false;
 
-    interfaces.eno1.ipv4.addresses = [
-      { address = "51.89.98.8";
+    usePredictableInterfaceNames = false;
+    interfaces.eth0.ipv4.addresses = [
+      { address = "46.4.96.113";
         prefixLength = 24;
       }
     ];
 
-    defaultGateway = "51.89.98.254";
+    defaultGateway = "46.4.96.97";
     nameservers = [ "8.8.8.8" "1.1.1.1" ];
 
     #interfaces.eno1.ipv6.addresses = [

hosts/lucent-firepit/hardware-configuration.nix

@@ -9,12 +9,12 @@
     initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ];
     initrd.kernelModules = [ ];
     kernelPackages = pkgs.linuxPackages_hardened;
-    kernelModules = [ "kvm-intel" ];
+    kernelModules = [ "kvm-amd" ];
     loader = {
-      systemd-boot = {
-        enable = true;
-        configurationLimit = 10;
-      };
+      # and them squiggles steady shifting in the wind
+      grub.enable = lib.mkForce false;
+
+      systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
     };
   };
@@ -39,21 +39,25 @@
 
   fileSystems = {
     "/" = {
-      device = "/dev/disk/by-uuid/819f03bb-73d2-4ae1-9fd2-01099e8efae6";
+      device = "/dev/disk/by-uuid/2fb43a32-d7c2-4ed1-97c6-4588d731a132";
       fsType = "xfs";
+      options = [
+        "noatime"
+        "nodiratime"
+        "discard"
+      ];
     };
 
     "/boot" = {
-      device = "/dev/disk/by-uuid/D018-F9AF";
+      device = "/dev/disk/by-uuid/7192-FE7C";
       fsType = "vfat";
     };
   };
 
-  swapDevices = [
-    { device = "/dev/disk/by-uuid/01ba93e4-71e3-404d-9549-351e22130185"; }
-    { device = "/dev/disk/by-uuid/dee63218-1666-4035-8d63-b9e0e0b2cd28"; }
-  ];
+  swapDevices = [ ];
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 }

hosts/lucent-firepit/og/configuration.nix

@@ -0,0 +1,115 @@
+# 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/sda"; # or "nodev" for efi only
+
+  # networking.hostName = "nixos"; # 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
+  #     tree
+  #   ];
+  # };
+
+  # 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;
+
+  # Open ports in the firewall.
+  # networking.firewall.allowedTCPPorts = [ ... ];
+  # networking.firewall.allowedUDPPorts = [ ... ];
+  # Or disable the firewall altogether.
+  # networking.firewall.enable = false;
+
+  # 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 = "23.05"; # Did you read the comment?
+
+}
+

hosts/lucent-firepit/og/hardware-configuration.nix

@@ -0,0 +1,63 @@
+# 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 =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "tmpfs";
+      fsType = "tmpfs";
+    };
+
+  fileSystems."/nix/.ro-store" =
+    { device = "/nix/store/bg6n34zcsz3vil02fjf7lk35xli2ssd6-squashfs.img (deleted)";
+      fsType = "squashfs";
+      options = [ "loop" ];
+    };
+
+  fileSystems."/nix/.rw-store" =
+    { device = "tmpfs";
+      fsType = "tmpfs";
+    };
+
+  fileSystems."/nix/store" =
+    { device = "overlay";
+      fsType = "overlay";
+    };
+
+  fileSystems."/mnt" =
+    { device = "/dev/disk/by-uuid/2fb43a32-d7c2-4ed1-97c6-4588d731a132";
+      fsType = "xfs";
+    };
+
+  fileSystems."/mnt/boot" =
+    { device = "/dev/disk/by-uuid/ABFD-C238";
+      fsType = "vfat";
+    };
+
+  fileSystems."/mnt/mnt" =
+    { device = "/dev/disk/by-uuid/b5adde13-80af-4314-b0d5-ab79b10cc078";
+      fsType = "ext4";
+    };
+
+  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.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp5s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}

modules/editors/helix.nix

@@ -11,7 +11,7 @@ in {
     };
   };
 
-  #config = mkIf cfg.enable {
-  #  
-  #};
+  config = mkIf cfg.enable {
+    
+  };
 }

modules/hyprland.nix

@@ -4,10 +4,6 @@ with lib;
 let
   cfg = config.modules.hyprland;
 in {
-  imports = [
-    inputs.hyprland.nixosModules.default
-  ];
-
   options.modules.hyprland = {
     enable = mkOption {
       type = types.bool;
@@ -15,6 +11,7 @@ in {
     };
   };
 
+/*
   config = mkIf cfg.enable {
     programs.hyprland = {
       enable = true;
@@ -128,4 +125,5 @@ in {
       '';
     };
   };
-}
+*/
+}

modules/services/libreddit.nix

@@ -19,6 +19,7 @@ in {
     };
   };
 
+/*
   config = mkIf cfg.enable {
     services = {
       libreddit = {
@@ -37,4 +38,5 @@ in {
       };
     };
   };
+*/
 }

modules/services/ssh.nix

@@ -11,6 +11,7 @@ in {
       default = false;
       description = "Provide system SSH support though OpenSSH.";
     };
+
     requirePassword = mkOption {
       type = types.bool;
       default = true;
@@ -26,6 +27,7 @@ in {
         PermitRootLogin = "no";
       };
     };
+
     programs.gnupg.agent = {
       enable = true;
       enableSSHSupport = true;

packages/srb2kart/default.nix

@@ -21,7 +21,7 @@ releaseTag = "v1.6";
 
 assets = fetchurl {
   url = "https://github.com/STJr/Kart-Public/releases/download/${releaseTag}/AssetsLinuxOnly.zip";
-  sha256 = "sha256-A4HkxnDGQICucsJyHXYc5GCRbMP0M4NjreohhFOQarA=";
+  sha256 = "sha256-ejhPuZ1C8M9B0S4+2HN1T5pbormT1eVL3nlivqOszdE=";
 };
 
 in stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
     owner = "KartKrew";
     repo = "Kart-Public";
     domain = "git.do.srb2.org";
-    rev = "024a140e8d8a1f86ccf16ef3dd93e3bccbe3bd73";
+    rev = "v1.6";
     sha256 = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0=";
   };