From 546fe36923a7e681a50d8314370e5ceab84bad1a Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Sun, 5 Oct 2025 19:24:14 +0800 Subject: [PATCH] comment out/remove unnecessary stuff --- flake.lock | 116 ++++++++++++------------- flake.nix | 2 +- home/programs/browser/default.nix | 4 +- home/programs/coding/default.nix | 4 +- home/programs/default.nix | 2 +- home/programs/desktop/dank.nix | 59 +++++++++++++ home/programs/desktop/default.nix | 5 +- home/programs/desktop/niri/default.nix | 8 +- home/programs/documents/default.nix | 4 +- home/programs/study/default.nix | 2 +- home/programs/terminal/default.nix | 2 +- home/programs/utils/ai.nix | 2 +- home/programs/utils/default.nix | 22 +++-- home/programs/utils/music.nix | 2 +- hosts/default.nix | 13 +-- os/programs/default.nix | 2 +- os/programs/tuigreet.nix | 2 +- 17 files changed, 156 insertions(+), 95 deletions(-) create mode 100644 home/programs/desktop/dank.nix diff --git a/flake.lock b/flake.lock index 4d57cfe..a9abbf5 100644 --- a/flake.lock +++ b/flake.lock @@ -420,11 +420,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1759330332, - "narHash": "sha256-ZKyOgOOm9Itjbc5xi89xMtw+cnnOFfl79zndPMTzKpU=", + "lastModified": 1759634682, + "narHash": "sha256-+AcM/Gk0pJWDPW/mQ2PgWG7YuuHe3vfg39KxcKA5hZk=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "a5aff0e347b0016e2735d4ec4b4cdca96b5438d1", + "rev": "31ba6534cf16a1799b5fdc15641e4efeb483b5f7", "type": "github" }, "original": { @@ -478,11 +478,11 @@ ] }, "locked": { - "lastModified": 1759337100, - "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=", + "lastModified": 1759573136, + "narHash": "sha256-ILSPD0Dm8p0w0fCVzOx98ZH8yFDrR75GmwmH3fS2VnE=", "owner": "nix-community", "repo": "home-manager", - "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3", + "rev": "5f06ceafc6c9b773a776b9195c3f47bbe1defa43", "type": "github" }, "original": { @@ -547,11 +547,11 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1759373850, - "narHash": "sha256-d8/aUBJDnH6Mih6WzHjomk1NJdSB6F0ms7BsOjVDq5M=", + "lastModified": 1759635166, + "narHash": "sha256-LoKGRyEL5mPNcoWM4F4v/rjnrRSKTyH0O/nKpWVocF0=", "owner": "DreamMaoMao", "repo": "mangowc", - "rev": "54fff77249e6e07b7fa99d245d95f27f4c36ab81", + "rev": "a58e911bfcb517e1d2f229316a03f1647924f6e2", "type": "github" }, "original": { @@ -587,15 +587,15 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1759315083, - "narHash": "sha256-vYR2THbt0fHOVyQfAhs8MdB848dNq+llWHZpJF53OBY=", - "owner": "viperML", + "lastModified": 1759605663, + "narHash": "sha256-N2Kl0PgX1DypFWUUtylIwBgVtPx4j2B0TP8hRamutIs=", + "owner": "nix-community", "repo": "nh", - "rev": "f625021ec708f002070382f1594cdf0ed8b69a3d", + "rev": "63799abca10ed9966f09e88e7fcac8e78bf733db", "type": "github" }, "original": { - "owner": "viperML", + "owner": "nix-community", "repo": "nh", "type": "github" } @@ -630,11 +630,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759368439, - "narHash": "sha256-bnSC8cERE0zJDCY7yr+ds6YR1ndVIzZDSRXs5X5ybKI=", + "lastModified": 1759635394, + "narHash": "sha256-rRf/DW3U9sGx4Gi6UpcKZs0t5C3brJEu7Y7pRAMTgqI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f7b8c9ff119c1a190df9260aa8871d52663ea9b7", + "rev": "3c44a443d159d6a11280225c2b752ae9a27131ec", "type": "github" }, "original": { @@ -663,11 +663,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758691861, - "narHash": "sha256-CYgoGrY/Fx+hjzp8graTxJw1M7mn1f2jBkK26M04T0s=", + "lastModified": 1759395653, + "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "e837e39623457dc5ad29c34a5ce4d4616e5fbf1e", + "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", "type": "github" }, "original": { @@ -829,11 +829,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1759281824, - "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", "type": "github" }, "original": { @@ -845,11 +845,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1759281824, - "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", + "lastModified": 1759580034, + "narHash": "sha256-YWo57PL7mGZU7D4WeKFMiW4ex/O6ZolUS6UNBHTZfkI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", + "rev": "3bcc93c5f7a4b30335d31f21e2f1281cba68c318", "type": "github" }, "original": { @@ -866,11 +866,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1759371013, - "narHash": "sha256-owED1ZtsB6iQqamD/V6UYdbyRcD2hXrZPWXsN38aAZE=", + "lastModified": 1759630856, + "narHash": "sha256-oJ3vVo/BeusR/lz5XMFUHPqTp6c0HM+1bPEl14WpTFE=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "b6fd8e2297ee24a0b0ee914b805c302460d39b8c", + "rev": "1461a72a495d5d6b761491005fd5a3095f782733", "type": "github" }, "original": { @@ -881,11 +881,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -913,15 +913,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748189127, - "narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=", - "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334", + "lastModified": 315532800, + "narHash": "sha256-YwoXN6fthkakCFD7nXPcUK+rkNr6ZTNTuF8zdGaxZo0=", + "rev": "dc704e6102e76aad573f63b74c742cd96f8f1e6c", "type": "tarball", - "url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre870318.dc704e6102e7/nixexprs.tar.xz" }, "original": { "type": "tarball", - "url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz" + "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, "nixpkgs_3": { @@ -971,11 +971,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -1002,11 +1002,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1759336499, - "narHash": "sha256-qIdMRH5NE0tRshQJLPiuVi8lcTwxseSNPVeCWyyExwY=", + "lastModified": 1759587528, + "narHash": "sha256-1ZTMNc9W3LCZ7OeSNaYqwa+/HOTfjcDzaV6QyS+Dwgk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c6a695ef58d1fc935b9b2cb728c654e78c20db5", + "rev": "49a636772fd8ea6f25b9c9ff9c5a04434e90b96f", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -1062,11 +1062,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1759378211, - "narHash": "sha256-iXNKln2flzPdd4McalSVVe3YoZzWQ5w11LNVhU+CrMk=", + "lastModified": 1759643458, + "narHash": "sha256-oQLW/vQ8/BLhZqp8K8YyP1k8r9ju6iqkbBgBRZ+ah74=", "owner": "nix-community", "repo": "NUR", - "rev": "582768fc7099fdb7afac64aafa829e9131fb80f7", + "rev": "33404b168828bde62e36a61f9a16b54b6d6bcdfb", "type": "github" }, "original": { @@ -1187,11 +1187,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1759305203, - "narHash": "sha256-Mj3VQcpE5CVqfhi0Yp2B5qn5EcUwiPD4nCngxUiBHMg=", + "lastModified": 1759595578, + "narHash": "sha256-cYPdsYgZFyvpMbRg9Nbtt3JtcdjE80gXfe/65T1ELco=", "owner": "nix-community", "repo": "stylix", - "rev": "126e6c7625620e949d86578046fe97f418478c42", + "rev": "503d989626aa41174b3a51f18528547da1afe572", "type": "github" }, "original": { @@ -1445,11 +1445,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1758577423, - "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=", + "lastModified": 1759449168, + "narHash": "sha256-Ka18wfIaNvTN9sr+PBie6P83959Om4j5P62M4RwNeoY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "03368548ba745e17a85bd631613a59cb2d8469a4", + "rev": "da6693c88ab5edac2ec3c81730f112be67abe278", "type": "github" }, "original": { @@ -1474,11 +1474,11 @@ ] }, "locked": { - "lastModified": 1748261582, - "narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=", + "lastModified": 1759192380, + "narHash": "sha256-0BWJgt4OSzxCESij5oo8WLWrPZ+1qLp8KUQe32QeV4Q=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "aafb1b093fb838f7a02613b719e85ec912914221", + "rev": "0bcd1401ed43d10f10cbded49624206553e92f57", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4a78290..cde6dd3 100644 --- a/flake.nix +++ b/flake.nix @@ -79,7 +79,7 @@ url = "github:nix-community/nixd"; inputs.nixpkgs.follows = "nixpkgs"; }; - nh.url = "github:viperML/nh"; + nh.url = "github:nix-community/nh"; treefmt-nix.url = "github:numtide/treefmt-nix"; agenix.url = "github:ryantm/agenix"; mangowc.url = "github:DreamMaoMao/mangowc"; diff --git a/home/programs/browser/default.nix b/home/programs/browser/default.nix index 857f241..940b31a 100644 --- a/home/programs/browser/default.nix +++ b/home/programs/browser/default.nix @@ -1,7 +1,7 @@ { imports = [ ./firefox.nix - ./chromium.nix - ./qutebrowser.nix + # ./chromium.nix + # ./qutebrowser.nix ]; } diff --git a/home/programs/coding/default.nix b/home/programs/coding/default.nix index d819107..528d383 100644 --- a/home/programs/coding/default.nix +++ b/home/programs/coding/default.nix @@ -3,8 +3,8 @@ ./misc.nix ./tex.nix ./python.nix - ./neovide.nix - ./zed.nix + # ./neovide.nix + # ./zed.nix ./nixvim ./R.nix ./distrobox.nix diff --git a/home/programs/default.nix b/home/programs/default.nix index a5ea077..5ed9988 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -9,6 +9,6 @@ ./documents ./network ./study - ./social + # ./social ]; } diff --git a/home/programs/desktop/dank.nix b/home/programs/desktop/dank.nix new file mode 100644 index 0000000..9c06351 --- /dev/null +++ b/home/programs/desktop/dank.nix @@ -0,0 +1,59 @@ +# copied from https://github.com/nix-community/stylix/pull/1932 +{ config, ... }: +let + inherit (config.lib.stylix) colors; + colorTheme = { + dark = with colors.withHashtag; { + name = "Stylix generatated dark theme"; + primary = base0D; + primaryText = base00; + primaryContainer = base0C; + secondary = base0E; + surface = base01; + surfaceText = base05; + surfaceVariant = base02; + surfaceVariantText = base04; + surfaceTint = base0D; + background = base00; + backgroundText = base05; + outline = base03; + surfaceContainer = base01; + surfaceContainerHigh = base02; + surfaceContainerHighest = base03; + error = base08; + warning = base0A; + info = base0C; + }; + light = with colors.withHashtag; { + name = "Stylix generatated light theme"; + primary = base0D; + primaryText = base07; + primaryContainer = base0C; + secondary = base0E; + surface = base06; + surfaceText = base01; + surfaceVariant = base07; + surfaceVariantText = base02; + surfaceTint = base0D; + background = base07; + backgroundText = base00; + outline = base04; + surfaceContainer = base06; + surfaceContainerHigh = base05; + surfaceContainerHighest = base04; + error = base08; + warning = base0A; + info = base0C; + }; + }; + + configDir = ".config/DankMaterialShell"; + colorThemePath = "${configDir}/stylix-colors.json"; +in +{ + home.file."${colorThemePath}".text = builtins.toJSON colorTheme; + home.file."${configDir}/settings.json".text = builtins.toJSON { + currentThemeName = "custom"; + currentThemeFile = colorThemePath; + }; +} diff --git a/home/programs/desktop/default.nix b/home/programs/desktop/default.nix index 57bd847..7be7571 100644 --- a/home/programs/desktop/default.nix +++ b/home/programs/desktop/default.nix @@ -6,8 +6,9 @@ ./mako.nix ./niri ./swhkd.nix - ./scroll - ./mango + ./dank.nix + # ./scroll + # ./mango ]; home.packages = with pkgs; [ swww diff --git a/home/programs/desktop/niri/default.nix b/home/programs/desktop/niri/default.nix index f4efd60..99a19de 100644 --- a/home/programs/desktop/niri/default.nix +++ b/home/programs/desktop/niri/default.nix @@ -48,10 +48,10 @@ }) config.monitors; binds = with config.lib.niri.actions; { "Mod+Return".action = spawn "kitty"; - "Mod+Shift+Return".action = spawn [ - "ghostty" - "--launched-from=desktop" - ]; + # "Mod+Shift+Return".action = spawn [ + # "ghostty" + # "--launched-from=desktop" + # ]; "Mod+P".action = spawn [ "sh" "-c" diff --git a/home/programs/documents/default.nix b/home/programs/documents/default.nix index 668d470..7f04dff 100644 --- a/home/programs/documents/default.nix +++ b/home/programs/documents/default.nix @@ -1,10 +1,10 @@ -{ pkgs, ... }: +{ inputs, pkgs, ... }: { imports = [ ./zathura.nix ]; home.packages = with pkgs; [ libreoffice - onlyoffice-desktopeditors + inputs.nixpkgs-stable.legacyPackages.${pkgs.system}.onlyoffice-desktopeditors ]; } diff --git a/home/programs/study/default.nix b/home/programs/study/default.nix index 6fb6fae..917d465 100644 --- a/home/programs/study/default.nix +++ b/home/programs/study/default.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { home.packages = with pkgs; [ - pspp + # pspp zotero ]; } diff --git a/home/programs/terminal/default.nix b/home/programs/terminal/default.nix index 48d414d..d14ccf1 100644 --- a/home/programs/terminal/default.nix +++ b/home/programs/terminal/default.nix @@ -1,6 +1,6 @@ { imports = [ ./kitty.nix - ./ghostty.nix + # ./ghostty.nix ]; } diff --git a/home/programs/utils/ai.nix b/home/programs/utils/ai.nix index 61da2ac..ebbf1ca 100644 --- a/home/programs/utils/ai.nix +++ b/home/programs/utils/ai.nix @@ -17,5 +17,5 @@ ANTHROPIC_AUTH_TOKEN = "$(cat ${config.age.secrets.anyrouter_token.path})"; ANTHROPIC_BASE_URL = "https://anyrouter.top"; }; - home.packages = with pkgs; [ qwen-code ]; + # home.packages = with pkgs; [ qwen-code ]; } diff --git a/home/programs/utils/default.nix b/home/programs/utils/default.nix index d5efb5c..8fcbadb 100644 --- a/home/programs/utils/default.nix +++ b/home/programs/utils/default.nix @@ -13,25 +13,25 @@ sd socat pandoc - typst + # typst du-dust killall htop gparted gimp3 kdePackages.kdenlive - tesseract # ocr - marp-cli + # tesseract # ocr + # marp-cli appimage-run - audiowaveform - papers - nom + # audiowaveform + # papers + # nom yad - pcmanfm - yazi - ydotool + # pcmanfm + # yazi + # ydotool jq - scrcpy + # scrcpy direnv entr lutgen @@ -43,8 +43,6 @@ nix-init wl-color-picker (config.lib.misc.addFlags "--wayland-text-input-version=3" "cherry-studio" cherry-studio) - gemini-cli - qwen-code ]; imports = [ ./eye-candy.nix diff --git a/home/programs/utils/music.nix b/home/programs/utils/music.nix index a78b4da..d5c524f 100644 --- a/home/programs/utils/music.nix +++ b/home/programs/utils/music.nix @@ -6,7 +6,7 @@ { home.packages = with pkgs; [ go-musicfox - fum + # fum ]; xdg.configFile."go-musicfox/go-musicfox.ini".text = # ini diff --git a/hosts/default.nix b/hosts/default.nix index e11752c..35c2611 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -10,7 +10,7 @@ let ../nix inputs.stylix.nixosModules.stylix inputs.niri.nixosModules.niri - inputs.mangowc.nixosModules.mango + # inputs.mangowc.nixosModules.mango ]; sharedHomeModules = [ @@ -21,8 +21,9 @@ let inputs.nixvim.homeModules.nixvim inputs.agenix.homeManagerModules.default ../secrets/age.nix - inputs.mangowc.hmModules.mango - ] ++ (builtins.attrValues self.homeManagerModules); + # inputs.mangowc.hmModules.mango + ] + ++ (builtins.attrValues self.homeManagerModules); mkHost = { @@ -44,7 +45,8 @@ let host user ; - } // extraOSArgs; + } + // extraOSArgs; modules = extraOSModules ++ sharedOSModules; }; @@ -57,7 +59,8 @@ let host user ; - } // extraHomeArgs; + } + // extraHomeArgs; modules = extraHomeModules ++ sharedHomeModules; }; }; diff --git a/os/programs/default.nix b/os/programs/default.nix index a020ae2..263518e 100644 --- a/os/programs/default.nix +++ b/os/programs/default.nix @@ -4,7 +4,7 @@ ./doas.nix ./niri.nix ./swhkd.nix - ./mango.nix + # ./mango.nix ./matlab.nix ./misc.nix ./tuigreet.nix diff --git a/os/programs/tuigreet.nix b/os/programs/tuigreet.nix index 59e35d2..760e076 100644 --- a/os/programs/tuigreet.nix +++ b/os/programs/tuigreet.nix @@ -9,7 +9,7 @@ in # bash '' - ${pkgs.greetd.tuigreet}/bin/tuigreet --time \ + ${pkgs.tuigreet}/bin/tuigreet --time \ --sessions ${desktops}/share/xsessions:${desktops}/share/wayland-sessions \ --remember --remember-user-session --asterisks --cmd niri-session \ --user-menu --greeting "Who TF Are You?" --window-padding 2'';