feat: use owickstrom colours

fix(alacritty): use correct config path
fix(nextcloud): do not sync paychecks anymore
2026-03-26 22:31:08 +01:00 · 2022-11-30 12:39:45 +01:00 · 2022-11-30 11:44:39 +01:00 · 2022-11-30 11:23:07 +01:00 · 2022-11-30 11:21:38 +01:00 · 2022-11-30 09:19:30 +01:00
11 changed files with 153 additions and 97 deletions
--- a/configs/alacritty.nix
+++ b/configs/alacritty.nix
@@ -6,7 +6,7 @@
 }: let
  alacritty-cfg = theme:
    (pkgs.formats.yaml {}).generate "alacritty.yml" {
-      window.opacity = 0.95;
+      window.opacity = 0.99;
      font = {
        normal.family = "Monospace";
        size = 6;
@@ -43,8 +43,8 @@
    name = "alacritty";
    paths = [
      (pkgs.writeDashBin "alacritty" ''
-        ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yaml msg create-window "$@" ||
-        ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yaml "$@"
+        ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml msg create-window "$@" ||
+        ${pkgs.alacritty}/bin/alacritty --config-file /var/theme/config/alacritty.yml "$@"
      '')
      pkgs.alacritty
    ];
@@ -57,7 +57,7 @@ in {
  ];

  environment.etc = {
-    "themes/dark/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/ayu-dark.nix>);
-    "themes/light/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/ayu-light.nix>);
+    "themes/dark/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/owickstrom-dark.nix>);
+    "themes/light/alacritty.yml".source = alacritty-cfg (import <niveum/lib/colours/owickstrom-light.nix>);
  };
 }
--- a/configs/cloud.nix
+++ b/configs/cloud.nix
@@ -62,7 +62,6 @@ in {
    in ''
      mkdir -p ${lib.escapeShellArg kieran.target}
      ${pkgs.nextcloud-client}/bin/nextcloudcmd --non-interactive --user ${kieran.user} --password ${lib.escapeShellArg kieran.password} --path /Notes ${lib.escapeShellArg kieran.target} ${kieran.endpoint}
-      ${pkgs.nextcloud-client}/bin/nextcloudcmd --non-interactive --user ${kieran.user} --password ${lib.escapeShellArg kieran.password} --path /kmein ${lib.escapeShellArg "${config.users.users.me.home}/cloud/Seafile/Documents/Akten/FYSI/Lohn"} ${kieran.endpoint}
    '';
    serviceConfig = {
      Type = "oneshot";
--- a/configs/default.nix
+++ b/configs/default.nix
@@ -32,6 +32,9 @@ in {
            iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> {};
            ix = pkgs.callPackage <niveum/packages/ix.nix> {};
          };
+          permittedInsecurePackages = [
+            "qtwebkit-5.212.0-alpha4"
+          ];
        };
      };
    }
--- a/configs/zsh.nix
+++ b/configs/zsh.nix
@@ -7,6 +7,15 @@
    # nothing to see here
  '';

+  environment.systemPackages = [pkgs.atuin];
+  environment.variables.ATUIN_CONFIG_DIR = toString (pkgs.writeTextDir "/config.toml" ''
+    auto_sync = true
+    update_check = false
+    sync_address = "http://zaatar.r:8888"
+    sync_frequency = 0
+    style = "compact"
+  '');
+
  programs.zsh = let
    zsh-completions = pkgs.fetchFromGitHub {
      owner = "zsh-users";
@@ -14,12 +23,6 @@
      rev = "cf565254e26bb7ce03f51889e9a29953b955b1fb";
      sha256 = "1yf4rz99acdsiy0y1v3bm65xvs2m0sl92ysz0rnnrlbd5amn283l";
    };
