Change structure

.gitmodules

@@ -11,8 +11,8 @@
 	path = home-common/graphical/rofi/zzzfoo
 	url = https://github.com/andersju/zzzfoo.git
 [submodule "modules/cdarknet/hosts"]
-	path = modules/cdarknet/hosts
+	path = system/modules/cdarknet/hosts
 	url = git@git.darmstadt.ccc.de:cdark.net/hosts
 [submodule "modules/cdarknet/nixdark"]
-	path = modules/cdarknet/nixdark
+	path = system/modules/cdarknet/nixdark
 	url = git@git.darmstadt.ccc.de:cdark.net/nixdark

Makefile

@@ -1,20 +0,0 @@
-default: all
-
-all: links config
-
-links:
-	ln -sfT data/aktuell/it/config ~/config
-	ln -sfT data/aktuell/it/config/dotfiles ~/.dotfiles
-	ln -sfT data/aktuell/it/config/bin ~/bin
-	ln -sfT ~/data/aktuell/it/config/nixos ~/.config/nixpkgs/config
-	ln -sfT data/aktuell/it/secrets/password-store ~/.password-store
-	ln -sfT data/aktuell/it/secrets/gnupg ~/.gnupg
-
-system-links:
-	sudo ln -sfT ${HOME}/data/aktuell/it/config/nixos /etc/nixos/config
-
-config:
-	rcup rcrc
-	rcup
-	mkdir -p ~/.vimhist/bak
-	touch .chpwd-recent-dirs

home-common/graphical/rofi/zzzfoo

@@ -1 +0,0 @@
-Subproject commit 4800c1c645b24ef7b7638f2a31f45826b8fc2973

home-manager/Makefile

@@ -0,0 +1,8 @@
+default: all
+
+all: links
+
+links:
+	ln -sfT ~/data/aktuell/it/config/nixos ~/.config/nixpkgs/config
+	ln -sfT data/aktuell/it/secrets/password-store ~/.password-store
+	ln -sfT data/aktuell/it/secrets/gnupg ~/.gnupg

home-manager/default.nix

@@ -97,8 +97,6 @@ in {
     };
   };
 
-
-
   home.sessionVariables = {
     BROWSER="${pkgs.firefox}/bin/firefox";
     EDITOR="${pkgs.neovim}/bin/nvim";

home-manager/graphical/st/config.h

@@ -5,7 +5,8 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char font[] = "Roboto Mono:pixelsize=12:antialias=true:autohint=true";
+static char font[] = "Monofur Nerd Font:pixelsize=16:antialias=true:autohint=true";
+//static char font[] = "-misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1";
 static int borderpx = 2;
 #define histsize 20000
 

home-manager/packages/eventd/default.nix

@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     owner = "sardemff7";
     repo = "eventd";
     rev = version;
-    sha256 = "162gr3agmjn6d0wdj3lixv8qfvgfm9qg3wphbvwywdp4qcwvnjz8";
+    sha256 = "1xjkary1lq8yk1nqw039hrxwax1h0l0vi1dmcyqrgvzb1igsfa6y";
     fetchSubmodules = true;
   };
   buildInputs = [
@@ -30,6 +30,6 @@ stdenv.mkDerivation rec {
     dbus
   ];
   preConfigure = ''
-    export mesonFlags="-Denable-systemd=true -Denable-introspection=false -Denable-nd-wayland=false -Denable-im=false -Denable-sound=false -Ddbussessionservicedir=$prefix/share/dbus-1/services -Dsystemduserunitdir=$prefix/lib/systemd/user -Dsystemdsystemunitdir=$prefix/lib/systemd/system"
+    export mesonFlags="-Dsystemd=true -Dintrospection=false -Dnd-wayland=false -Dim=false -Dsound=false -Ddbussessionservicedir=$prefix/share/dbus-1/services -Dsystemduserunitdir=$prefix/lib/systemd/user -Dsystemdsystemunitdir=$prefix/lib/systemd/system"
   '';
 }

home-manager/packages/rust-scripts/.gitignore

@@ -0,0 +1 @@
+target

home-manager/packages/rust-scripts/src/kassandra.rs

