chore: Prepare for multi configuration and cleanup

This commit is contained in:
dashie 2024-04-16 13:26:52 +02:00
parent 81134126a9
commit 4986770f16
40 changed files with 77 additions and 76 deletions

View file

@ -0,0 +1,63 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
openssl
dbus
glib
gtk4
gtk3
gtk-layer-shell
gtk4-layer-shell
direnv
dconf
gsettings-desktop-schemas
gnome.nixos-gsettings-overrides
gnome.adwaita-icon-theme
bibata-cursors
xorg.xkbutils
];
fonts.packages = with pkgs; [
cantarell-fonts
];
environment.variables = {
NIX_LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (config.systemd.packages ++ config.environment.systemPackages);
PKG_CONFIG_PATH = pkgs.lib.makeLibraryPath (config.systemd.packages ++ config.environment.systemPackages);
};
nix.settings.experimental-features = "nix-command flakes";
programs.fish.enable = true;
programs.fish.promptInit = ''
${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source
'';
programs.dconf.enable = true;
services.printing.enable = true;
services.dbus.enable = true;
services.dbus.packages = with pkgs; [
gnome2.GConf
];
services.avahi = {
enable = true;
nssmdns4 = true;
openFirewall = true;
};
services.xserver.desktopManager.gnome.extraGSettingsOverrides = ''
[org.gnome.desktop.interface]
gtk-theme='adw-gtk3'
cursor-theme='Bibata-Modern-Classsic'
cursor-size=24
'';
programs.direnv = {
package = pkgs.direnv;
silent = false;
loadInNixShell = true;
direnvrcExtra = "";
nix-direnv = {
enable = true;
package = pkgs.nix-direnv;
};
};
}

View file

@ -1,10 +1,9 @@
{ ...
}: {
{
imports = [
./login_manager.nix
./big_g.nix
./env.nix
./xkb_layout.nix
../hardware/streamdeck.nix
./base_packages.nix
];
}

View file

@ -1,5 +1,4 @@
{ lib
, pkgs
{ pkgs
, ...
}: {
environment.variables = {