From 294182bbcc5ab61c92fb1f4efda7cfc74a79e9c8 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Sun, 23 Jun 2024 16:10:56 +0900
Subject: [PATCH] Updates

---
 flake.lock                                    | 21 -------------------
 flake.nix                                     |  5 +----
 nixos/common/services/docker.nix              |  1 -
 nixos/common/services/podman.nix              |  1 -
 nixos/default.nix                             |  2 +-
 .../hosts/milan-linode-01/containers/derp.nix |  1 -
 nixos/hosts/nixos-desktop/default.nix         |  9 ++------
 nixos/hosts/nixos-framework/default.nix       |  9 +-------
 .../hosts/osaka-linode-01/containers/derp.nix |  1 -
 9 files changed, 5 insertions(+), 45 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6d55947f..1c022113 100644
--- a/flake.lock
+++ b/flake.lock
@@ -114,26 +114,6 @@
         "type": "github"
       }
     },
-    "compose2nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1717354014,
-        "narHash": "sha256-WwQo3TGnEbpp3tPqHHqqiXK3jXD9oykdhKaxrv9UzKs=",
-        "owner": "aksiksi",
-        "repo": "compose2nix",
-        "rev": "3cc5f141667c1dd434570ab6cb2dbac5739edc52",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aksiksi",
-        "repo": "compose2nix",
-        "type": "github"
-      }
-    },
     "crane": {
       "inputs": {
         "nixpkgs": [
@@ -1676,7 +1656,6 @@
     },
     "root": {
       "inputs": {
-        "compose2nix": "compose2nix",
         "deploy-rs": "deploy-rs",
         "disko": "disko",
         "doom-emacs": "doom-emacs",
diff --git a/flake.nix b/flake.nix
index 4f387c45..5eb1153f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,9 +40,6 @@
     # Manage Plasma desktop with Nix
     plasma-manager.url = "github:pjones/plasma-manager";
     plasma-manager.inputs.nixpkgs.follows = "nixpkgs";
-    # compose2nix - Convert docker-compose.yml files to nix syntax
-    compose2nix.url = "github:aksiksi/compose2nix";
-    compose2nix.inputs.nixpkgs.follows = "nixpkgs";
     # Hyprland Flake
     hyprland.url = "github:hyprwm/Hyprland";
     # Steam Deck configs for NixOS
@@ -97,7 +94,7 @@
       nixos-linode-img  = libx.mkMinImage { hostname = "nixos-linode-img"; format = "linode"; };
       nixos-rpi4-img    = libx.mkImage    { hostname = "nixos-rpi4-img"; format = "sd-aarch64"; system = "aarch64-linux"; };
       nixos-iso-console = libx.mkImage    { hostname = "nixos-iso-console"; format = "iso"; };
-      nixos-iso-desktop = libx.mkImage    { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "gnome"; unfree = true; };
+      nixos-iso-desktop = libx.mkImage    { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "plasma6"; unfree = true; };
     };
 
     # Checks for deploy-rs -  Makes deploy-rs fail when system evaluations fail
diff --git a/nixos/common/services/docker.nix b/nixos/common/services/docker.nix
index 1ccea644..6cb934f9 100644
--- a/nixos/common/services/docker.nix
+++ b/nixos/common/services/docker.nix
@@ -15,7 +15,6 @@
     environment.systemPackages = with pkgs; [ 
       docker-compose 
       ctop
-      inputs.compose2nix.packages.${system}.default
     ];
   
     # Add the docker telegraf listener
diff --git a/nixos/common/services/podman.nix b/nixos/common/services/podman.nix
index c57b908f..0dcedae9 100644
--- a/nixos/common/services/podman.nix
+++ b/nixos/common/services/podman.nix
@@ -23,7 +23,6 @@
     environment.systemPackages = with pkgs; [ 
       podman-compose 
       podman-tui
-      inputs.compose2nix.packages.${system}.default
     ]; 
 
     # Add the docker telegraf listener
diff --git a/nixos/default.nix b/nixos/default.nix
index dd483c3f..aff90ba2 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -21,7 +21,7 @@
     ./common/modules/networking.nix      # Initial Networking configs
     ./common/modules/nixos.nix           # NixOS related items
     ./common/modules/remote-builders.nix # Add remote builders
-    ./common/modules/hosts.nix           # Adblockers
+    # ./common/modules/hosts.nix           # Adblockers
 
     ./users/${username}
     ./hosts/${hostname}
diff --git a/nixos/hosts/milan-linode-01/containers/derp.nix b/nixos/hosts/milan-linode-01/containers/derp.nix
index 4d131726..e16f4c0b 100644
--- a/nixos/hosts/milan-linode-01/containers/derp.nix
+++ b/nixos/hosts/milan-linode-01/containers/derp.nix
@@ -1,4 +1,3 @@
-# Auto-generated using compose2nix v0.1.7.
 { ... }: {
     services.cron = {
       enable = true;
diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix
index 68a0eb4f..4c2f9602 100644
--- a/nixos/hosts/nixos-desktop/default.nix
+++ b/nixos/hosts/nixos-desktop/default.nix
@@ -46,19 +46,14 @@
   };
 
   hardware = {
-    opengl = {
-      enable = true;
-      driSupport32Bit = true;
-      driSupport = true;
-    };
-
+    graphics.enable = true;
     nvidia = {
       open = false;
       nvidiaSettings = true;
       modesetting.enable = true;
       package = config.boot.kernelPackages.nvidiaPackages.production;  # (installs 535)
-      };
     };
+  };
 
   environment.systemPackages = [ 
     # deployments and development environments
diff --git a/nixos/hosts/nixos-framework/default.nix b/nixos/hosts/nixos-framework/default.nix
index 75be9c83..7e8a77f5 100644
--- a/nixos/hosts/nixos-framework/default.nix
+++ b/nixos/hosts/nixos-framework/default.nix
@@ -41,14 +41,7 @@
 
   # Set the networking hostname:
   networking.hostName = "nixos-framework";
-
-  hardware = {
-    opengl = {
-      enable = true;
-      driSupport32Bit = true;
-      driSupport = true;
-    };
-  };
+  hardware.graphics.enable = true;
 
   programs.gamemode = {
     enable = true;
diff --git a/nixos/hosts/osaka-linode-01/containers/derp.nix b/nixos/hosts/osaka-linode-01/containers/derp.nix
index d98bdcd3..0cefc0c8 100644
--- a/nixos/hosts/osaka-linode-01/containers/derp.nix
+++ b/nixos/hosts/osaka-linode-01/containers/derp.nix
@@ -1,4 +1,3 @@
-# Auto-generated using compose2nix v0.1.7.
 { ... }: {
     services.cron = {
       enable = true;