clean up config + update + rice

hosts/kitagawa/configs/fastfetch.nix

@@ -125,7 +125,7 @@
         "break"
         {
           type = "custom";
-          format = "┌──────────────── Age / Uptime ────────────────┐";
+          format = "┌──────────────── Age + Uptime ────────────────┐";
         }
         {
 	        type = "disk";

hosts/kitagawa/configs/fetch.nix

@@ -0,0 +1,8 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
+  programs.zsh.initContent = lib.mkOrder 1500 "${pkgs.fetch}/bin/fetch";
+}

hosts/kitagawa/configs/kitty.nix

@@ -0,0 +1,16 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: {
+  programs.kitty = {
+    enable = true;
+
+    font = lib.mkForce {
+      name = "Iosevka Comfy";
+      package = pkgs.iosevka-comfy.comfy;
+      size = 12;
+    };
+  };
+}

hosts/kitagawa/configs/zsh.nix

@@ -0,0 +1,14 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  programs.zsh.shellAliases = {
+    wake-takamaki = "ssh sakamoto .local/bin/wake-takamaki";
+    shutdown-takamaki = "ssh takamaki universal-shutdown";
+    reboot-takamaki = "ssh takamaki universal-reboot";
+    switch-takamaki-os = "ssh takamaki switch-os";
+    apply-config = "zsh -c 'cd /home/grey/nixos; git add .; nh os switch .'";
+    update-system = "zsh -c 'cd /home/grey/nixos; git add .; nh os switch -u .'";
+  };
+}

hosts/kitagawa/default.nix

@@ -13,9 +13,11 @@ in {
     ../../global-default.nix
     ./hardware-configuration.nix
     "${modules-dir}/zsh.nix"
-    "${modules-dir}/display-managers/lightdm.nix"
+    "${modules-dir}/display-managers/ly.nix"
     "${modules-dir}/window-managers/niri.nix"
+    "${modules-dir}/nautilus.nix"
     ./modules/hardware-fixes.nix
+    ./modules/plymouth.nix
   ];
 
   nix.buildMachines = [
@@ -23,11 +25,12 @@ in {
       hostName = "nixremote";
       systems = [ "x86_64-linux" "i686-linux" ];
       protocol = "ssh-ng";
-      maxJobs = 25;
-      speedFactor = 100;
+      maxJobs = 250;
+      speedFactor = 1000;
       supportedFeatures = [ "benchmark" "kvm" "big-parallel" ];
     }
   ];
+
   nix.distributedBuilds = true;
   nix.settings.builders-use-substitutes = true;
 
