diff --git a/flake.lock b/flake.lock index 4e0d662..5b6c4a9 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "catppuccin": { "locked": { - "lastModified": 1720472194, - "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=", + "lastModified": 1717070887, + "narHash": "sha256-ZTEMINFqQL+m55kmoDYIKf3i2NGitSkjBnnLu99ezh0=", "owner": "catppuccin", "repo": "nix", - "rev": "d75d5803852fb0833767dc969a4581ac13204e22", + "rev": "2c7661c9fa26a920b8088300ef87d14179c71a27", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1717052710, + "narHash": "sha256-LRhOxzXmOza5SymhOgnEzA8EAQp+94kkeUYWKKpLJ/U=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "29c69d9a466e41d46fd3a7a9d0591ef9c113c2ae", "type": "github" }, "original": { @@ -119,11 +119,11 @@ ] }, "locked": { - "lastModified": 1720926593, - "narHash": "sha256-fW6e27L6qY6s+TxInwrS2EXZZfhMAlaNqT0sWS49qMA=", + "lastModified": 1716772633, + "narHash": "sha256-Idcye44UW+EgjbjCoklf2IDF+XrehV6CVYvxR1omst4=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "5fe5b0cdf1268112dc96319388819b46dc051ef4", + "rev": "ff80cb4a11bb87f3ce8459be6f16a25ac86eb2ac", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1720920808, - "narHash": "sha256-aq9nBiDz0i+JH47YDtPcx/f5OaMMxy/JvBNLDMe97aI=", + "lastModified": 1717032429, + "narHash": "sha256-1+87CE8xOUsJChiq9aNQqWPKoWMuyurW+aXrGbMWH7I=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "2571d560820e4ce23cf060a4460cebc0d9d17f60", + "rev": "0309d806a5431a46fb7fd81e20d7133ac8b1de55", "type": "github" }, "original": { @@ -158,11 +158,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1720737798, - "narHash": "sha256-G/OtEAts7ZUvW5lrGMXSb8HqRp2Jr9I7reBuvCOL54w=", + "lastModified": 1716987116, + "narHash": "sha256-uuEkErFVsFdg2K0cKbNQ9JlFSAm/xYqPr4rbPLI91Y8=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c5013aa7ce2c7ec90acee5d965d950c8348db751", + "rev": "8251761f93d6f5b91cee45ac09edb6e382641009", "type": "github" }, "original": { @@ -174,59 +174,59 @@ }, "nixpkgs": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1718870667, + "narHash": "sha256-jab3Kpc8O1z3qxwVsCMHL4+18n5Wy/HHKyu1fcsF7gs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "9b10b8f00cb5494795e5f51b39210fed4d2b0748", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", "repo": "nixpkgs", + "rev": "9b10b8f00cb5494795e5f51b39210fed4d2b0748", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1720691131, - "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=", + "lastModified": 1704290814, + "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4", + "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720915306, - "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=", + "lastModified": 1716655032, + "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d", + "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-24.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, "nur": { "locked": { - "lastModified": 1720935990, - "narHash": "sha256-SAji50yPFmnQfD2XsDHk6tqEkRHDcWMpEoOlnEneqAY=", + "lastModified": 1717079713, + "narHash": "sha256-mvTQgi86WwALm6NGi9tvCx92zrNjSr8Mz+nCqbG0ZhE=", "owner": "nix-community", "repo": "NUR", - "rev": "42851361fdfde870bfd7e3c71f2ac5d3113c63d6", + "rev": "1a7bbb238afcada295aabc758941ce82e6b1d292", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1720926522, - "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=", + "lastModified": 1716692524, + "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", "owner": "Mic92", "repo": "sops-nix", - "rev": "0703ba03fd9c1665f8ab68cc3487302475164617", + "rev": "962797a8d7f15ed7033031731d0bb77244839960", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3433ffa..f01c389 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { inputs = { # Pin nixpkgs to a specific commit - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/9b10b8f00cb5494795e5f51b39210fed4d2b0748"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/home/xin/common/default.nix b/home/xin/common/default.nix index 44cb225..c5b2817 100644 --- a/home/xin/common/default.nix +++ b/home/xin/common/default.nix @@ -15,7 +15,6 @@ ffmpeg tealdeer rclone - wl-clipboard inetutils ]; diff --git a/machines/calcite/configuration.nix b/machines/calcite/configuration.nix index 502498d..7de3001 100644 --- a/machines/calcite/configuration.nix +++ b/machines/calcite/configuration.nix @@ -187,9 +187,8 @@ gnomeExtensions.paperwm gnomeExtensions.search-light gnomeExtensions.appindicator - gnomeExtensions.pano - gnome-tweaks - gnome-themes-extra + gnome.gnome-tweaks + gnome.gnome-themes-extra gnome.gnome-remote-desktop bibata-cursors gthumb @@ -203,7 +202,6 @@ element-desktop tdesktop qq - feishu # Password manager bitwarden @@ -319,6 +317,4 @@ autoPrune.enable = true; }; }; - - services.nixseparatedebuginfod.enable = true; } diff --git a/machines/calcite/hardware-configuration.nix b/machines/calcite/hardware-configuration.nix index 8a08bcd..94415af 100644 --- a/machines/calcite/hardware-configuration.nix +++ b/machines/calcite/hardware-configuration.nix @@ -49,9 +49,9 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.graphics = { + hardware.opengl = { enable = true; - enable32Bit = true; + driSupport32Bit = true; }; hardware.nvidia = { diff --git a/machines/dolomite/default.nix b/machines/dolomite/default.nix index 69ac5cc..a6fcfc5 100644 --- a/machines/dolomite/default.nix +++ b/machines/dolomite/default.nix @@ -80,7 +80,7 @@ in }; nix.settings = { - trusted-users = [ "root" ]; + trusted-users = config.users.groups.wheel.members ++ [ "root" ]; }; services.sing-box = let diff --git a/machines/massicot/services.nix b/machines/massicot/services.nix index a9889f0..a0efd28 100644 --- a/machines/massicot/services.nix +++ b/machines/massicot/services.nix @@ -85,11 +85,6 @@ in log = "info"; database_backend = "rocksdb"; allow_registration = false; - - well_known = { - client = "https://msg.xinyang.life"; - server = "msg.xinyang.life:443"; - }; }; }; @@ -165,7 +160,17 @@ in virtualHosts."xinyang.life:443".extraConfig = '' tls internal encode zstd gzip - reverse_proxy /.well-known/matrix/* localhost:6167 + handle_path /.well-known/matrix/client { + header Content-Type "application/json" + header Access-Control-Allow-Origin "*" + header Content-Disposition attachment; filename="client" + respond `{"m.homeserver":{"base_url":"https://msg.xinyang.life/"}, "org.matrix.msc3575.proxy":{"url":"https://msg.xinyang.life/"}}` + } + handle_path /.well-known/matrix/server { + header Content-Type "application/json" + header Access-Control-Allow-Origin "*" + respond `{"m.server": "msg.xinyang.life:443"}` + } reverse_proxy * http://localhost:8080 { flush_interval -1 } diff --git a/modules/home-manager/vscode.nix b/modules/home-manager/vscode.nix index 32b09e7..e08eedb 100644 --- a/modules/home-manager/vscode.nix +++ b/modules/home-manager/vscode.nix @@ -28,10 +28,6 @@ let "cmake.configureOnEdit" = false; "cmake.showOptionsMovedNotification" = false; "cmake.showNotAllDocumentsSavedQuestion" = false; - "cmake.pinnedCommands" = [ - "workbench.action.tasks.configureTaskRunner" - "workbench.action.tasks.runTask" - ]; "C_Cpp.intelliSenseEngine" = "Disabled"; }; };