bump

extras/dev.nix

@@ -1,30 +1,12 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
+    gnumake
+    unstable.pijul
     freecad
-    # alsa-lib
-    # alsa-oss
     clang
-    # cmake
-    # libclang
-    # libopus
-    # opencv
-    # openssl
-    # pkg-config
-    # pkgconfig
     rustup
-    # udev
     nixpkgs-fmt
     nil
-    # expat
-    # fontconfig
-    # freetype
-    # freetype.dev
-    # libGL
-    # pkgconfig
-    # xorg.libX11
-    # xorg.libXcursor
-    # xorg.libXi
-    # xorg.libXrandr
     bacon
     unstable.cargo
     unstable.cargo-feature

extras/gaming.nix

@@ -1,4 +1,6 @@
-{ pkgs, ... }: {
+{ pkgs, aagl, ... }: {
+  imports = [ aagl.nixosModules.default ];
+
   environment.systemPackages = with pkgs; [
     unstable.lutris
     unstable.mangohud
@@ -12,6 +14,9 @@
   programs.gamemode.enable = true;
   programs.gamescope.enable = true;
 
+  nix.settings = aagl.nixConfig;
+  programs.honkers-railway-launcher.enable = true;
+
   security.rtkit.enable = true;
   environment.etc =
     let
@@ -28,5 +33,4 @@
         };
       };
     };
-
 }

flake.lock

@@ -1,12 +1,49 @@
 {
   "nodes": {
+    "aagl": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1696252780,
+        "narHash": "sha256-sQEjVzzstiaNLyiFJ19EMwwbDSSNDyQZIbPiLonlDCQ=",
+        "owner": "ezKEa",
+        "repo": "aagl-gtk-on-nix",
+        "rev": "0c9d93bdb311f7948f9fb0e98d869316d78eec12",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ezKEa",
+        "repo": "aagl-gtk-on-nix",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1697100850,
+        "lastModified": 1697748412,
-        "narHash": "sha256-qSAzJVzNRIo+r3kBjL8TcpJctcgcHlnZyqdzpWgtg0M=",
+        "narHash": "sha256-5VSB63UE/O191cuZiGHbCJ9ipc7cGKB8cHp0cfusuyo=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "fb6af288f6cf0f00d3af60cf9d5110433b954565",
+        "rev": "72d53d51704295f1645d20384cd13aecc182f624",
         "type": "github"
       },
       "original": {
@@ -66,11 +103,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1697456312,
+        "lastModified": 1697723726,
-        "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=",
+        "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ca012a02bf8327be9e488546faecae5e05d7d749",
+        "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0",
         "type": "github"
       },
       "original": {
@@ -81,11 +118,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1697583813,
+        "lastModified": 1697655685,
-        "narHash": "sha256-SRXK2EBMZHlOAs/5bjphhX9XnIKR6peTV6i7yoL6/Lg=",
+        "narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b5f8ec6be261dfc44c3b56b220e2793d1b61512b",
+        "rev": "80c1aab725151632ddc2a20caeb914e76dd0673c",
         "type": "github"
       },
       "original": {
@@ -96,6 +133,7 @@
     },
     "root": {
       "inputs": {
+        "aagl": "aagl",
         "nixos-hardware": "nixos-hardware",
         "nixos-raspberrypi": "nixos-raspberrypi",
         "nixpkgs": "nixpkgs_2",

flake.nix

@@ -6,11 +6,16 @@
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
     nixos-hardware.url = "nixos-hardware";
     nixos-raspberrypi.url = "github:ramblurr/nixos-raspberrypi";
-    # nixos-raspberrypi.inputs.nixpkgs.follows = "nixpkgs";
+    aagl.url = "github:ezKEa/aagl-gtk-on-nix";
+    aagl.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { nixpkgs, nixos-hardware, nixpkgs-unstable, nixos-raspberrypi, ... }:
+  outputs = { nixpkgs, nixos-hardware, nixpkgs-unstable, nixos-raspberrypi, aagl, ... }@attrs:
     let
+      nixos-system = (systemModules: nixpkgs.lib.nixosSystem {
+        modules = systemModules;
+        specialArgs = attrs;
+      });
       overlay-unstable = final: prev: {
         unstable = import nixpkgs-unstable {
           system = "x86_64-linux";
@@ -24,13 +29,12 @@
           # config.allowUnsupportedSystem = true;
         };
       };
-      nixosSystem = (systemModules: nixpkgs.lib.nixosSystem { modules = systemModules; });
       nixos-hw = nixos-hardware.nixosModules;
       nixos-rpi = nixos-raspberrypi.nixosModules;
     in
     {
       nixosConfigurations = {
-        NOcomputer = nixosSystem [
+        NOcomputer = nixos-system [
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
           nixos-hw.common-cpu-amd
           nixos-hw.common-gpu-nvidia-nonprime
@@ -41,7 +45,7 @@
           ./extras/dev.nix
           ./extras/gaming.nix
         ];
-        NOlaptop = nixosSystem [
+        NOlaptop = nixos-system [
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
           nixos-hw.common-cpu-intel
           # inputs.nixos-hardware.nixosModules.framework
@@ -52,7 +56,7 @@
           ./extras/dev.nix
           ./extras/gaming.nix
         ];
-        NObangers = nixosSystem [
+        NObangers = nixos-system [
           # ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable-arm ]; })
           nixos-hw.raspberry-pi-4
           nixos-rpi.hardware

systems/BASED.nix

@@ -84,9 +84,11 @@
   time.timeZone = "US/Pacific";
   i18n.defaultLocale = "en_US.utf8";
   i18n.supportedLocales = [ "all" ];
-  # i18n.extraLocaleSettings = {
+  i18n.extraLocaleSettings = {
-  #   LC_MESSAGES = "en_US.UTF-8";
+    LC_CTYPE = "en_US.UTF-8";
-  # };
+    LC_MESSAGES = "en_US.UTF-8";
+    LC_ALL = "en_US.UTF-8";
+  };
 
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 

systems/NOlaptop.nix

@@ -35,6 +35,12 @@
 
   services.xserver.displayManager.defaultSession = "plasmawayland";
 
+  # SUBSYSTEM=="backlight", GROUP="video", MODE="0664"
+  services.udev.extraRules = ''
+    ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness"
+    ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness"
+  '';
+
   boot.initrd.availableKernelModules = [
     "nvme"
     "sd_mod"

users/tao.nix

@@ -24,7 +24,6 @@
     keepassxc
     libsForQt5.kcharselect
     libsForQt5.kdeconnect-kde
-    mosh
     obs-studio
     ocs-url
     onlyoffice-bin
@@ -51,7 +50,9 @@
     thunderbird
     birdtray
     syncthingtray
+    unstable.pandoc
   ];
+  programs.mosh.enable = true;
   environment.shells = with pkgs; [ unstable.nushell ];
 
   # services.expressvpn.enable = true;
@@ -74,7 +75,7 @@
 
   users.users.tao = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "libvirtd" "dialout" "scanner" "lp" ];
+    extraGroups = [ "video" "wheel" "libvirtd" "dialout" "scanner" "lp" ];
     shell = pkgs.unstable.nushell;
   };