flake.lock

@@ -24,11 +24,11 @@
     },
     "bleedingpkgs": {
       "locked": {
-        "lastModified": 1724654909,
-        "narHash": "sha256-otsBriUWjxgJae6DwjsEO4TUQkEhtLmXxLUlqRK1HrU=",
+        "lastModified": 1724581532,
+        "narHash": "sha256-h9a24T9AE4/kIsK1m6zoeEo8XyRDI83sVXQS4OOmVfk=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a64bbc6c1b77d2012b50370bc33102cb4ed0418c",
+        "rev": "cefe8a71e78741c16e88181c8cdf467d07a4b401",
         "type": "github"
       },
       "original": {
@@ -463,11 +463,11 @@
     "homebrew-cask": {
       "flake": false,
       "locked": {
-        "lastModified": 1724652617,
-        "narHash": "sha256-/iCv+iXkc6pnAQVb3K/ofJvAbnMz0s4Fx7bQQoMTDVs=",
+        "lastModified": 1724579842,
+        "narHash": "sha256-izixjuJn9JjWhmfRXCSVSODosdNcK0nEZVDWzk8+vJ0=",
         "owner": "homebrew",
         "repo": "homebrew-cask",
-        "rev": "05f6a38cd2c3fa5e7e6c38b573cbb8fe6615d2d6",
+        "rev": "f3046f799c32d169398e9940d00018c3535ec8f6",
         "type": "github"
       },
       "original": {
@@ -479,11 +479,11 @@
     "homebrew-core": {
       "flake": false,
       "locked": {
-        "lastModified": 1724654372,
-        "narHash": "sha256-8kuJn915lC4NZn1q9P6x5O0oejbAQOUbkQknnaxfau8=",
+        "lastModified": 1724581596,
+        "narHash": "sha256-/IEFvoNS7LM3mVIUvmKyekFTByORdTkcTWrmCz3gja8=",
         "owner": "homebrew",
         "repo": "homebrew-core",
-        "rev": "0ef0cd2c850c85d264922569d37badedcf701c9b",
+        "rev": "0f996959e7c025eb54aa1ada8b43dad0737e78a6",
         "type": "github"
       },
       "original": {
@@ -676,22 +676,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable-small": {
-      "locked": {
-        "lastModified": 1724607561,
-        "narHash": "sha256-7I922FoAJO9P2YRJrxQx1ufQom3wvozJNL/Ul6eEKLI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "8da188f8e754473cb2f5a922bef75a734bfa0fd6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1716330097,
@@ -868,12 +852,10 @@
         "nix-darwin": "nix-darwin",
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs_3",
-        "nixpkgs-unstable-small": "nixpkgs-unstable-small",
         "personal-neovim": "personal-neovim",
         "spicetify": "spicetify",
         "stablepkgs": "stablepkgs",
-        "vesktop-bin": "vesktop-bin",
-        "wallpapers": "wallpapers"
+        "vesktop-bin": "vesktop-bin"
       }
     },
     "rust-overlay": {
@@ -925,11 +907,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1724645793,
-        "narHash": "sha256-z0QdJ8N24msqy6uakRNHpCsrNsswTA9/Evsd3+DOAZc=",
+        "lastModified": 1724559309,
+        "narHash": "sha256-9y3yreHjQyyn8bIQmTx1ZkiNGgq1og/PDUZLiE96iJA=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "2e3b9ea2f89113d71ab57127ca7226253afd2660",
+        "rev": "8d823dea059ec5de57f276360acbd0601b20e433",
         "type": "github"
       },
       "original": {
@@ -1057,11 +1039,11 @@
         "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1724592759,
-        "narHash": "sha256-Nimd8iRzkCHWZuNq1TV3SSP5ZInpPExOwEgeH1gK/S8=",
+        "lastModified": 1724591359,
+        "narHash": "sha256-BOjN/xLegrPM02Uhhs3WyyTvin4tdWC+iBamoA7EtHY=",
         "owner": "youwen5",
         "repo": "vesktop-bin-flake",
-        "rev": "52b8100929743aa051462509142ae7c17409f47d",
+        "rev": "fe8b5fff01426dcb04dee671d228032c6894316f",
         "type": "github"
       },
       "original": {
@@ -1069,22 +1051,6 @@
         "repo": "vesktop-bin-flake",
         "type": "github"
       }
-    },
-    "wallpapers": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1724660030,
-        "narHash": "sha256-l0Z4e7oeYJsvXIaRrlygxyVC7bQcJ5bd5dgH11TvKFg=",
-        "ref": "refs/heads/main",
-        "rev": "abfd5f3522fcac0ace21075b498c9e053165c53f",
-        "revCount": 5,
-        "type": "git",
-        "url": "https://code.youwen.dev/youwen5/wallpapers"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://code.youwen.dev/youwen5/wallpapers"
-      }
     }
   },
   "root": "root",

flake.nix

@@ -3,15 +3,16 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    bleedingpkgs.url = "github:nixos/nixpkgs/master";
-    nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small";
 
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    stablepkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+
+    bleedingpkgs.url = "github:nixos/nixpkgs/master";
+
     nix-darwin = {
       url = "github:LnL7/nix-darwin";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -31,11 +32,6 @@
 
     catppuccin.url = "github:catppuccin/nix";
 
-    # firefox-addons = {
-    #   url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
-
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.1";
 
@@ -61,11 +57,6 @@
     personal-neovim.url = "github:youwen5/neovim-flake";
 
     vesktop-bin.url = "github:youwen5/vesktop-bin-flake";
-
-    wallpapers = {
-      url = "git+https://code.youwen.dev/youwen5/wallpapers";
-      flake = false;
-    };
   };
 
   outputs = {

overlays/default.nix

@@ -5,11 +5,10 @@
 }: let
   stablepkgs = inputs.stablepkgs.legacyPackages.${pkgs.system};
   bleedingpkgs = inputs.bleedingpkgs.legacyPackages.${pkgs.system};
-  nixpkgs-small = inputs.nixpkgs-unstable-small.legacyPackages.${pkgs.system};
 in {
   nixpkgs.overlays = [
     (self: super: {
-      librewolf = nixpkgs-small.librewolf;
+      librewolf = stablepkgs.librewolf;
       manga-tui = bleedingpkgs.manga-tui;
     })
   ];

users/youwen/linux/home.nix

@@ -1,5 +1,5 @@
 {
-  inputs,
+  config,
   pkgs,
   ...
 }: {
@@ -22,7 +22,7 @@
   # '';
 
   home.file.".wallpapers" = {
-    source = inputs.wallpapers;
+    source = ../../../wallpapers;
     recursive = true;
   };
 

users/youwen/linux/programs/default.nix

@@ -1,8 +1,4 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.kitty = {
     enable = true;
     theme = "Tokyo Night";
@@ -35,81 +31,6 @@
       "privacy.clearOnShutdown.cookies" = false;
       "network.cookie.lifetimePolicy" = 0;
     };
+    package = pkgs.librewolf-wayland;
   };
-
-  # programs.firefox = {
-  #   enable = true;
-  #   # package = pkgs.librewolf;
-  #   profiles = {
-  #     Personal = {
-  #       name = "Youwen Wu";
-  #       settings = {
-  #         webgl.disabled = false;
-  #         privacy.resistFingerprinting = false;
-  #         privacy.clearOnShutdown.history = false;
-  #         privacy.clearOnShutdown.cookies = false;
-  #         network.cookie.lifetimePolicy = 0;
-  #         search.default = "Google";
-  #         search.force = true;
-  #         search.engines = {
-  #           "Nix Packages" = {
-  #             urls = [
-  #               {
-  #                 template = "https://search.nixos.org/packages";
-  #                 params = [
-  #                   {
-  #                     name = "type";
-  #                     value = "packages";
-  #                   }
-  #                   {
-  #                     name = "query";
-  #                     value = "{searchTerms}";
-  #                   }
-  #                 ];
-  #               }
-  #             ];
-  #
-  #             icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
-  #             definedAliases = ["@np"];
-  #           };
-  #
-  #           "NixOS Wiki" = {
-  #             urls = [{template = "https://wiki.nixos.org/index.php?search={searchTerms}";}];
-  #             iconUpdateURL = "https://wiki.nixos.org/favicon.png";
-  #             updateInterval = 24 * 60 * 60 * 1000; # every day
-  #             definedAliases = ["@nw"];
-  #           };
-  #
-  #           "Google" = {
-  #             urls = [
-  #               {
-  #                 template = "https://www.google.com/search";
-  #                 params = [
-  #                   {
-  #                     name = "q";
-  #                     value = "{searchTerms}";
-  #                   }
-  #                   {
-  #                     name = "udm";
-  #                     value = "14";
-  #                   }
-  #                 ];
-  #               }
-  #             ];
-  #             definedAliases = ["@g"];
-  #           };
-  #         };
-  #       };
-  #       extensions = with inputs.firefox-addons.packages.${pkgs.system}; [
-  #         ublock-origin
-  #         bitwarden
-  #         vimium
-  #         tabliss
-  #         privacy-badger
-  #         reddit-enhancement-suite
-  #         catppuccin
-  #       ];
-  #     };
-  #   };
-  # };
 }