Move from unstable
This commit is contained in:
parent
f19519b0a2
commit
45cf7d3a0e
|
@ -28,7 +28,7 @@
|
||||||
Bool a -> show a
|
Bool a -> show a
|
||||||
Null -> "null"
|
Null -> "null"
|
||||||
'';
|
'';
|
||||||
inherit (import ../lib) writeHaskellScript unstable;
|
inherit (import ../lib) writeHaskellScript;
|
||||||
libraries = [
|
libraries = [
|
||||||
pkgs.haskellPackages.fdo-notify
|
pkgs.haskellPackages.fdo-notify
|
||||||
pkgs.haskellPackages.aeson
|
pkgs.haskellPackages.aeson
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
fi
|
fi
|
||||||
|
|
||||||
${builtins.readFile ./zshrc}
|
${builtins.readFile ./zshrc}
|
||||||
source ${my-pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
|
source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
|
||||||
source ${./p10k.zsh}
|
source ${./p10k.zsh}
|
||||||
'';
|
'';
|
||||||
oh-my-zsh = {
|
oh-my-zsh = {
|
||||||
|
|
|
@ -2,14 +2,13 @@
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
weechatConfig = import ../secret/weechat.nix;
|
weechatConfig = import ../secret/weechat.nix;
|
||||||
inherit (import ../../../lib) unstable;
|
weechat = pkgs.wrapWeechat pkgs.weechat-unwrapped {
|
||||||
weechat = unstable.wrapWeechat unstable.weechat-unwrapped {
|
|
||||||
configure = { availablePlugins, ... }: {
|
configure = { availablePlugins, ... }: {
|
||||||
plugins = builtins.attrValues (availablePlugins // {
|
plugins = builtins.attrValues (availablePlugins // {
|
||||||
python = (availablePlugins.python.withPackages
|
python = (availablePlugins.python.withPackages
|
||||||
(ps: [ unstable.weechatScripts.weechat-matrix ]));
|
(ps: [ pkgs.weechatScripts.weechat-matrix ]));
|
||||||
});
|
});
|
||||||
scripts = [ unstable.weechatScripts.weechat-matrix ];
|
scripts = [ pkgs.weechatScripts.weechat-matrix ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
let
|
let
|
||||||
inherit (import ../pkgs) niv;
|
|
||||||
inherit (import ../lib)
|
inherit (import ../lib)
|
||||||
pkgs writeHaskellScript get-niv-path home-manager unstable haskellList;
|
pkgs writeHaskellScript get-niv-path home-manager unstable haskellList;
|
||||||
in rec {
|
in rec {
|
||||||
|
@ -38,7 +37,8 @@ in rec {
|
||||||
keys = [ "default" "apollo" "hera" ];
|
keys = [ "default" "apollo" "hera" ];
|
||||||
test-config = writeHaskellScript {
|
test-config = writeHaskellScript {
|
||||||
name = "test-config";
|
name = "test-config";
|
||||||
bins = [ test-system-config test-home-config pkgs.git niv pkgs.git-crypt ];
|
bins =
|
||||||
|
[ test-system-config test-home-config pkgs.git pkgs.niv pkgs.git-crypt ];
|
||||||
imports = [ "System.Directory (withCurrentDirectory)" ];
|
imports = [ "System.Directory (withCurrentDirectory)" ];
|
||||||
} ''
|
} ''
|
||||||
checkout :: IO FilePath
|
checkout :: IO FilePath
|
||||||
|
|
|
@ -16,17 +16,15 @@ in rec {
|
||||||
my-ssh-add = pkgs.writeShellScriptBin "my-ssh-add" ''
|
my-ssh-add = pkgs.writeShellScriptBin "my-ssh-add" ''
|
||||||
SSH_ASKPASS=${cat-pw}/bin/cat-ssh-pw ${pkgs.openssh}/bin/ssh-add < /dev/null
|
SSH_ASKPASS=${cat-pw}/bin/cat-ssh-pw ${pkgs.openssh}/bin/ssh-add < /dev/null
|
||||||
'';
|
'';
|
||||||
zsh-powerlevel10k = unstable.zsh-powerlevel10k;
|
|
||||||
ghcide = (import sources.ghcide { }).ghcide-ghc865;
|
ghcide = (import sources.ghcide { }).ghcide-ghc865;
|
||||||
obelisk = (import sources.obelisk { }).command;
|
obelisk = (import sources.obelisk { }).command;
|
||||||
nix-direnv = sources.nix-direnv + "/direnvrc";
|
nix-direnv = sources.nix-direnv + "/direnvrc";
|
||||||
neovim = unstable.neovim.override {
|
neovim = pkgs.neovim.override {
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
withPython3 = true;
|
withPython3 = true;
|
||||||
withPython = false;
|
withPython = false;
|
||||||
};
|
};
|
||||||
home-neovim = (import ./nvim) neovim;
|
home-neovim = (import ./nvim) neovim;
|
||||||
niv = unstable.niv;
|
|
||||||
|
|
||||||
# pkgs assumed to be present on a non nixos host
|
# pkgs assumed to be present on a non nixos host
|
||||||
core-system-pkgs = {
|
core-system-pkgs = {
|
||||||
|
@ -37,14 +35,13 @@ in rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
extra-system-pkgs = {
|
extra-system-pkgs = {
|
||||||
inherit niv;
|
|
||||||
inherit (pkgs.gitAndTools) git-annex;
|
inherit (pkgs.gitAndTools) git-annex;
|
||||||
inherit (pkgs.rxvt_unicode) terminfo;
|
inherit (pkgs.rxvt_unicode) terminfo;
|
||||||
inherit (pkgs.python3Packages) qrcode;
|
inherit (pkgs.python3Packages) qrcode;
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
git-crypt htop tree pwgen borgbackup inotifyTools direnv socat nmap ncdu
|
git-crypt htop tree pwgen borgbackup inotifyTools direnv socat nmap ncdu
|
||||||
tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat
|
tcpdump tmux tig exa fzf ag fd bat ripgrep ranger pass sshuttle vnstat
|
||||||
entr libargon2 mblaze;
|
entr libargon2 mblaze niv;
|
||||||
};
|
};
|
||||||
gw2wrapper = writeHaskellScript {
|
gw2wrapper = writeHaskellScript {
|
||||||
name = "gw2wrapper";
|
name = "gw2wrapper";
|
||||||
|
@ -98,7 +95,7 @@ in rec {
|
||||||
libXext
|
libXext
|
||||||
libX11
|
libX11
|
||||||
libudev
|
libudev
|
||||||
libGLU_combined
|
libGLU
|
||||||
mesa_noglu.osmesa
|
mesa_noglu.osmesa
|
||||||
libdrm
|
libdrm
|
||||||
libpulseaudio
|
libpulseaudio
|
||||||
|
@ -119,11 +116,12 @@ in rec {
|
||||||
inherit (pkgs.gnome3) nautilus;
|
inherit (pkgs.gnome3) nautilus;
|
||||||
inherit (pkgs.xorg) xev xbacklight;
|
inherit (pkgs.xorg) xev xbacklight;
|
||||||
inherit (pkgs.gitAndTools) hub;
|
inherit (pkgs.gitAndTools) hub;
|
||||||
inherit (unstable) mumble;
|
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
# web
|
# web
|
||||||
chromium
|
chromium
|
||||||
|
|
||||||
|
mumble
|
||||||
|
|
||||||
upower speedtest-cli
|
upower speedtest-cli
|
||||||
|
|
||||||
anki
|
anki
|
||||||
|
@ -174,8 +172,7 @@ in rec {
|
||||||
inherit (pkgs.gnome3) dconf;
|
inherit (pkgs.gnome3) dconf;
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
kitty lm_sensors sway swaylock swayidle xwayland rofi dmenu xdg_utils
|
kitty lm_sensors sway swaylock swayidle xwayland rofi dmenu xdg_utils
|
||||||
libnotify mako;
|
libnotify mako wofi;
|
||||||
inherit (unstable) wofi;
|
|
||||||
|
|
||||||
};
|
};
|
||||||
home-pkgs = {
|
home-pkgs = {
|
||||||
|
@ -185,7 +182,7 @@ in rec {
|
||||||
stack ghcid;
|
stack ghcid;
|
||||||
inherit (my-lib) ghc;
|
inherit (my-lib) ghc;
|
||||||
inherit home-neovim ghcide obelisk;
|
inherit home-neovim ghcide obelisk;
|
||||||
cabal-fmt = (unBreak unstable.haskell.packages.ghc881.cabal-fmt);
|
cabal-fmt = (unBreak pkgs.haskell.packages.ghc881.cabal-fmt);
|
||||||
};
|
};
|
||||||
accounting-pkgs = {
|
accounting-pkgs = {
|
||||||
jali = pkgs.callPackage ./jali { };
|
jali = pkgs.callPackage ./jali { };
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
{ aqbanking, python36Packages, fetchgit }:
|
{ aqbanking, python3Packages, fetchgit }:
|
||||||
let
|
let
|
||||||
andir = import (builtins.fetchTarball {
|
andir = import (builtins.fetchTarball {
|
||||||
url = "https://github.com/andir/nixpkgs/archive/aqbanking.tar.gz";
|
url = "https://github.com/andir/nixpkgs/archive/aqbanking.tar.gz";
|
||||||
sha256 = "06m7risi68jfqgv001ip77lzz6bylvvdn5j8sn845c54zpm6qp36";
|
sha256 = "06m7risi68jfqgv001ip77lzz6bylvvdn5j8sn845c54zpm6qp36";
|
||||||
}) { };
|
}) { };
|
||||||
in with python36Packages;
|
in with python3Packages;
|
||||||
buildPythonApplication rec {
|
buildPythonApplication rec {
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
pname = "jali";
|
pname = "jali";
|
||||||
|
|
|
@ -1,6 +1,4 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }: {
|
||||||
let inherit (import ../lib) unstable;
|
|
||||||
in {
|
|
||||||
fonts = {
|
fonts = {
|
||||||
fontconfig = {
|
fontconfig = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
@ -21,10 +19,7 @@ in {
|
||||||
font-awesome # icons I guess?
|
font-awesome # icons I guess?
|
||||||
material-icons # icons in my app
|
material-icons # icons in my app
|
||||||
b612 # sans font
|
b612 # sans font
|
||||||
powerline-fonts # fonts e.g. for swaybar
|
jetbrains-mono; # code font
|
||||||
;
|
|
||||||
inherit (unstable) jetbrains-mono # code font
|
|
||||||
;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
let
|
let
|
||||||
hostName = "matrix.maralorn.de";
|
hostName = "matrix.maralorn.de";
|
||||||
inherit (config.m-0) hosts;
|
inherit (config.m-0) hosts;
|
||||||
inherit (import ../lib) unstable;
|
|
||||||
in {
|
in {
|
||||||
networking.firewall.allowedTCPPorts = [ 8448 ];
|
networking.firewall.allowedTCPPorts = [ 8448 ];
|
||||||
|
|
||||||
|
@ -29,7 +28,7 @@ in {
|
||||||
# Synapse
|
# Synapse
|
||||||
matrix-synapse = {
|
matrix-synapse = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = unstable.matrix-synapse;
|
package = pkgs.matrix-synapse;
|
||||||
enable_metrics = true;
|
enable_metrics = true;
|
||||||
server_name = "maralorn.de";
|
server_name = "maralorn.de";
|
||||||
public_baseurl = "https://${hostName}";
|
public_baseurl = "https://${hostName}";
|
||||||
|
|
|
@ -20,20 +20,13 @@ let
|
||||||
"https://cloud.maralorn.de/apps/theming/image/background";
|
"https://cloud.maralorn.de/apps/theming/image/background";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
inherit (import ../lib) unstable;
|
|
||||||
in {
|
in {
|
||||||
services.nginx = {
|
services.nginx = {
|
||||||
enable = true;
|
enable = true;
|
||||||
virtualHosts."riot.maralorn.de" = {
|
virtualHosts."riot.maralorn.de" = {
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
root = unstable.riot-web;
|
root = pkgs.riot-web.overrideAttrs (old: { conf = riot_config; });
|
||||||
locations."/config.json" = {
|
|
||||||
extraConfig = ''
|
|
||||||
default_type application/json;
|
|
||||||
return 200 '${builtins.toJSON riot_config}';
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue