modules/lix: Use unstable/lix instead of compiling it myself

home-manager/default.nix

@@ -99,7 +99,6 @@ in
       htop
       xdg-utils
       moreutils
-      insomnia
       mumble
       inkscape
       guvcview

home-manager/modules/neovim.nix

@@ -76,6 +76,9 @@
 
       # indentation lines
       indent-blankline-nvim
+
+      # Add/change surrounding characters
+      nvim-surround
     ];
 
     extraConfig = ''
@@ -177,6 +180,7 @@
       nnoremap <leader>fg <cmd>Telescope live_grep<cr>
 
       lua << EOF
+        require("nvim-surround").setup({})
         require("ibl").setup{
                indent = { char = "▏" };
         }

machines/smithers/batterylight.nix

@@ -0,0 +1,32 @@
+{ pkgs, ... }:
+{
+  systemd.timers."batterylight" = {
+    wantedBy = [ "timers.target" ];
+    timerConfig = {
+      OnBootSec = "5m";
+      OnUnitActiveSec = "5m";
+      Unit = "batterylight.service";
+    };
+  };
+
+  systemd.services."batterylight" = {
+    script = ''
+      STATUS=`cat /sys/bus/acpi/drivers/battery/PNP0C0A:00/power_supply/BAT1/status`
+      PERCENT=`cat /sys/bus/acpi/drivers/battery/PNP0C0A:00/power_supply/BAT1/capacity`
+      if [[ $STATUS == "Discharging" && $PERCENT -lt 10 ]]; then
+        for i in `seq 0 3`; do
+          ${pkgs.framework-tool}/bin/framework_tool --kblight 0
+          sleep 0.2
+          ${pkgs.framework-tool}/bin/framework_tool --kblight 100
+          sleep 0.2
+          ${pkgs.framework-tool}/bin/framework_tool --kblight 0
+          sleep 0.2
+        done
+      fi
+    '';
+    serviceConfig = {
+      Type = "oneshot";
+      User = "root";
+    };
+  };
+}

machines/smithers/configuration.nix

@@ -6,6 +6,7 @@
       ./hardware-configuration.nix
       ../../roles/all.nix
       ../../roles/laptop.nix
+      ./batterylight.nix
 
       # import hardware specific settings
       <nixos-hardware/framework/13-inch/7040-amd>

modules/fonts.nix

@@ -13,7 +13,6 @@
     enableDefaultPackages = true;
     fontDir.enable = true;
     packages = with pkgs; [
-      nerdfonts
       dejavu_fonts
       fira-code
     ];

modules/lix.nix

@@ -1,16 +1,6 @@
 let
-  module = fetchTarball {
+  unstable = import <nixos-unstable> { };
-    name = "source";
-    url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz";
-    sha256 = "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=";
-  };
-  lixSrc = fetchTarball {
-    name = "source";
-    url = "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz";
-    sha256 = "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=";
-  };
 in
-# This is the core of the code you need; it is an exercise to the
+{
-# reader to write the sources in a nicer way, or by using npins or
+  nix.package = unstable.lix;
-# similar pinning tools.
+}
-import "${module}/module.nix" { lix = lixSrc; }

overlay

@@ -1 +1 @@
-Subproject commit 62209bcff29f6d2d1a643870b643d6c9d2577d5f
+Subproject commit 7fc544758f1004ca7e193acc4a8d0ee784e585a9

secrets

@@ -1 +1 @@
-Subproject commit b5be7037c16f25899be906029de9dc9cb6f79ff8
+Subproject commit 0073a1ebe983e942b7a9513ef33ad29c6ac8d6ac