From 78e72248c552fe16c31c606bd231742b1a438b6a Mon Sep 17 00:00:00 2001 From: iFargle Date: Sun, 2 Jul 2023 20:07:36 +0900 Subject: [PATCH] test --- desktops/gnome.nix | 8 ++++---- flake.nix | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/desktops/gnome.nix b/desktops/gnome.nix index 17523e76..306ce3b8 100644 --- a/desktops/gnome.nix +++ b/desktops/gnome.nix @@ -1,5 +1,5 @@ -{ config, gnomepkgs, ... }: { - # Use "gnomepkgs" instead of "pkgs" to get the latest packages, defined in "flake.nix" +{ config, master, ... }: { + # Use "master" instead of "pkgs" to get the latest packages, defined in "flake.nix" services.xserver = { # https://nixos.org/manual/nixos/stable/index.html#chap-gnome # Enable the GNOME Desktop Environment. @@ -15,7 +15,7 @@ # https://nixos.wiki/wiki/GNOME # Remove unwanted packages - environment.gnome.excludePackages = (with gnomepkgs.pkgs; [ + environment.gnome.excludePackages = (with master.pkgs; [ gnome.cheese gnome.gnome-music gnome.epiphany @@ -33,7 +33,7 @@ gnome.simple-scan ]); - environment.systemPackages = with gnomepkgs.pkgs; [ + environment.systemPackages = with master.pkgs; [ # Gnome Extensions gnomeExtensions.tiling-assistant gnomeExtensions.dash-to-dock diff --git a/flake.nix b/flake.nix index 3f1e5988..035d213d 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ # NixOS packages stable-nixpkgs.url = "nixpkgs/nixos-23.05"; unstable-nixpkgs.url = "nixpkgs/nixos-unstable"; - gnome-nixpkgs.url = "nixpkgs/gnomeExt-compile-schemas"; + master-nixpkgs.url = "nixpkgs/master"; # Manage dotfiles in a home directory home-manager.url = "github:nix-community/home-manager/release-23.05"; @@ -29,7 +29,7 @@ }; - outputs = { stable-nixpkgs, gnome-nixpkgs, unstable-nixpkgs, home-manager, lanzaboote, moz_overlay, nur, sops-nix, ... }@inputs: + outputs = { stable-nixpkgs, master-nixpkgs, unstable-nixpkgs, home-manager, lanzaboote, moz_overlay, nur, sops-nix, ... }@inputs: let # Variables - Remember to set these hostname = "nixos-laptop"; @@ -45,7 +45,7 @@ config = { allowUnfree = true; }; }; - gnomepkgs = import gnome-nixpkgs { + master = import master-nixpkgs { inherit system; config = { allowUnfree = true; }; }; @@ -57,7 +57,7 @@ nixosConfigurations = { # Declare a generic configuration using the $hostname variable: ${hostname} = lib.nixosSystem { - inherit gnomepkgs unstable system; + inherit master unstable system; modules = [ # Configuration Imports ./hosts/${hostname}/hardware-configuration.nix # Hardware Configuration