major refactor and reorg

This commit is contained in:
Matt Nish-Lapidus 2025-02-04 13:13:24 -05:00
parent f43b32286c
commit e91cca9aeb
13 changed files with 614 additions and 591 deletions

View file

@ -2,23 +2,31 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, lib, inputs, musnix, outputs, ... }:
{ nix-config, config, pkgs, lib, inputs, ... }:
{
# imports =
# [ # Include the results of the hardware scan.
# ./hardware-configuration.nix
# ./razer-speaker-fix.nix
# ];
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
./razer-speaker-fix.nix
];
nixpkgs = {
config = {
allowUnfree = true;
};
overlays = builtins.attrValues nix-config.overlays
++ [ inputs.emacs-overlay.overlays.default
inputs.niri.overlays.default
];
};
# environment.etc."nix/inputs/nixpkgs".source = "${nixpkgs}";
nix = {
# registry.nixpkgs.flake = nixpkgs;
channel.enable = false;
settings = {
experimental-features = [ "nix-command" "flakes" ];
substituters = [ "https://nix-community.cachix.org" ];
@ -63,7 +71,7 @@
systemd-boot.configurationLimit = 8;
efi.canTouchEfiVariables = true;
};
kernelPackages = pkgs.unstable.linuxPackages_latest;
kernelPackages = pkgs.linuxPackages_latest;
initrd.systemd.enable = true;
initrd.kernelModules = [ "nvidia" "nvidia_modeset" "nvidia_uvm" "nvidia_drm" "snd-virmidi" ];
kernelParams = [ "nvidia_drm.fbdev=1" "nvidia_drm.modeset=1" ];
@ -224,7 +232,7 @@
# wireless = {
# iwd = {
# enable = true;
# package = pkgs.unstable.iwd;
# package = pkgs.iwd;
# settings = {
# IPv6 = {
# enabled = true;
@ -275,7 +283,7 @@
extraArgs = "--keep-since 4d --keep 3";
};
flake = "/home/emenel/source/nixos-config";
package = pkgs.unstable.nh;
package = pkgs.nh;
};
programs.dconf.enable = true;
@ -311,7 +319,7 @@
};
# Enable sound with pipewire.
hardware.pulseaudio.enable = false;
services.pulseaudio.enable = false;
services.pipewire = {
enable = true;
@ -435,12 +443,12 @@
keyboards = {
sinc = {
device = "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-kbd";
config = builtins.readFile ../../dotfiles/dot_config/kmonad/sinc.kbd;
config = builtins.readFile ../../homes/emenel/dotfiles/dot_config/kmonad/sinc.kbd;
};
razer = {
extraGroups = [ "openrazer" ];
device = "/dev/input/by-id/usb-Razer_Razer_Blade-if01-event-kbd";
config = builtins.readFile ../../dotfiles/dot_config/kmonad/razer.kbd;
config = builtins.readFile ../../homes/emenel/dotfiles/dot_config/kmonad/razer.kbd;
};
};
};
@ -515,7 +523,7 @@
services.power-profiles-daemon = {
enable = true;
package = pkgs.unstable.power-profiles-daemon;
package = pkgs.power-profiles-daemon;
};
# enable the OpenSSH daemon.