summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorSilas Schöffel <sils@sils.li>2024-04-21 16:59:46 +0200
committerSilas Schöffel <sils@sils.li>2024-04-21 17:01:51 +0200
commit76c67b975ce8924c14dd82d448abaff95c1a5bda (patch)
tree39290c567266a9f734d4f6bbe73be2f7456681ad
parentsils: make networking toggleable (diff)
downloadnix-config-76c67b975ce8924c14dd82d448abaff95c1a5bda.tar.gz
nix-config-76c67b975ce8924c14dd82d448abaff95c1a5bda.zip
treewide: remove all traces of intellectual property of others
Diffstat (limited to '')
-rw-r--r--hm/default.nix3
-rw-r--r--hm/grades/config.yaml57
-rw-r--r--hm/grades/default.nix9
-rw-r--r--hm/river/default.nix49
-rwxr-xr-xhm/river/init74
-rw-r--r--hm/river/res/keys.ron57
-rwxr-xr-xhm/river/res/safe_init160
-rw-r--r--hm/yambar/config/laptop.yml234
-rw-r--r--hm/yambar/default.nix49
-rwxr-xr-xhm/yambar/scripts/disk24
-rwxr-xr-xhm/yambar/scripts/grades-average17
-rwxr-xr-xhm/yambar/scripts/network49
-rwxr-xr-xhm/yambar/scripts/sound-volume22
-rw-r--r--sys/desktop/river/default.nix20
14 files changed, 0 insertions, 824 deletions
diff --git a/hm/default.nix b/hm/default.nix
index 9bd7322..6f1194f 100644
--- a/hm/default.nix
+++ b/hm/default.nix
@@ -9,14 +9,12 @@
     ./foot
     ./git
     ./gpg
-    #./grades
     ./gtk
     ./hyfetch
     ./hyprland
     ./mako
     ./nixvim
     ./packages
-    #./river #TODO Update Shell Library
     ./rofi
     ./ssh
     ./sway
@@ -24,7 +22,6 @@
     ./swaylock
     ./swayosd
     ./xsession
-    #./yambar #TODO Update Shell Library
     ./waybar
     ./xdg
     ./zsh
