From d820a596f5a683a28d6cba9554f1dd962fb08889 Mon Sep 17 00:00:00 2001 From: xenia Date: Sat, 28 Oct 2023 22:57:45 +0200 Subject: [PATCH] Add alloy, split graphical into PC and laptop --- flake.nix | 11 ++++++++--- home/apps.nix | 8 ++++++++ home/graphical.nix | 2 -- 3 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 home/apps.nix diff --git a/flake.nix b/flake.nix index c9470367..a62b6bfb 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,10 @@ ansi-utils = ansi-utils.packages.${system}; unambig-path = unambig-path.packages.${system}.unambig-path; }; - mkLaptop = {system, pkgs} : import ./home/graphical.nix { + mkPC = {system, pkgs} : import ./home/graphical.nix { + inherit pkgs xdg-runtime-dir; + }; + mkLaptop = {system, pkgs} : import ./home/apps.nix { inherit pkgs xdg-runtime-dir; }; mkMac = {system, pkgs, laptop} : import ./home/mac.nix { @@ -74,6 +77,7 @@ prompt-color = 172; inherit system pkgs; }; + pc = mkPC { inherit system pkgs; }; laptop = mkLaptop { inherit system pkgs; }; mac = mkMac { inherit system pkgs laptop; }; in home-manager.lib.homeManagerConfiguration { @@ -81,6 +85,7 @@ modules = [ home + pc laptop mac ]; @@ -114,13 +119,13 @@ prompt-color = 205; inherit system pkgs; }; - laptop = mkLaptop { inherit system pkgs; }; + pc = mkPC { inherit system pkgs; }; in home-manager.lib.homeManagerConfiguration { inherit pkgs; modules = [ home - laptop + pc ]; }; diff --git a/home/apps.nix b/home/apps.nix new file mode 100644 index 00000000..5094d0c3 --- /dev/null +++ b/home/apps.nix @@ -0,0 +1,8 @@ +{ pkgs, xdg-runtime-dir }: +{ + home.packages = with pkgs; [ + discord-canary + + alloy6 + ]; +} diff --git a/home/graphical.nix b/home/graphical.nix index cd25c15b..275ebe24 100644 --- a/home/graphical.nix +++ b/home/graphical.nix @@ -4,8 +4,6 @@ let alacritty = import ./alacritty/alacritty.nix pkgs; in rec { home.packages = with pkgs; [ - discord-canary - # libreoffice-bin fira-code ibm-plex ];