mirror of
https://github.com/EdenQwQ/nixos.git
synced 2025-12-26 18:34:56 +08:00
import -> callPackage
This commit is contained in:
parent
835edc5466
commit
5522f31f19
6 changed files with 14 additions and 26 deletions
|
|
@ -3,7 +3,7 @@ let
|
|||
colors = config.lib.stylix.colors.withHashtag;
|
||||
in
|
||||
{
|
||||
home.packages = with (import ../../../pkgs/R.nix pkgs); [
|
||||
home.packages = with (pkgs.callPackage ../../../pkgs/R.nix { }); [
|
||||
(config.lib.misc.addFlags
|
||||
"--enable-features=UseOzonePlatform --ozone-platform=wayland --use-gl=angle --wayland-text-input-version=3"
|
||||
"rstudio"
|
||||
|
|
|
|||
|
|
@ -1,13 +1,7 @@
|
|||
{ pkgs, lib, ... }:
|
||||
{
|
||||
home.packages = [
|
||||
(import ../../../pkgs/fonts/kose.nix {
|
||||
inherit pkgs lib;
|
||||
inherit (pkgs) stdenvNoCC;
|
||||
})
|
||||
(import ../../../pkgs/fonts/hugmetight.nix {
|
||||
inherit pkgs lib;
|
||||
inherit (pkgs) stdenvNoCC;
|
||||
})
|
||||
(pkgs.callPackage ../../../pkgs/fonts/kose.nix { })
|
||||
(pkgs.callPackage ../../../pkgs/fonts/hugmetight.nix { })
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
zju-connect = import ../../../pkgs/zju-connect.nix {
|
||||
inherit (pkgs) lib buildGoModule fetchFromGitHub;
|
||||
};
|
||||
zju-connect = pkgs.callPackage ../../../pkgs/zju-connect.nix { };
|
||||
zjuconnect = pkgs.writeShellScriptBin "zjuconnect" ''exec ${zju-connect}/bin/zju-connect --config ~/.config/zju-connect/config.toml'';
|
||||
in
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
...
|
||||
}:
|
||||
let
|
||||
edenfetch = import ../../../pkgs/edenfetch.nix { inherit (pkgs) lib fetchFromGitHub rustPlatform; };
|
||||
edenfetch = pkgs.callPackage ../../../pkgs/edenfetch.nix { };
|
||||
in
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,6 @@
|
|||
{ pkgs, ... }:
|
||||
let
|
||||
swhkd = import ../../pkgs/swhkd.nix {
|
||||
inherit (pkgs)
|
||||
lib
|
||||
rustPlatform
|
||||
fetchFromGitHub
|
||||
pkg-config
|
||||
udev
|
||||
;
|
||||
};
|
||||
swhkd = pkgs.callPackage ../../pkgs/swhkd.nix { };
|
||||
in
|
||||
{
|
||||
environment.systemPackages = [
|
||||
|
|
|
|||
12
pkgs/R.nix
12
pkgs/R.nix
|
|
@ -1,6 +1,10 @@
|
|||
pkgs:
|
||||
{
|
||||
rPackages,
|
||||
rWrapper,
|
||||
rstudioWrapper,
|
||||
}:
|
||||
let
|
||||
rPkgs = with pkgs.rPackages; [
|
||||
rPkgs = with rPackages; [
|
||||
ggplot2
|
||||
dplyr
|
||||
tidyverse
|
||||
|
|
@ -13,10 +17,10 @@ let
|
|||
];
|
||||
in
|
||||
{
|
||||
myR = pkgs.rWrapper.override {
|
||||
myR = rWrapper.override {
|
||||
packages = rPkgs;
|
||||
};
|
||||
myRstudio = pkgs.rstudioWrapper.override {
|
||||
myRstudio = rstudioWrapper.override {
|
||||
packages = rPkgs;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue