stable place

This commit is contained in:
ari committed 2025-12-31 14:38:31 -05:00
1 parent 5632f1fbe5
commit ca67bcd0c6
23 files changed
+281 -378

No files matched your search

+14 -11
View File
@@ -1,8 +1,7 @@
{
config,
lib,
pkgs,
...
{ config
, lib
, pkgs
, ...
}:
with lib;
@@ -52,12 +51,16 @@ in
in
mkIf cfg.user.enable {
programs.zsh.enable = true;
home-manager.users.root = (hm.makeRootUser { hostName = config.skyg.core.hostName; }) {
pkgs = pkgs;
};
home-manager.backupFileExtension = ".bak";
home-manager.users.${cfg.user.name} = ((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
imports = cfg.home-manager.extraImports;
home-manager = {
backupFileExtension = ".bak";
useGlobalPkgs = true;
useUserPackages = true;
users.root = (hm.makeRootUser { hostName = config.skyg.core.hostName; }) {
pkgs = pkgs;
};
users.${cfg.user.name} = ((hm.makeCommonUser cfg.user) { pkgs = pkgs; }) // {
imports = cfg.home-manager.extraImports;
};
};
};
}
+5 -7
View File
@@ -47,17 +47,15 @@ in
};
makeCommonUser =
{
fullName,
email,
extraGitConfigs ? [ ],
name,
...
{ fullName
, email
, extraGitConfigs ? [ ]
, name
, ...
}@user:
{ pkgs, ... }:
{
fonts = fontsModule;
# xdg.configFile."mimeapps.list".force = true;
home = homeModule // {
username = name;
homeDirectory = "/home/${name}";
+55 -35
View File
@@ -7,28 +7,37 @@
, nix-flatpak
, specialArgs
, stylix
,
}:
let
skygUtils = import ./skyg-utils.nix;
makeImports =
{ attrs
, extraConfiguration ? [ ]
}: (if (isNull attrs.configuration) then [ ] else [ attrs.configuration ])
++ [
,
}:
(if (isNull attrs.configuration) then [ ] else [ attrs.configuration ])
++ [
(import ./main.nix attrs)
] ++ extraConfiguration;
]
++ extraConfiguration;
eachSystem = nixpkgs.lib.genAttrs (import systems);
allPkgs = eachSystem (system:
allPkgs = eachSystem (
system:
import nixpkgs {
system = system;
config = { allowUnfree = true; };
});
config = {
allowUnfree = true;
};
}
);
makeNixOsModuleMaker =
masterAttrs:
{ system ? masterAttrs.system ? "x86_64-linux"
, ...
}@attrs:
let joinedttrs = masterAttrs // attrs;
let
joinedttrs = masterAttrs // attrs;
in
nixpkgs.lib.nixosSystem {
specialArgs = specialArgs // {
@@ -38,16 +47,17 @@ let
modules = [
determinate.nixosModules.default
stylix.nixosModules.stylix
] ++ (makeImports {
]
++ (makeImports {
attrs = joinedttrs;
extraConfiguration = [
home-manager.nixosModules.default
nix-flatpak.nixosModules.nix-flatpak
specialArgs.dms.nixosModules.dankMaterialShell
];
});
};
makeNixOsModule =
makeNixOsModuleMaker { };
makeNixOsModule = makeNixOsModuleMaker { };
makeHLService = makeNixOsModuleMaker hlCommonSettings;
makeDarwinModule =
{ system ? "x86_64-darwin"
@@ -55,36 +65,42 @@ let
, ...
}@attrs:
nix-darwin.lib.darwinSystem {
modules = (makeImports {
attrs = attrs;
extraConfiguration = [
home-manager.darwinModules.home-manager
stylix.darwinModules.stylix
];
}) ++ [
(import ./macos.nix {
user = user;
system = system;
modules =
(makeImports {
attrs = attrs;
extraConfiguration = [
home-manager.darwinModules.home-manager
stylix.darwinModules.stylix
];
})
];
++ [
(import ./macos.nix {
user = user;
system = system;
})
];
};
makeHomeManagerUsers =
{ modules ? [ ]
, homeManagerVersion
, user
, system ? "x86_64-linux"
,
}:
let
hm = (import ./home {
stateVersion = homeManagerVersion;
});
hm = (
import ./home {
stateVersion = homeManagerVersion;
}
);
pkgs = allPkgs."${system}";
in
home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [
(hm.makeCommonUser user)
] ++ modules;
]
++ modules;
};
in
{
@@ -98,14 +114,18 @@ in
{ nodeNames ? [ ]
, systemStateVersion ? "24.05"
, user
}: builtins.listToAttrs (builtins.map
(name: {
name = name;
value = makeHLService {
hostName = name;
configuration = (import (../hosts + "/${name}.nix") { user = user; });
systemStateVersion = systemStateVersion;
};
})
nodeNames);
,
}:
builtins.listToAttrs (
builtins.map
(name: {
name = name;
value = makeHLService {
hostName = name;
configuration = (import (../hosts + "/${name}.nix") { user = user; });
systemStateVersion = systemStateVersion;
};
})
nodeNames
);
}
+3 -4
View File
@@ -1,7 +1,6 @@
{
lib,
config,
...
{ lib
, config
, ...
}:
let
cfg = config.skyg.nixos.common.hardware.pipewire;
+4 -5
View File
@@ -1,8 +1,7 @@
{
config,
lib,
pkgs,
...
{ config
, lib
, pkgs
, ...
}:
let
cfg = config.skyg.nixos;
+47 -39
View File
@@ -1,4 +1,8 @@
{ config, lib, pkgs, ... }:
{ config
, lib
, pkgs
, ...
}:
let
cfg = config.skyg.nixos.desktop.tiler;
in
@@ -10,46 +14,50 @@ in
];
options = {
skyg.nixos.desktop.tiler = {
enable = lib.mkEnableOption
"Enable libraries for tiling window managers";
enable = lib.mkEnableOption "Enable libraries for tiling window managers";
};
};
config = lib.mkIf cfg.enable
{
users.users.${config.skyg.user.name} = {
extraGroups = [
"input"
];
};
# services.blueman.enable = true;
programs.hyprlock.enable = true;
programs.nm-applet.enable = true;
environment.systemPackages = with pkgs; [
# Protocols and libraries
xwayland-satellite
libnotify
# Notifications
mako
wofi
rofi
# Control Tools
pavucontrol
playerctl
brightnessctl
networkmanagerapplet
blueman
# Apps
walker
waybar
nwg-bar
gnome-calendar
nautilus
# Screen capture and recording tools
(flameshot.override { enableWlrSupport = true; })
grim
slurp
satty
wf-recorder
config = lib.mkIf cfg.enable {
users.users.${config.skyg.user.name} = {
extraGroups = [
"input"
];
};
# services.blueman.enable = true;
programs.dankMaterialShell = {
enable = true;
systemd = {
enable = true; # Systemd service for auto-start
restartIfChanged = true; # Auto-restart dms.service when dankMaterialShell changes
};
};
# programs.hyprlock.enable = true;
# programs.nm-applet.enable = true;
environment.systemPackages = with pkgs; [
# Protocols and libraries
xwayland-satellite
libnotify
# Notifications
mako
wofi
rofi
# Control Tools
pavucontrol
playerctl
brightnessctl
# networkmanagerapplet
blueman
# Apps
walker
# waybar
# nwg-bar
gnome-calendar
nautilus
# Screen capture and recording tools
grim
slurp
satty
wf-recorder
];
};
}
+4 -5
View File
@@ -1,8 +1,7 @@
{
config,
lib,
pkgs,
...
{ config
, lib
, pkgs
, ...
}:
let
cfg = config.skyg.nixos.desktop.tiler.hyprland;
+7 -8
View File
@@ -1,11 +1,10 @@
{
config,
lib,
pkgs,
skygUtils,
system,
nixpkgs-unstable,
...
{ config
, lib
, pkgs
, skygUtils
, system
, nixpkgs-unstable
, ...
}:
let
cfg = config.skyg.nixos.desktop.tiler.niri;