Rebuild packages with pulseaudio and fix GTK theme

This commit is contained in:
coolneng 2020-05-14 02:09:23 +02:00
parent 3eebf8e140
commit b977babf29
Signed by: coolneng
GPG Key ID: 9893DA236405AF57
5 changed files with 33 additions and 34 deletions

View File

@ -35,6 +35,7 @@
gc = { gc = {
automatic = true; automatic = true;
options = "--delete-older-than 14d"; options = "--delete-older-than 14d";
dates = "14:30";
}; };
extraOptions = '' extraOptions = ''
keep-outputs = true keep-outputs = true
@ -49,7 +50,10 @@
services.journald.extraConfig = "SystemMaxFiles=7"; services.journald.extraConfig = "SystemMaxFiles=7";
# Allow propietary software # Allow propietary software
nixpkgs.config.allowUnfree = true; nixpkgs.config = {
allowUnfree = true;
pulseaudio = true;
};
# Scrub zpool monthly # Scrub zpool monthly
services.zfs.autoScrub = { services.zfs.autoScrub = {
@ -75,7 +79,7 @@
shell = pkgs.fish; shell = pkgs.fish;
}; };
# Set fish shell for root user # Set shell and SSH for root user
users.users.root = { users.users.root = {
shell = pkgs.fish; shell = pkgs.fish;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
@ -83,14 +87,6 @@
]; ];
}; };
# Enable localhost SSH
services.openssh = {
enable = true;
permitRootLogin = "yes";
passwordAuthentication = false;
openFirewall = false;
};
# Import other configuration modules # Import other configuration modules
imports = [ imports = [
./modules/software.nix ./modules/software.nix

View File

@ -19,16 +19,8 @@
extensionPackages = extensionPackages =
[ pkgs.mopidy-mpd pkgs.mopidy-soundcloud pkgs.mopidy-youtube ]; [ pkgs.mopidy-mpd pkgs.mopidy-soundcloud pkgs.mopidy-youtube ];
configuration = '' configuration = ''
[core]
cache_dir = $XDG_CACHE_DIR/cache/mopidy
config_dir = $XDG_CONFIG_DIR/mopidy
data_dir = $XDG_DATA_DIR/lib/mopidy
[logging]
config_file = $XDG_CONFIG_DIR/mopidy/logging.conf
[audio] [audio]
mixer = software mixer = none
mixer_volume = mixer_volume =
output = pulsesink server=127.0.0.1 output = pulsesink server=127.0.0.1
visualizer = visualizer =
@ -47,11 +39,6 @@
.txt .txt
[mpd] [mpd]
enabled = true
hostname = 127.0.0.1
port = 6600
password =
max_connections = 20
zeroconf = "" zeroconf = ""
[http] [http]
@ -65,7 +52,4 @@
base_dir = /home/coolneng/Music base_dir = /home/coolneng/Music
''; '';
}; };
# Give permissions to mopidy user
users.users.mopidy = { extraGroups = [ "audio" ]; };
} }

View File

@ -11,6 +11,7 @@
enable = true; enable = true;
user = "coolneng"; user = "coolneng";
}; };
greeter.package = pkgs.lightdm_gtk_greeter;
}; };
}; };
@ -34,12 +35,15 @@
kitty kitty
]; ];
extraSessionCommands = '' extraSessionCommands = ''
export MOZ_DBUS_REMOTE=1
export GRIM_DEFAULT_DIR=/home/coolneng/Photos/Screenshots export GRIM_DEFAULT_DIR=/home/coolneng/Photos/Screenshots
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
export QT_QPA_PLATFORM=wayland export QT_QPA_PLATFORM=wayland
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1" export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
export SDL_VIDEODRIVER=wayland export SDL_VIDEODRIVER=wayland
export GTK_THEME=Adapta-Eta
''; '';
wrapperFeatures.gtk = true;
}; };
# Backlight # Backlight
@ -65,5 +69,8 @@
programs.waybar.enable = true; programs.waybar.enable = true;
# GPG agent # GPG agent
programs.gnupg.agent = { enable = true; }; programs.gnupg.agent = {
enable = true;
pinentryFlavor = "gnome3";
};
} }

View File

@ -3,7 +3,7 @@
{ {
environment.systemPackages = with pkgs; [ avahi wireguard ]; environment.systemPackages = with pkgs; [ avahi wireguard ];
# Set hostname and hostid # Set hostname, hostid and enable WiFi
networking = { networking = {
hostName = "panacea"; hostName = "panacea";
hostId = "8feb0bb8"; hostId = "8feb0bb8";
@ -34,4 +34,12 @@
}; };
}; };
# Enable localhost SSH
services.openssh = {
enable = true;
permitRootLogin = "yes";
passwordAuthentication = false;
openFirewall = false;
startWhenNeeded = true;
};
} }

View File

@ -6,7 +6,7 @@
htop htop
# Password management # Password management
gnupg gnupg
pinentry-curses pinentry-gnome
pass-wayland pass-wayland
passff-host passff-host
gitAndTools.pass-git-helper gitAndTools.pass-git-helper
@ -34,7 +34,6 @@
nixfmt nixfmt
podman-compose podman-compose
# Rice # Rice
gtk_engines
adapta-gtk-theme adapta-gtk-theme
paper-icon-theme paper-icon-theme
# Audio # Audio
@ -51,18 +50,23 @@
isync isync
notmuch notmuch
msmtp msmtp
imapnotify
w3m w3m
urlscan urlscan
# Media
gimp
# File management
zip
unzip
unrar
]; ];
# Fonts declaration # Fonts declaration
fonts = { fonts = {
fonts = with pkgs; [ fonts = with pkgs; [
google-fonts google-fonts
siji
cherry
iosevka
emacs-all-the-icons-fonts emacs-all-the-icons-fonts
terminus-nerdfont
]; ];
}; };