moved desktop to system instead of home scope

This commit is contained in:
twoneis 2023-11-13 18:22:16 +01:00
parent 18186be804
commit 4c562fc8c0
6 changed files with 8 additions and 6 deletions

View file

@ -1,7 +1,5 @@
{ config, ... }: { { config, ... }: {
imports = [ imports = [
../../modules/system
./hardware-config.nix ./hardware-config.nix
]; ];

View file

@ -1,7 +1,5 @@
{ ... }: { { ... }: {
imports = [ imports = [
../../modules/system
./hardware-config.nix ./hardware-config.nix
]; ];

View file

@ -15,12 +15,14 @@
outputs = { nixpkgs, home-manager, ... }: outputs = { nixpkgs, home-manager, ... }:
let let
x86 = "x86_64-linux"; x86 = "x86_64-linux";
common = ./modules/system;
in { in {
nixosConfigurations = { nixosConfigurations = {
desktop = nixpkgs.lib.nixosSystem { desktop = nixpkgs.lib.nixosSystem {
specialArgs = { inherit x86; }; specialArgs = { inherit x86; };
modules = [ modules = [
common
./devices/desktop ./devices/desktop
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {
@ -37,6 +39,7 @@
specialArgs = { inherit x86; }; specialArgs = { inherit x86; };
modules = [ modules = [
common
./devices/surface ./devices/surface
home-manager.nixosModules.home-manager { home-manager.nixosModules.home-manager {

View file

@ -6,7 +6,7 @@
services.gnome.core-utilities.enable = false; services.gnome.core-utilities.enable = false;
environment.gnome.excludePackages = [ pkgs.gnome-tour ]; environment.gnome.excludePackages = [ pkgs.gnome-tour ];
home.packages = with pkgs; [ environment.systemPackages = with pkgs; [
gnomeExtensions.paperwm gnomeExtensions.paperwm
gnome.gnome-characters gnome.gnome-characters
]; ];

View file

@ -8,7 +8,6 @@
./email ./email
./gdb ./gdb
./git ./git
./gnome
./media ./media
./terminal ./terminal
./utils ./utils

View file

@ -3,6 +3,10 @@
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ pkgs, ... }: { { pkgs, ... }: {
imports = [
../gnome
];
# Enable nix flakes # Enable nix flakes
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [ "nix-command" "flakes" ];