From 0057e4f804eae19ad674da783cd6da44f81e618b Mon Sep 17 00:00:00 2001
From: iFargle <albert@sysctl.io>
Date: Mon, 11 Dec 2023 19:52:52 +0900
Subject: [PATCH] Test

---
 flake.nix                                | 17 ++++-------------
 lib/deploy-rs.nix                        |  5 -----
 lib/nixpkgs.nix                          |  5 -----
 lib/sops-nix.nix                         |  5 -----
 nixos/hosts/framework-server/default.nix |  7 +++++--
 5 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 lib/deploy-rs.nix
 delete mode 100644 lib/nixpkgs.nix
 delete mode 100644 lib/sops-nix.nix

diff --git a/flake.nix b/flake.nix
index 4ad5eb6f..e3ec9530 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,24 +39,18 @@
     libx = import ./lib { inherit self inputs outputs stateVersion hmStateVersion; };
   in {
     nixosConfigurations = {
-      # Virtual
-      osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; type = "small"; };
-      nixos-vm-01     = libx.mkHost { hostname = "nixos-vm-01"; };
-      # Physical
+      osaka-linode-01  = libx.mkHost { hostname = "osaka-linode-01"; type = "small"; };
+      nixos-vm-01      = libx.mkHost { hostname = "nixos-vm-01"; };
       framework-server = libx.mkHost { hostname = "framework-server"; };
-      # nixos-desktop    = libx.mkHost { hostname = "nixos-desktop";   desktop = "gnome"; gpu = "nvidia"; };
       nixos-framework  = libx.mkHost { hostname = "nixos-framework"; desktop = "hyprland"; gpu = "amd";  theme = "green"; };
       nixos-rpi4-01    = libx.mkHost { hostname = "nixos-rpi4-01";   platform = "aarch64-linux"; };
       nixos-rpi4-02    = libx.mkHost { hostname = "nixos-rpi4-02";   platform = "aarch64-linux"; };
       nixos-rpi4-03    = libx.mkHost { hostname = "nixos-rpi4-03";   platform = "aarch64-linux"; };
     };
     homeConfigurations = {
-      # Virtual
-      "albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; };
-      "albert@nixos-vm-01"     = libx.mkHome { hostname = "nixos-vm-01"; };
-      # Physical
+      "albert@osaka-linode-01"  = libx.mkHome { hostname = "osaka-linode-01"; };
+      "albert@nixos-vm-01"      = libx.mkHome { hostname = "nixos-vm-01"; };
       "albert@framework-server" = libx.mkHome { hostname = "framework-server"; };
-      # "albert@nixos-desktop"    = libx.mkHome { hostname = "nixos-desktop"; };
       "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "hyprland"; theme = "green"; };
       "albert@nixos-rpi4-01"    = libx.mkHome { hostname = "nixos-rpi4-01"; platform = "aarch64-linux"; };
       "albert@nixos-rpi4-02"    = libx.mkHome { hostname = "nixos-rpi4-02"; platform = "aarch64-linux"; };
@@ -69,12 +63,9 @@
       nixos-iso-desktop = libx.mkImage    { hostname = "nixos-iso-desktop"; format = "iso"; desktop = "gnome"; };
     };
     deploy.nodes = {
-      # Virtual
       osaka-linode-01  = libx.deploy { hostname = "osaka-linode-01"; };
       nixos-vm-01      = libx.deploy { hostname = "nixos-vm-01"; };
-      # Physical
       framework-server = libx.deploy { hostname = "framework-server"; };
-      # nixos-desktop    = libx.deploy { hostname = "nixos-desktop"; };
       nixos-framework  = libx.deploy { hostname = "nixos-framework"; };
       nixos-rpi4-01    = libx.deploy { hostname = "nixos-rpi4-01"; platform = "aarch64-linux"; };
       nixos-rpi4-02    = libx.deploy { hostname = "nixos-rpi4-02"; platform = "aarch64-linux"; };
diff --git a/lib/deploy-rs.nix b/lib/deploy-rs.nix
deleted file mode 100644
index c7900245..00000000
--- a/lib/deploy-rs.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-let deploy-rs-lock  = (builtins.fromJSON (builtins.readFile ../flake.lock)).nodes.deploy-rs.locked;
-in import (fetchTarball {
-    url = "https://github.com/serokell/deploy-rs/archive/${deploy-rs-lock.rev}.tar.gz";
-    sha256 = deploy-rs-lock.narHash;
-})
\ No newline at end of file
diff --git a/lib/nixpkgs.nix b/lib/nixpkgs.nix
deleted file mode 100644
index bf0ce060..00000000
--- a/lib/nixpkgs.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-let nixpkgs-lock  = (builtins.fromJSON (builtins.readFile ../flake.lock)).nodes.nixpkgs.locked;
-in import (fetchTarball {
-    url = "https://github.com/nixos/nixpkgs/archive/${nixpkgs-lock.rev}.tar.gz";
-    sha256 = nixpkgs-lock.narHash;
-})
\ No newline at end of file
diff --git a/lib/sops-nix.nix b/lib/sops-nix.nix
deleted file mode 100644
index 89a01a29..00000000
--- a/lib/sops-nix.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-let sops-nix-lock = (builtins.fromJSON (builtins.readFile ../flake.lock)).nodes.sops-nix.locked;
-in import (fetchTarball {
-    url = "https://github.com/Mic92/sops-nix/archive/${sops-nix-lock.rev}.tar.gz";
-    sha256 =  sops-nix-lock.narHash;
-})
\ No newline at end of file
diff --git a/nixos/hosts/framework-server/default.nix b/nixos/hosts/framework-server/default.nix
index 9cead674..a616a688 100644
--- a/nixos/hosts/framework-server/default.nix
+++ b/nixos/hosts/framework-server/default.nix
@@ -1,8 +1,7 @@
-{ inputs, config, lib, pkgs, modulesPath, desktop, username, ... }: {
+{ inputs, config, lib, pkgs, modulesPath, desktop, username, platform, ... }: {
   imports = [ 
     # inputs.nixos-hardware.nixosModules.framework-13-inch-13th-gen-intel
     inputs.nixos-hardware.nixosModules.framework-13th-gen-intel
-    inputs.deploy-rs.deploy-rs
     (modulesPath + "/installer/scan/not-detected.nix")
     ./disks.nix
     ../../common/modules/secureboot.nix
@@ -15,6 +14,10 @@
     ./cron.nix
   ] ++ lib.optional (builtins.isString desktop) ./rdesktop.nix;
 
+    environment.systemPackages =  [
+      inputs.deploy-rs.packages.${platform}.deploy-rs
+    ];
+
   # steam , etc
   nixpkgs.config.allowUnfree = true;