This commit is contained in:
Chris Cochrun 2025-10-10 17:00:19 -05:00
parent 767bf2e9de
commit 886e1a0209
3 changed files with 25 additions and 6 deletions

View file

@ -103,7 +103,7 @@ in
"Super+Space".action.spawn = ["${pkgs.fish}/bin/fish" "-c" "rofi -no-lazy-grab -modi combi -show combi -combi-modi drun,run"];
"Super+Shift+W".action.spawn = "rofi -i -show window";
"Super+V".action = spawn ["${pkgs.fish}/bin/fish" "-c" "${pkgs.cliphist}/bin/cliphist list | ${pkgs.rofi}/bin/rofi -p '󱃔 ' -dmenu | ${pkgs.cliphist}/bin/cliphist decode | ${pkgs.wl-clipboard}/bin/wl-copy"];
"Super+I".action.spawn = ["alacritty" "--class" "btm" "-e" "btop"];
"Super+I".action.spawn = ["alacritty" "--class" "btop" "-e" "btop"];
"Super+Alt+B".action.spawn = ["alacritty" "--class" "bluetui" "-e" "bluetui"];
"Super+Alt+W".action.spawn = ["alacritty" "--class" "impala" "-e" "impala"];
"Super+A".action.spawn = ["alacritty" "--class" "pulsemixer" "-e" "${pkgs.wiremix}/bin/wiremix" "-v" "output"];
@ -202,7 +202,7 @@ in
default-window-height.proportion = 0.7;
}
{
matches = [{app-id = "btm";}];
matches = [{app-id = "btop";}];
open-floating = true;
default-column-width.proportion = 0.9;
default-window-height.proportion = 0.9;

View file

@ -1,24 +1,33 @@
{ lib, config, pkgs, callPackage, inputs, ... }:
{ lib, config, pkgs, callPackage, inputs, modulesPath, ... }:
{
imports = [
# ./hardware-configuration.nix
# ../../pkgs/base-packages.nix
(modulesPath + "/installer/scan/not-detected.nix")
./pkgs.nix
../../modules/base.nix
];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" "acpi_call" ];
boot.extraModulePackages = with config.boot.kernelPackages; [ acpi_call ];
networking.hostName = "nixbook";
isoImage.squashfsCompression = "gzip -Xcompression-level 1";
# boot.initrd.kernelModules = [ "i915" ];
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.acpilight.enable = lib.mkDefault true;
# networking.interfaces.wlp170s0.useDHCP = true;
# networking.useDHCP = false;
hardware.uinput.enable = true;
hardware.bluetooth.enable = true;
networking.enableB43Firmware = true;
# Use the systemd-boot EFI boot loader.
boot = {
kernelPackages = pkgs.linuxPackages_zen;
@ -27,9 +36,12 @@
boot.supportedFilesystems = [ "ntfs" ];
services = {
desktopManager.plasma6.enable = true;
desktopManager.cosmic.enable = true;
};
# services.displayManager.cosmic-greeter.enable = true;
services.desktopManager.plasma6.enable = true;
services.displayManager.sddm = {
enable = true;
enableHidpi = true;
@ -47,7 +59,8 @@
# name = "kwallet";
# enableKwallet = true;
# };
fonts.fontconfig.useEmbeddedBitmaps = true;
fonts.fontDir.enable = true;
fonts.packages = with pkgs; [
nerd-fonts.victor-mono
noto-fonts
@ -173,6 +186,9 @@
libvdpau-va-gl
vaapiVdpau
libva1
mesa
intel-media-driver # LIBVA_DRIVER_NAME=iHD
vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium)
];
};
hardware.amdgpu.initrd.enable = lib.mkDefault true;

View file

@ -45,6 +45,9 @@
openssl
xdg-utils
hardinfo2
calamares
calamares-nixos
calamares-nixos-extensions
# scribus
brightnessctl
mpc-cli