This commit is contained in:
Michael Thomson 2024-04-24 01:19:44 -04:00
parent 67a1223421
commit e0123eae55
6 changed files with 33 additions and 8 deletions

View File

@ -15,11 +15,11 @@
outputs = inputs@{ self, nixpkgs, home-manager, nix-darwin, ... }: { outputs = inputs@{ self, nixpkgs, home-manager, nix-darwin, ... }: {
nixosConfigurations = { nixosConfigurations = {
nixos = nixpkgs.lib.nixosSystem { desktop = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./hosts/nixos/configuration.nix ./hosts/desktop/configuration.nix
]; ];
}; };
}; };

View File

@ -15,7 +15,7 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "nixos"; # Define your hostname. networking.hostName = "desktop"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Enable networking # Enable networking

View File

@ -14,17 +14,17 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/96c63add-dc4b-473e-9273-db9e281f3004"; { device = "/dev/disk/by-uuid/4dc20e43-03f8-4695-8bb5-ad9974215ac8";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/A240-8690"; { device = "/dev/disk/by-uuid/7F11-62C6";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/3b38e555-ddc9-41ae-a3c7-49a20a2c5295"; } [ { device = "/dev/disk/by-uuid/51bbac0f-6f93-45ff-92b5-fea4d110c138"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking

View File

@ -3,6 +3,8 @@
{ {
imports = [ imports = [
../../modules/home-manager/i3 ../../modules/home-manager/i3
../../modules/home-manager/1password
../../modules/home-manager/git
../../modules/home-manager/neovim ../../modules/home-manager/neovim
../../modules/home-manager/wezterm ../../modules/home-manager/wezterm
../../modules/home-manager/zsh ../../modules/home-manager/zsh
@ -19,7 +21,6 @@
home.packages = with pkgs; [ home.packages = with pkgs; [
firefox firefox
_1password-gui
gcc gcc
fzf fzf
ripgrep ripgrep
@ -27,5 +28,4 @@
]; ];
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.git.enable = true;
} }

View File

@ -0,0 +1,16 @@
{ pkgs, config, ... }:
{
home.packages = with pkgs; [
_1password
_1password-gui
];
programs.ssh = {
enable = true;
extraConfig = ''
Host *
IdentityAgent ~/.1password/agent.sock
'';
};
}

View File

@ -0,0 +1,9 @@
{ pkgs, config, ... }:
{
programs.git = {
enable = true;
userName = "Michael Thomson";
userEmail = "michael@michaelthomson.dev";
};
}