summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix2
-rw-r--r--machines/zenbook/hardware-configuration.nix1
-rw-r--r--modules/nixos/asus-numpad-touchpad.nix5
-rw-r--r--modules/nixos/cgit.nix5
-rw-r--r--modules/nixos/environment.nix1
-rw-r--r--modules/nixos/hyprland.nix2
6 files changed, 12 insertions, 4 deletions
diff --git a/flake.nix b/flake.nix
index 4493b22..2112cac 100644
--- a/flake.nix
+++ b/flake.nix
@@ -214,7 +214,7 @@
system = "aarch64-linux";
modules = [
- (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
+ (nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix")
./machines/iso/configuration.nix
./modules/users/defin.nix
./modules/nixos/system-packages.nix
diff --git a/machines/zenbook/hardware-configuration.nix b/machines/zenbook/hardware-configuration.nix
index 531b45b..14da63f 100644
--- a/machines/zenbook/hardware-configuration.nix
+++ b/machines/zenbook/hardware-configuration.nix
@@ -48,4 +48,5 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+ hardware.i2c.enable = true;
}
diff --git a/modules/nixos/asus-numpad-touchpad.nix b/modules/nixos/asus-numpad-touchpad.nix
new file mode 100644
index 0000000..6410f3a
--- /dev/null
+++ b/modules/nixos/asus-numpad-touchpad.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... } : {
+ environment.systemPackages = with pkgs; [
+ libevdev python312Packages.libevdev python312Packages.i2c-tools i2c-tools git
+ ];
+}
diff --git a/modules/nixos/cgit.nix b/modules/nixos/cgit.nix
index 177158a..a5b4013 100644
--- a/modules/nixos/cgit.nix
+++ b/modules/nixos/cgit.nix
@@ -1,12 +1,13 @@
-{ config, ... } : { # This is for hosting on bosco
+{ config, pkgs, ... } : { # This is for hosting on bosco
services.cgit = {
"git.myrmexia.xyz" = {
enable = true;
- nginx.location = "/git/";
+ nginx.location = "/";
# nginx.virtualHost = "git.myrmexia.xyz";
settings = {
enable-commit-graph = 1;
enable-http-clone = 0;
+ source-filter = "${pkgs.cgit}/lib/cgit/filters/syntax-highlighting.py";
};
repos = {
nixos-flake = {
diff --git a/modules/nixos/environment.nix b/modules/nixos/environment.nix
index 52aaae9..4fdd495 100644
--- a/modules/nixos/environment.nix
+++ b/modules/nixos/environment.nix
@@ -7,7 +7,6 @@
sessionVariables = {
NIXOS_OZONE_WL = "1";
NIXPKGS_ALLOW_INSECURE = "1";
- RADV_PERFTEST = "rt";
};
variables = {
# PATH = "/home/defin/.local/share/gem/ruby/3.0.0/bin:";
diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix
index 793ce4c..afc96df 100644
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -59,6 +59,7 @@
swayidle # the idle timeout
swaylock-effects # locking the screen
brightnessctl # control device brightness
+ foot # terminal
wlogout # logout menu
wl-clipboard # copying and pasting
hyprpicker # color picker
@@ -69,6 +70,7 @@
slurp # selecting a region to screenshot
# TODO replace by 'flameshot gui --raw | wl-copy'
+ wofi # launch programs
mako # the notification daemon, the same as dunst
yad # a fork of zenity, for creating dialogs