Compare commits

..

3 commits

Author SHA1 Message Date
github-actions[bot]
f87615ef70 flake.lock: Update
Flake lock file updates:

• Updated input 'apple-silicon':
    'github:nix-community/nixos-apple-silicon/3ddc251d2acce5019b0fa770e224d068610a34e4?narHash=sha256-dav2hzyCmXZ3n6lEZrfZBG51%2Bg6PUhkzRl3d6Ypd9x0%3D' (2025-05-31)
  → 'github:nix-community/nixos-apple-silicon/eba4b40c816e5aff8951ae231ac237e8aab8ec1d?narHash=sha256-EE3NBsej517VRa1x%2BylAghrvngftxf1KgfHlE9OYyXE%3D' (2025-07-04)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569?narHash=sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98%3D' (2025-06-08)
  → 'github:hercules-ci/flake-parts/77826244401ea9de6e3bac47c2db46005e1f30b5?narHash=sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ%3D' (2025-07-01)
• Updated input 'home-manager':
    'github:nix-community/home-manager/ff31a4677c1a8ae506aa7e003a3dba08cb203f82?narHash=sha256-DTCCcp6WCFaYXWKFRA6fiI2zlvOLCf5Vwx8%2B/0R8Wc4%3D' (2025-06-24)
  → 'github:nix-community/home-manager/8b0180dde1d6f4cf632e046309e8f963924dfbd0?narHash=sha256-qBGNn7T/zOgUDQTo/RM/D2oxMkB2x36j3ajvpVanEVs%3D' (2025-07-06)
• Updated input 'homebrew-cask':
    'github:homebrew/homebrew-cask/50bc3e3366f7ffa9dc12d42ad4eede9ce483b68d?narHash=sha256-1KjCh/cug/MvGDeJtAbkpxJ0zsm6/T0GlyUdcT8Cs0I%3D' (2025-06-25)
  → 'github:homebrew/homebrew-cask/5dca1c162b0bd3fc91c9035d41be00df629a14ca?narHash=sha256-fFsGoD37BEJ%2BxEwJV8ixGqJbDF2XWlNHWN7D4NkIuIc%3D' (2025-07-06)
• Updated input 'homebrew-core':
    'github:homebrew/homebrew-core/86573ce7eab42960abd78e568dffb8e1060f17b6?narHash=sha256-X4Wb1F6mMSQEMyCyyUEhdJLq3pzF6WsbiKUgbJEzLPk%3D' (2025-06-25)
  → 'github:homebrew/homebrew-core/5ebe6deb98aff153df53aec524710756c41e1102?narHash=sha256-jvC8mqTESUbuveVCECi/OTPZA/qxoApL3b6TY1Ecz%2B4%3D' (2025-07-06)
• Updated input 'nix-darwin':
    'github:LnL7/nix-darwin/1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5?narHash=sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E%3D' (2025-06-22)
  → 'github:LnL7/nix-darwin/e04a388232d9a6ba56967ce5b53a8a6f713cdfcf?narHash=sha256-HsJM3XLa43WpG%2B665aGEh8iS8AfEwOIQWk3Mke3e7nk%3D' (2025-06-30)
• Updated input 'nix-flatpak':
    'github:gmodena/nix-flatpak/64c6e53a3999957c19ab95cda78bde466d8374cc?narHash=sha256-WbWkzIvB0gqAdBLghdmUpGveY7MlAS2iMj3VEJnJ9yE%3D' (2025-06-08)
  → 'github:gmodena/nix-flatpak/59adb9ad1cbd915494fc35cd0e0a9d582ca9de74?narHash=sha256-oOYrnKStMsOXST%2BwKnzuSZ49h8Dr1Q3mIn2f5Kb5GAw%3D' (2025-06-30)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/78cd697acc2e492b4e92822a4913ffad279c20e6?narHash=sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM%3D' (2025-06-22)
  → 'github:nix-community/nix-index-database/9c932ae632d6b5150515e5749b198c175d8565db?narHash=sha256-3EKpUmyGmHYA/RuhZjINTZPU%2BOFWko0eDwazUOW64nw%3D' (2025-06-29)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4b1164c3215f018c4442463a27689d973cffd750?narHash=sha256-Z0djmTa1YmnGMfE9jEe05oO4zggjDmxOGKwt844bUhE%3D' (2025-06-24)
  → 'github:nixos/nixpkgs/5c724ed1388e53cc231ed98330a60eb2f7be4be3?narHash=sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8%2B%2BxWA8itO4%3D' (2025-07-04)