-    zsh-history-substring-search = pkgs.fetchFromGitHub {
-      owner = "zsh-users";
-      repo = "zsh-history-substring-search";
-      rev = "aae3388491c2312c4efb2e86bcb999927bb2900e";
-      sha256 = "0lgmq1xcccnz5cf7vl0r0qj351hwclx9p80cl0qczxry4r2g5qaz";
-    };
  in {
    enable = true;
    enableCompletion = true;
@@ -54,12 +57,6 @@
      autoload -U zmv run-help

      fpath=(${zsh-completions}/src $fpath)
-      source ${zsh-history-substring-search}/zsh-history-substring-search.zsh
-
-      bindkey '^[[A' history-substring-search-up
-      bindkey '^[[B' history-substring-search-down
-      bindkey -M vicmd 'k' history-substring-search-up
-      bindkey -M vicmd 'j' history-substring-search-down
    '';
    promptInit = with config.niveum; ''
      autoload -Uz vcs_info
@@ -71,6 +68,13 @@
      zstyle ':vcs_info:*' formats "%c%u%F{cyan}%b%f"
      zstyle ':vcs_info:*' actionformats "(%a) %c%u%F{cyan}%b%f"

+      # atuin distributed shell history
+      export ATUIN_NOBIND="true" # disable all keybdinings of atuin
+      eval "$(atuin init zsh)"
+      bindkey '^r' _atuin_search_widget # bind ctrl+r to atuin
+      # use zsh only session history
+      fc -p
+
      precmd () {
        vcs_info
        RPROMPT="$vcs_info_msg_0_"
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
  "nodes": {
    "flake-utils": {
      "locked": {
-        "lastModified": 1667077288,
-        "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
        "type": "github"
      },
      "original": {
@@ -23,11 +23,11 @@
        "utils": "utils"
      },
      "locked": {
-        "lastModified": 1667234164,
-        "narHash": "sha256-oPMAvHZBDgamjmIQly5+sw2LtfKwY7qcWZZwKiwKQy8=",
+        "lastModified": 1669510155,
+        "narHash": "sha256-PS2WdRXujfxH9PuH0w8aRmrEQ+Toz3RqGlp0mXQRGio=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "722e8d65d3aba6f527100cc2d1539e4ca04d066f",
+        "rev": "e999dfe7cba2e1fd59ab135e7496545bd4f82b76",
        "type": "github"
      },
      "original": {
@@ -110,11 +110,11 @@
    },
    "nixos-stable": {
      "locked": {
-        "lastModified": 1667125965,
-        "narHash": "sha256-z/OLvPwIhwdN9J+ED/0rPz/Wh/0sPuvczURwsiEENSQ=",
+        "lastModified": 1669418739,
+        "narHash": "sha256-T86oFvcUIRwHWBWUt7WjaP4BP/3lDGbv5AppQSI1FkI=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "26eb67abc9a7370a51fcb86ece18eaf19ae9207f",
+        "rev": "695b3515251873e0a7e2021add4bba643c56cde3",
        "type": "github"
      },
      "original": {
@@ -126,11 +126,11 @@
    },
    "nixos-unstable": {
      "locked": {
-        "lastModified": 1667142599,
-        "narHash": "sha256-OLJxsg9VqfKjFkerOxWtNIkibsCvxsv5A8wNWO1MeWk=",
+        "lastModified": 1669411043,
+        "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "412b9917cea092f3d39f9cd5dead4effd5bc4053",
+        "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8",
        "type": "github"
      },
      "original": {
@@ -195,11 +195,11 @@
    "scripts": {
      "flake": false,
      "locked": {
-        "lastModified": 1665563768,
-        "narHash": "sha256-H5VtcMxQY/1AeJExcM/eoi49wOFpd8U1nTyS8qm4OhU=",
+        "lastModified": 1669193831,
+        "narHash": "sha256-R8RNb7mM0bDF3UTfQqpumYPBwal7QzWSKgxMUY2dRm8=",
        "owner": "kmein",
        "repo": "scripts",
-        "rev": "66b2068d548d3418c81dd093bba3f80248c68196",
+        "rev": "84ad80348294e9423996b52a4b112700ae5d3176",
        "type": "github"
      },
      "original": {
@@ -211,11 +211,11 @@
    "stockholm": {
      "flake": false,
      "locked": {
-        "lastModified": 1667238582,
-        "narHash": "sha256-lpDW8Owmauwh9p/Vv442F20z2lUh0mByv0iPwLPgeB4=",
+        "lastModified": 1669306514,
+        "narHash": "sha256-bHhys4UdNC2rvg8RHL3BHR5uXv1Z0jxcQb/V7Wavhfk=",
        "ref": "refs/heads/master",
-        "rev": "a83dec755ca2753705254f90346e4441d2f25c7c",
-        "revCount": 10871,
+        "rev": "dae12b6893a1d28e8bcb1fe3fb9ee8757bbfbed4",
+        "revCount": 10963,
        "type": "git",
        "url": "https://cgit.lassul.us/stockholm"
      },
@@ -290,11 +290,11 @@
    },
    "utils": {
      "locked": {
-        "lastModified": 1667077288,
-        "narHash": "sha256-bdC8sFNDpT0HK74u9fUkpbf1MEzVYJ+ka7NXCdgBoaA=",
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
        "owner": "numtide",
        "repo": "flake-utils",
-        "rev": "6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -172,7 +172,7 @@
            sources =
              ["nix-writers" "nixpkgs" "retiolum" "stockholm"]
              ++ {
-                zaatar = ["traadfri"];
+                zaatar = ["traadfri" "nixos-unstable"];
                ful = [];
                tahina = [];
                tabula = [];
--- a/lib/colours/owickstrom-dark.nix
+++ b/lib/colours/owickstrom-dark.nix
@@ -1,37 +1,37 @@
 rec {
  black = {
-    bright = "#4b4b4b";
-    dark = "#242424";
+    bright = "#282c34";
+    dark = "#282c34";
  };
  red = {
-    bright = "#fc1c18";
-    dark = "#d71c15";
+    bright = "#e06c75";
+    dark = "#e06c75";
  };
  green = {
-    bright = "#6bc219";
-    dark = "#5aa513";
+    bright = "#98c379";
+    dark = "#98c379";
  };
  yellow = {
-    bright = "#fec80e";
-    dark = "#fdb40c";
+    bright = "#e5c07b";
+    dark = "#e5c07b";
  };
  blue = {
-    bright = "#0955ff";
-    dark = "#063b8c";
+    bright = "#61afef";
+    dark = "#61afef";
  };
  magenta = {
-    bright = "#fb0050";
-    dark = "#e40038";
+    bright = "#c678dd";
+    dark = "#c678dd";
  };
  cyan = {
-    bright = "#3ea8fc";
-    dark = "#2595e1";
+    bright = "#56b6c2";
+    dark = "#56b6c2";
  };
  white = {
-    bright = "#8c00ec";
-    dark = "#efefef";
+    bright = "#dcdfe4";
+    dark = "#dcdfe4";
  };
-  background = "#181818";
-  foreground = white.dark;
-  cursor = "#bbbbbb";
+  background = black.dark;
+  foreground = white.bright;
+  cursor = "#a3b3cc";
 }
--- a/lib/colours/owickstrom-light.nix
+++ b/lib/colours/owickstrom-light.nix
@@ -0,0 +1,37 @@
+rec {
+  black = {
+    bright = "#4b4b4b";
+    dark = "#242424";
+  };
+  red = {
+    bright = "#fc1c18";
+    dark = "#d71c15";
+  };
+  green = {
+    bright = "#6bc219";
+    dark = "#5aa513";
+  };
+  yellow = {
+    bright = "#fec80e";
+    dark = "#fdb40c";
+  };
+  blue = {
+    bright = "#0955ff";
+    dark = "#063b8c";
+  };
+  magenta = {
+    bright = "#fb0050";
+    dark = "#e40038";
+  };
+  cyan = {
+    bright = "#3ea8fc";
+    dark = "#2595e1";
+  };
+  white = {
+    bright = "#8c00ec";
+    dark = "#efefef";
+  };
+  background = white.dark;
+  foreground = "#181818";
+  cursor = "#bbbbbb";
+}
--- a/lib/colours/owickstrom.nix
+++ b/lib/colours/owickstrom.nix
@@ -1,37 +0,0 @@
-rec {
-  black = {
-    bright = "#282c34";
-    dark = "#282c34";
-  };
-  red = {
-    bright = "#e06c75";
-    dark = "#e06c75";
-  };
-  green = {
-    bright = "#98c379";
-    dark = "#98c379";
-  };
-  yellow = {
-    bright = "#e5c07b";
-    dark = "#e5c07b";
-  };
-  blue = {
-    bright = "#61afef";
-    dark = "#61afef";
-  };
-  magenta = {
-    bright = "#c678dd";
-    dark = "#c678dd";
-  };
-  cyan = {
-    bright = "#56b6c2";
-    dark = "#56b6c2";
-  };
-  white = {
-    bright = "#dcdfe4";
-    dark = "#dcdfe4";
-  };
-  background = black.dark;
-  foreground = white.bright;
-  cursor = "#a3b3cc";
-}
--- a/systems/zaatar/atuin.nix
+++ b/systems/zaatar/atuin.nix
@@ -0,0 +1,49 @@
+{config, ...}: let
+  inherit (import <niveum/lib>) tmpfilesConfig;
+  unstable = import <nixos-unstable> {inherit (config.nixpkgs) config;};
+in {
+  services.postgresql = {
+    enable = true;
+    dataDir = "/var/state/postgresql/${config.services.postgresql.package.psqlSchema}";
+    ensureDatabases = ["atuin"];
+    ensureUsers = [
+      {
+        name = "atuin";
+        ensurePermissions."DATABASE atuin" = "ALL PRIVILEGES";
+      }
+    ];
+  };
+
+  systemd.tmpfiles.rules = [
+    (tmpfilesConfig {
+      type = "d";
+      path = "/var/state/postgresql";
+      mode = "0700";
+      user = "postgres";
+      group = "postgres";
+    })
+  ];
+
+  users.groups.atuin = {};
+  users.users.atuin = {
+    isSystemUser = true;
+    group = "atuin";
+    home = "/run/atuin";
+    createHome = true;
+  };
+
+  systemd.services.atuin = {
+    wantedBy = ["multi-user.target"];
+    environment = {
+      ATUIN_HOST = "0.0.0.0";
+      ATUIN_PORT = "8888";
+      ATUIN_OPEN_REGISTRATION = "true";
+      ATUIN_DB_URI = "postgres:///atuin";
+    };
+    serviceConfig = {
+      User = "atuin";
+      ExecStart = "${unstable.atuin}/bin/atuin server start";
+    };
+  };
+  networking.firewall.allowedTCPPorts = [8888];
+}
--- a/systems/zaatar/configuration.nix
+++ b/systems/zaatar/configuration.nix
@@ -7,6 +7,7 @@
  inherit (import <niveum/lib>) retiolumAddresses restic;
 in {
  imports = [
+    ./atuin.nix
    ./backup.nix
    ./gaslight.nix
    ./hardware-configuration.nix
Author	SHA1	Message	Date
Kierán Meinhardt	a34b4a8262	feat: use owickstrom colours	2022-11-30 12:39:45 +01:00
Kierán Meinhardt	3102d6f56c	fix(alacritty): use correct config path	2022-11-30 11:44:39 +01:00
Kierán Meinhardt	a2b65034bf	fix(nextcloud): do not sync paychecks anymore	2022-11-30 11:23:07 +01:00
Kierán Meinhardt	90550dc18b	feat: atuin	2022-11-30 11:21:38 +01:00
Kierán Meinhardt	03d40a488b	chore: permit insecure qtwebkit	2022-11-30 09:19:30 +01:00
Kierán Meinhardt	74191a27ee	Merge remote-tracking branch 'origin/update_flake_lock_action'	2022-11-30 07:42:47 +01:00
github-actions[bot]	10949f7746	flake.lock: Update Flake lock file updates: • Updated input 'flake-utils': 'github:numtide/flake-utils/6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817' (2022-10-29) → 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Updated input 'home-manager': 'github:nix-community/home-manager/722e8d65d3aba6f527100cc2d1539e4ca04d066f' (2022-10-31) → 'github:nix-community/home-manager/e999dfe7cba2e1fd59ab135e7496545bd4f82b76' (2022-11-27) • Updated input 'home-manager/utils': 'github:numtide/flake-utils/6ee9ebb6b1ee695d2cacc4faa053a7b9baa76817' (2022-10-29) → 'github:numtide/flake-utils/5aed5285a952e0b949eb3ba02c12fa4fcfef535f' (2022-11-02) • Updated input 'nixos-stable': 'github:NixOS/nixpkgs/26eb67abc9a7370a51fcb86ece18eaf19ae9207f' (2022-10-30) → 'github:NixOS/nixpkgs/695b3515251873e0a7e2021add4bba643c56cde3' (2022-11-25) • Updated input 'nixos-unstable': 'github:NixOS/nixpkgs/412b9917cea092f3d39f9cd5dead4effd5bc4053' (2022-10-30) → 'github:NixOS/nixpkgs/5dc7114b7b256d217fe7752f1614be2514e61bb8' (2022-11-25) • Updated input 'scripts': 'github:kmein/scripts/66b2068d548d3418c81dd093bba3f80248c68196' (2022-10-12) → 'github:kmein/scripts/84ad80348294e9423996b52a4b112700ae5d3176' (2022-11-23) • Updated input 'stockholm': 'git+https://cgit.lassul.us/stockholm?ref=refs%2fheads%2fmaster&rev=a83dec755ca2753705254f90346e4441d2f25c7c' (2022-10-31) → 'git+https://cgit.lassul.us/stockholm?ref=refs%2fheads%2fmaster&rev=dae12b6893a1d28e8bcb1fe3fb9ee8757bbfbed4' (2022-11-24)	2022-11-27 00:55:59 +00:00