@@ -41,29 +44,30 @@ in {
   environment.systemPackages = with pkgs; [
     github-desktop
     moonlight-qt
-    steam-run
-    unityhub
   ];
 
   hardware.steam-hardware.enable = true;
 
-  boot.loader.limine = {
-    enable = true;
-    maxGenerations = 10;
-  };
+  boot = {
+    # Enable "Silent boot"
+    consoleLogLevel = 3;
+    initrd.verbose = false;
+    kernelParams = [
+      "quiet"
+      "rd.udev.log_level=3"
+      "rd.systemd.show_status=auto"
+    ];
 
-  services.iio-niri.enable = true;
+    loader.limine = {
+      enable = true;
+      maxGenerations = 10;
+    };
+  };
 
   stylix.enable = true;
   stylix.image = ../../assets/wallpapers/kitagawa.jpg;
   stylix.polarity = "dark";
 
-  services.fprintd.enable = true;
-
-  programs.nautilus-open-any-terminal = {
-    enable = true;
-    terminal = "kitty";
-  };
 
   # List services that you want to enable:
 

hosts/kitagawa/home.nix

@@ -9,7 +9,6 @@ global-configs = ../../global-configs;
 in {
   imports = [
     ../../global-home.nix
-    ./configs/fastfetch.nix
     "${global-configs}/zsh.nix"
     "${global-configs}/kitty.nix"
     "${global-configs}/floorp.nix"
@@ -18,7 +17,10 @@ in {
     "${global-configs}/equibop.nix"
     "${global-configs}/spicetify.nix"
     "${global-configs}/niri.nix"
-    #./configs/flatpak.nix
+    ./configs/kitty.nix
+    ./configs/fastfetch.nix
+    #./configs/fetch.nix
+    ./configs/zsh.nix
   ];
 
   home.packages = with pkgs; [
@@ -29,9 +31,6 @@ in {
     proton-vpn
     ente-auth
     signal-desktop
-    hyperfine
-    nautilus
-    code-nautilus
     xarchiver
     kdePackages.filelight
     remmina
@@ -99,16 +98,15 @@ in {
         User = "grey";
         IdentityFile = "~/.ssh/id_sakamoto";
       };
+      "nixremote" = {
+        HostName = "greyweather.dev";
+        Port = "2222";
+        User = "nixremote";
+        IdentityFile = "~/.ssh/id_takamaki";
+      };
     };
   };
 
-  programs.zsh.shellAliases = {
-    wake-takamaki = "ssh sakamoto .local/bin/wake-takamaki";
-    shutdown-takamaki = "ssh takamaki universal-shutdown";
-    reboot-takamaki = "ssh takamaki universal-reboot";
-    switch-takamaki-os = "ssh takamaki switch-os";
-  };
-
   home.activation = {
     linkRemminaPresets = lib.hm.dag.entryAfter ["writeBoundary"] ''
       #!/bin/bash

hosts/kitagawa/modules/hardware-fixes.nix

@@ -16,7 +16,7 @@
     serviceConfig = {
       Type = "simple";
       User = "root";
-      ExecStart = "${pkgs.busybox}/bin/sh -c \"if [ \\\"$(cat /proc/acpi/wakeup | grep 'LID' | grep 'enabled')\\\" != \\\"\\\" ]; then echo LID > /proc/acpi/wakeup; fi\"";
+      ExecStart = "/bin/sh -c \"if [ \\\"$(cat /proc/acpi/wakeup | grep 'LID' | grep 'enabled')\\\" != \\\"\\\" ]; then echo LID > /proc/acpi/wakeup; fi\"";
     };
   };
 
@@ -26,7 +26,11 @@
     serviceConfig = {
       Type = "simple";
       User = "root";
-      ExecStart = "${pkgs.busybox}/bin/sh -c \"${pkgs.kbd}/bin/dumpkeys -k|grep -v Incr_Console|grep -v Decr_Console|${pkgs.kbd}/bin/loadkeys\"";
+      ExecStart = "/bin/sh -c \"${pkgs.kbd}/bin/dumpkeys -k|grep -v Incr_Console|grep -v Decr_Console|${pkgs.kbd}/bin/loadkeys\"";
     };
   };
+
+  services.fprintd.enable = true;
+
+  services.iio-niri.enable = true;
 }

hosts/kitagawa/modules/plymouth.nix

@@ -0,0 +1,19 @@
+{
+  pkgs,
+  config,
+  ...
+}: let
+  plymouthTheme = "double";
+in {
+  stylix.targets.plymouth.enable = false;
+
+  boot.plymouth = {
+    enable = true;
+    theme = plymouthTheme;
+    themePackages = with pkgs; [
+      (adi1090x-plymouth-themes.override {
+        selected_themes = [ plymouthTheme ];
+      })
+    ];
+  };
+}

hosts/nixos-vm/configs/kitty.nix

@@ -1,12 +0,0 @@
-{
-  pkgs,
-  ...
-}: {
-  imports = [
-    ../../../global-configs/kitty.nix
-  ];
-
-  programs.kitty = {
-    themeFile = "Arthur";
-  };
-}

hosts/nixos-vm/default.nix

@@ -1,35 +0,0 @@
-# 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,
-  ...
-}: let
-modules-dir = ../../modules;
-in {
-  imports = [
-    ../../global-default.nix
-    ./hardware-configuration.nix
-    "${modules-dir}/display-managers/sddm.nix"
-    "${modules-dir}/desktop-environments/plasma6.nix"
-    "${modules-dir}/zsh.nix"
-  ];
-
-  boot.loader.systemd-boot.enable = true;
-
-  virtualisation.virtualbox.guest.enable = true;
-  virtualisation.virtualbox.guest.dragAndDrop = 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;
-}

hosts/nixos-vm/hardware-configuration.nix

@@ -1,29 +0,0 @@
-# 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" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" =
-    { device = "/dev/disk/by-uuid/9f7f7f45-eb12-4b9a-a751-8d675d8bb592";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/4D2B-B3CD";
-      fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
-    };
-
-  swapDevices = [ ];
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  virtualisation.virtualbox.guest.enable = true;
-}

hosts/nixos-vm/home.nix

@@ -1,35 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-global-configs = ../../global-configs;
-in {
-  imports = [
-    ../../global-home.nix
-    "${global-configs}/plasma.nix"
-    "${global-configs}/fastfetch.nix"
-    "${global-configs}/zen-browser.nix"
-    "${global-configs}/zsh.nix"
-    ./configs/kitty.nix
-  ];
-
-  home.packages = with pkgs; [
-    steam
-    equibop
-    prismlauncher
-    obsidian
-    github-desktop
-    vscode
-    thunderbird
-    spotify
-    unityhub
-    godot
-    jetbrains.clion
-    jetbrains.idea
-    obs-studio
-    proton-vpn
-    ente-auth
-    lact
-  ];
-}