• Updated input 'nur':
    'github:nix-community/NUR/0ad40a3e8e4fdc34bb5b1f41fac70ccf6177eff9?narHash=sha256-llpKr%2BIAdof5D0XWXjPIIYpPUC4liarc3k9pNx%2BXveQ%3D' (2025-06-25)
  → 'github:nix-community/NUR/feddc752c19779132fa6b904b2cb261e0e29e77a?narHash=sha256-gARxzPFRzgIV8IURddZP65AAPMuiXU3DqResBrunvz8%3D' (2025-07-05)
• Removed input 'nur/treefmt-nix'
• Removed input 'nur/treefmt-nix/nixpkgs'
• Updated input 'spicetify':
    'github:Gerg-L/spicetify-nix/e32285f5d1dfc184b039a813644e226c3914e7d7?narHash=sha256-GVNXxMZynKZt%2B83QQQEVXscqtkJbScvaBrwianovUW4%3D' (2025-06-22)
  → 'github:Gerg-L/spicetify-nix/16adc163d966fc2bb5da47580df4602ae2c7a310?narHash=sha256-SeVvQm9ex%2B6BhDPIsRt9E1kSmMblQ6gTi53baphnX08%3D' (2025-06-29)
• Updated input 'stylix':
    'github:danth/stylix/a6eff346d8e346b5a8e7eb3f8f7c4b36c9597a3c?narHash=sha256-YVh5IuhJJiX5eQmCsQZ/jKx2viwYbrm47E%2BY1ecHSMs%3D' (2025-06-25)
  → 'github:danth/stylix/606944b16862d43934fec3311f9cb9f478b7f99b?narHash=sha256-x1uJ6wQ7C%2BN/Zx9liQzjyVOEwGf5tcKogSoGgxASZOg%3D' (2025-07-04)
• Updated input 'stylix/gnome-shell':
    'github:GNOME/gnome-shell/52c517c8f6c199a1d6f5118fae500ef69ea845ae?narHash=sha256-0RJ4mJzf%2BklKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew%3D' (2025-04-13)
  → 'github:GNOME/gnome-shell/8c88f917db0f1f0d80fa55206c863d3746fa18d0?narHash=sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0%3D' (2025-05-25)
• Updated input 'stylix/home-manager':
    'github:nix-community/home-manager/5675a9686851d9626560052a032c4e14e533c1fa?narHash=sha256-5kvBbLYdp%2Bn7Ftanjcs6Nv%2BUO6sBhelp6MIGJ9nWmjQ%3D' (2025-06-01)
  → 'github:nix-community/home-manager/76d0c31fce2aa0c71409de953e2f9113acd5b656?narHash=sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU%3D' (2025-06-28)
• Updated input 'zen-browser':
    'github:youwen5/zen-browser-flake/18d6cd2f5a9cd1527d478d4f716e9b9ee6fb6cbb?narHash=sha256-wce%2BerYDBm6wpLJm6IJh85KYqy/NtdKp6DZQCn4YP1Q%3D' (2025-06-18)
  → 'github:youwen5/zen-browser-flake/b5d422dc2b28eb77a21fbdf60aca9a6e63d5a1ab?narHash=sha256-6kYe6ozYDvsHAxV1zbSxg0oRWF4TzTfOUUJsR6MJlYY%3D' (2025-07-05)