@@ -22,7 +22,7 @@ use tasktree::{TreeCache, TaskNode};
 fn print_task_short(task: &Task) -> String {
     let mut info = vec![task.description().clone()];
     if let Some(tags) = task.tags() {
-        info.push(format!("+{}", tags.join(",+")));
+        info.push(format!("+{}", tags.join(", +")));
     }
     if let Some(project) = task.project() {
         info.push(format!("({})", project));

home-manager/packages/rust-scripts/src/refresh.rs

@@ -1,4 +1,5 @@
 use chrono::offset::{Local, TimeZone};
+use chrono::Duration;
 
 use kairos::timetype::TimeType as TT;
 use kairos::iter::Iter;
@@ -7,14 +8,14 @@ use kairos::error::Result as KairosResult;
 use task_hookrs::status::TaskStatus as TS;
 use task_hookrs::task::Task;
 use task_hookrs::cache::TaskCache;
-use task_hookrs::error::{Result, ResultExt};
+use task_hookrs::error::Result;
 use task_hookrs::date::Date;
 
 use generate::TaskGenerator;
 use tasktree::TaskNode;
 
 pub enum Timer {
-    DeadTime(TT),
+    DeadTime(Duration),
     Repetition(Iter),
 }
 
@@ -29,16 +30,13 @@ impl TaskRefresher for TaskCache {
     where
         T: IntoIterator<Item = Task>,
     {
-        let now = TT::Moment(Local::now().naive_local());
+        let now = Local::now();
+        let now_moment = TT::Moment(Local::now().naive_local());
         let recent = match recurrence {
-            Timer::DeadTime(time) => {
+            Timer::DeadTime(time) => TT::Moment((now - time).naive_local()),
-                (now - time).calculate().chain_err(
-                    || "Failed to calculate recent from deadtime",
-                )?
-            }
             Timer::Repetition(iter) => {
                 iter.filter_map(KairosResult::ok)
-                    .take_while(|t| *t <= now)
+                    .take_while(|t| *t <= now_moment)
                     .last()
                     .ok_or("Repetition starts in the future")?
                     .clone()

home-manager/packages/rust-scripts/src/update.rs

@@ -5,6 +5,7 @@ use generate::GeneratedTask;
 use refresh::{TaskRefresher, Timer};
 use tasktree::TreeCache;
 use chrono::NaiveDate;
+use chrono::Duration;
 use kairos::timetype::TimeType as TT;
 use kairos::iter::extensions::{Weekly, Monthly, Daily};
 
@@ -52,17 +53,17 @@ pub fn update_tasks(cache: &mut TaskCache) -> Result<()> {
             "Putze Waschbecken",
             "Wäsche sortieren und entscheiden, welche Waschgänge notwendig sind",
         ]),
-        Timer::DeadTime(TT::weeks(2)),
+        Timer::DeadTime(Duration::weeks(2)),
     )?;
     cache.reactivate(
         simple_tasks(
             vec!["Reinige Toilette", "Zehennägel schneiden"],
         ),
-        Timer::DeadTime(TT::weeks(4)),
+        Timer::DeadTime(Duration::weeks(4)),
     )?;
     cache.reactivate(
         simple_tasks(vec!["Friseurtermin machen"]),
-        Timer::DeadTime(TT::weeks(6)),
+        Timer::DeadTime(Duration::weeks(6)),
     )?;
     cache.reactivate(
         simple_tasks(vec![

hosts/apollo/configuration.nix

@@ -10,11 +10,14 @@ networking = {
 i18n.consoleKeyMap = "neo";
 
 imports = [
+   <home-manager/nixos>
    ./hardware-configuration.nix
    ../../modules/cdarknet
    ../../host-common/common.nix
 ];
 
+home-manager.users = {};
+
 # Use the systemd-boot EFI boot loader.
 boot = {
 	loader = {

hosts/apollo/home.nix

@@ -89,6 +89,12 @@ in
     # look & feel
     libertine
     nerdfonts
+    dina-font
+    envypn-font
+    google-fonts
+    gnome3.gnome-font-viewer
+    unscii
+    xfontsel
 
     # media
     ncmpcpp

packages/blezz/default.nix

@@ -1,18 +0,0 @@
-{ fetchFromGitHub, stdenv, libxcb, xcbutil, xcbutilwm  }:
-stdenv.mkDerivation rec {
-  name = "blezz";
-  version = "8643772";
-  src = fetchFromGitHub {
-    owner = "Blezzing";
-    repo = "blezz";
-    rev = version;
-    sha256 = "0kgbzkx49018wxli4agf2vwyq9lnin1qvh1hs6wr59384hmvrbnv";
-  };
-  buildInputs = [ libxcb xcbutil xcbutilwm ];
-   patchPhase = ''
-    grep -v /usr/lib makefile > makefile1
-    mv makefile1 makefile
-    sed s,/usr/bin/,$prefix/usr/bin/, -i makefile
-    mkdir -p $prefix/usr/bin
-  '';
-}

packages/rust-scripts/default.nix

@@ -1,8 +0,0 @@
-{ rustPlatform }:
-with rustPlatform; buildRustPackage rec {
-  name = "rust-scripts";
-  src = ./.;
-#  depsSha256 = "";
-  cargoSha256 = "0h1fimvkm05y5vi2c2baxys5scv2icf0g6bjp62p7x935y5j85ks";
-  doCheck = false;
-}