Merge branch 'nixos' of github.com:MoritzBoehme/dotfiles into nixos

bin/aursync

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-if [ -d "$HOME/aur/" ]; then
-    cd "$HOME/aur/custom-repo/x64_86" || exit
-    repo-add -q custom.db.tar.gz ./*.pkg.*
-    if [[ "$#" -eq 1 ]]; then
-        aur sync --repo custom --root "$(pwd)" --no-view -u "$1" >/dev/null
-    else
-        aur sync --repo custom --root "$(pwd)" --no-view -u >/dev/null
-    fi
-    mv custom.db.tar.gz custom.db
-    mv custom.files.tar.gz custom.files
-    git add .
-    git commit -a -q -m "$(date +"%F %T")"
-    git push -q
-fi

bin/cheat

@@ -1,3 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env zsh
-cat="$(which bat 2>/dev/null || which cat)"
+curl -s "cheat.sh/$1" | bat
-curl -s "cheat.sh/$1" | eval "$cat"

bin/lock

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-B='#00000000' # blank
-C='#FFFFFF22' # clear ish
-D='#bd93f9'   # default
-T='#ff79c6'   # text
-W='#ff5555'   # wrong
-V='#50fa7b'   # verifying
-
-/usr/bin/i3lock \
-    --insidever-color=$C \
-    --ringver-color=$V \
-    \
-    --insidewrong-color=$C \
-    --ringwrong-color=$W \
-    \
-    --inside-color=$B \
-    --ring-color=$D \
-    --line-color=$B \
-    --separator-color=$D \
-    \
-    --verif-color=$T \
-    --wrong-color=$T \
-    --time-color=$T \
-    --date-color=$T \
-    --layout-color=$T \
-    --keyhl-color=$W \
-    --bshl-color=$W \
-    \
-    --screen 1 \
-    --blur 5 \
-    --clock \
-    --indicator \
-    --time-str="%H:%M:%S" \
-    --date-str="%A, %m %Y" \
-    --keylayout 1

bin/remove_orphans

@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo pacman -Qtdq | sudo pacman -Rns -

bin/sup

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+pushd ~/.dotfiles
+if [[ $1 =~ (update) ]]; then
+    sudo nixos-rebuild switch --flake .# --recreate-lock-file
+fi
+if [[ $1 =~ (apply) ]]; then
+    sudo nixos-rebuild switch --flake .#
+fi
+popd

bin/sxhkd-help

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 awk '/^[a-z]/ && last {print "<small>",$0,"\t",last,"</small>"} {last=""} /^#/{last=$0}' ~/.config/sxhkd/sxhkdrc |
     column -t -s $'\t' |

flake.lock

@@ -20,11 +20,11 @@
     },
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1632992735,
+        "lastModified": 1633515705,
-        "narHash": "sha256-EuqMxgREM2lNk7JLyHfl5732gjW6pZJurgmKWWUo6ow=",
+        "narHash": "sha256-VLCg/A4yuvvc/wiC8CBtwZ6bo6u7QD0rsm06r20x4Ms=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "5fa26165cf34adbe693b159093ea15f24f7f7ea4",
+        "rev": "8a47765478628f684b09d7f7aa5960e697309c74",
         "type": "github"
       },
       "original": {
@@ -55,11 +55,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1631573611,
+        "lastModified": 1633291410,
-        "narHash": "sha256-u2E/wstadWNcn6vOIoK1xY86QPOzzBZQfT1FbePfdaI=",
+        "narHash": "sha256-IxUzCGwj+s2Rn/+u0NtY36ix5I8MopMOO8Ip59PnBlw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "7d9ba15214004c979d2c8733f8be12ce6502cf8a",
+        "rev": "382505714d10c6791a96712e0554587c75c5bf8b",
         "type": "github"
       },
       "original": {
@@ -84,11 +84,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1633083543,
+        "lastModified": 1633524929,
-        "narHash": "sha256-thXKms0SvDirYb8/Hw0zqAE1TsuSFWd0y51mSzkPGLU=",
+        "narHash": "sha256-5juxXsj+jK4XoYsj61C1FANdCJa9eMR1nQC7a6nQlt4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "92609f3d9bc3acffbdbe54fa1c591a885612aa73",
+        "rev": "980a9792cdf62d42ea98f437123a7e64c6d784e2",
         "type": "github"
       },
       "original": {
@@ -100,11 +100,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1633086458,
+        "lastModified": 1633533282,
-        "narHash": "sha256-NHccp42ZPYUSiFKTAWOjqTQv2q5mBz0GAeJKh5i5QJg=",
+        "narHash": "sha256-5DDrS+TVLa4nyXtQmEHWCgt41iqJjuAvgU+OtKNHjIA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "e514365e94d704bc64d25f9a43f0b4a402d062fb",
+        "rev": "3b68f16d449aff2a40c8d6137525b337c8832ca9",
         "type": "github"
       },
       "original": {
@@ -145,11 +145,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1632820883,
+        "lastModified": 1633351077,
-        "narHash": "sha256-MegRCaHkbD0f/Auwpowba0z+xaKLFlJ+7D7ZrgtmfvY=",
+        "narHash": "sha256-z38JG4Bb0GtM1aF1pANVdp1dniMP23Yb3HnRoJRy2uU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c21ba4f7bb4a3d621eb1d187e6b5e816bb85380c",
+        "rev": "14aef06d9b3ad1d07626bdbb16083b83f92dc6c1",
         "type": "github"
       },
       "original": {

modules/containers/media.nix

@@ -69,5 +69,19 @@
       ];
       ports = [ "8989:8989" ];
     };
+    "bazarr" = {
+      image = "linuxserver/bazarr";
+      environment = {
+        "PUID" = "1000";
+        "PGID" = "100";
+        "TZ" = "DE";
+      };
+      volumes = [
+        "/media/media/tv:/tv"
+        "/media/media/movies:/movies"
+        "/home/moritz/Docker/Bazarr:/config"
+      ];
+      ports = [ "6767:6767" ];
+    };
   };
 }

modules/default.nix

@@ -32,6 +32,12 @@
     home.username = "moritz";
     home.homeDirectory = "/home/moritz";
 
+    home.sessionPath = [ "/home/moritz/bin" ];
+    home.file."bin" = {
+      recursive = true;
+      source = ../bin;
+    };
+
     xdg.userDirs = {
       enable = true;
       createDirectories = true;