2025-07-06 00:39:18 +00:00
16bcf4b85a
chore(callisto): set time zone and enable mullvad vpn 2025-07-01 22:42:35 -07:00
ec85fd633f
feat: enable systemd-resolved 2025-07-01 22:42:28 -07:00
3 changed files with 57 additions and 71 deletions

118
flake.lock generated
View file

@ -74,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748659443, "lastModified": 1751622568,
"narHash": "sha256-dav2hzyCmXZ3n6lEZrfZBG51+g6PUhkzRl3d6Ypd9x0=", "narHash": "sha256-EE3NBsej517VRa1x+ylAghrvngftxf1KgfHlE9OYyXE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-apple-silicon", "repo": "nixos-apple-silicon",
"rev": "3ddc251d2acce5019b0fa770e224d068610a34e4", "rev": "eba4b40c816e5aff8951ae231ac237e8aab8ec1d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -326,11 +326,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749398372, "lastModified": 1751413152,
"narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -446,16 +446,16 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744584021, "lastModified": 1748186689,
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "GNOME", "owner": "GNOME",
"ref": "48.1", "ref": "48.2",
"repo": "gnome-shell", "repo": "gnome-shell",
"type": "github" "type": "github"
} }
@ -489,11 +489,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751146119, "lastModified": 1751760902,
"narHash": "sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU=", "narHash": "sha256-qBGNn7T/zOgUDQTo/RM/D2oxMkB2x36j3ajvpVanEVs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "76d0c31fce2aa0c71409de953e2f9113acd5b656", "rev": "8b0180dde1d6f4cf632e046309e8f963924dfbd0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -510,11 +510,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748737919, "lastModified": 1751146119,
"narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "narHash": "sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5675a9686851d9626560052a032c4e14e533c1fa", "rev": "76d0c31fce2aa0c71409de953e2f9113acd5b656",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -526,11 +526,11 @@
"homebrew-cask": { "homebrew-cask": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1751137566, "lastModified": 1751761814,
"narHash": "sha256-gs7kNlWUBZALAe4nUzfBLtzYrTqc+RnmqvpMlkff6+E=", "narHash": "sha256-fFsGoD37BEJ+xEwJV8ixGqJbDF2XWlNHWN7D4NkIuIc=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-cask", "repo": "homebrew-cask",
"rev": "8dea2358bca3dc55c8b562b69765b25189cce353", "rev": "5dca1c162b0bd3fc91c9035d41be00df629a14ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -542,11 +542,11 @@
"homebrew-core": { "homebrew-core": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1751148439, "lastModified": 1751761822,
"narHash": "sha256-7E/PggJcX4ezFeufDeXhiMVgWy+akCX6yszDbDoi8ss=", "narHash": "sha256-jvC8mqTESUbuveVCECi/OTPZA/qxoApL3b6TY1Ecz+4=",
"owner": "homebrew", "owner": "homebrew",
"repo": "homebrew-core", "repo": "homebrew-core",
"rev": "c7fac280ef6b96c8df34be6a530a2506fed5e6d2", "rev": "5ebe6deb98aff153df53aec524710756c41e1102",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -634,11 +634,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750618568, "lastModified": 1751313918,
"narHash": "sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E=", "narHash": "sha256-HsJM3XLa43WpG+665aGEh8iS8AfEwOIQWk3Mke3e7nk=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5", "rev": "e04a388232d9a6ba56967ce5b53a8a6f713cdfcf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -649,11 +649,11 @@
}, },
"nix-flatpak": { "nix-flatpak": {
"locked": { "locked": {
"lastModified": 1749394952, "lastModified": 1751276396,
"narHash": "sha256-WbWkzIvB0gqAdBLghdmUpGveY7MlAS2iMj3VEJnJ9yE=", "narHash": "sha256-oOYrnKStMsOXST+wKnzuSZ49h8Dr1Q3mIn2f5Kb5GAw=",
"owner": "gmodena", "owner": "gmodena",
"repo": "nix-flatpak", "repo": "nix-flatpak",
"rev": "64c6e53a3999957c19ab95cda78bde466d8374cc", "rev": "59adb9ad1cbd915494fc35cd0e0a9d582ca9de74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -687,11 +687,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750565152, "lastModified": 1751170039,
"narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=", "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "78cd697acc2e492b4e92822a4913ffad279c20e6", "rev": "9c932ae632d6b5150515e5749b198c175d8565db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -770,11 +770,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1751011381, "lastModified": 1751637120,
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -807,15 +807,14 @@
], ],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ]
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1751150016, "lastModified": 1751754818,
"narHash": "sha256-aaNJgaEXYMsdmLG38YyCO0eZdTf49Cj0TZsW4gpn9jg=", "narHash": "sha256-gARxzPFRzgIV8IURddZP65AAPMuiXU3DqResBrunvz8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "c3c9ee3b26349abe162df39499ec587f453ce089", "rev": "feddc752c19779132fa6b904b2cb261e0e29e77a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -834,7 +833,7 @@
"stylix", "stylix",
"nixpkgs" "nixpkgs"
], ],
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1748730660, "lastModified": 1748730660,
@ -976,11 +975,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1750567035, "lastModified": 1751171964,
"narHash": "sha256-GVNXxMZynKZt+83QQQEVXscqtkJbScvaBrwianovUW4=", "narHash": "sha256-SeVvQm9ex+6BhDPIsRt9E1kSmMblQ6gTi53baphnX08=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "e32285f5d1dfc184b039a813644e226c3914e7d7", "rev": "16adc163d966fc2bb5da47580df4602ae2c7a310",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1015,11 +1014,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1751145558, "lastModified": 1751656637,
"narHash": "sha256-OPlbpH64jzIspYqvJB96tnN9V9HBlAxROS5ijQwtN70=", "narHash": "sha256-x1uJ6wQ7C+N/Zx9liQzjyVOEwGf5tcKogSoGgxASZOg=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "3a09d3f5cb940fa4142a2f3415b508a8be92b721", "rev": "606944b16862d43934fec3311f9cb9f478b7f99b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1193,27 +1192,6 @@
} }
}, },
"treefmt-nix": { "treefmt-nix": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
@ -1315,11 +1293,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750219862, "lastModified": 1751688498,
"narHash": "sha256-wce+erYDBm6wpLJm6IJh85KYqy/NtdKp6DZQCn4YP1Q=", "narHash": "sha256-6kYe6ozYDvsHAxV1zbSxg0oRWF4TzTfOUUJsR6MJlYY=",
"owner": "youwen5", "owner": "youwen5",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "18d6cd2f5a9cd1527d478d4f716e9b9ee6fb6cbb", "rev": "b5d422dc2b28eb77a21fbdf60aca9a6e63d5a1ab",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -107,6 +107,8 @@ in
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
services.resolved.enable = true;
nix = lib.mkIf cfg.nixSaneDefaults { nix = lib.mkIf cfg.nixSaneDefaults {
gc = lib.mkIf (!cfg.useNh) { gc = lib.mkIf (!cfg.useNh) {
automatic = true; automatic = true;

View file

@ -11,7 +11,8 @@
imports = [ ./hardware-configuration.nix ]; imports = [ ./hardware-configuration.nix ];
networking.hostName = "callisto"; networking.hostName = "callisto";
time.timeZone = "America/Los_Angeles"; # time.timeZone = "America/Los_Angeles";
time.timeZone = "Asia/Shanghai";
liminalOS = { liminalOS = {
flakeLocation = "/home/youwen/.config/liminalOS"; flakeLocation = "/home/youwen/.config/liminalOS";
@ -27,6 +28,11 @@
}; };
}; };
services.mullvad-vpn = {
enable = true;
package = pkgs.mullvad-vpn;
};
boot = { boot = {
loader.systemd-boot.enable = true; loader.systemd-boot.enable = true;
loader.efi.canTouchEfiVariables = false; loader.efi.canTouchEfiVariables = false;