Compare commits

...

3 Commits

5 changed files with 30 additions and 21 deletions

View File

@ -96,6 +96,8 @@
gnome-weather gnome-weather
gnome-maps gnome-maps
gnome-contacts gnome-contacts
pkgs.gnome-console
totem
]; ];
# Enable CUPS to print documents. # Enable CUPS to print documents.
@ -114,23 +116,6 @@
}; };
}; };
# Enable sound with pipewire.
# sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager). # Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true; # services.xserver.libinput.enable = true;

View File

@ -42,13 +42,14 @@
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" { "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix" {
networking.wireless.enable = false; networking.wireless.enable = false;
} }
./configuration.nix { ./configuration.nix {
networking.hostName = "kremzeek"; networking.hostName = "kremzeek";
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
sound.enable = true; # sound.enable = true;
# hardware.pulseaudio.enable = true;
} }
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
@ -79,6 +80,7 @@
sound.enable = true; # only on unstable? sound.enable = true; # only on unstable?
} }
./hardware/galvatron-hw.nix ./hardware/galvatron-hw.nix
./modules/sound/pipewire.nix
inputs.apple-silicon.nixosModules.apple-silicon-support inputs.apple-silicon.nixosModules.apple-silicon-support
inputs.home-manager-unstable.nixosModules.home-manager { inputs.home-manager-unstable.nixosModules.home-manager {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -101,6 +103,7 @@
} }
./server/services.nix ./server/services.nix
./hardware/breakdown-hw.nix ./hardware/breakdown-hw.nix
./modules/sound/pipewire.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -123,6 +126,7 @@
sound.enable = true; sound.enable = true;
} }
./hardware/starscream-hw.nix ./hardware/starscream-hw.nix
./modules/sound/pipewire.nix
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -150,6 +154,7 @@
} }
./modules/droidcam-obs.nix # only this machine ./modules/droidcam-obs.nix # only this machine
./hardware/knockout-hw.nix ./hardware/knockout-hw.nix
./modules/sound/pipewire.nix
inputs.home-manager-unstable.nixosModules.home-manager inputs.home-manager-unstable.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

View File

@ -13,7 +13,7 @@ with lib.hm.gvariant;
dconf.settings = { dconf.settings = {
"org/gnome/shell" = { "org/gnome/shell" = {
"favorite-apps" = [ "favorite-apps" = [
"org.gnome.Console.desktop" "kitty.desktop"
"firefox.desktop" "firefox.desktop"
"emacs.desktop" "emacs.desktop"
"org.gnome.Settings.desktop" "org.gnome.Settings.desktop"

View File

@ -3,7 +3,7 @@
programs.bash = { programs.bash = {
enable = true; enable = true;
shellAliases = { shellAliases = {
ls = "exa"; ls = "eza";
}; };
initExtra = '' initExtra = ''
export EDITOR=emacs\ -nw export EDITOR=emacs\ -nw

View File

@ -0,0 +1,19 @@
{ config, lib, pkgs, nixos-unstable, inputs, ... }:
{
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
}