Compare commits

..

No commits in common. "e0cd176d1e49d7ee861eb107d90920f05fa2c549" and "54d835c290ffbf3a7a1c64181de028d967cc38d3" have entirely different histories.

7 changed files with 18 additions and 36 deletions

View File

@ -15,8 +15,8 @@ in
{
imports = getModules ./.;
# nixpkgs.config.allowUnfree = true;
# nixpkgs.overlays = [ self.overlays.default ];
nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ self.overlays.default ];
snowhawk.user.enable = lib.mkDefault true;
snowhawk.tmux.enable = lib.mkDefault true;

View File

@ -19,12 +19,6 @@ in
(writeShellScriptBin "iinact" ''
${pkgs.brave}/bin/brave --new-window "http://proxy.iinact.com/overlay/skyline/?OVERLAY_WS=ws://127.0.0.1:10501/ws"
'')
# (lib.mkIf cfg.textools.enable pkgs.wrapWine {
# # https://gist.github.com/helpful-fox-senko-san/6238143f5c7352ab44e62c5a0f7f7642
# name = "textools";
# tricks = [ "dotnet48" "dxvk" ];
# })
] ++ map (name: (writeShellScriptBin name launchffxiv)) [ "ff14" "xivlauncher" ];
};
}

View File

@ -97,8 +97,11 @@
security.polkit.enable = true;
home-manager.users = { "ravenshade" = import ./home.nix; };
# home-manager.backupFileExtension = "backup";
home-manager = {
extraSpecialArgs = { inherit inputs self; };
users = { "ravenshade" = import ./home.nix; };
# backupFileExtension = "backup";
};
# programs.hyprland.enable = true;
# environment.sessionVariables.NIXOS_OZONE_WL = "1";

View File

@ -1,17 +1,10 @@
{ nixpkgs, self, ... }@inputs:
let
makePkgs = system: (import nixpkgs {
inherit system;
config.allowUnfree = true;
overlays = [ self.overlays.default ];
});
lib = nixpkgs.lib.extend (import ../lib);
inherit (inputs.home-manager.lib) homeManagerConfiguration;
inherit (lib) nixosSystem right;
inherit (nixpkgs.lib) nixosSystem;
inherit (lib.strings) optionalString;
inherit (lib.attrsets) nameValuePair;
in
@ -20,20 +13,13 @@ rec {
{ hostname, system }:
nameValuePair
hostname
(nixosSystem rec {
pkgs = makePkgs system;
specialArgs = { inherit inputs self; };
(nixosSystem {
inherit system;
specialArgs = { inherit inputs lib self; };
modules = [
../hosts/${hostname}/hardware-configuration.nix
../hosts/${hostname}/configuration.nix
inputs.home-manager.nixosModules.default
{
home-manager.extraSpecialArgs = {
inherit inputs self pkgs;
lib = pkgs.lib.extend (_: _: inputs.home-manager.lib);
};
}
];
});
compileSystems =
@ -53,8 +39,11 @@ rec {
nameValuePair
"${user}${hostStr}"
(homeManagerConfiguration {
pkgs = makePkgs system;
extraSpecialArgs = { inherit inputs self; };
pkgs = nixpkgs.legacyPackages.${system};
extraSpecialArgs = {
inherit inputs self;
lib = lib.extend (_: _: inputs.home-manager.lib);
};
modules = [
../hosts/${configHost}/home.nix

View File

@ -1,7 +1,5 @@
final: prev:
let
inherit (prev) isFunction;
in
with prev;
rec {
# Ternary operator
# Exaample:

View File

@ -14,5 +14,5 @@ in
snowhawk.audio.enable = lib.mkDefault true;
snowhawk.env.enable = lib.mkDefault true;
snowhawk.sops.enable = lib.mkDefault true;
snowhawk.nixpkgs.enable = lib.mkDefault false;
snowhawk.nixpkgs.enable = lib.mkDefault true;
}

View File

@ -3,8 +3,6 @@ let
callDefaultPackage = path: prev.callPackage path { };
in
{
lib = prev.lib.extend (import ../lib);
wrapWine = callDefaultPackage ./wrapWine;
writeXrandrScriptBin = callDefaultPackage ./writeXrandrScriptBin;
borderlessBrowser = callDefaultPackage ./borderlessBrowser;