chore: re-enable vesktop

flake.lock

@@ -24,11 +24,11 @@
     },
     "bleedingpkgs": {
       "locked": {
-        "lastModified": 1724117083,
-        "narHash": "sha256-26Zgap4D9E8PRL9jvc4Df9POMNGFS9fMwKz+SiGrlXI=",
+        "lastModified": 1724276371,
+        "narHash": "sha256-AEK+0c0mJm75fci44x9kmzGf70cQJPZduZsrrbPKiUc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "44f636f8cb95238dabd5f33d00557329c0681cd5",
+        "rev": "79ac163d665a38a8af4164cf094b12e2098f641a",
         "type": "github"
       },
       "original": {
@@ -57,11 +57,11 @@
     },
     "catppuccin": {
       "locked": {
-        "lastModified": 1724048768,
-        "narHash": "sha256-OZ9OXsPQi+fNdMM7SBPtU8OB1ntLzOvUwA/3zYJY6Eo=",
+        "lastModified": 1724156255,
+        "narHash": "sha256-rpUCeS/QZwQdJmDrvCm0hRi8bFvQNQKAnIMK5ZDBfpM=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "ff4128f8ea57879050145cf077a27b9d3a9cbf33",
+        "rev": "8886a68edadb1d93c7101337f995ffce4b410ff2",
         "type": "github"
       },
       "original": {
@@ -404,11 +404,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1724120139,
-        "narHash": "sha256-vVE53gBCJPc3/dj7OHvQ7mNuUk1bWVpNR4c0jKe+K9U=",
+        "lastModified": 1724275186,
+        "narHash": "sha256-cMp8ILGJnvcX04teLdSwL2Mj7+JKQ4mlraWhH3hACKM=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "606d3429e6fae79849c0eaf4bbcf05ff1570051a",
+        "rev": "730d44f4edad75035f6c5a9bd51e89271af4b79e",
         "type": "github"
       },
       "original": {
@@ -420,11 +420,11 @@
     "homebrew-core": {
       "flake": false,
       "locked": {
-        "lastModified": 1724119620,
-        "narHash": "sha256-p+M24z3IDeIJBppaWWTpaz63WMGvi3HGW/mQHQVYpgM=",
+        "lastModified": 1724271049,
+        "narHash": "sha256-5EQuQNjx6fKq5Ar2QGyDlvE5EvBhJjTEAdAc4bIlY20=",
         "owner": "homebrew",
         "repo": "homebrew-core",
-        "rev": "cd06a79081ce6e08b475e01315cdf1cb51952d77",
+        "rev": "3065f857bbf9b8b175ba4222d26d3ad8ca2a71f8",
         "type": "github"
       },
       "original": {
@@ -433,22 +433,6 @@
         "type": "github"
       }
     },
-    "hyprland-stable": {
-      "locked": {
-        "lastModified": 1723474844,
-        "narHash": "sha256-9dyLWfx/PruwHjCZhIvY3jBdNfhID1AbsSU6Wkn284k=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6404fe89d602c9511c08f4978bcb214032cd3cfc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "6404fe89d602c9511c08f4978bcb214032cd3cfc",
-        "type": "github"
-      }
-    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -518,11 +502,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1723859949,
-        "narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=",
+        "lastModified": 1724219898,
+        "narHash": "sha256-7PwlnEQDIbww8+nk0CHLeYTYMA23F/CkynHsX7Mxk+s=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "076b9a905af8a52b866c8db068d6da475839d97b",
+        "rev": "d6703b988728b89456b32bac242c8689902e5a5b",
         "type": "github"
       },
       "original": {
@@ -667,11 +651,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1724118730,
-        "narHash": "sha256-UwtVD2FyD7FjfLLmqGLsCBCQgLC1Jj78e1PhiVb0MJk=",
+        "lastModified": 1724222231,
+        "narHash": "sha256-IFlMn1lgVsZQZC9WklY9YKcCdI0mUxSYZ7EfkaKCsQU=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "39081a41067a7bdb66f6f85a3fee9693ff8a21b1",
+        "rev": "b7f419a759f70126e220533b724cc17e8528b184",
         "type": "github"
       },
       "original": {
@@ -737,7 +721,6 @@
         "home-manager": "home-manager",
         "homebrew-cask": "homebrew-cask",
         "homebrew-core": "homebrew-core",
-        "hyprland-stable": "hyprland-stable",
         "lanzaboote": "lanzaboote",
         "lix-module": "lix-module",
         "nix-darwin": "nix-darwin",
@@ -790,11 +773,11 @@
     },
     "stablepkgs": {
       "locked": {
-        "lastModified": 1723938990,
-        "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=",
+        "lastModified": 1724098845,
+        "narHash": "sha256-D5HwjQw/02fuXbR4LCTo64koglP2j99hkDR79/3yLOE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890",
+        "rev": "f1bad50880bae73ff2d82fafc22010b4fc097a9c",
         "type": "github"
       },
       "original": {

flake.nix

@@ -53,8 +53,6 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    hyprland-stable.url = "github:nixos/nixpkgs/6404fe89d602c9511c08f4978bcb214032cd3cfc";
   };
 
   outputs = {
@@ -90,8 +88,10 @@
       };
 
       callisto = nixpkgs.lib.nixosSystem {
-        specialArgs = {inherit inputs;};
-        system = "aarch64-linux";
+        specialArgs = {
+          inherit inputs;
+          system = "aarch64-linux";
+        };
         modules = [
           ./hosts/callisto
         ];

hosts/callisto/default.nix

@@ -1,4 +1,8 @@
-{inputs, ...}: {
+{
+  inputs,
+  system,
+  ...
+}: {
   imports = with inputs; [
     ./configuration.nix
     ../../modules/nixos/audio
@@ -16,6 +20,10 @@
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
       home-manager.backupFileExtension = "backup";
+      home-manager.extraSpecialArgs = {
+        inherit inputs;
+        inherit system;
+      };
       home-manager.users.youwen = {
         imports = [
           ../../users/youwen/common

hosts/callisto/hardware-configuration.nix

@@ -1,32 +1,32 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
 {
-  config,
-  lib,
-  pkgs,
-  modulesPath,
-  ...
-}: {
-  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = ["usb_storage" "sdhci_pci"];
-  boot.initrd.kernelModules = [];
-  boot.kernelModules = [];
-  boot.extraModulePackages = [];
+  boot.initrd.availableKernelModules = [ "usb_storage" "sdhci_pci" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/bc88058e-6e3a-4987-b78e-e19cb5611608";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/mapper/crypted";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/852F-07F1";
-    fsType = "vfat";
-    options = ["fmask=0022" "dmask=0022"];
-  };
+  boot.initrd.luks.devices."crypted".device = "/dev/disk/by-uuid/f4c552be-a4c2-4ca0-aec6-ed692d78fe24";
 
-  swapDevices = [];
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/852F-07F1";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
+    };
+
+  swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

hosts/callisto/hardware-configuration.nix.old

@@ -0,0 +1,39 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}: {
+  imports = [(modulesPath + "/installer/scan/not-detected.nix")];
+
+  boot.initrd.availableKernelModules = ["usb_storage" "sdhci_pci"];
+  boot.initrd.kernelModules = [];
+  boot.kernelModules = [];
+  boot.extraModulePackages = [];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/bc88058e-6e3a-4987-b78e-e19cb5611608";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/852F-07F1";
+    fsType = "vfat";
+    options = ["fmask=0022" "dmask=0022"];
+  };
+
+  swapDevices = [];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlan0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
+}

users/youwen/linux/hyprland/common.nix

@@ -6,7 +6,7 @@
 }: {
   wayland.windowManager.hyprland = {
     enable = true;
-    package = inputs.hyprland-stable.legacyPackages.${system}.hyprland;
+    package = inputs.stablepkgs.legacyPackages.${system}.hyprland;
     settings = {
       exec-once = ["waypaper --restore"];
       "$mod" = "SUPER";