Added gbar flake
This commit is contained in:
1 parent
ea744f2530
commit
80f5faaed2
6 files changed
+88
-6
No files matched your search
@@ -10,6 +10,9 @@ in
|
||||
skyg.home-manager.version = mkOption {
|
||||
type = types.str;
|
||||
};
|
||||
skyg.home-manager.extraImports = mkOption {
|
||||
default = [ ];
|
||||
};
|
||||
skyg.user = {
|
||||
enabled = mkEnableOption "";
|
||||
name = mkOption {
|
||||
@@ -48,6 +51,8 @@ in
|
||||
home-manager.users.root =
|
||||
(hm.makeRootUser { hostName = config.skyg.core.hostName; }) { pkgs = pkgs; };
|
||||
home-manager.users.${cfg.user.name} =
|
||||
(hm.makeCommonUser cfg.user) { pkgs = pkgs; };
|
||||
((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
|
||||
imports = cfg.home-manager.extraImports;
|
||||
};
|
||||
};
|
||||
}
|
||||
+2
-1
@@ -3,6 +3,7 @@
|
||||
, nix-darwin
|
||||
, systems
|
||||
, hlCommonSettings
|
||||
, gBar
|
||||
}:
|
||||
let
|
||||
makeImports =
|
||||
@@ -10,7 +11,7 @@ let
|
||||
, extraConfiguration ? [ ]
|
||||
}: (if (isNull attrs.configuration) then [ ] else [ attrs.configuration ])
|
||||
++ [
|
||||
(import ./main.nix attrs)
|
||||
(import ./main.nix (attrs // { inherit gBar; }))
|
||||
] ++ extraConfiguration;
|
||||
eachSystem = nixpkgs.lib.genAttrs (import systems);
|
||||
allPkgs = eachSystem (system:
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
enable = false;
|
||||
}
|
||||
, localNixCaches ? { keys = [ ]; urls = [ ]; }
|
||||
, gBar
|
||||
, ...
|
||||
}:
|
||||
{ pkgs, ... }: {
|
||||
@@ -25,6 +26,9 @@
|
||||
skyg.user = user;
|
||||
skyg.core.hostName = hostName;
|
||||
skyg.home-manager.version = homeManagerVersion;
|
||||
skyg.home-manager.extraImports = [
|
||||
gBar.homeManagerModules.x86_64-linux.default
|
||||
];
|
||||
skyg.core.substituters = localNixCaches;
|
||||
skyg.networkDrives.enabled = enableNetworkDrives;
|
||||
skyg.nixos.common.containers = (if os.enable then os.containers else { });
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
with lib;
|
||||
|
||||
let
|
||||
cfg = config.skyg.nixos.desktop;
|
||||
cfg = config.skyg.nixos;
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
@@ -19,7 +19,7 @@ in
|
||||
"Enable Desktop";
|
||||
};
|
||||
};
|
||||
config = mkIf cfg.enabled {
|
||||
config = mkIf cfg.desktop.enabled {
|
||||
services.displayManager.sddm.enable = true;
|
||||
services.displayManager.sddm.wayland.enable = true;
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user