jackmechem/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Lots of changes...

Browse source 
Fix flake.nix merge conflict
This commit is contained in:
Jack Mechem 2026-04-03 15:10:55 -07:00
parent c165d5bbba
commit 99abfabc12
5 changed files with 280 additions and 150 deletions
Download patch file Download diff file Expand all files Collapse all files

134
hosts/t480/configuration.nix
View file

@ -1,78 +1,106 @@
{
config,
lib,
pkgs,
inputs,
...
config,
lib,
pkgs,
inputs,
...
}:
{
imports = [
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
../../modules/nixos/gtkapps.nix
../../modules/nixos/gtkbar.nix
../../modules/nixos/fonts.nix
../../modules/nixos/system-packages.nix
../../modules/nixos/user-jack.nix
../../modules/nixos/sound.nix
../../modules/nixos/syncthing.nix
imports = [
./hardware-configuration.nix
inputs.home-manager.nixosModules.default
../../modules/nixos/gtkapps.nix
../../modules/nixos/gtkbar.nix
../../modules/nixos/fonts.nix
../../modules/nixos/system-packages.nix
../../modules/nixos/user-jack.nix
../../modules/nixos/sound.nix
../../modules/nixos/syncthing.nix
];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = "t480";
networking.networkmanager.enable = true;
nix.settings = {
# Use all cores for building
cores = 0; # 0 = use all available cores
max-jobs = "auto";
# Binary caches — fetch pre-built packages instead of compiling
substituters = [
"https://cache.nixos.org"
"https://nix-community.cachix.org" # useful for rust-overlay, lix, etc.
];
trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"nix-community.cachix.org-1:mB9FSh9qf2dde0enLeymSlflN93qlwkTnNQsGbLFPzU="
];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
# Avoid redundant downloads
http-connections = 128;
http2 = true;
boot.kernelPackages = pkgs.linuxPackages_latest;
# Keep build dependencies around so incremental builds are faster
keep-outputs = true;
keep-derivations = true;
networking.hostName = "t480";
networking.networkmanager.enable = true;
nix.settings.experimental-features = [
"nix-command"
"flakes"
# Experimental features (you likely already have these)
experimental-features = [
"nix-command"
"flakes"
];
};
time.timeZone = "America/Los_Angeles";
time.timeZone = "America/Los_Angeles";
# Enable CUPS to print documents.
services.printing.enable = true;
# Enable CUPS to print documents.
services.printing.enable = true;
services.dbus.enable = true;
services.dbus.enable = true;
programs.zsh.enable = true;
programs.zsh.enable = true;
programs.thunar.enable = true;
programs.thunar.enable = true;
programs.dconf.enable = true;
programs.dconf.enable = true;
nixpkgs.config.allowUnfree = true;
nixpkgs.config.allowUnfree = true;
virtualisation.docker.enable = true;
virtualisation.docker.enable = true;
services.gtkapps.enable = true;
services.gtkbar.enable = true;
# services.gtkapps.enable = true;
services.gtkbar.enable = true;
environment.systemPackages = [
inputs.rust-app-menu.packages.${pkgs.system}.default
];
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland
xdg-desktop-portal-gnome
];
xdg.portal = {
enable = true;
wlr.enable = true;
extraPortals = with pkgs; [
xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland
xdg-desktop-portal-gnome
];
};
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {
"jack" = import ./home.nix;
};
};
home-manager = {
extraSpecialArgs = { inherit inputs; };
users = {
"jack" = import ./home.nix;
};
};
services.libinput.enable = true;
services.libinput.enable = true;
services.openssh.enable = true;
services.openssh.enable = true;
system.stateVersion = "25.05";
system.stateVersion = "25.05";
}