steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fmt

Browse source
This commit is contained in:
steveej 2024-01-22 15:01:36 +01:00
parent 2ff952b3a3
commit 69b17e91f2
1 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

38
nix/home-manager/configuration/graphical-fullblown.nix
View file

@ -1,17 +1,18 @@
{ { pkgs
pkgs, , config
config, , # these come in via home-manager.extraSpecialArgs and are specific to each node
# these come in via home-manager.extraSpecialArgs and are specific to each node nodeFlake
nodeFlake, , packages'
packages', , # repoFlake,
# repoFlake,
# repoFlakeInputs', # repoFlakeInputs',
... ...
}: let }:
let
# pkgsMaster = nodeFlake.inputs.nixpkgs-master.legacyPackages.${pkgs.system}; # 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}; pkgs2211 = nodeFlake.inputs.nixpkgs-2211.legacyPackages.${pkgs.system};
in { in
{
imports = [ imports = [
../profiles/common.nix ../profiles/common.nix
../profiles/dotfiles.nix ../profiles/dotfiles.nix
@ -37,13 +38,13 @@ in {
../programs/vscode ../programs/vscode
# TODO: bump these to 23.05 and make it work # 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;})) # (args: import ../programs/espanso.nix (args // {pkgs = pkgs2211;}))
]; ];
home.sessionVariables.HM_CONFIG = "graphical-fullblown"; home.sessionVariables.HM_CONFIG = "graphical-fullblown";
home.sessionVariables.GOPATH = "$HOME/src/go"; 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 = [ nixpkgs.config.permittedInsecurePackages = [
"electron-24.8.6" "electron-24.8.6"
@ -51,7 +52,7 @@ in {
]; ];
home.packages = home.packages =
[] [ ]
++ (with pkgs; [ ++ (with pkgs; [
# Authentication # Authentication
cacert cacert
@ -249,11 +250,12 @@ in {
pcmanfm pcmanfm
# mendeley # mendeley
evince evince
(runCommand "logseq-wrapper" { (runCommand "logseq-wrapper"
nativeBuildInputs = [ makeWrapper ]; {
} '' nativeBuildInputs = [ makeWrapper ];
makeWrapper ${logseq}/bin/logseq $out/bin/logseq \ } ''
--set NIXOS_OZONE_WL "" makeWrapper ${logseq}/bin/logseq $out/bin/logseq \
--set NIXOS_OZONE_WL ""
'') '')
# (logseq.override({ electron_25 = electron_26; })) # (logseq.override({ electron_25 = electron_26; }))