From 0f008ee0d4031c45881d7e33932bb316267bcf0c Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Mon, 2 Sep 2024 19:04:54 -0700
Subject: ok

---
 flake.lock                                  | 47 +++--------------------------
 flake.nix                                   |  5 ---
 home/ebisu/fortune/system/default.nix       |  1 -
 home/ebisu/fortune/system/opengl.nix        | 23 --------------
 home/ebisu/fortune/system/terminal/foot.nix |  2 +-
 modules/services/default.nix                |  2 ++
 6 files changed, 8 insertions(+), 72 deletions(-)
 delete mode 100644 home/ebisu/fortune/system/opengl.nix

diff --git a/flake.lock b/flake.lock
index ac965d0..c7d9f58 100644
--- a/flake.lock
+++ b/flake.lock
@@ -55,7 +55,7 @@
     },
     "emacs": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": "nixpkgs_7",
         "nixpkgs-stable": "nixpkgs-stable"
       },
@@ -148,21 +148,6 @@
       }
     },
     "flake-utils_2": {
-      "locked": {
-        "lastModified": 1659877975,
-        "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_3": {
       "inputs": {
         "systems": "systems_3"
       },
@@ -180,7 +165,7 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
+    "flake-utils_3": {
       "locked": {
         "lastModified": 1637014545,
         "narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
@@ -195,7 +180,7 @@
         "type": "github"
       }
     },
-    "flake-utils_5": {
+    "flake-utils_4": {
       "inputs": {
         "systems": "systems_4"
       },
@@ -555,27 +540,6 @@
         "type": "github"
       }
     },
-    "nixGL": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1713543440,
-        "narHash": "sha256-lnzZQYG0+EXl/6NkGpyIz+FEOc/DSEG57AP1VsdeNrM=",
-        "owner": "nix-community",
-        "repo": "nixGL",
-        "rev": "310f8e49a149e4c9ea52f1adf70cdc768ec53f8a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixGL",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1723175592,
@@ -616,7 +580,7 @@
     "nixpkgs-fmt": {
       "inputs": {
         "fenix": "fenix",
-        "flake-utils": "flake-utils_4",
+        "flake-utils": "flake-utils_3",
         "nixpkgs": [
           "nixpkgs-f2k",
           "nixpkgs"
@@ -869,7 +833,6 @@
         "nix-gaming": "nix-gaming",
         "nix-index-database": "nix-index-database_2",
         "nix-thorium": "nix-thorium",
-        "nixGL": "nixGL",
         "nixpkgs": "nixpkgs_6",
         "nixpkgs-f2k": "nixpkgs-f2k",
         "nur": "nur",
@@ -899,7 +862,7 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "flake-utils": "flake-utils_5",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": "nixpkgs_9"
       },
       "locked": {
diff --git a/flake.nix b/flake.nix
index e70a9b4..3a1fb67 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,11 +23,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixGL = {
-      url = "github:nix-community/nixGL";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     hyprland = {
       type = "git";
       url = "https://github.com/hyprwm/Hyprland";
diff --git a/home/ebisu/fortune/system/default.nix b/home/ebisu/fortune/system/default.nix
index 5e3a43b..3f48f0b 100644
--- a/home/ebisu/fortune/system/default.nix
+++ b/home/ebisu/fortune/system/default.nix
@@ -6,7 +6,6 @@
     ./terminal
     ./virtualisation
     ./bitwarden.nix
-    ./opengl.nix
     ./peripheral.nix
     ./tracing.nix
     ./variables.nix
diff --git a/home/ebisu/fortune/system/opengl.nix b/home/ebisu/fortune/system/opengl.nix
deleted file mode 100644
index d44091b..0000000
--- a/home/ebisu/fortune/system/opengl.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}:
-let
-  nixGLIntel = inputs.nixGL.packages.${pkgs.system}.nixGLIntel;
-in
-{
-  imports = [
-    (builtins.fetchurl {
-      url = "https://raw.githubusercontent.com/nix-community/home-manager/5e59fe27d938a8c2d5e215f64f5d937c2f863fed/modules/misc/nixgl.nix";
-      sha256 = "74f9fb98f22581eaca2e3c518a0a3d6198249fb1490ab4a08f33ec47827e85db";
-    })
-  ];
-
-  # Ref. https://github.com/nix-community/home-manager/issues/3968
-  nixGL.prefix = "${nixGLIntel}/bin/nixGLIntel";
-
-  home.packages = [
-    nixGLIntel
-  ];
-}
diff --git a/home/ebisu/fortune/system/terminal/foot.nix b/home/ebisu/fortune/system/terminal/foot.nix
index 7bf1063..36fd525 100644
--- a/home/ebisu/fortune/system/terminal/foot.nix
+++ b/home/ebisu/fortune/system/terminal/foot.nix
@@ -1,6 +1,6 @@
 {
   programs.foot = {
-    enable = true;
+    enable = false;
 
     settings = {
       main = {
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 4aadbd8..38f4c42 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 {
   imports = [
     ./ananicy.nix
@@ -16,5 +17,6 @@
     gnome.gnome-keyring.enable = true;
     fstrim.enable = true;
     gvfs.enable = true;
+    udev.packages = with pkgs; [ pkgs.logitech-udev-rules ];
   };
 }
-- 
cgit v1.2.3