From 69b17e91f26842642e1ca187b07b5efda93ac500 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Mon, 22 Jan 2024 15:01:36 +0100 Subject: [PATCH] fmt --- .../configuration/graphical-fullblown.nix | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/nix/home-manager/configuration/graphical-fullblown.nix b/nix/home-manager/configuration/graphical-fullblown.nix index 8ef7cc4..0333dad 100644 --- a/nix/home-manager/configuration/graphical-fullblown.nix +++ b/nix/home-manager/configuration/graphical-fullblown.nix @@ -1,17 +1,18 @@ -{ - pkgs, - config, - # these come in via home-manager.extraSpecialArgs and are specific to each node - nodeFlake, - packages', - # repoFlake, +{ pkgs +, config +, # these come in via home-manager.extraSpecialArgs and are specific to each node + nodeFlake +, packages' +, # repoFlake, # repoFlakeInputs', ... -}: let +}: +let # pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system}; - pkgsUnstableSmall = import nodeFlake.inputs.nixpkgs-unstable-small {inherit (pkgs) system config;}; + pkgsUnstableSmall = import nodeFlake.inputs.nixpkgs-unstable-small { inherit (pkgs) system config; }; pkgs2211 = nodeFlake.inputs.nixpkgs-2211.legacyPackages.${pkgs.system}; -in { +in +{ imports = [ ../profiles/common.nix ../profiles/dotfiles.nix @@ -37,13 +38,13 @@ in { ../programs/vscode # TODO: bump these to 23.05 and make it work - (args: import ../programs/radicale.nix (args // {pkgs = pkgs2211;})) + (args: import ../programs/radicale.nix (args // { pkgs = pkgs2211; })) # (args: import ../programs/espanso.nix (args // {pkgs = pkgs2211;})) ]; home.sessionVariables.HM_CONFIG = "graphical-fullblown"; home.sessionVariables.GOPATH = "$HOME/src/go"; - home.sessionVariables.PATH = pkgs.lib.concatStringsSep ":" ["$HOME/.local/bin" "$PATH"]; + home.sessionVariables.PATH = pkgs.lib.concatStringsSep ":" [ "$HOME/.local/bin" "$PATH" ]; nixpkgs.config.permittedInsecurePackages = [ "electron-24.8.6" @@ -51,7 +52,7 @@ in { ]; home.packages = - [] + [ ] ++ (with pkgs; [ # Authentication cacert @@ -249,11 +250,12 @@ in { pcmanfm # mendeley evince - (runCommand "logseq-wrapper" { - nativeBuildInputs = [ makeWrapper ]; - } '' - makeWrapper ${logseq}/bin/logseq $out/bin/logseq \ - --set NIXOS_OZONE_WL "" + (runCommand "logseq-wrapper" + { + nativeBuildInputs = [ makeWrapper ]; + } '' + makeWrapper ${logseq}/bin/logseq $out/bin/logseq \ + --set NIXOS_OZONE_WL "" '') # (logseq.override({ electron_25 = electron_26; }))