diff --git a/hm/grades/config.yaml b/hm/grades/config.yaml
deleted file mode 100644
index d80516a..0000000
--- a/hm/grades/config.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-# für oberstufe
----
-unit: Punkte
-grade_groups:
-  - name: Zeugnis
-    weight: '100'
-  - name: Sonstige
-    weight: '1'
-  - name: Klausur
-    weight: '1'
-
-grade_types:
-  - name: Zeugnis
-    group: Zeugnis
-  - name: Klausur
-    group: Klausur
-  - name: Epo
-    group: Sonstige
-  - name: Test
-    group: Sonstige
-
-class_types:
-  - name: NebenFach
-  - name: LeistungsKurs
-
-classes:
-  - name: M
-    long_name: Mathe
-    class_type: LeistungsKurs
-  - name: EK
-    long_name: Erdkunde
-    class_type: LeistungsKurs
-  - name: PH
-    long_name: Physik
-    class_type: LeistungsKurs
-
-  - name: d
-    long_name: Deutsch
-    class_type: NebenFach
-  - name: g
-    long_name: Geschichte
-    class_type: NebenFach
-  - name: mu
-    long_name: Musik
-    class_type: NebenFach
-  - name: rel
-    long_name: Religion
-    class_type: NebenFach
-  - name: spj
-    long_name: Sport
-    class_type: NebenFach
-  - name: inf
-    long_name: Informatik
-    class_type: NebenFach
-  - name: e
-    long_name: Englisch
-    class_type: NebenFach
diff --git a/hm/grades/default.nix b/hm/grades/default.nix
deleted file mode 100644
index 64af8a6..0000000
--- a/hm/grades/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  config,
-  grades,
-  ...
-}: {
-  xdg.configFile."grades/config.yaml".source = ./config.yaml;
-
-  home.packages = [grades];
-}
diff --git a/hm/river/default.nix b/hm/river/default.nix
deleted file mode 100644
index 07fc5ec..0000000
--- a/hm/river/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  pkgs,
-  sysLib,
-  river_init_lesser,
-  nixosConfig,
-  system,
-  ...
-}: let
-  inherit (nixosConfig.networking) hostName;
-  mappings = ''
-    err_fail riverctl keyboard-layout 'de'
-    err_fail river_init_lesser ~/.config/river/res/keys.ron
-  '';
-
-  screen_setup = ''
-    #err_fail wlr-randr --output Virtual-1 --mode 1920x1080
-  '';
-  init_scr = pkgs.substituteAll {
-    src = ./init;
-    inherit mappings screen_setup;
-  };
-in {
-  xdg.configFile."river/init".source =
-    sysLib.writeShellScriptWithLibraryAndKeepPath {
-      name = "river_init";
-      script = init_scr;
-      dependencies = builtins.attrValues {
-        river_init_lesser = river_init_lesser.packages.${system}.default;
-        inherit
-          (pkgs)
-          dash
-          river
-          gammastep
-          wlr-randr
-          yambar
-          mako
-          swaybg
-          swayidle
-          swaylock
-          alacritty
-          ;
-      };
-    }
-    + /bin/river_init;
-
-  xdg.configFile."river/res".source = ./res;
-}
-# vim: ts=2
-
diff --git a/hm/river/init b/hm/river/init
deleted file mode 100755
index c419ed7..0000000
--- a/hm/river/init
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env dash
-# shellcheck source=/dev/null
-. %SHELL_LIBRARY_PATH
-
-err_fail() {
-    if ! "$@";then
-        warning "\"$*\" failed!\n" >> ~/river_log
-        # msg "Executing the safe init!"
-        # exec ~/.config/river/res/safe_init
-    fi
-}
-err_fail rm ~/river_log
-exec 1>> "$HOME"/river_log
-exec 2>> "$HOME"/river_log
-
-#Setup of environment variables {{{
-err_fail riverctl spawn "exec dbus-update-activation-environment SEATD_SOCK DISPLAY WAYLAND_DISPLAY DESKTOP_SESSION=river XDG_CURRENT_DESKTOP=river"
-err_fail export XDG_CURRENT_DESKTOP=river
-#}}}
-
-# Setup of mappings {{{
-@mappings@
-# }}}
-
-# Setup of Rules {{{
-err_fail riverctl float-filter-add app-id float
-err_fail riverctl float-filter-add app-id mpv
-err_fail riverctl float-filter-add app-id ModernGL
-err_fail riverctl float-filter-add title "Manim Slides"
-
-err_fail riverctl csd-filter-add app-id firefox
-# }}}
-
-# Set riverctl settings {{{
-# background
-err_fail riverctl background-color 0x002b36
-err_fail riverctl border-color-focused 0x93a1a1
-err_fail riverctl border-color-unfocused 0x586e75
-
-# keyboard repeat rate
-err_fail riverctl set-repeat 50 300
-
-# Cursor
-err_fail riverctl focus-follows-cursor normal
-#riverctl hide-cursor timeout 2000
-err_fail riverctl hide-cursor when-typing enabled
-err_fail riverctl set-cursor-warp on-output-change
-err_fail riverctl xcursor-theme Nordzy-cursors 24
-
-err_fail riverctl input pointer-1133-49970-Logitech_Gaming_Mouse_G502 pointer-accel 0
-err_fail riverctl input pointer-1133-49970-Logitech_Gaming_Mouse_G502 accel-profile none
-# }}}
-
-# Setup of general apps {{{
-@screen_setup@
-
-err_fail yambar &
-
-err_fail mako &
-err_fail swaybg -i "$WALLPAPER" &
-err_fail swayidle &
-err_fail alacritty &
-# }}}
-
-
-
-# Setup of layout [acts as exec!] {{{
-err_fail riverctl default-layout rivertile
-err_fail rivertile -main-ratio 0.5 -view-padding 1 -outer-padding 0
-
-#riverctl default-layout luatile
-#river-luatile
-# }}}
-# vim: ft=sh
diff --git a/hm/river/res/keys.ron b/hm/river/res/keys.ron
deleted file mode 100644
index 17ff54e..0000000
--- a/hm/river/res/keys.ron
+++ /dev/null
@@ -1,57 +0,0 @@
-#![enable(implicit_some)]
-RiverctlCommandArray(
-    commands: [
-    // Focus change
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "H",                       mods: "Super",          command: "focus-view",          command_args: "next",),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "L",                       mods: "Super",          command: "focus-view",          command_args: "previous",),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "H",                       mods: "Super+Control",  command: "focus-output",        command_args: "next",),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "L",                       mods: "Super+Control",  command: "focus-output",        command_args: "previous",),
-
-    // Standard program
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "Return",                  mods: "Super",          command: "spawn",               command_args: "alacritty",),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "q",                       mods: "Super+Shift",    command: "exit",                command_args: None,),
-
-    // Screenshot
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "Print",                   mods: "None",           command: "spawn",               command_args: "~/repos/shell/scripts/screen_shot",),
-
-    // Audio
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "XF86AudioRaiseVolume",    mods: "None",           command: "spawn",               command_args: "pactl set-sink-volume @DEFAULT_SINK@ +1000",),
-    RiverctlCommand( map_mode: Map,         mode: ["normal", "locked"], key: "XF86AudioLowerVolume",    mods: "None",           command: "spawn",               command_args: "pactl set-sink-volume @DEFAULT_SINK@ -1000",),
-    RiverctlCommand( map_mode: Map,         mode: ["normal", "locked"], key: "XF86AudioMute",           mods: "None",           command: "spawn",               command_args: "pactl set-sink-mute @DEFAULT_SINK@ toggle",),
-    RiverctlCommand( map_mode: Map,         mode: ["normal", "locked"], key: "XF86AudioMicMute",           mods: "None",           command: "spawn",               command_args: "pactl set-source-mute @DEFAULT_SINK@ toggle",),
-
-    // Launcher
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "R",                       mods: "Super",          command: "spawn",               command_args: "rofi -show drun",),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "S",                       mods: "Super",          command: "spawn",               command_args: "rofi -show run",),
-
-    //Lockscreen
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "Q",                       mods: "Super",          command: "spawn",               command_args: "swaylock -f",),
-
-    // Client
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "f",                       mods: "Super",          command: "toggle-fullscreen",   command_args: None,),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "c",                       mods: "Super+Shift",    command: "close",               command_args: None,),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "space",                   mods: "Super+Control",  command: "toggle-float",        command_args: None,),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "Return",                  mods: "Super+Control",  command: "zoom",                command_args: None,),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "o",                       mods: "Super",          command: "send-to-output",      command_args: "next",),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "H",                       mods: "Super+Shift",    command: "swap",                command_args: "next",),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "L",                       mods: "Super+Shift",    command: "swap",                command_args: "previous",),
-
-    // Toggle all tags
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "0",                       mods: "Super",          command: "set-focused-tags",    command_args: "4294967295"),
-    RiverctlCommand( map_mode: Map,         mode: ["normal"],           key: "0",                       mods: "Super+Shift",    command: "set-view-tags",       command_args: "4294967295"),
-
-    // Mouse
-    RiverctlCommand( map_mode: MapMouse,    mode: ["normal"],           key: "BTN_LEFT",                mods: "Super",          command: "move-view",           command_args: None,),
-    RiverctlCommand( map_mode: MapMouse,    mode: ["normal"],           key: "BTN_RIGHT",               mods: "Super",          command: "resize-view",         command_args: None,),
-
-    ],
-    // Set these mappings for the tags 0-8 with key [1-9]
-    tags_number: 9,
-    tag_commands: [
-    RiverctlTagCommand( map_mode: Map, mode: ["normal"], mods: "Super",                 command: "set-focused-tags",),
-    RiverctlTagCommand( map_mode: Map, mode: ["normal"], mods: "Super+Shift",           command: "set-view-tags",),
-    RiverctlTagCommand( map_mode: Map, mode: ["normal"], mods: "Super+Control",         command: "toggle-focused-tags",),
-    RiverctlTagCommand( map_mode: Map, mode: ["normal"], mods: "Super+Shift+Control",   command: "toggle-view-tags",),
-    ],
-)
-
diff --git a/hm/river/res/safe_init b/hm/river/res/safe_init
deleted file mode 100755
index 8e80026..0000000
--- a/hm/river/res/safe_init
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/sh
-
-# This is the example configuration file for river.
-#
-# If you wish to edit this, you will probably want to copy it to
-# $XDG_CONFIG_HOME/river/init or $HOME/.config/river/init first.
-#
-# See the river(1), riverctl(1), and rivertile(1) man pages for complete
-# documentation.
-
-# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.
-
-# Super+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
-riverctl map normal Super Return spawn alacritty
-
-# Super+Q to close the focused view
-riverctl map normal Super Q close
-
-# Super+Shift+E to exit river
-riverctl map normal Super+Shift Q exit
-
-# Super+J and Super+K to focus the next/previous view in the layout stack
-riverctl map normal Super J focus-view next
-riverctl map normal Super K focus-view previous
-
-# Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous
-# view in the layout stack
-riverctl map normal Super+Shift J swap next
-riverctl map normal Super+Shift K swap previous
-
-# Super+Period and Super+Comma to focus the next/previous output
-riverctl map normal Super Period focus-output next
-riverctl map normal Super Comma focus-output previous
-
-# Super+Shift+{Period,Comma} to send the focused view to the next/previous output
-riverctl map normal Super+Shift Period send-to-output next
-riverctl map normal Super+Shift Comma send-to-output previous
-
-# Super+Return to bump the focused view to the top of the layout stack
-riverctl map normal Super Return zoom
-
-# Super+H and Super+L to decrease/increase the main ratio of rivertile(1)
-riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05"
-riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05"
-
-# Super+Shift+H and Super+Shift+L to increment/decrement the main count of rivertile(1)
-riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1"
-riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1"
-
-# Super+Alt+{H,J,K,L} to move views
-riverctl map normal Super+Alt H move left 100
-riverctl map normal Super+Alt J move down 100
-riverctl map normal Super+Alt K move up 100
-riverctl map normal Super+Alt L move right 100
-
-# Super+Alt+Control+{H,J,K,L} to snap views to screen edges
-riverctl map normal Super+Alt+Control H snap left
-riverctl map normal Super+Alt+Control J snap down
-riverctl map normal Super+Alt+Control K snap up
-riverctl map normal Super+Alt+Control L snap right
-
-# Super+Alt+Shift+{H,J,K,L} to resize views
-riverctl map normal Super+Alt+Shift H resize horizontal -100
-riverctl map normal Super+Alt+Shift J resize vertical 100
-riverctl map normal Super+Alt+Shift K resize vertical -100
-riverctl map normal Super+Alt+Shift L resize horizontal 100
-
-# Super + Left Mouse Button to move views
-riverctl map-pointer normal Super BTN_LEFT move-view
-
-# Super + Right Mouse Button to resize views
-riverctl map-pointer normal Super BTN_RIGHT resize-view
-
-for i in $(seq 1 9)
-do
-    tags=$((1 << ($i - 1)))
-
-    # Super+[1-9] to focus tag [0-8]
-    riverctl map normal Super $i set-focused-tags $tags
-
-    # Super+Shift+[1-9] to tag focused view with tag [0-8]
-    riverctl map normal Super+Shift $i set-view-tags $tags
-
-    # Super+Ctrl+[1-9] to toggle focus of tag [0-8]
-    riverctl map normal Super+Control $i toggle-focused-tags $tags
-
-    # Super+Shift+Ctrl+[1-9] to toggle tag [0-8] of focused view
-    riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
-done
-
-# Super+0 to focus all tags
-# Super+Shift+0 to tag focused view with all tags
-all_tags=$(((1 << 32) - 1))
-riverctl map normal Super 0 set-focused-tags $all_tags
-riverctl map normal Super+Shift 0 set-view-tags $all_tags
-
-# Super+Space to toggle float
-riverctl map normal Super Space toggle-float
-
-# Super+F to toggle fullscreen
-riverctl map normal Super F toggle-fullscreen
-
-# Super+{Up,Right,Down,Left} to change layout orientation
-riverctl map normal Super Up    send-layout-cmd rivertile "main-location top"
-riverctl map normal Super Right send-layout-cmd rivertile "main-location right"
-riverctl map normal Super Down  send-layout-cmd rivertile "main-location bottom"
-riverctl map normal Super Left  send-layout-cmd rivertile "main-location left"
-
-# Declare a passthrough mode. This mode has only a single mapping to return to
-# normal mode. This makes it useful for testing a nested wayland compositor
-riverctl declare-mode passthrough
-
-# Super+F11 to enter passthrough mode
-riverctl map normal Super F11 enter-mode passthrough
-
-# Super+F11 to return to normal mode
-riverctl map passthrough Super F11 enter-mode normal
-
-# Various media key mapping examples for both normal and locked mode which do
-# not have a modifier
-for mode in normal locked
-do
-    # Eject the optical drive (well if you still have one that is)
-    riverctl map $mode None XF86Eject spawn 'eject -T'
-
-    # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer)
-    riverctl map $mode None XF86AudioRaiseVolume  spawn 'pamixer -i 5'
-    riverctl map $mode None XF86AudioLowerVolume  spawn 'pamixer -d 5'
-    riverctl map $mode None XF86AudioMute         spawn 'pamixer --toggle-mute'
-
-    # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl)
-    riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
-    riverctl map $mode None XF86AudioPlay  spawn 'playerctl play-pause'
-    riverctl map $mode None XF86AudioPrev  spawn 'playerctl previous'
-    riverctl map $mode None XF86AudioNext  spawn 'playerctl next'
-
-    # Control screen backlight brightness with light (https://github.com/haikarainen/light)
-    riverctl map $mode None XF86MonBrightnessUp   spawn 'light -A 5'
-    riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5'
-done
-
-# Set background and border color
-riverctl background-color 0x002b36
-riverctl border-color-focused 0x93a1a1
-riverctl border-color-unfocused 0x586e75
-
-# Set keyboard repeat rate
-riverctl set-repeat 50 300
-
-# Make certain views start floating
-riverctl float-filter-add app-id float
-riverctl float-filter-add title "popup title with spaces"
-
-# Set app-ids and titles of views which should use client side decorations
-riverctl csd-filter-add app-id "gedit"
-
-# Set the default layout generator to be rivertile and start it.
-# River will send the process group of the init executable SIGTERM on exit.
-riverctl default-layout rivertile
-rivertile -view-padding 6 -outer-padding 6
diff --git a/hm/yambar/config/laptop.yml b/hm/yambar/config/laptop.yml
deleted file mode 100644
index 1c16982..0000000
--- a/hm/yambar/config/laptop.yml
+++ /dev/null
@@ -1,234 +0,0 @@
----
-# Config file for yambar
-# Note that this may be version-dependent, this file is written for v1.8.0
-
-
-# Font anchors
-font-main: &fontmain Source Code Pro:pixelsize=22
-font-aws: &awesome Font Awesome 5 Free:style=solid:pixelsize=20
-
-# Color anchors
-fg-none: &fgnone 00000000
-fg-1: &fg1 c6ceefff
-fg-blue: &fgblue 99d1dbff
-fg-sapphire: &fgsapp 74c7ecdd
-fg-green: &fggreen a6e3a1dd
-fg-peach: &fgpeach fab387dd
-fg-mauve: &fgmauve cba6f7dd
-fg-teal: &fgteal 94e2d5dd
-fg-lavendar: &fglav b4befedd
-fg-focus: &fgfocus e78284ff
-bg-1: &bg1 303446ff
-bg-tag: &bgtag 585b70ff
-bg-tag2: &bgtag2 45475aff
-bg-urgent: &bgurgent e78284ff
-
-# Background blocks
-background-block: &bgcblock {background: {color: *bg1 }}
-background-block-urgent: &bgcurg {background: {color: *bgurgent }}
-
-# Underlines
-underline-focused: &line {underline: { size: 3, color: *fgfocus}}
-underline-urgent: &lineurgent {underline: { size: 3, color: *fgblue}}
-underline-utils: &lineutil {underline: { size: 3, color: *fgpeach}}
-underline-resources: &linemem {underline: { size: 3, color: *fggreen}}
-underline-battery: &linebat {underline: { size: 3, color: *fgsapp}}
-underline-clock: &lineclock {underline: { size: 3, color: *fgteal}}
-underline-weather: &linewea {underline: { size: 3, color: *fglav}}
-underline-title: &linetitle {underline: { size: 3, color: *bgtag}}
-
-# Combined decorations
-combination-utils: &combutil {stack: [ <<: *bgcblock, <<: *lineutil]}
-combination-resources: &combmem {stack: [ <<: *bgcblock, <<: *linemem]}
-combination-battery: &combbat {stack: [ <<: *bgcblock, <<: *linebat]}
-combination-clock: &combclock {stack: [ <<: *bgcblock, <<: *lineclock]}
-combination-weather: &combwea {stack: [ <<: *bgcblock, <<: *linewea]}
-
-
-### Main
-
-bar:
-  location: top
-  height: 25
-  layer: bottom
-  spacing: 0
-  margin: 10
-  border: {margin: 0, top-margin: 5}
-  foreground: *fg1
-  background: *fgnone
-  font: *fontmain
-
-  ### Left, river tags
-  left:
-    - river:
-        anchors:
-          - id: &name { text: "{id}" }
-          - string: &focus { stack: [ {background: {color: *bg1}} ] }
-          - string: &normal { string: { <<: *name, margin: 10 } }
-          - string:
-              &occupied { string: { <<: *name, deco: {background: {color: *bgtag2}}, margin: 10 } }
-          - string: &urgent { string: { <<: *name, deco: {stack: [background: {color: *bgurgent}, <<: *lineurgent]}, margin: 10 } }
-          - string: &focused { string: { <<: *name, deco: {stack: [background: {color: *bgtag}, <<: *line]}, margin: 10 } }
-          - string: &unfocused { string: { <<: *name, deco: {background: {color: *bgtag2}}, margin: 10 } }
-          - base: &river_base
-              default: *normal
-              conditions:
-                state == focused: *focused
-                state == unfocused: *unfocused
-                state == urgent: *urgent
-                state == invisible:
-                  map:
-                    conditions:
-                      occupied: *occupied
-                      ~occupied: *normal
-        content:
-          map:
-            on-click:
-              left: sh -c "riverctl set-focused-tags $((1 << ({id} - 1)))"
-              right: sh -c "riverctl toggle-focused-tags $((1 << ({id} -1)))"
-              middle: sh -c "riverctl toggle-view-tags $((1 << ({id} -1)))"
-            conditions:
-              id == 1: { map: { <<: *river_base } }
-              id == 2: { map: { <<: *river_base } }
-              id == 3: { map: { <<: *river_base } }
-              id == 4: { map: { <<: *river_base } }
-              id == 5: { map: { <<: *river_base } }
-              id == 6: { map: { <<: *river_base } }
-              id == 7: { map: { <<: *river_base } }
-              id == 8: { map: { <<: *river_base } }
-              id == 9: { map: { <<: *river_base } }
-        title:
-          map:
-            default:
-              {
-                string:
-                  {
-                    text: "{title}",
-                    left-margin: 12,
-                    right-margin: 12,
-                    # max: 35,
-                    deco: *linetitle
-                  },
-              }
-            conditions:
-              title == "": { string: { text: "" } }
-
-  ### Center, clock & weather gadget
-  center:
-    - clock:
-        time-format: "%H:%M:%S %Z"
-        date-format: "%d/%m/%y (%a)"
-        foreground: *fgblue
-        content:
-          string:
-            text: " {date} {time} "
-            deco: *combclock
-
-  ### Right, system tray
-  right:
-    #- network:
-    #    name: wlp5s0
-    #    poll-interval: 10
-    #    content:
-    #      map:
-    #        on-click: /bin/sh -c "nmtui"
-    #        conditions:
-    #          ~carrier: {empty: {}}
-    #          carrier:
-    #            string: {text: "  {ssid} ", deco: *combutil}
-    #- network:
-    #    name: enp4s0
-    #    content:
-    #      map:
-    #        on-click: /bin/sh -c "nmtui"
-    #        conditions:
-    #          ~carrier:
-    #            string: {text: "  Eth failed ", deco: *combutil}
-    #          carrier: {empty: {}}
-
-    - script:   # Sound volume
-        path: @volume_script@
-        content:
-          map:
-            on-click: /bin/sh -c "pavucontrol"
-            conditions:
-              muted:
-                string:
-                  text: " ﱝ "
-                  deco: *bgcurg
-              ~muted:
-                string: {text: "  {volume}% ", deco: *combutil}
-
-    - script:   # Grade average
-        path: @grade_average_script@
-        content:
-          string:
-            text: "   {grade} "
-            deco: *combmem
-
-    - backlight:
-       name: @backlight@
-       content:
-         - string: {text: "  {percent}% ", deco: *combutil}
-
-    - script:   # CPU
-        path: @cpu_script@
-        content:
-          string:
-            text: "  {cpu}% "
-            deco: *combmem
-
-    - script:   # Memory info
-        path: @memory_script@
-        content:
-          map:
-            conditions:
-              swapstate:
-                string:
-                  text: "  {memperc}%({swapperc}%) "
-                  deco: *combmem
-              ~swapstate:
-                string:
-                  text: "  {memperc}% "
-                  deco: *combmem
-    - script:   # Disk space
-        path: @disk_script@
-        content:
-          string:
-            text: "  {diskspace}({diskperc})"
-            deco: *combmem
-    - battery:
-        name: BAT0
-        poll-interval: 30
-        content:
-          list:
-            items:
-              - ramp:
-                  tag: capacity
-                  items:
-                    - string:
-                        text: "  {capacity}%({estimate}) "
-                        deco: *bgcurg
-                    - string:
-                        text: "  {capacity}%({estimate}) "
-                        deco: {stack: [ <<: *bgcblock, <<: *linebat]}
-                    - string:
-                        text: "  {capacity}%({estimate}) "
-                        deco: {stack: [ <<: *bgcblock, <<: *linebat]}
-                    - string:
-                        text: "  {capacity}%({estimate}) "
-                        deco: {stack: [ <<: *bgcblock, <<: *linebat]}
-                    - string:
-                        text: "  {capacity}%({estimate}) "
-                        deco: {stack: [ <<: *bgcblock, <<: *linebat]}
-   #- script:   # tray
-   #    path: /home/dt/.config/yambar/scripts/yambar-tray
-   #    content:
-   #      empty: {}
-   #- script:
-   #    path: /home/dt/.config/yambar/scripts/yambar-tray-width
-   #    poll-interval: 10
-   #    content:
-   #      string:
-   #         text: "{padding}"
-   #         deco: *combmem
diff --git a/hm/yambar/default.nix b/hm/yambar/default.nix
deleted file mode 100644
index 814174c..0000000
--- a/hm/yambar/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  nixosConfig,
-  sysLib,
-  system,
-  pkgs,
-  grades,
-  yambar_cpu,
-  yambar_memory,
-  ...
-}: let
-  makeScript = {
-    file,
-    dependencies,
-    ...
-  }:
-    sysLib.makeShellScriptWithLibrary {
-      name = "${builtins.baseNameOf file}";
-      script = file;
-      dependencies = dependencies ++ (builtins.attrValues {inherit (pkgs) dash;});
-    }
-    + "/bin/${builtins.baseNameOf file}";
-in {
-  xdg.configFile."yambar/config.yml".source = pkgs.substituteAll {
-    src = ./config/laptop.yml;
-
-    backlight = "intel_backlight";
-    volume_script = makeScript {
-      dependencies = builtins.attrValues {inherit (pkgs) pulseaudio gawk coreutils;};
-      file = ./scripts/sound-volume;
-    };
-    grade_average_script = makeScript {
-      dependencies =
-        [
-          grades.outputs.packages.${system}.default
-        ]
-        ++ (builtins.attrValues {inherit (pkgs) coreutils gawk;});
-      file = ./scripts/grades-average;
-    };
-    cpu_script = yambar_cpu.app.${system}.default.program;
-    memory_script = yambar_memory.app.${system}.default.program;
-
-    disk_script = makeScript {
-      dependencies = builtins.attrValues {inherit (pkgs) gawk btrfs-progs coreutils;};
-      file = ./scripts/disk;
-    };
-  };
-}
-# vim: ts=2
-
diff --git a/hm/yambar/scripts/disk b/hm/yambar/scripts/disk
deleted file mode 100755
index dad41fe..0000000
--- a/hm/yambar/scripts/disk
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /usr/bin/env dash
-# shellcheck disable=SC2086
-# shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
-
-# Main loop
-while true; do
-    # vars
-    used_space=$(btrfs filesystem usage /srv 2> /dev/null | awk '{if ( /Used:/ ) { print $2 } } ' | head -n1)
-    all_space=$(btrfs filesystem usage /srv 2> /dev/null | awk '{if ( /Device size:/ ) { print $3 } } ' | head -n1 | tr -d "GiB")
-
-
-  # Check space available (4) and percentage used (5)
-  spaceperc=$(echo "$(echo "$used_space" | tr -d "GiB" )"  "$all_space"  | awk '{div=$1/$2;div *= 100; printf"%2d%%\n",div }')
-
-  echo "diskspace|string|$used_space"
-  echo "diskperc|string|$spaceperc"
-  echo ""
-  sleep 1
-done
-
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
-# vim: ft=sh
diff --git a/hm/yambar/scripts/grades-average b/hm/yambar/scripts/grades-average
deleted file mode 100755
index 98e0685..0000000
--- a/hm/yambar/scripts/grades-average
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /usr/bin/env dash
-# shellcheck disable=SC2086
-# shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
-
-while true; do
-    grade=$(grades list average | awk '{print $2}');
-
-    echo "grade|string|$grade";
-    echo "";
-
-    sleep 1;
-done
-
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
-# vim: ft=sh
diff --git a/hm/yambar/scripts/network b/hm/yambar/scripts/network
deleted file mode 100755
index 45c164d..0000000
--- a/hm/yambar/scripts/network
+++ /dev/null
@@ -1,49 +0,0 @@
-#! /usr/bin/env dash
-# shellcheck disable=SC2086
-# shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
-
-retest=120
-retest_if_con_fails=10
-backend=nmcli
-
-case "$backend" in
-    "nmcli") # Test for connectivity with nmcli
-        while true; do
-            connection_status=$(nmcli networking connectivity)
-            if [ "$connection_status" = "full" ]; then
-                echo "internet|string|Connected"
-                echo ""
-                sleep $retest
-            else
-                echo "internet|string|Disconnected"
-                echo ""
-                sleep $retest_if_con_fails
-            fi
-        done
-        ;;
-    "ping") # Test for connectivity with ping
-        ip_address='8.8.8.8'
-        ping_number=3
-
-        while true; do
-
-            ping_result=$(mktmp)
-            ping $ip_address -c $ping_number -q | awk 'BEGIN {FS="/"} END {print $5}' > $ping_result
-
-            if [ "$(cat $ping_result | wc -l)" -eq 0 ]; then
-                echo "med|string|No connection"
-                echo ""
-                sleep $retest_if_con_fails
-            else
-                echo "med|string|$(cat $ping_result) ms"
-                echo ""
-                sleep $retest
-            fi
-        done
-        ;;
-esac
-
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
-# vim: ft=sh
diff --git a/hm/yambar/scripts/sound-volume b/hm/yambar/scripts/sound-volume
deleted file mode 100755
index 8a9cf0d..0000000
--- a/hm/yambar/scripts/sound-volume
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /usr/bin/env dash
-# shellcheck disable=SC2086
-# shellcheck source=/dev/null
-# . ~/.local/lib/shell/lib
-. %SHELL_LIBRARY_PATH
-
-while true; do
-    volume=$(pactl get-sink-volume 0 | awk 'BEGIN { FS="/" } {gsub("%","",$2); gsub(" ","",$2)} {printf $2}')
-
-    if [ "$volume" -eq 0 ]; then
-        echo "muted|bool|true"
-    else
-        echo "volume|string|$volume"
-        echo "muted|bool|false"
-    fi
-    echo ""
-
-    sleep 1;
-done
-
-if [ -d "$LIB_TEMP_DIR_FOR_SCRIPT" ];then rm -r "$LIB_TEMP_DIR_FOR_SCRIPT"; fi
-# vim: ft=sh
diff --git a/sys/desktop/river/default.nix b/sys/desktop/river/default.nix
deleted file mode 100644
index 72fb3e2..0000000
--- a/sys/desktop/river/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{pkgs, ...}: {
-  services.xserver = {
-    enable = false;
-    displayManager = {
-      lightdm.enable = false;
-      defaultSession = "river";
-      session = [
-        {
-          manage = "desktop";
-          name = "river";
-          start = ''
-            ${pkgs.river}/bin/river;
-          '';
-        }
-      ];
-    };
-  };
-}
-# vim: ts=2
-