flake.lock

@@ -157,22 +157,6 @@
         "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
       }
     },
-    "flake-compat_4": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -743,7 +727,6 @@
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs_3",
         "nixvim": "nixvim",
-        "spicetify": "spicetify",
         "stablepkgs": "stablepkgs"
       }
     },
@@ -788,27 +771,6 @@
         "type": "github"
       }
     },
-    "spicetify": {
-      "inputs": {
-        "flake-compat": "flake-compat_4",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1724472954,
-        "narHash": "sha256-65NfzEvwdJGHsOZA+w4AUFUG10RyfuQltct3h++gsw0=",
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "rev": "3caf2a241f7af52419ce97c6682b0467219ab914",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Gerg-L",
-        "repo": "spicetify-nix",
-        "type": "github"
-      }
-    },
     "stablepkgs": {
       "locked": {
         "lastModified": 1724098845,

flake.nix

@@ -53,16 +53,20 @@
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    spicetify = {
-      url = "github:Gerg-L/spicetify-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = {
+    self,
     nixpkgs,
+    home-manager,
+    catppuccin,
+    lanzaboote,
+    stablepkgs,
+    bleedingpkgs,
+    lix-module,
     nix-darwin,
+    nix-homebrew,
+    apple-silicon,
     ...
   } @ inputs: let
   in {

hosts/demeter/default.nix

@@ -11,7 +11,6 @@
     ../../modules/nixos/fonts
     ../../modules/nixos/greeter
     ../../modules/nixos/core
-    ../../modules/nixos/hamachi
     ../../overlays
 
     catppuccin.nixosModules.catppuccin
@@ -34,7 +33,6 @@
           ../../users/youwen/common/neofetch
           ../../users/youwen/common/neovim
           ../../users/youwen/common
-          ../../users/youwen/linux/spicetify
           ./home-manager-extras
           catppuccin.homeManagerModules.catppuccin
           nixvim.homeManagerModules.nixvim

modules/nixos/hamachi/default.nix

@@ -1,4 +0,0 @@
-{
-  services.logmein-hamachi.enable = true;
-  programs.haguichi.enable = true;
-}

modules/nixos/networking/default.nix

@@ -1,19 +1,6 @@
-let
+{
-  universalAllowedPorts = [27016 42805];
-  universalAllowedRanges = [
-    {
-      from = 42852;
-      to = 42872;
-    }
-  ];
-in {
   services.openssh.enable = true;
-  networking.firewall = {
+  # networking.firewall.allowedTCPPorts = [ ... ];
-    allowedTCPPorts = universalAllowedPorts;
+  # networking.firewall.allowedUDPPorts = [ ... ];
-    allowedUDPPorts = universalAllowedPorts;
-    allowedUDPPortRanges = universalAllowedRanges;
-    allowedTCPPortRanges = universalAllowedRanges;
-  };
-  networking.firewall.enable = true;
   networking.nameservers = ["1.1.1.1" "1.0.0.1"];
 }

users/youwen/linux/hyprland/common.nix

@@ -43,7 +43,6 @@
         "$mod, T, exec, kitty"
         "$mod, E, exec, dolphin"
         "$mod, R, exec, pavucontrol"
-        "$mod, M, exec, thunderbird"
 
         # Window actions
         "$mod, Q, killactive"

users/youwen/linux/packages/x86_64/default.nix

@@ -4,6 +4,7 @@ in {
   home.packages =
     (createCommon pkgs)
     ++ (with pkgs; [
+      spotify
       bitwarden-desktop
       modrinth-app
       lutris

users/youwen/linux/spicetify/default.nix

@@ -1,20 +0,0 @@
-{
-  inputs,
-  pkgs,
-  ...
-}: let
-  spicepkgs = inputs.spicetify.legacyPackages.${pkgs.system};
-in {
-  imports = [
-    inputs.spicetify.homeManagerModules.default
-  ];
-
-  programs.spicetify = {
-    enable = true;
-    theme = spicepkgs.themes.catppuccin;
-    colorScheme = "mocha";
-    enabledExtensions = with spicepkgs.extensions; [
-      lastfm
-    ];
-  };
-}