flake.nix

@@ -20,13 +20,13 @@
       pkgs = nixpkgs.legacyPackages.${system};
       pkgs-stable = nixpkgs-stable.legacyPackages.${system};
     in {
-      nixosConfigurations.hyuganatsu = nixpkgs.lib.nixosSystem {
+      nixosConfigurations.nixos = nixpkgs.lib.nixosSystem {
         inherit system;
         specialArgs = {
           inherit pkgs-stable;
           inherit flake-programs-sqlite;
         };
-        modules = [ system/hyuganatsu ];
+        modules = [ ./system ];
       };
       homeConfigurations.ahnwuoa = home-manager.lib.homeManagerConfiguration {
         inherit pkgs;

system/configuration.nix

@@ -11,8 +11,11 @@
 
   boot.tmp.useTmpfs = true;
 
+  networking.hostName = "nixos";
   networking.networkmanager.enable = true;
 
+  time.timeZone = "America/Chicago";
+
   environment.systemPackages = with pkgs; [
     neovim
     wget

system/default.nix

@@ -7,6 +7,7 @@
     ./boot.nix
     ./configuration.nix
     ./display.nix
+    ./hardware-configuration.nix
     ./locale.nix
     ./plasma.nix
     ./security.nix

system/display.nix

@@ -9,6 +9,8 @@
     desktopManager.plasma5.enable = true;
     autoRepeatDelay = 200;
     autoRepeatInterval = 30;
+    videoDrivers = [ "amdgpu" ];
+    deviceSection = ''Option "TearFree" "true"'';
   };
   services.libinput = {
     enable = true;

system/hyuganatsu/default.nix

@@ -1,15 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ../common
-    ./hardware-configuration.nix
-  ];
-
-  networking.hostName = "hyuganatsu";
-  time.timeZone = "America/Chicago";
-  services.xserver = {
-    videoDrivers = [ "amdgpu" ];
-    deviceSection = ''Option "TearFree" "true"'';
-  };
-}

user/bin/edit

@@ -1,45 +0,0 @@
-#!/bin/sh
-if [ "$#" -ne 1 ]; then
-  echo "usage: $0 <file>"
-  exit 1
-fi
-
-first_link () {
-  if [ "${1%/*}" != "$1" ]; then
-    local x="$(first_link "${1%/*}")"
-  fi
-  if [ -z "$x" ] && [ -L "$1" ]; then
-    echo "$1"
-  else
-    echo "$x"
-  fi
-}
-
-NIX="$HOME/.local/nixos/user"
-FIRST="$(first_link "$(realpath -s "$1")")"
-if ! [ -z "$FIRST" ]; then
-  LINKED="$(realpath "$FIRST")"
-  if [ "${LINKED#/nix/store/}" != "$LINKED" ]; then
-    CONFIG="${FIRST#~/.config/}"
-    if [ "$CONFIG" != "$FIRST" ] && [ -e "$NIX/config/$CONFIG" ]; then
-      rm "$FIRST"
-      ln -s "$NIX/config/$CONFIG" "$FIRST"
-      $EDITOR "$1"
-      exit
-    fi
-    BIN="${FIRST#~/.local/bin}"
-    if [ "$BIN" != "$FIRST" ] && [ -e "$NIX/bin/$BIN" ]; then
-      rm "$FIRST"
-      ln -s "$NIX/bin/$BIN" "$FIRST"
-      $EDITOR "$1"
-      exit
-    fi
-    echo "not symlinkable"
-    exit 1
-  fi
-fi
-if ! [ -e "$1" ]; then
-  DIR="${1%/*}"
-  [ "$DIR" != "$1" ] && mkdir -p "$DIR"
-fi
-$EDITOR "$1"

user/config/starship.toml

@@ -12,6 +12,7 @@ $line_break\
 $jobs\
 $shlvl\
 $status\
+$shell\
 $nix_shell\
 $character"""
 
@@ -23,6 +24,12 @@ symbol = "x"
 success_symbol = '[\$](bold green)'
 error_symbol = '[\$](bold red)'
 
+[shell]
+disabled = true
+bash_indicator = "[bsh](yellow italic)"
+zsh_indicator = "[zsh](blue italic)"
+fish_indicator = "[fsh](green italic)"
+
 [fill]
 symbol = " "
 
@@ -33,7 +40,7 @@ style_user = "#E34F7C"
 style_root = "#4571a2 bg:red"
 
 [directory]
-format = "[$path [$read_only]($style bg:red inverted)]($style bg:white inverted)[ ]($style)"
+format = "[ $path [$read_only]($style bg:red inverted)]($style bg:white inverted)[ ]($style)"
 style = "#443f59"
 read_only =" "