From c3c294e7845d98a07f19e8e04b71776596afa3df Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Sat, 29 Mar 2025 14:30:29 +0800 Subject: [PATCH] use dae --- flake.lock | 110 +++++++++++++++++------------------ home/default.nix | 6 -- home/programs/shell/fish.nix | 2 + os/programs/basic.nix | 6 -- os/system/configuration.nix | 15 ++--- 5 files changed, 63 insertions(+), 76 deletions(-) diff --git a/flake.lock b/flake.lock index 2d7b0ca..95e3739 100644 --- a/flake.lock +++ b/flake.lock @@ -491,11 +491,11 @@ ] }, "locked": { - "lastModified": 1742871411, - "narHash": "sha256-F3xBdOs5m0SE6Gq3jz+JxDOPvsLs22vbGfD05uF6xEc=", + "lastModified": 1743136572, + "narHash": "sha256-uwaVrKgi6g1TUq56247j6QvvFtYHloCkjCrEpGBvV54=", "owner": "nix-community", "repo": "home-manager", - "rev": "869f2ec2add75ce2a70a6dbbf585b8399abec625", + "rev": "1efd2503172016a6742c87b47b43ca2c8145607d", "type": "github" }, "original": { @@ -622,11 +622,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1741336922, - "narHash": "sha256-ahECQuhpwRKp0TcBsE1rsHlm6t+mUllMojORXmgBcC4=", + "lastModified": 1742933628, + "narHash": "sha256-Qe/XUKvcaNdQflvhQQSX1PV5SjNx/RCBBDHxbWxE2xI=", "owner": "viperML", "repo": "nh", - "rev": "509dd6c96eefa11e7324f475a86ff4ea447987b7", + "rev": "7bd0d00a3f1aab85a7e29d34b4f1f6744263e6c3", "type": "github" }, "original": { @@ -667,11 +667,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1742832363, - "narHash": "sha256-STJUQ7PVfjlWdHSuxXDH/UZNjrUVO1Up/x2AwhtJRio=", + "lastModified": 1743186084, + "narHash": "sha256-zEPpazywKQLIRWxeTBFnSnacSnGIqM2Qr1iJ5qB94IQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "8720365191e3931cefd3fc9484dccba5e219b73d", + "rev": "111a3afc23fdf64fd76115df48c2e6571fee51b7", "type": "github" }, "original": { @@ -700,11 +700,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1742719554, - "narHash": "sha256-zBB/Niset99u6/b6z9hS2IYfDigDI9huiG0QXvDKDS4=", + "lastModified": 1743017820, + "narHash": "sha256-EYq2NfWSSO87O7hLrJLPPt0VbgvSjgPzru+58LQ29WI=", "owner": "YaLTeR", "repo": "niri", - "rev": "c709696237f3e963225b8df248538cc691ccba3d", + "rev": "7cfecf4b1b9b8c11c80061fb31926f888228499d", "type": "github" }, "original": { @@ -823,11 +823,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -839,11 +839,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1742937945, + "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", "type": "github" }, "original": { @@ -922,22 +922,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1742889210, "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", @@ -953,13 +937,29 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_7": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1743095683, + "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "type": "github" }, "original": { @@ -994,11 +994,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742559284, - "narHash": "sha256-PSSjCCqpJPkCagkkdLODBVVonGxgwU5dN2CYlFPNVNw=", + "lastModified": 1743157969, + "narHash": "sha256-ldlSyVKNaXL7ys7Jr7mLhlpGDE4VPVcWmV7Odupn5TY=", "owner": "nix-community", "repo": "nixvim", - "rev": "c980271267ef146a6c30394c611a97e077471cf2", + "rev": "95573411bc9be155a93b0f15d2bad62c6b43b3cc", "type": "github" }, "original": { @@ -1014,11 +1014,11 @@ "treefmt-nix": "treefmt-nix_3" }, "locked": { - "lastModified": 1742569316, - "narHash": "sha256-eYigu2oVF87d/VG9GX39JPWfOhrRGlI2JrYkPVqyZuk=", + "lastModified": 1743220426, + "narHash": "sha256-CICMo3NMN5LRNMQEDalsgfF3BuW9pPo0KzgtMw1MgDk=", "owner": "nix-community", "repo": "NUR", - "rev": "62626540151e6cec8e1d3a6c77d48a1a06d3ba16", + "rev": "b98a30cb74df3816ed0e973aefebf0ca83c48838", "type": "github" }, "original": { @@ -1060,11 +1060,11 @@ ] }, "locked": { - "lastModified": 1741886583, - "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", + "lastModified": 1742659553, + "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", "owner": "NuschtOS", "repo": "search", - "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", + "rev": "508752835128a3977985a4d5225ff241f7756181", "type": "github" }, "original": { @@ -1136,11 +1136,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1742496983, - "narHash": "sha256-UpJrU0DEhNLVZwL/RPVOEUHCG6iDOVDoYelkmgS4V38=", + "lastModified": 1743075971, + "narHash": "sha256-8fSI6C19ZTcHgvoLK17wfEEVI08tgnZfSLgVe3E/22w=", "owner": "danth", "repo": "stylix", - "rev": "7e9906679d384472849272e5a5eef7adbdb1d87f", + "rev": "2fb8321ea16c595e0208b22021ddaf1f471c634a", "type": "github" }, "original": { @@ -1396,11 +1396,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1742370146, - "narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", + "lastModified": 1743081648, + "narHash": "sha256-WRAylyYptt6OX5eCEBWyTwOEqEtD6zt33rlUkr6u3cE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", + "rev": "29a3d7b768c70addce17af0869f6e2bd8f5be4b7", "type": "github" }, "original": { @@ -1429,11 +1429,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1742671548, - "narHash": "sha256-nJK70IyhyOXth5Dcyv7DKtv95TTZkqcAYHVj4Uq2Blw=", + "lastModified": 1742773235, + "narHash": "sha256-YhJex62HHVF6EfdGLIC01uM6jH8XJu5ryZ+LlhG7wMs=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0fa13c6fb43ae26a597103989a42e44a03d2d827", + "rev": "b2613aec05f9e3f8488ef924203d62cafb712642", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 93c1c9c..c0f21dc 100644 --- a/home/default.nix +++ b/home/default.nix @@ -57,12 +57,6 @@ userName = "EdenQwQ"; userEmail = "lsahlm1eden@gmail.com"; extraConfig = { - http = { - proxy = "http://127.0.0.1:7890"; - }; - https = { - proxy = "http://127.0.0.1:7890"; - }; safe = { directory = "*"; }; diff --git a/home/programs/shell/fish.nix b/home/programs/shell/fish.nix index 7c9a816..87a8457 100644 --- a/home/programs/shell/fish.nix +++ b/home/programs/shell/fish.nix @@ -17,6 +17,8 @@ shellInit = '' zoxide init fish | source export PATH="$HOME/.local/bin:$HOME/.juliaup/bin:$PATH" + set -g fish_color_command = blue --italics + set -g fish_color_quote = yellow --italics ''; plugins = with pkgs.fishPlugins; [ { diff --git a/os/programs/basic.nix b/os/programs/basic.nix index f8b0af6..36630d4 100644 --- a/os/programs/basic.nix +++ b/os/programs/basic.nix @@ -9,12 +9,6 @@ git = { enable = true; config = { - http = { - proxy = "http://127.0.0.1:7890"; - }; - https = { - proxy = "http://127.0.0.1:7890"; - }; safe = { directory = "*"; }; diff --git a/os/system/configuration.nix b/os/system/configuration.nix index 4feaba6..5c86246 100644 --- a/os/system/configuration.nix +++ b/os/system/configuration.nix @@ -9,15 +9,7 @@ ./boot.nix ]; - networking = { - networkmanager.enable = true; - proxy = { - default = "http://127.0.0.1:7890"; - httpProxy = "http://127.0.0.1:7890"; - httpsProxy = "http://127.0.0.1:7890"; - noProxy = "localhost,internal.domain"; - }; - }; + networking.networkmanager.enable = true; time = { timeZone = "Asia/Shanghai"; @@ -102,6 +94,11 @@ gvfs.enable = true; openssh.enable = true; + + dae = { + enable = true; + configFile = "/home/${user}/.config/dae/config.dae"; + }; }; security = {