nix: remove wezterm overlay

flake.nix: remove wezterm flake
tsuki: update hardware
2024-05-02 00:59:31 -04:00 · 2024-05-02 00:59:24 -04:00 · 2024-05-02 00:58:11 -04:00
6 changed files with 22 additions and 229 deletions
--- a/flake.lock
+++ b/flake.lock
@ -523,25 +523,7 @@
    },
    "flake-utils_6": {
      "inputs": {
-        "systems": "systems_14"
-      },
-      "locked": {
-        "lastModified": 1705309234,
-        "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flake-utils_7": {
-      "inputs": {
-        "systems": "systems_17"
+        "systems": "systems_16"
      },
      "locked": {
        "lastModified": 1694529238,
@ -557,23 +539,6 @@
        "type": "github"
      }
    },
-    "freetype2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1675923892,
-        "narHash": "sha256-dOm8VKYdclTLLkqWMLv7DQI0Qyjit7S4SOCszKEkG3o=",
-        "owner": "wez",
-        "repo": "freetype2",
-        "rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11",
-        "type": "github"
-      },
-      "original": {
-        "owner": "wez",
-        "repo": "freetype2",
-        "rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11",
-        "type": "github"
-      }
-    },
    "fromYaml": {
      "flake": false,
      "locked": {
@ -628,23 +593,6 @@
        "type": "github"
      }
    },
-    "harfbuzz": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1677798343,
-        "narHash": "sha256-Lsd0Vrkrv67CMyV0ZveShfjUvqh/jDhI8rAK9ps+SZQ=",
-        "owner": "harfbuzz",
-        "repo": "harfbuzz",
-        "rev": "60841e26187576bff477c1a09ee2ffe544844abc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "harfbuzz",
-        "repo": "harfbuzz",
-        "rev": "60841e26187576bff477c1a09ee2ffe544844abc",
-        "type": "github"
-      }
-    },
    "helix": {
      "inputs": {
        "crane": "crane_2",
@ -994,7 +942,7 @@
          "xdg-portal-hyprland",
          "nixpkgs"
        ],
-        "systems": "systems_15"
+        "systems": "systems_14"
      },
      "locked": {
        "lastModified": 1713121246,
@ -1068,23 +1016,6 @@
        "type": "github"
      }
    },
