mirror of
https://github.com/kmein/niveum
synced 2026-03-16 10:11:08 +01:00
feat: use newest zoom-us
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
hc = pkgs.callPackage <stockholm/tv/5pkgs/simple/hc.nix> {};
|
||||
inherit (import <niveum/lib>) nixpkgs-unstable;
|
||||
in {
|
||||
imports = [
|
||||
./krebs.nix
|
||||
@@ -97,7 +99,7 @@ in {
|
||||
audacity
|
||||
calibre
|
||||
inkscape
|
||||
zoom-us # video conferencing
|
||||
nixpkgs-unstable.zoom-us # video conferencing
|
||||
pdfgrep # search in pdf
|
||||
pdftk # pdf toolkit
|
||||
evince # for viewing pdf annotations
|
||||
|
||||
@@ -2,8 +2,6 @@
|
||||
let
|
||||
inherit (import <niveum/lib>) nixpkgs-unstable;
|
||||
|
||||
unstable = import nixpkgs-unstable {};
|
||||
|
||||
zoteroStyle = { name, sha256 }: {
|
||||
name = "${name}.csl";
|
||||
path = pkgs.fetchurl {
|
||||
@@ -70,7 +68,7 @@ in {
|
||||
libreoffice
|
||||
# gnumeric
|
||||
dia
|
||||
unstable.pandoc
|
||||
nixpkgs-unstable.pandoc
|
||||
# proselint
|
||||
asciidoctor
|
||||
wordnet
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
{
|
||||
nixpkgs-unstable = builtins.fetchGit {
|
||||
rec {
|
||||
nixpkgs-src = builtins.fetchGit {
|
||||
url = "https://github.com/NixOS/nixpkgs";
|
||||
rev = "c40f06022a83d6f286dd2a906e1d5fefcc05dfa1";
|
||||
rev = "f3042e30785437f6cb2d99b15625b962fb96799f";
|
||||
};
|
||||
nixpkgs-unstable = import nixpkgs-src { config.allowUnfree = true; };
|
||||
|
||||
sshPort = 22022;
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ let
|
||||
netname = "retiolum";
|
||||
cfg = config.networking.retiolum;
|
||||
in {
|
||||
imports = [ "${(import <niveum/lib>).nixpkgs-unstable}/nixos/modules/services/networking/tinc.nix" ];
|
||||
imports = [ "${(import <niveum/lib>).nixpkgs-src}/nixos/modules/services/networking/tinc.nix" ];
|
||||
disabledModules = [ "services/networking/tinc.nix" ];
|
||||
|
||||
options = {
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
inherit (import <niveum/lib>) nixpkgs-unstable;
|
||||
unstable = import nixpkgs-unstable {
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [
|
||||
@@ -39,7 +36,7 @@ in
|
||||
nix.buildCores = 1;
|
||||
nix.maxJobs = 2;
|
||||
|
||||
environment.systemPackages = [ unstable.minecraft ];
|
||||
environment.systemPackages = [ nixpkgs-unstable.minecraft ];
|
||||
|
||||
boot.loader.systemd-boot = {
|
||||
enable = true;
|
||||
|
||||
Reference in New Issue
Block a user