Compare commits

...

3 Commits

Author SHA1 Message Date
dichgrem
8650ac8879 fix:switch.sh&&mysql 2025-12-04 18:47:47 +08:00
dichgrem
608238846f update:flake
style:waybar

Version 401 -> 402:
  OVMF: 202508.01 → 202511
  dbeaver-bin: 25.2.5 → 25.3.0, -295.6 KiB
  initrd-linux: 6.17.9 → 6.18.0
  linux: 6.17.9 → 6.18.0, -6579.1 KiB
  lowdown: 2.0.2 → 2.0.4, +13.1 KiB
  nixos-init: 0.1.0 → ∅, -454.1 KiB
  nixos-system-dos: 26.05.20251130.2d293cb → 26.05.20251202.418468a
  ruff: 0.14.6 → 0.14.7, +371.3 KiB
  source: +202.2 KiB
  unit-initrd-find-nixos-closure.service: ε → ∅
  unit-script-initrd-find-nixos-closure: ε → ∅
  unit-script-initrd-nixos-activation: ε → ∅
  v4l2loopback: 0.15.1-6.17.9 → ∅, -313.6 KiB
  vimplugin-luajit2.1-fzf-lua: 0.0.2311-1-unstable-0.0.2311-1 → 0.0.2314-1-unstable-0.0.2314-1
  x86_energy_perf_policy: 6.12.59 → 6.12.60
2025-12-04 17:18:22 +08:00
dichgrem
0c20b462be chore:remove_gfs 2025-12-04 15:04:32 +08:00
11 changed files with 138 additions and 79 deletions

View File

@@ -50,3 +50,5 @@ sleep 0.5
niri msg reload-layout >/dev/null 2>&1 || true
pkill swayosd-server
(swayosd-server &>/dev/null &)
pkill wl-gammarelay-rs
(wl-gammarelay-rs &>/dev/null &)

View File

@@ -10,7 +10,7 @@
"custom/startmenu",
"backlight",
"wireplumber",
"battery",
"custom/wl-gammarelay-brightness",
"hyprland/workspaces",
"niri/workspaces",
"sway/workspaces"
@@ -21,9 +21,9 @@
"modules-right": [
"custom/screenshot",
"tray",
"custom/wl-gammarelay-brightness",
// "custom/wl-gammarelay-temperature",
"clock",
"battery",
"custom/swaync",
],
@@ -182,4 +182,3 @@
"escape": true,
},
}

View File

@@ -131,3 +131,27 @@ tooltip label {
padding-right: 8px;
padding-left: 10px;
}
#custom-startmenu {
color: @overlay2;
}
#wireplumber {
color: @green;
}
#custom-wl-gammarelay-brightness {
color: @sapphire;
}
#custom-wl-gammarelay-temperature {
color: @teal;
}
#custom-swaync {
color: @overlay2;
}
#wlr-taskbar {
color: @subtext0;
}

114
flake.lock generated
View File

