notgne2/nixfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: notgne2:d3af57b733c018154e13fffb990258de671e9770
Branches Tags
notgne2:master
..
compare: notgne2:df75571c56bb7d8f18c1f558984192de5d0a5778
Branches Tags
notgne2:master

No commits in common. "d3af57b733c018154e13fffb990258de671e9770" and "df75571c56bb7d8f18c1f558984192de5d0a5778" have entirely different histories.
d3af57b733 ... df75571c56

2 changed files with 5 additions and 21 deletions
Show Stats Expand all files Collapse all files

7
home-manager/modules/colors.nix
View File

@ -41,7 +41,6 @@ let
mustache = scheme: name: src: mustache = scheme: name: src:
pkgs.stdenv.mkDerivation ( pkgs.stdenv.mkDerivation (
{ {
# TODO add template name
name = lib.strings.sanitizeDerivationName name; name = lib.strings.sanitizeDerivationName name;
inherit src; inherit src;
data = pkgs.writeText "${name}-data" (builtins.toJSON scheme); data = pkgs.writeText "${name}-data" (builtins.toJSON scheme);
@ -75,11 +74,6 @@ in
type = types.attrsOf (types.attrsOf types.int); type = types.attrsOf (types.attrsOf types.int);
}; };
base16Split = mkOption {
readOnly = true;
type = types.attrsOf (types.attrsOf types.str);
};
base16 = mkOption { base16 = mkOption {
readOnly = true; readOnly = true;
type = types.attrsOf types.str; type = types.attrsOf types.str;
@ -203,7 +197,6 @@ in
# Read only utility attributes # Read only utility attributes
colors.base16 = cfg.favColors.base16; colors.base16 = cfg.favColors.base16;
colors.base16Rgb = builtins.mapAttrs hexToRgb cfg.favColors.base16; colors.base16Rgb = builtins.mapAttrs hexToRgb cfg.favColors.base16;
colors.base16Split = builtins.mapAttrs splitHex cfg.favColors.base16;
# Element # Element
xdg.configFile."Riot/config.json".text = builtins.toJSON elementConfig; xdg.configFile."Riot/config.json".text = builtins.toJSON elementConfig;

19
modules/ezpc.nix
View File

@ -84,26 +84,23 @@ let
steam-run = steam.run; steam-run = steam.run;
newwine = (pkgs.wineFull.override { wineBuild = "wine64"; wineRelease = "staging"; }); newwine = (pkgs.wineFull.override { wineBuild = "wineWow"; wineRelease = "staging"; });
newwinetricks = pkgs.winetricks.override { wine = newwine; }; newwinetricks = pkgs.winetricks.override { wine = newwine; };
oldwine = (pkgs.wineFull.override { wineBuild = "wine64"; }); oldwine = (pkgs.wineFull.override { wineBuild = "wineWow"; });
oldwinetricks = pkgs.winetricks.override { wine = oldwine; }; oldwinetricks = pkgs.winetricks.override { wine = oldwine; };
in in
with pkgs; ([ with pkgs; ([
steam
steam-run
xlibs.xf86inputjoystick xlibs.xf86inputjoystick
oldwine oldwine
oldwinetricks oldwinetricks
] ++ (if !cfg.flatSteam then [
steam
steam-run
(writeScriptBin "steam-run-native" '' (writeScriptBin "steam-run-native" ''
#!${pkgs.stdenv.shell} #!${pkgs.stdenv.shell}
${(steam.override { nativeOnly = true; }).run}/bin/steam-run $@ ${(steam.override { nativeOnly = true; }).run}/bin/steam-run $@
'') '')
] else [ ] ++ (
# steam-run-native
]) ++ (
if cfg.newWine then [ if cfg.newWine then [
( (
pkgs.runCommand "new-wine-stuff" pkgs.runCommand "new-wine-stuff"
@ -145,12 +142,6 @@ in
description = "If this PC is used for gaming"; description = "If this PC is used for gaming";
}; };
flatSteam = mkOption {
type = types.bool;
default = false;
description = "If you use the flatpak Steam instead of NixOS";
};
touchscreen = mkOption { touchscreen = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;