refactor to one single config per box

This commit is contained in:
Cyryl Płotnicki 2020-07-25 08:46:56 +01:00
parent bbc5d87701
commit e1760deb23
6 changed files with 24 additions and 16 deletions

View file

@ -49,12 +49,16 @@
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
home-manager.users.cyryl = {...}: { home-manager.users.cyryl = {...}: {
imports = [ imports = [
./home.nix ../../home-common.nix
../../programs/git.nix
../../gui.nix
]; ];
home.stateVersion = config.system.stateVersion; home.stateVersion = config.system.stateVersion;
nixpkgs.overlays = config.nixpkgs.overlays; nixpkgs.overlays = config.nixpkgs.overlays;
nixpkgs.config = config.nixpkgs.config; nixpkgs.config = config.nixpkgs.config;
home.file.".config/i3/status.toml".source = ../../../.config/i3/status-double-bat.toml;
}; };
imports = [ imports = [
@ -66,8 +70,8 @@
../../zerotier.nix ../../zerotier.nix
../../distributed-builds.nix ../../distributed-builds.nix
../../libvirt.nix ../../libvirt.nix
../../gnome/system.nix
../../backups.nix ../../backups.nix
../../gnome
]; ];

View file

@ -1,12 +0,0 @@
{ config, pkgs, ... }:
{
home.file.".config/i3/status.toml".source = ../../../.config/i3/status-double-bat.toml;
imports = [
../../home-common.nix
../../programs/git.nix
../../gui.nix
../../gnome/home.nix
];
}

View file

@ -6,6 +6,5 @@
../../home-common.nix ../../home-common.nix
../../programs/git.nix ../../programs/git.nix
../../gui.nix ../../gui.nix
../../i3/home.nix
]; ];
} }

12
nixos/gnome/default.nix Normal file
View file

@ -0,0 +1,12 @@
{ config, pkgs, ... }:
{
imports = [
./system.nix
];
home-manager.users.cyryl = {...}: {
imports = [
./home.nix
];
};
}

View file

@ -11,7 +11,11 @@
allowAnyUser = true; allowAnyUser = true;
}; };
dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf ]; dbus = {
packages = with pkgs; [ gnome2.GConf gnome3.dconf ];
socketActivated = true;
};
fractalart.enable = true; fractalart.enable = true;
colord.enable = true; colord.enable = true;
xserver.windowManager.i3.enable = true; xserver.windowManager.i3.enable = true;

View file

@ -1,6 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf ]; services.dbus.packages = with pkgs; [ gnome2.GConf gnome3.dconf ];
services.dbus.socketActivated = true;
programs.sway.enable = true; programs.sway.enable = true;
systemd.defaultUnit = "graphical.target"; systemd.defaultUnit = "graphical.target";
} }