@@ -38,11 +38,11 @@
"base16-helix": {
"flake": false,
"locked": {
"lastModified": 1752979451,
"narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
"lastModified": 1760703920,
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
"owner": "tinted-theming",
"repo": "base16-helix",
"rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
"type": "github"
},
"original": {
@@ -77,11 +77,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1764351487,
"narHash": "sha256-7XJcTfz0dPhBd7nfyjcFxT1LIIctJZ2LthiI2Ltd7zY=",
"lastModified": 1764720660,
"narHash": "sha256-zrU6DwLb5zXCg6JxfVJyNCJex0LjuTUXchotq44Vn+w=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "2031f4a0507d0f7ab3e1aaff4c027a010feee447",
"rev": "1739cb8049b3184496279dc6a272b56d466ddd58",
"type": "github"
},
"original": {
@@ -117,11 +117,11 @@
]
},
"locked": {
"lastModified": 1764350888,
"narHash": "sha256-6Rp18zavTlnlZzcoLoBTJMBahL2FycVkw2rAEs3cQvo=",
"lastModified": 1764627417,
"narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=",
"owner": "nix-community",
"repo": "disko",
"rev": "2055a08fd0e2fd41318279a5355eb8a161accf26",
"rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3",
"type": "github"
},
"original": {
@@ -133,11 +133,11 @@
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1758112371,
"narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
"lastModified": 1764724327,
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
"type": "github"
},
"original": {
@@ -193,11 +193,11 @@
]
},
"locked": {
"lastModified": 1756770412,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
"lastModified": 1763759067,
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "4524271976b625a4a605beefd893f270620fd751",
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
"type": "github"
},
"original": {
@@ -258,11 +258,11 @@
"flake": false,
"locked": {
"host": "gitlab.gnome.org",
"lastModified": 1762869044,
"narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
"lastModified": 1764524476,
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
"owner": "GNOME",
"repo": "gnome-shell",
"rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
"type": "gitlab"
},
"original": {
@@ -281,11 +281,11 @@
]
},
"locked": {
"lastModified": 1764194569,
"narHash": "sha256-iUM9ktarEzThkayyZrzQ7oycPshAY2XRQqVKz0xX/L0=",
"lastModified": 1764636297,
"narHash": "sha256-S41K55kw+hWgDfgKmZ9/fMZ3F0BQDMvqFfE120fMHeE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9651819d75f6c7ffaf8a9227490ac704f29659f0",
"rev": "ff067cfc619fdf6f82d50344e7d19ff2323f0827",
"type": "github"
},
"original": {
@@ -301,11 +301,11 @@
]
},
"locked": {
"lastModified": 1764544324,
"narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=",
"lastModified": 1764788330,
"narHash": "sha256-hE/gXK+Z0j654T0tsW+KcndRqsgZXe8HyWchjBJgQpw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612",
"rev": "fca4cba863e76c26cfe48e5903c2ff4bac2b2d5d",
"type": "github"
},
"original": {
@@ -351,11 +351,11 @@
]
},
"locked": {
"lastModified": 1764275117,
"narHash": "sha256-DRcv8Y0BnWm4ZhUQnaYk1dNzC6ZhA2W9Vv5Jl4n0RbE=",
"lastModified": 1764655750,
"narHash": "sha256-tBrcUSu/47u+E+81SUVUpXrqhkcM3Xqg/4taWFI/99k=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "96023dcc9a0febaaa3b91f447b9ae2fbe86f2923",
"rev": "1127a4fc66425cceae683becb93f038819cf2633",
"type": "github"
},
"original": {
@@ -389,11 +389,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1764242076,
"narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github"
},
"original": {
@@ -433,11 +433,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"lastModified": 1764667669,
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"rev": "418468ac9527e799809c900eda37cbff999199b6",
"type": "github"
},
"original": {
@@ -449,11 +449,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1762977756,
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github"
},
"original": {
@@ -473,11 +473,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1764537799,
"narHash": "sha256-+FvqJSUI9kNLwnSbEBnvjoNs9uQplNytf5+jYPafsKw=",
"lastModified": 1764803799,
"narHash": "sha256-94SMf4Uw5iSoX37ui6LAdcadCUHUDfrvggGay0uWkis=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "aab92fcc99cdfa81c01d754f5a9047414bb6cf32",
"rev": "5d1c27e53c96e2c94e69f2e2d083ef147b3a3ccb",
"type": "github"
},
"original": {
@@ -498,11 +498,11 @@
]
},
"locked": {
"lastModified": 1758998580,
"narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
"lastModified": 1764773531,
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
"rev": "1d9616689e98beded059ad0384b9951e967a17fa",
"type": "github"
},
"original": {
@@ -553,11 +553,11 @@
]
},
"locked": {
"lastModified": 1764211126,
"narHash": "sha256-p5y13PnMZYd5WdHk+XCzyUaLGBUCwnz2n4KYKEZM0Pw=",
"lastModified": 1764643237,
"narHash": "sha256-6Ezx9DqVv5UZ7DBK9rcNwBuQUENFyWPS7M09I+FvNao=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "895935bff08cfcfb663fb9c8263c43596e7cd1ed",
"rev": "e66d6b924ac59e6c722f69332f6540ea57c69233",
"type": "github"
},
"original": {
@@ -585,11 +585,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1764550443,
"narHash": "sha256-ArO2V1YEHmEILilTj4KPtqF4gqc1q2HBrrrmygQ/UyU=",
"lastModified": 1764798099,
"narHash": "sha256-IIwR5ZWo7tjxjRpkz0tViF9KFbQ1YXs9Wkan46WQbfk=",
"owner": "danth",
"repo": "stylix",
"rev": "794b6e1fa75177ebfeb32967f135858a1ab1ba15",
"rev": "4b9e0e7ba3cccb86fe2bf0f4a2dd18256bef1cc6",
"type": "github"
},
"original": {
@@ -679,11 +679,11 @@
"tinted-schemes": {
"flake": false,
"locked": {
"lastModified": 1757716333,
"narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
"lastModified": 1763914658,
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
"owner": "tinted-theming",
"repo": "schemes",
"rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
"type": "github"
},
"original": {
@@ -695,11 +695,11 @@
"tinted-tmux": {
"flake": false,
"locked": {
"lastModified": 1757811970,
"narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
"lastModified": 1764465359,
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
"owner": "tinted-theming",
"repo": "tinted-tmux",
"rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
"type": "github"
},
"original": {
@@ -711,11 +711,11 @@
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1757811247,
"narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
"lastModified": 1764464512,
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
"type": "github"
},
"original": {

View File

@@ -1,5 +0,0 @@
{pkgs, ...}: {
home.packages = with pkgs; [
gui-for-singbox
];
}

View File

@@ -6,7 +6,9 @@
GPU-AMD = true;
### See https://nixos.wiki/wiki/AMD_GPU
SingBox = true;
Power-control = "TLP";
### Possible options: PPD ; TLP

View File

@@ -14,7 +14,7 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/67e9d418-8f31-4af7-9178-ae9641099844";
{ device = "/dev/mapper/luks-6647cbcd-ed3a-4205-9a2c-78e337e2f3bf";
fsType = "xfs";
};
@@ -28,13 +28,6 @@
swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View File

@@ -16,6 +16,8 @@
HotSpot-Use-Case = false;
### See https://nixos.wiki/wiki/Internet_Connection_Sharing
SingBox = true;
Power control = "PPD";
### Possible options: PPD ; TLP

View File

@@ -9,9 +9,12 @@ in
package = pkgs.mysql84;
};
systemd.services.mysql = {
enable = false;
};
environment.systemPackages = [
pkgs.dbeaver-bin
];
};
}

View File

@@ -0,0 +1,39 @@
{ hostname, lib, pkgs, ... }:
with lib;
let
inherit (import ../../hosts/${hostname}/env.nix) SingBox;
in
{
disabledModules = [ "services/networking/sing-box.nix" ];
config = mkIf SingBox {
environment.systemPackages = [ pkgs.sing-box ];
systemd.tmpfiles.rules = [
"d /etc/sing-box 0755 root root -"
];
systemd.services.sing-box = {
description = "sing-box service (custom)";
after = [ "network.target" ];
wantedBy = [ ];
script = ''
exec ${pkgs.sing-box}/bin/sing-box -D "$STATE_DIRECTORY" run -c /etc/sing-box/config.json
'';
serviceConfig = {
DynamicUser = true;
CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_DAC_OVERRIDE";
AmbientCapabilities = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_DAC_OVERRIDE";
NoNewPrivileges = true;
StateDirectory = "sing-box";
StateDirectoryMode = "0700";
Restart = "always";
RestartSec = 5;
};
};
};
}

View File

@@ -30,9 +30,9 @@ in
"wdat_wdt"
];
consoleLogLevel = 2; # Only errors and warnings are displayed
extraModulePackages = [
config.boot.kernelPackages.v4l2loopback # v4l2loopback is for OBS Virtual Cam Support
];
# extraModulePackages = [
# config.boot.kernelPackages.v4l2loopback # v4l2loopback is for OBS Virtual Cam Support
# ];
initrd = {
compressor = "zstd";
compressorArgs = ["-T0" "-19" "--long"];
@@ -43,7 +43,7 @@ in
"kernel.core_pattern" = "|/bin/false"; # Disable automatic core dumps
"vm.max_map_count" = 2147483642; # Needed For Some Steam Games
};
kernelModules = ["v4l2loopback"]; # v4l2loopback is for OBS Virtual Cam Support
# kernelModules = ["v4l2loopback"]; # v4l2loopback is for OBS Virtual Cam Support
kernelPackages = pkgs.${KernelPackages};
kernelParams = ["audit=0" "console=tty1" "erst_disable" "nmi_watchdog=0" "noatime" "nowatchdog"];
loader = {