Dragon and beefcake build

modules/home-manager/common.nix

@@ -1,13 +1,12 @@
 {
   pkgs,
   lib,
-  system,
-  inputs,
-  outputs,
   config,
   ...
-}: {
+}: let
-  imports = with outputs.homeManagerModules; [
+  inherit (pkgs) system;
+in {
+  imports = with homeManagerModules; [
     # nix-colors.homeManagerModules.default
     fish
     bat
@@ -55,7 +54,6 @@
 
   programs.eza = {
     enable = true;
-    package = inputs.nixpkgs.legacyPackages.${system}.eza;
   };
 
   programs.skim = {

modules/home-manager/helix.nix

@@ -1,8 +1,6 @@
 {
   config,
   pkgs,
-  inputs,
-  colors,
   ...
 }: let
   inherit (pkgs) system;

nixos/dragon.nix

@@ -1,179 +0,0 @@
-{
-  # flake inputs
-  hardware,
-  slippi,
-  # inputs from our flake
-  diskoConfigurations,
-  nixosModules,
-  homeManagerModules,
-  # module args
-  # config,
-  lib,
-  pkgs,
-  ...
-}: {
-  networking.hostName = "dragon";
-
-  # support interacting with the windows drive
-  boot.supportedFilesystems = ["ntfs"];
-
-  imports = with nixosModules; [
-    # diskoConfigurations.standard
-    # hardware.nixosModules.common-cpu-amd
-    # hardware.nixosModules.common-pc-ssd
-
-    # slippi.outputs.nixosModules.default
-
-    # pipewire-low-latency
-    # music-production
-    # desktop-usage
-    # podman
-    # kde-plasma
-    # postgres
-    # wifi
-    # # hyprland
-    # printing
-    # steam
-    # lutris
-  ];
-
-  # programs.steam = {
-  #   enable = true;
-  #   remotePlay.openFirewall = true;
-  #   gamescopeSession.enable = true;
-  # };
-
-  # environment = {
-  #   systemPackages = with pkgs; [
-  #     spotify
-  #     discord
-  #     radeontop
-  #     slack
-  #     godot_4
-  #     fractal
-  #     jdk17
-  #     prismlauncher
-  #     # variety
-  #     radeontop
-  #     sops
-  #     obs-studio
-  #     xh
-  #   ];
-  # };
-
-  # home-manager.users.daniel = {
-  #   imports = with homeManagerModules; [
-  #     # sway
-  #     # pass
-  #     # firefox-no-tabs
-  #     # # wallpaper-manager
-  #     # slippi.homeManagerModules.default
-  #     # {
-  #     #   slippi.launcher = {
-  #     #     enable = true;
-  #     #     isoPath = "${config.home-manager.users.daniel.home.homeDirectory}/../games/roms/dolphin/melee.iso";
-  #     #     launchMeleeOnPlay = false;
-  #     #   };
-  #     # }
-  #     # hyprland
-  #   ];
-
-  #   services.mako.enable = lib.mkForce false; # don't use mako when using plasma
-
-  #   wayland.windowManager.hyprland = {
-  #     settings = {
-  #       env = [
-  #         "EWW_BAR_MON,1"
-  #       ];
-  #       # See https://wiki.hyprland.org/Configuring/Keywords/ for more
-  #       monitor = [
-  #         # "DP-2,3840x2160@60,-2160x0,1,transform,3"
-  #         "DP-3,3840x2160@120,${toString (builtins.ceil (2160 / 1.5))}x0,1"
-  #         # HDR breaks screenshare? "DP-3,3840x2160@120,${toString (builtins.ceil (2160 / 1.5))}x0,1,bitdepth,10"
-  #         # "desc:LG Display 0x0521,3840x2160@120,0x0,1"
-  #         # "desc:Dell Inc. DELL U2720Q D3TM623,3840x2160@60,3840x0,1.5,transform,1"
-  #         "DP-2,3840x2160@60,0x0,1.5,transform,1"
-  #       ];
-  #       input = {
-  #         force_no_accel = true;
-  #         sensitivity = 1; # -1.0 - 1.0, 0 means no modification.
-  #       };
-  #     };
-  #   };
-
-  #   wayland.windowManager.sway = {
-  #     config = {
-  #       output = {
-  #         "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307" = {
-  #           mode = "3840x2160@120Hz";
-  #           position = "${toString (builtins.ceil (2160 / 1.5))},0";
-  #         };
-
-  #         "Dell Inc. DELL U2720Q D3TM623" = {
-  #           # desktop left vertical monitor
-  #           mode = "3840x2160@60Hz";
-  #           transform = "90";
-  #           scale = "1.5";
-  #           position = "0,0";
-  #         };
-  #       };
-
-  #       workspaceOutputAssign =
-  #         (
-  #           map
-  #           (ws: {
-  #             output = "GIGA-BYTE TECHNOLOGY CO., LTD. AORUS FO48U 23070B000307";
-  #             workspace = toString ws;
-  #           })
-  #           (lib.range 1 7)
-  #         )
-  #         ++ (
-  #           map
-  #           (ws: {
-  #             output = "Dell Inc. DELL U2720Q D3TM623";
-  #             workspace = toString ws;
-  #           })
-  #           (lib.range 8 9)
-  #         );
-  #     };
-  #   };
-  # };
-
-  # services.printing.enable = true;
-
-  # # TODO: https://nixos.wiki/wiki/Remote_LUKS_Unlocking
-
-  # # hardware
-  # boot.loader.efi.canTouchEfiVariables = true;
-  # boot.loader.systemd-boot.enable = true;
-  # boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "ahci"];
-  # boot.kernelModules = ["kvm-amd"];
-
-  # hardware.bluetooth = {
-  #   enable = true;
-  #   package = pkgs.bluez;
-  #   # powerOnBoot = true; # this is the default
-  #   settings = {
-  #     General = {
-  #       AutoConnect = true;
-  #       MultiProfile = "multiple";
-  #     };
-  #   };
-  # };
-  # powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-
-  # networking = {
-  #   firewall = let
-  #     terraria = 7777;
-  #     stardew-valley = 24642;
-  #   in {
-  #     enable = true;
-  #     allowPing = true;
-  #     allowedTCPPorts = [22 terraria stardew-valley];
-  #     allowedUDPPorts = [terraria stardew-valley];
-  #   };
-  # };
-
-  # # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
-  # system.stateVersion = "24.05";
-}

packages/default.nix

@@ -1,6 +1,8 @@
-{callPackage, ...}: rec {
+{pkgs, ...}: let
-  iosevkaLyteTerm = callPackage ./iosevkaLyteTerm.nix {};
+  iosevkaLyteTerm = pkgs.callPackage ./iosevkaLyteTerm.nix {};
-  iosevkaLyteTermSubset = callPackage ./iosevkaLyteTermSubset.nix {
+in rec {
+  inherit iosevkaLyteTerm;
+  iosevkaLyteTermSubset = pkgs.callPackage ./iosevkaLyteTermSubset.nix {
     inherit iosevkaLyteTerm;
   };
 }