nix fmt
This commit is contained in:
@@ -7,51 +7,48 @@
|
||||
hmOnly,
|
||||
username,
|
||||
...
|
||||
}: let
|
||||
}:
|
||||
let
|
||||
# from https://github.com/Gerg-L/demoninajar/blob/39964f198dbfa34c21f81c35370fab312b476051/homes/veritas_manjaro/nixGL.nix#L42
|
||||
mkWrapped = wrap: orig-pkg: execName:
|
||||
pkgs.makeOverridable
|
||||
(
|
||||
attrs: let
|
||||
mkWrapped =
|
||||
wrap: orig-pkg: execName:
|
||||
pkgs.makeOverridable (
|
||||
attrs:
|
||||
let
|
||||
pkg = orig-pkg.override attrs;
|
||||
outs = pkg.meta.outputsToInstall;
|
||||
paths = pkgs.lib.attrsets.attrVals outs pkg;
|
||||
nonTrivialOuts = pkgs.lib.lists.remove "out" outs;
|
||||
metaAttributes =
|
||||
pkgs.lib.attrsets.getAttrs
|
||||
(
|
||||
[
|
||||
"name"
|
||||
"pname"
|
||||
"version"
|
||||
"meta"
|
||||
]
|
||||
++ nonTrivialOuts
|
||||
)
|
||||
pkg;
|
||||
metaAttributes = pkgs.lib.attrsets.getAttrs (
|
||||
[
|
||||
"name"
|
||||
"pname"
|
||||
"version"
|
||||
"meta"
|
||||
]
|
||||
++ nonTrivialOuts
|
||||
) pkg;
|
||||
in
|
||||
pkgs.symlinkJoin (
|
||||
{
|
||||
inherit paths;
|
||||
nativeBuildInputs = [pkgs.makeWrapper];
|
||||
postBuild = ''
|
||||
mv $out/bin/${execName} $out/bin/.${execName}-mkWrapped-original
|
||||
makeWrapper \
|
||||
${wrap}/bin/${wrap.name} $out/bin/${execName} \
|
||||
--add-flags $out/bin/.${execName}-mkWrapped-original
|
||||
'';
|
||||
}
|
||||
// metaAttributes
|
||||
)
|
||||
)
|
||||
{};
|
||||
pkgs.symlinkJoin (
|
||||
{
|
||||
inherit paths;
|
||||
nativeBuildInputs = [ pkgs.makeWrapper ];
|
||||
postBuild = ''
|
||||
mv $out/bin/${execName} $out/bin/.${execName}-mkWrapped-original
|
||||
makeWrapper \
|
||||
${wrap}/bin/${wrap.name} $out/bin/${execName} \
|
||||
--add-flags $out/bin/.${execName}-mkWrapped-original
|
||||
'';
|
||||
}
|
||||
// metaAttributes
|
||||
)
|
||||
) { };
|
||||
glintel = mkWrapped pkgs.nixgl.nixGLIntel;
|
||||
firefox =
|
||||
if (pkgs.stdenv.hostPlatform.system == "x86_64-linux")
|
||||
then pkgs.firefox-bin
|
||||
else pkgs.firefox;
|
||||
if (pkgs.stdenv.hostPlatform.system == "x86_64-linux") then pkgs.firefox-bin else pkgs.firefox;
|
||||
homeDirectory = "/home/${username}";
|
||||
in {
|
||||
in
|
||||
{
|
||||
home = {
|
||||
inherit stateVersion username homeDirectory;
|
||||
};
|
||||
@@ -61,13 +58,12 @@ in {
|
||||
".parallel/will-cite".text = "";
|
||||
};
|
||||
|
||||
home.sessionVariables = lib.mkIf devTools {
|
||||
GOPATH = "${homeDirectory}/.go";
|
||||
};
|
||||
home.sessionVariables = lib.mkIf devTools { GOPATH = "${homeDirectory}/.go"; };
|
||||
|
||||
home.packages = with pkgs;
|
||||
home.packages =
|
||||
with pkgs;
|
||||
lib.mkMerge [
|
||||
[extract_url]
|
||||
[ extract_url ]
|
||||
|
||||
(lib.mkIf devTools [
|
||||
go_1_22
|
||||
@@ -106,17 +102,14 @@ in {
|
||||
chromium = {
|
||||
enable = true;
|
||||
extensions = [
|
||||
{id = "cjpalhdlnbpafiamejdnhcphjbkeiagm";} # ublock origin
|
||||
{id = "mdjildafknihdffpkfmmpnpoiajfjnjd";} # consent-o-matic
|
||||
{ id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; } # ublock origin
|
||||
{ id = "mdjildafknihdffpkfmmpnpoiajfjnjd"; } # consent-o-matic
|
||||
];
|
||||
};
|
||||
firefox = lib.mkIf devTools {
|
||||
enable = true;
|
||||
# firefox doesn't need the wrapper on the personal laptop
|
||||
package =
|
||||
if hmOnly
|
||||
then (glintel firefox "firefox")
|
||||
else firefox;
|
||||
package = if hmOnly then (glintel firefox "firefox") else firefox;
|
||||
policies.DisableAppUpdate = true;
|
||||
profiles = {
|
||||
xdefault = {
|
||||
@@ -148,7 +141,7 @@ in {
|
||||
vimdiffAlias = true;
|
||||
defaultEditor = true;
|
||||
plugins = lib.mkMerge [
|
||||
[pkgs.vimPlugins.fugitive]
|
||||
[ pkgs.vimPlugins.fugitive ]
|
||||
(lib.mkIf devTools [
|
||||
pkgs.vimPlugins.vim-go
|
||||
pkgs.vimPlugins.zig-vim
|
||||
@@ -162,11 +155,10 @@ in {
|
||||
(lib.mkIf devTools {
|
||||
extraLuaConfig =
|
||||
builtins.readFile
|
||||
(pkgs.substituteAll {
|
||||
src = ./dev.lua;
|
||||
inherit (pkgs) ripgrep;
|
||||
})
|
||||
.outPath;
|
||||
(pkgs.substituteAll {
|
||||
src = ./dev.lua;
|
||||
inherit (pkgs) ripgrep;
|
||||
}).outPath;
|
||||
})
|
||||
];
|
||||
|
||||
@@ -228,22 +220,19 @@ in {
|
||||
'';
|
||||
};
|
||||
}
|
||||
(
|
||||
lib.mkIf (!hmOnly)
|
||||
{
|
||||
bash = {
|
||||
enable = true;
|
||||
shellAliases = {
|
||||
"l" = "echo -n ł | ${pkgs.xclip}/bin/xclip -selection clipboard";
|
||||
"gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
|
||||
};
|
||||
initExtra = ''
|
||||
t() { git rev-parse --show-toplevel; }
|
||||
d() { date --utc --date=@$(echo "$1" | sed -E 's/^[^1-9]*([0-9]{10}).*/\1/') +"%F %T"; }
|
||||
source ${./gg.sh}
|
||||
'';
|
||||
(lib.mkIf (!hmOnly) {
|
||||
bash = {
|
||||
enable = true;
|
||||
shellAliases = {
|
||||
"l" = "echo -n ł | ${pkgs.xclip}/bin/xclip -selection clipboard";
|
||||
"gp" = "${pkgs.git}/bin/git remote | ${pkgs.parallel}/bin/parallel --verbose git push";
|
||||
};
|
||||
}
|
||||
)
|
||||
initExtra = ''
|
||||
t() { git rev-parse --show-toplevel; }
|
||||
d() { date --utc --date=@$(echo "$1" | sed -E 's/^[^1-9]*([0-9]{10}).*/\1/') +"%F %T"; }
|
||||
source ${./gg.sh}
|
||||
'';
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user