libkookie: fix issues from updating nixpkgs

wip/nixpkgs-raku
Katharina Fey 3 years ago
parent e1ebe378ad
commit 62325b1a80
Signed by: kookie
GPG Key ID: 90734A9E619C8A6C
  1. 11
      infra/libkookie/configuration/users/spacekookie/default.nix
  2. 2
      infra/libkookie/configuration/workstation/creative/default.nix
  3. 2
      infra/libkookie/configuration/workstation/devel/default.nix
  4. 2
      infra/libkookie/modules/harness/lib.nix
  5. 1
      infra/libkookie/modules/workstation/mail/core/default.nix
  6. 2
      infra/libkookie/overlays/kookie/emacs/base/default.el
  7. 2
      infra/libkookie/overlays/kookie/emacs/base/default.nix
  8. 2
      infra/libkookie/overlays/kookie/emacs/default.nix
  9. 15
      infra/libkookie/overlays/kookie/funkwhale-frontend/default.nix
  10. 5
      infra/libkookie/roots/tempest.nix

@ -1,14 +1,17 @@
{ lib, pkgs, ... }:
{ lib, pkgs, ... } @ args:
let klib = (import <modules/harness/lib.nix>) args;
in
{
name = "spacekookie"; # FIXME: remove this redundancy
cfg = {
isNormalUser = true;
createHome = true;
description = "Katharina Fey";
home = lib.mkDefault "/home";
uid = lib.mkDefault 1000;
home = klib.mkDefault "/home";
uid = klib.mkDefault 1000;
extraGroups = [ "wheel" "dialout" "video" ];
shell = lib.mkDefault pkgs.fish;
shell = klib.mkDefault pkgs.fish;
};
pubkeys = [

@ -9,7 +9,7 @@
{
home.packages = with pkgs;
[
ardour audacity lmms
audacity
kdenlive obs-studio

@ -6,6 +6,8 @@ let
.overrideAttrs ({ ...}: { doInstallCheck = false; });
in
{
imports = [ ./cad.nix ];
home.packages = with pkgs; [
# Custom emacs with modules

@ -21,4 +21,6 @@ in
# This function wraps around lib.recursiveUpdate to make it slighly
# less cumbersome to work with in one-liners.
patchAttrs = attrs: f: (lib.recursiveUpdate attrs (f attrs));
mkDefault = lib.mkOverride ((lib.mkDefault null).priority - 1);
}

@ -11,6 +11,7 @@ in
createHome = true;
inherit (cfg.access) group;
home = "/var/lib/mail";
isSystemUser = true;
};
systemd.services.isync = (import ./isync.nix) args;

@ -12,6 +12,8 @@
(provide 'base)
(direnv-mode)
;;; Setup consistent line numbering
(setq display-line-numbers-grow-only t)
(setq display-line-numbers-width-start t)

@ -1,3 +1,3 @@
{ buildModule, pkgs, epkgs }:
with epkgs;
(buildModule "base" ./. [ smex sublimity scad-mode protobuf-mode ])
(buildModule "base" ./. [ direnv smex sublimity scad-mode protobuf-mode ])

@ -30,11 +30,9 @@ pkgs.emacsWithPackages (epkgs:
markdown-mode
nim-mode
nix-mode
python-mode
raku-mode
# Utility moduse
direnv
fzf
magit
treemacs

@ -0,0 +1,15 @@
{ stdenv, fetchzip }:
stdenv.mkDerivation rec {
pname = "funkwhale-frontend";
version = "1.1";
src = fetchzip {
url = "https://dev.funkwhale.audio/funkwhale/funkwhale/builds/artifacts/${version}/download?job=build_front&foo.zip";
sha256 = "0zddwd47ik3nrqpgkmvn4zx90w9708zjxlq0rr54vh5gzj326pgc";
};
installPhase = ''
cp -rv dist $out
'';
}

@ -152,7 +152,10 @@ in
networking.useDHCP = false;
#networking.interfaces.enp8s0.useDHCP = true;
networking.interfaces.eth0.useDHCP = true;
networking.hosts = {
"10.7.1.3" = [ "music.kookiejar.tech" "media.kookiejar.tech" "cloud.kookiejar.tech" ];
};
# Select internationalisation properties.
i18n.defaultLocale = "en_GB.UTF-8";

Loading…
Cancel
Save