Compare commits

...

3 Commits

6 changed files with 65 additions and 113 deletions

View File

@@ -31,28 +31,27 @@
}; };
}; };
outputs = { self, nixpkgs, ... }@inputs: { outputs =
nixosConfigurations = { { self, nixpkgs, ... }@inputs:
drew-desktop = (import ./system/hosts/drew-desktop) { {
inherit inputs; nixosConfigurations = {
inherit self; drew-desktop = (import ./system/hosts/drew-desktop) {
inherit nixpkgs; inherit inputs;
inherit self;
inherit nixpkgs;
};
mcp = (import ./system/hosts/mcp) {
inherit inputs;
inherit self;
inherit nixpkgs;
};
}; };
mcp = (import ./system/hosts/mcp) { darwinConfigurations = {
inherit inputs; # Removed. See 133a3f82073f03e62cb3e7902c85fb3fc6292fe2 for when the
inherit self; # last one was removed.
inherit nixpkgs; };
features = {
development = (import ./home-manager/features/development/development.nix);
}; };
}; };
darwinConfigurations = {
DGVGYQLQP5 = (import ./system/hosts/tarro-mbp) {
inherit inputs;
inherit self;
inherit nixpkgs;
};
};
features = {
development = (import ./home-manager/features/development/development.nix);
};
};
} }

View File

@@ -187,5 +187,4 @@
# Enable the font directory for managing fonts # Enable the font directory for managing fonts
# This doesn't seem to be needed though. # This doesn't seem to be needed though.
# fonts.fontDir.enable = true; # fonts.fontDir.enable = true;
} }

View File

@@ -1,33 +1,48 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/343c0ac5-3973-49b3-964a-6ad90c36b89c"; device = "/dev/disk/by-uuid/343c0ac5-3973-49b3-964a-6ad90c36b89c";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/5F99-043D"; device = "/dev/disk/by-uuid/5F99-043D";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
}; "fmask=0077"
"dmask=0077"
];
};
fileSystems."/home" = fileSystems."/home" = {
{ device = "/dev/disk/by-uuid/28f4fb41-9414-4504-a767-c2e8bf5eb2c8"; device = "/dev/disk/by-uuid/28f4fb41-9414-4504-a767-c2e8bf5eb2c8";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = [ ]; swapDevices = [ ];
@@ -48,7 +63,7 @@
enable32Bit = true; enable32Bit = true;
}; };
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = { hardware.nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.beta; package = config.boot.kernelPackages.nvidiaPackages.beta;
@@ -72,4 +87,14 @@
# Enable the nvidia-settings menu? # Enable the nvidia-settings menu?
nvidiaSettings = true; nvidiaSettings = true;
}; };
# Add a udev rule to prevent the mouse from waking the system. Note that it
# has two entries depending on whether it's plugged in or not.
# Bus 001 Device 009: ID 046d:c539 Logitech, Inc. Lightspeed Receiver
# Bus 001 Device 015: ID 046d:c08d Logitech, Inc. G502 LIGHTSPEED Wireless Gaming Mouse
# Note: Still seem to require `sudo udevadm trigger` or reconnecting the device after the change.
services.udev.extraRules = ''
ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c539", ATTR{power/wakeup}="disabled"
ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c08d", ATTR{power/wakeup}="disabled"
'';
} }

View File

@@ -1,29 +0,0 @@
{ config, pkgs, inputs, ... }:
{
# List packages installed in system profile. To search by name, run:
# $ nix-env -qaP | grep wget
environment.systemPackages =
[ pkgs.vim
];
# Necessary for using flakes on this system.
nix.settings.experimental-features = "nix-command flakes";
# Enable alternative shell support in nix-darwin.
programs.zsh.enable = true;
# Set Git commit hash for darwin-version.
system.configurationRevision = inputs.self.rev or inputs.self.dirtyRev or null;
# Used for backwards compatibility, please read the changelog before changing.
# $ darwin-rebuild changelog
system.stateVersion = 6;
# The platform the configuration will be used on.
nixpkgs.hostPlatform = "aarch64-darwin";
users.users.drew = {
name = "drew";
home = "/Users/drew";
};
}

View File

@@ -1,16 +0,0 @@
{ inputs, self, ... }:
inputs.nix-darwin.lib.darwinSystem {
modules = [
./configuration.nix
inputs.home-manager.darwinModules.home-manager
{
home-manager.users.drew = import ./drew.nix;
home-manager.useGlobalPkgs = true;
home-manager.extraSpecialArgs = { inherit inputs; };
}
];
specialArgs = {
inherit inputs;
inherit self;
};
}

View File

@@ -1,26 +0,0 @@
{ pkgs, ... }:
{
imports = [
../../../home-manager/features/kubernetes.nix
../../../home-manager/features/macos
../../../home-manager/features/nix.nix
../../../home-manager/features/terminal.nix
../../../home-manager/features/development/development.nix
../../../home-manager/features/development/macos.nix
../../../home-manager/features/development/rust.nix
];
home.username = "drew";
home.homeDirectory = "/Users/drew";
home.packages = with pkgs; [
nodejs_22
];
home.stateVersion = "24.11";
programs.git = {
userName = "Drew Haven";
userEmail = "drew.haven@tarro.com";
};
}