-    "libpng": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1549245649,
-        "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=",
-        "owner": "glennrp",
-        "repo": "libpng",
-        "rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
-        "type": "github"
-      },
-      "original": {
-        "owner": "glennrp",
-        "repo": "libpng",
-        "rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
-        "type": "github"
-      }
-    },
    "nix-gaming": {
      "inputs": {
        "flake-parts": "flake-parts_3",
@ -1317,22 +1248,6 @@
      }
    },
    "nixpkgs_16": {
-      "locked": {
-        "lastModified": 1705403940,
-        "narHash": "sha256-bl7E3w35Bleiexg01WsN0RuAQEL23HaQeNBC2zjt+9w=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "f0326542989e1bdac955ad6269b334a8da4b0c95",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_17": {
      "locked": {
        "lastModified": 1712963716,
        "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
@ -1348,7 +1263,7 @@
        "type": "github"
      }
    },
-    "nixpkgs_18": {
+    "nixpkgs_17": {
      "locked": {
        "lastModified": 1701174899,
        "narHash": "sha256-1W+FMe8mWsJKXoBc+QgKmEeRj33kTFnPq7XCjU+bfnA=",
@ -1554,7 +1469,6 @@
        "pre-commit-hooks": "pre-commit-hooks",
        "sops-nix": "sops-nix",
        "stylix": "stylix",
-        "wezterm": "wezterm",
        "xdg-portal-hyprland": "xdg-portal-hyprland",
        "yazi": "yazi"
      }
@ -1607,31 +1521,6 @@
      }
    },
    "rust-overlay_3": {
-      "inputs": {
-        "flake-utils": [
-          "wezterm",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "wezterm",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1705457855,
-        "narHash": "sha256-5cCHQtP/PEHK1YNTQyZN9v8ehpLTjc723ZSKAP3Tva8=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "a854609265af0e9f48c92e497679edf8fab9e690",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_4": {
      "inputs": {
        "flake-utils": [
          "yazi",
@ -1782,16 +1671,16 @@
    },
    "systems_14": {
      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
        "type": "github"
      },
      "original": {
        "owner": "nix-systems",
-        "repo": "default",
+        "repo": "default-linux",
        "type": "github"
      }
    },
@ -1811,21 +1700,6 @@
      }
    },
    "systems_16": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_17": {
      "locked": {
        "lastModified": 1681028828,
        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1978,33 +1852,6 @@
        "type": "github"
      }
    },
-    "wezterm": {
-      "inputs": {
-        "flake-utils": "flake-utils_6",
-        "freetype2": "freetype2",
-        "harfbuzz": "harfbuzz",
-        "libpng": "libpng",
-        "nixpkgs": "nixpkgs_16",
-        "rust-overlay": "rust-overlay_3",
-        "zlib": "zlib"
-      },
-      "locked": {
-        "dir": "nix",
-        "lastModified": 1707245719,
-        "narHash": "sha256-+1jfdBwyp6q6gW9FOft90w39zThLvhHvN/yymlv2OVs=",
-        "owner": "notohh",
-        "repo": "wezterm",
-        "rev": "4bdd59cc81a63f253e0dd201acc39013288b6cda",
-        "type": "github"
-      },
-      "original": {
-        "dir": "nix",
-        "owner": "notohh",
-        "ref": "nix-add-overlay",
-        "repo": "wezterm",
-        "type": "github"
-      }
-    },
    "wlroots": {
      "flake": false,
      "locked": {
@ -2026,8 +1873,8 @@
      "inputs": {
        "hyprland-protocols": "hyprland-protocols_2",
        "hyprlang": "hyprlang_6",
-        "nixpkgs": "nixpkgs_17",
-        "systems": "systems_16"
+        "nixpkgs": "nixpkgs_16",
+        "systems": "systems_15"
      },
      "locked": {
        "lastModified": 1713214484,
@ -2078,9 +1925,9 @@
    },
    "yazi": {
      "inputs": {
-        "flake-utils": "flake-utils_7",
-        "nixpkgs": "nixpkgs_18",
-        "rust-overlay": "rust-overlay_4"
+        "flake-utils": "flake-utils_6",
+        "nixpkgs": "nixpkgs_17",
+        "rust-overlay": "rust-overlay_3"
      },
      "locked": {
        "lastModified": 1713309288,
@ -2095,23 +1942,6 @@
        "repo": "yazi",
        "type": "github"
      }
-    },
-    "zlib": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1484501380,
-        "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=",
-        "owner": "madler",
-        "repo": "zlib",
-        "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "madler",
-        "repo": "zlib",
-        "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
-        "type": "github"
-      }
    }
  },
  "root": "root",
--- a/flake.nix
+++ b/flake.nix
@ -73,7 +73,6 @@
    yazi.url = "github:sxyazi/yazi";
    helix.url = "github:helix-editor/helix";
    pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
-    wezterm.url = "github:notohh/wezterm?dir=nix&ref=nix-add-overlay";
    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
    atuin.url = "github:atuinsh/atuin";
    flake-parts.url = "github:hercules-ci/flake-parts";
--- a/hosts/tsuki/disko-config.nix
+++ b/hosts/tsuki/disko-config.nix
@ -1,33 +0,0 @@
-{
-  disko.devices = {
-    disk = {
-      nvme0n1 = {
-        device = "/dev/nvme0n1";
-        type = "disk";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              end = "500M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-              };
-            };
-            root = {
-              name = "root";
-              end = "-0";
-              content = {
-                type = "filesystem";
-                format = "bcachefs";
-                mountpoint = "/";
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
--- a/hosts/tsuki/hardware.nix
+++ b/hosts/tsuki/hardware.nix
@ -6,7 +6,6 @@
 }: {
  imports = [
    (modulesPath + "/installer/scan/not-detected.nix")
-    #  ./disko-config.nix
  ];

  boot = {
@ -29,20 +28,19 @@
  };

  fileSystems = {
+    "/" = {
+      device = "/dev/disk/by-uuid/a423d32f-ac5d-4ea2-82fb-f94b05afce29";
+      fsType = "ext4";
+    };
+    "/boot/efi" = {
+      device = "/dev/disk/by-uuid/FEAF-138A";
+      fsType = "vfat";
+    };
    "/nas/restic" = {
      device = "192.168.1.199:/mnt/Sutoreji/nix-restic-data/tsuki";
      fsType = "nfs";
    };
-    "/nas/ISOS" = {
-      device = "192.168.1.199:/mnt/Sutoreji/ISOS";
-      fsType = "nfs";
-    };
-    "/nas/osu-backups" = {
-      device = "192.168.1.199:/mnt/Sutoreji/osu-backups";
-      fsType = "nfs";
-    };
  };
-
  networking.useDHCP = lib.mkDefault true;

  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
--- a/hosts/tsuki/services/default.nix
+++ b/hosts/tsuki/services/default.nix
@ -1,7 +1,7 @@
 {...}: {
  imports = [
    ./restic.nix
-    ./atticd.nix
+    #   ./atticd.nix
    ./hydroxide.nix
  ];
 }
--- a/modules/nix.nix
+++ b/modules/nix.nix
@ -4,7 +4,6 @@
      inputs.nur.overlay
      inputs.helix.overlays.default
      inputs.yazi.overlays.default
-      inputs.wezterm.overlays.default
      inputs.hyprland.overlays.default
      inputs.hypridle.overlays.default
      inputs.hyprlock.overlays.default
Author	SHA1	Message	Date
notohh	f8ef5a4cdb	nix: remove wezterm overlay	2024-05-02 00:59:31 -04:00
notohh	b63f4aadfa	flake.nix: remove wezterm flake	2024-05-02 00:59:24 -04:00
notohh	d8ad686e7b	tsuki: update hardware	2024-05-02 00:58:11 -04:00