1
0
mirror of https://github.com/kmein/niveum synced 2026-03-16 10:11:08 +01:00
- fix tmux config
- add window swallowing script
- make scripts an overlay
- setup disc burning
This commit is contained in:
Kierán Meinhardt
2020-06-22 08:44:09 +02:00
parent e380f96f4c
commit 871370e7a8
8 changed files with 45 additions and 15 deletions

View File

@@ -111,6 +111,9 @@ in {
};
};
overlays = [
(self: super: {
scripts = import <niveum/packages/scripts> { pkgs = super; lib = super.lib; };
})
# (import <niveum/overlays/rust.nix>)
];
};
@@ -151,6 +154,10 @@ in {
isNormalUser = true;
};
}
{
environment.systemPackages = with pkgs; [ k3b bashburn brasero ];
users.users.me.extraGroups = [ "cdrom" ];
}
{
sound.enable = true;
@@ -176,6 +183,7 @@ in {
take = pkgs.writers.writeDash "take" ''
mkdir "$1" && cd "$1"
'';
swallow = command: "${pkgs.scripts.swallow}/bin/swallow ${command}";
in {
"ß" = "${pkgs.utillinux}/bin/setsid";
cat = "${pkgs.bat}/bin/bat --style=plain";
@@ -199,6 +207,8 @@ in {
take = "source ${take}";
tmux = "${pkgs.tmux}/bin/tmux -2";
tree = "${pkgs.exa}/bin/exa --tree";
sxiv = swallow "${pkgs.sxiv}/bin/sxiv";
zathura = swallow "${pkgs.zathura}/bin/zathura";
us = "${pkgs.systemd}/bin/systemctl --user";
wcd = "source ${wcd}";
weechat = "${pkgs.openssh}/bin/ssh kmein@prism.r -t tmux attach";

View File

@@ -21,12 +21,14 @@ let
${pkgs.coreutils}/bin/tr '[A-Za-z]' '[N-ZA-Mn-za-m]'
'';
"ipa" = pkgs.writers.writeDash "ipa" ''
${scripts.ipa}/bin/ipa
${pkgs.scripts.ipa}/bin/ipa
'';
"betacode" = pkgs.writers.writeDash "betacode" ''
${pkgs.scripts.betacode}/bin/betacode
'';
};
};
scripts = import <niveum/packages/scripts> { inherit pkgs lib; };
myLib = import <niveum/lib> { inherit pkgs; };
inherit (myLib) writeTOML;

View File

@@ -1,9 +1,11 @@
{ pkgs, ... }: {
environment.systemPackages = with pkgs; [
(mpv-with-scripts.override { scripts = [ mpvScripts.mpris ]; })
mpv
mpv-poll
];
environment.shellAliases.mpv = "${pkgs.utillinux}/bin/setsid -f ${pkgs.mpv}/bin/mpv";
home-manager.users.me.xdg.configFile = {
"mpv/input.conf".text = ''
Alt+RIGHT add video-rotate 90

View File

@@ -1,9 +1,8 @@
{ pkgs, config, lib, ... }:
{ pkgs, config, ... }:
let
newsboat-home =
"${config.users.users.me.home}/cloud/syncthing/common/newsboat";
scripts = import <niveum/packages/scripts> { inherit pkgs lib; };
linkhandler-bin = "${scripts.linkhandler}/bin/linkhandler";
linkhandler-bin = "${pkgs.scripts.linkhandler}/bin/linkhandler";
newsboat-config = pkgs.writeText "config" ''
auto-reload no

View File

@@ -1,6 +1,4 @@
{ pkgs, lib, ... }:
let scripts = import <niveum/packages/scripts> { inherit pkgs lib; };
in {
{ pkgs, lib, ... }: {
imports = [
./krebs.nix
./writing.nix
@@ -100,14 +98,16 @@ in {
zoom-us # video conferencing
pdfgrep # search in pdf
pdftk # pdf toolkit
nur.repos.kmein.python3Packages.spotify-cli-linux
evince # for viewing pdf annotations
youtubeDL
bc # calculator
scripts.favicon
scripts.ipa # XSAMPA to IPA converter
scripts.betacode # ancient greek betacode to unicode converter
nur.repos.kmein.daybook
nur.repos.kmein.mahlzeit
nur.repos.kmein.slide
scripts.swallow # window swallowing
scripts.genius
scripts.instaget
scripts.literature-quote

View File

@@ -23,11 +23,6 @@
set -g status-right "#[fg=colour255,bg=colour237,bold] %Y-%m-%d #[default]#[fg=colour12,bg=colour233] %H:%M "
set -g status-justify left
set -g pane-active-border-fg colour237
set -g pane-border-fg colour237
set -g pane-active-border-bg default
set -g pane-border-bg default
set -g status-position bottom
set -g mouse on

View File

@@ -115,12 +115,27 @@ in {
packages = [ pkgs.st pkgs.fzf pkgs.dash pkgs.bash ];
};
swallow = wrapScript {
script = ./swallow.sh;
name = "swallow";
packages = [ pkgs.xdo ];
};
ipa = wrapScript {
script = ./ipa.py;
name = "ipa";
packages = [ pkgs.python3 ];
};
betacode = pkgs.writers.writePython3Bin "betacode" {
libraries = [ pkgs.nur.repos.kmein.python3Packages.betacode ];
} ''
import betacode.conv
import sys
sys.stdout.write(betacode.conv.beta_to_uni(sys.stdin.read()))
'';
scrot-dmenu = wrapScript {
script = ./scrot-dmenu.sh;
name = "dmenu-scrot";

7
packages/scripts/swallow.sh Executable file
View File

@@ -0,0 +1,7 @@
#!/bin/sh
# https://github.com/salman-abedin/devour/blob/master/devour.sh
id=$(xdo id)
xdo hide
$("$@") > /dev/null 2>&1
xdo show "$id"