sora/nixconfig
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases Activity

more WM
Some checks failed
Nix Build / build-nixos (push) Failing after 22s
Details

Browse Source
This commit is contained in:
soraefir 2024-04-14 22:24:23 +02:00
parent e325d82f34
commit 52423ffdad
Signed by: sora
GPG Key ID: A362EA0491E2EEA0
7 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
generator.nix
View File

@ -7,12 +7,12 @@
"nixos" = inputs.nixpkgs.lib.nixosSystem { "nixos" = inputs.nixpkgs.lib.nixosSystem {
system = system; system = system;
modules = [ modules = [
inputs.sops-nix.nixosModules.sops
./modules/shared/syscfg ./modules/shared/syscfg
./modules/shared/sops ./modules/shared/sops
./modules/nixos ./modules/nixos
syscfg syscfg
./systems/${host} ./systems/${host}
inputs.sops-nix.nixosModules.sops
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
@ -21,13 +21,13 @@
home-manager.users = builtins.listToAttrs (map (userConfig: home-manager.users = builtins.listToAttrs (map (userConfig:
nameValuePair userConfig.username { nameValuePair userConfig.username {
imports = [ imports = [
inputs.nix-colors.homeManagerModule
inputs.hyprland.homeManagerModules.default
./modules/shared/syscfg ./modules/shared/syscfg
./modules/shared/colors ./modules/shared/colors
./modules/home ./modules/home
syscfg syscfg
{ usercfg = userConfig; } { usercfg = userConfig; }
inputs.nix-colors.homeManagerModule
inputs.hyprland.homeManagerModules
]; ];
}) syscfg.syscfg.users); }) syscfg.syscfg.users);
} }
@ -46,7 +46,7 @@
home-manager.users.sora = { home-manager.users.sora = {
imports = [ imports = [
inputs.nix-colors.homeManagerModule inputs.nix-colors.homeManagerModule
inputs.hyprland.homeManagerModules.default inputs.hyprland.homeManagerModules
./systems/${host}/home.nix ./systems/${host}/home.nix
]; ];
}; };

5
modules/nixos/gui/greet/default.nix
View File

@ -1,7 +1,6 @@
{ lib, config, pkgs, ... }: { lib, config, pkgs, ... }:
let cfg = config.syscfg.make.gui; {
in { config = lib.mkIf (config.syscfg.make.gui) {
config = lib.mkIf cfg {
services.greetd = { services.greetd = {
enable = true; enable = true;

18
modules/nixos/system/xdg/default.nix
View File

@ -1,13 +1,15 @@
{ pkgs, ... }: { { pkgs, ... }: {
xdg.portal = { config = lib.mkIf (config.syscfg.make.gui) {
enable = true; xdg.portal = {
# wlr.enable = true; enable = true;
extraPortals = with pkgs; [ # wlr.enable = true;
xdg-desktop-portal-hyprland extraPortals = with pkgs; [
xdg-desktop-portal-gtk xdg-desktop-portal-hyprland
]; xdg-desktop-portal-gtk
config.common.default = [ "hyprland" "gtk" ]; ];
config.common.default = [ "hyprland" "gtk" ];
};
}; };
environment.sessionVariables = rec { environment.sessionVariables = rec {

2
modules/shared/syscfg/default.nix
View File

@ -4,7 +4,7 @@ let
username = mkOption { type = types.str; }; username = mkOption { type = types.str; };
wm = mkOption { wm = mkOption {
type = types.enum [ "Wayland" "X11" "-"]; type = types.enum [ "Wayland" "X11" "-"];
default = "Wayland"; default = "-";
}; };
git = { git = {
username = mkOption { type = types.str; }; username = mkOption { type = types.str; };

1
systems/ci/cfg.nix
View File

@ -4,6 +4,7 @@
defaultUser = "ci"; defaultUser = "ci";
users = [{ users = [{
username = "ci"; username = "ci";
wm = "-";
git = { git = {
email = "ci@ci"; email = "ci@ci";
username = "CI"; username = "CI";

2
systems/iriy/cfg.nix
View File

@ -4,7 +4,7 @@
defaultUser = "sora"; defaultUser = "sora";
users = [{ users = [{
username = "sora"; username = "sora";
wm = "-"; wm = "Wayland";
git = { git = {
email = "soraefir+git@helcel"; email = "soraefir+git@helcel";
username = "soraefir"; username = "soraefir";

1
systems/valinor/cfg.nix
View File

@ -4,6 +4,7 @@
defaultUser = "sora"; defaultUser = "sora";
users = [{ users = [{
username = "sora"; username = "sora";
wm = "Wayland";
git = { git = {
email = "soraefir+git@helcel"; email = "soraefir+git@helcel";
username = "soraefir"; username = "soraefir";