mirror of
https://github.com/Dichgrem/DCGOS.git
synced 2025-12-18 20:11:59 -05:00
Compare commits
1 Commits
main
...
2f4fb7e2d2
| Author | SHA1 | Date | |
|---|---|---|---|
|
2f4fb7e2d2 |
51
Justfile
51
Justfile
@@ -5,80 +5,79 @@ hostname := `hostname`
|
||||
username := `whoami`
|
||||
|
||||
|
||||
@anywhere input:
|
||||
anywhere input:
|
||||
# Perform nixos-anywhere install
|
||||
nix run github:nix-community/nixos-anywhere -- --generate-hardware-config nixos-generate-config ./hosts/{{input}}/hardware.nix --flake .#{{input}} --target-host root@{{input}}
|
||||
|
||||
|
||||
@anywhere-lb input:
|
||||
anywhere-lb input:
|
||||
# Perform nixos-anywhere install (local builder)
|
||||
nix run github:nix-community/nixos-anywhere -- --generate-hardware-config nixos-generate-config ./hosts/{{input}}/hardware.nix --flake .#{{input}} --target-host root@{{input}} --build-on local
|
||||
|
||||
|
||||
@anywhere-vm input:
|
||||
anywhere-vm input:
|
||||
# Test nixos-anywhere install in vm
|
||||
nix run github:nix-community/nixos-anywhere -- --flake .#{{input}} --vm-test
|
||||
|
||||
|
||||
@build input:
|
||||
build input:
|
||||
# Build
|
||||
sudo nixos-rebuild build --flake .#{{input}} --show-trace -L -v
|
||||
|
||||
|
||||
@build-vm input:
|
||||
build-vm input:
|
||||
# Build a vm
|
||||
sudo nixos-rebuild build-vm --flake .#{{input}} --show-trace -L -v
|
||||
|
||||
|
||||
@switch input:
|
||||
# Let system rebuild and switch
|
||||
sudo nixos-rebuild switch --flake .#{{input}} --show-trace -L -v
|
||||
|
||||
|
||||
@clean:
|
||||
clean:
|
||||
# Remove useless nix-channel files
|
||||
sudo rm -rf /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
|
||||
|
||||
|
||||
@gc:
|
||||
format:
|
||||
# Use alejandra and deadnix to format code
|
||||
deadnix -e
|
||||
alejandra .
|
||||
|
||||
|
||||
gc:
|
||||
# Do garbage-clean (remove unused packages, etc)
|
||||
sudo nix profile wipe-history --older-than 7d --profile /nix/var/nix/profiles/system
|
||||
sudo nix-collect-garbage --delete-old
|
||||
|
||||
|
||||
@ghc:
|
||||
ghc:
|
||||
# Generate hardware.nix
|
||||
nixos-generate-config --show-hardware-config > ./hosts/{{hostname}}/hardware.nix
|
||||
|
||||
|
||||
@install:
|
||||
install:
|
||||
# Install this flake
|
||||
bash install.sh
|
||||
|
||||
|
||||
@cat:
|
||||
list:
|
||||
# List system packages
|
||||
nix-store -qR /run/current-system | cat
|
||||
|
||||
|
||||
@list:
|
||||
sudo nix-env -p /nix/var/nix/profiles/system --list-generations
|
||||
profile:
|
||||
# Show system profile
|
||||
sudo nix profile history --profile /nix/var/nix/profiles/system
|
||||
|
||||
|
||||
@diff:
|
||||
sudo nix profile diff-closures --profile /nix/var/nix/profiles/system
|
||||
switch input:
|
||||
# Let system rebuild and switch
|
||||
sudo nixos-rebuild switch --flake .#{{input}} --show-trace -L -v
|
||||
|
||||
|
||||
@delete generation:
|
||||
sudo nix-env -p /nix/var/nix/profiles/system --delete-generations {{generation}}
|
||||
|
||||
|
||||
@update:
|
||||
update:
|
||||
# Update flake.lock
|
||||
nix flake update --extra-experimental-features flakes --extra-experimental-features nix-command --show-trace
|
||||
|
||||
|
||||
@upgrade:
|
||||
upgrade:
|
||||
# Let system totally upgrade
|
||||
## Set hostname and username in flake.nix
|
||||
sed -i "/^\s*hostname[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"{{hostname}}\"/" ./flake.nix
|
||||
@@ -88,7 +87,7 @@ username := `whoami`
|
||||
sudo nixos-rebuild switch --flake .#{{hostname}} --show-trace
|
||||
|
||||
|
||||
@upgrade-debug:
|
||||
upgrade-debug:
|
||||
# Let system totally upgrade (deBug Mode)
|
||||
## Set hostname and username in flake.nix
|
||||
sed -i "/^\s*hostname[[:space:]]*=[[:space:]]*\"/s/\"\(.*\)\"/\"{{hostname}}\"/" ./flake.nix
|
||||
|
||||
2
dotfiles/.config/hypr/hyprland/bind.conf
vendored
2
dotfiles/.config/hypr/hyprland/bind.conf
vendored
@@ -22,7 +22,7 @@ bind = Ctrl_ALT, B, exec, pkill waybar;sleep 1;waybar # Status Bar
|
||||
|
||||
## Shortcuts
|
||||
### Browser
|
||||
bind = SUPER, B, exec, firefox
|
||||
bind = SUPER, B, exec, floorp
|
||||
### Lock-window
|
||||
bind = SUPER, L, exec, hyprlock
|
||||
### File Explorer
|
||||
|
||||
11
dotfiles/.config/niri/config.kdl
vendored
11
dotfiles/.config/niri/config.kdl
vendored
@@ -24,7 +24,7 @@ binds {
|
||||
// Shortcuts
|
||||
Super+Shift+Slash { show-hotkey-overlay; }
|
||||
Super+E { spawn "nemo"; }
|
||||
Super+B { spawn "firefox";}
|
||||
Super+B { spawn "floorp";}
|
||||
Super+L { spawn "hyprlock";}
|
||||
Super+M { spawn-sh "$HOME/.config/niri/switch_monitors.sh"; }
|
||||
Ctrl+Super+Q { spawn "wlogout"; }
|
||||
@@ -181,8 +181,9 @@ binds {
|
||||
|
||||
environment {
|
||||
CURRENT_COMPOSITOR "niri"
|
||||
XDG_CURRENT_DESKTOP "Niri"
|
||||
XDG_SESSION_DESKTOP "Niri"
|
||||
DISPLAY ":0"
|
||||
XDG_CURRENT_DESKTOP "niri"
|
||||
XDG_SESSION_DESKTOP "niri"
|
||||
}
|
||||
|
||||
|
||||
@@ -200,7 +201,7 @@ spawn-at-startup "blueman-applet"
|
||||
spawn-at-startup "sh" "-c" "dbus-update-activation-environment --systemd --all && systemctl --user stop niri-session.target && systemctl --user start niri-session.target"
|
||||
spawn-at-startup "swayosd-server"
|
||||
spawn-at-startup "swww-daemon"
|
||||
spawn-at-startup "swww" "img" "$HOME/Git/DCGOS/dotfiles/.local/share/wallpapers/yohoho.jpg"
|
||||
spawn-at-startup "sh" "-c" "sleep 1 && swww img $HOME/Git/DCGOS/dotfiles/.local/share/wallpapers/yohoho.jpg"
|
||||
spawn-at-startup "swww" "restore"
|
||||
spawn-at-startup "waybar"
|
||||
spawn-at-startup "lxqt-policykit-agent"
|
||||
@@ -292,4 +293,4 @@ layout {
|
||||
top 0
|
||||
bottom 0
|
||||
}
|
||||
}
|
||||
}
|
||||
4
dotfiles/.config/niri/switch_monitors.sh
vendored
4
dotfiles/.config/niri/switch_monitors.sh
vendored
@@ -48,7 +48,3 @@ echo "$NEXT_MODE" > "$STATE_FILE"
|
||||
# 刷新 Niri 布局（防止残影）
|
||||
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 &)
|
||||
|
||||
5
dotfiles/.config/waybar/config.jsonc
vendored
5
dotfiles/.config/waybar/config.jsonc
vendored
@@ -10,7 +10,7 @@
|
||||
"custom/startmenu",
|
||||
"backlight",
|
||||
"wireplumber",
|
||||
"custom/wl-gammarelay-brightness",
|
||||
"battery",
|
||||
"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,3 +182,4 @@
|
||||
"escape": true,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
24
dotfiles/.config/waybar/style.css
vendored
24
dotfiles/.config/waybar/style.css
vendored
@@ -131,27 +131,3 @@ 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;
|
||||
}
|
||||
|
||||
|
||||
459
flake.lock
generated
459
flake.lock
generated
@@ -21,28 +21,28 @@
|
||||
"base16-fish": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1765809053,
|
||||
"narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
|
||||
"lastModified": 1754405784,
|
||||
"narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
|
||||
"owner": "tomyun",
|
||||
"repo": "base16-fish",
|
||||
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
|
||||
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tomyun",
|
||||
"repo": "base16-fish",
|
||||
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
|
||||
"rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"base16-helix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1760703920,
|
||||
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
|
||||
"lastModified": 1752979451,
|
||||
"narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-helix",
|
||||
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
|
||||
"rev": "27cf1e66e50abc622fb76a3019012dc07c678fac",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -68,6 +68,48 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"chaotic": {
|
||||
"inputs": {
|
||||
"flake-schemas": "flake-schemas",
|
||||
"home-manager": "home-manager",
|
||||
"jovian": "jovian",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763246168,
|
||||
"narHash": "sha256-gUDJZGSOg5syHtQvLImOKL6Eaw4e1ybz4o5pid66kQg=",
|
||||
"owner": "chaotic-cx",
|
||||
"repo": "nyx",
|
||||
"rev": "6476fbdd52621b4a532309d982d468dc08204151",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "chaotic-cx",
|
||||
"ref": "nyxpkgs-unstable",
|
||||
"repo": "nyx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"daeuniverse": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762203410,
|
||||
"narHash": "sha256-+WqPI5Il43oI2/TMUrZUzzReLW/dnWM6GNqrekDXgos=",
|
||||
"owner": "daeuniverse",
|
||||
"repo": "flake.nix",
|
||||
"rev": "effa0f113add0f982a657f5bce92bac503b542b6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "daeuniverse",
|
||||
"repo": "flake.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"disko": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
@@ -75,11 +117,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765794845,
|
||||
"narHash": "sha256-YD5QWlGnusNbZCqR3pxG8tRxx9yUXayLZfAJRWspq2s=",
|
||||
"lastModified": 1762276996,
|
||||
"narHash": "sha256-TtcPgPmp2f0FAnc+DMEw4ardEgv1SGNR3/WFGH0N19M=",
|
||||
"owner": "nix-community",
|
||||
"repo": "disko",
|
||||
"rev": "7194cfe5b7a3660726b0fe7296070eaef601cae9",
|
||||
"rev": "af087d076d3860760b3323f6b583f4d828c1ac17",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -91,11 +133,11 @@
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1764724327,
|
||||
"narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=",
|
||||
"lastModified": 1758112371,
|
||||
"narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047",
|
||||
"rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -105,6 +147,45 @@
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1738453229,
|
||||
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_2": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762980239,
|
||||
"narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "52a2caecc898d0b46b2b905f058ccc5081f842da",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts_3": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"stylix",
|
||||
@@ -112,11 +193,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763759067,
|
||||
"narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=",
|
||||
"lastModified": 1756770412,
|
||||
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0",
|
||||
"rev": "4524271976b625a4a605beefd893f270620fd751",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -125,6 +206,38 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-schemas": {
|
||||
"locked": {
|
||||
"lastModified": 1721999734,
|
||||
"narHash": "sha256-G5CxYeJVm4lcEtaO87LKzOsVnWeTcHGKbKxNamNWgOw=",
|
||||
"rev": "0a5c42297d870156d9c57d8f99e476b738dcd982",
|
||||
"revCount": 75,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.5/0190ef2f-61e0-794b-ba14-e82f225e55e6/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.5.tar.gz"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fromYaml": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -145,11 +258,11 @@
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"host": "gitlab.gnome.org",
|
||||
"lastModified": 1764524476,
|
||||
"narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=",
|
||||
"lastModified": 1762869044,
|
||||
"narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=",
|
||||
"owner": "GNOME",
|
||||
"repo": "gnome-shell",
|
||||
"rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22",
|
||||
"rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -163,15 +276,16 @@
|
||||
"home-manager": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"chaotic",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765980955,
|
||||
"narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=",
|
||||
"lastModified": 1762964643,
|
||||
"narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173",
|
||||
"rev": "827f2a23373a774a8805f84ca5344654c31f354b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -180,13 +294,150 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763313531,
|
||||
"narHash": "sha256-yvdCYUL85zEDp2NzPUBmaNBXP6KnWEOhAk3j7PTfsKw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "3670a78eee49deebe4825fc8ecc46b172d1a8391",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"ixx": {
|
||||
"inputs": {
|
||||
"flake-utils": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nuschtosSearch",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1754860581,
|
||||
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.1.1",
|
||||
"repo": "ixx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"jovian": {
|
||||
"inputs": {
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": [
|
||||
"chaotic",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1762951919,
|
||||
"narHash": "sha256-ma/xMEGf4J6n/RdZFdxXBJUQhP53HVEPQOC6Dp2TrkQ=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "3d248f6e8f877218dd2573fef8925ac997889922",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-github-actions": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"chaotic",
|
||||
"jovian",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729697500,
|
||||
"narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "nix-github-actions",
|
||||
"rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "zhaofengli",
|
||||
"ref": "matrix-name",
|
||||
"repo": "nix-github-actions",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1765779637,
|
||||
"narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=",
|
||||
"lastModified": 1762977756,
|
||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1738452942,
|
||||
"narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1739866667,
|
||||
"narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1763283776,
|
||||
"narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1306659b587dc277866c7b69eb97e5f07864d8c4",
|
||||
"rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -196,6 +447,45 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_4": {
|
||||
"locked": {
|
||||
"lastModified": 1762977756,
|
||||
"narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixvim": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nuschtosSearch": "nuschtosSearch",
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763334942,
|
||||
"narHash": "sha256-ORaewCyY3Fff+XaGrRjWi0XYzC22YTr/H3oL9c9k+9I=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "59af09b1814538b826f30eac8024d126d8c36efc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
@@ -208,11 +498,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1764773531,
|
||||
"narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=",
|
||||
"lastModified": 1758998580,
|
||||
"narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "1d9616689e98beded059ad0384b9951e967a17fa",
|
||||
"rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -221,14 +511,61 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nuschtosSearch": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"ixx": "ixx",
|
||||
"nixpkgs": [
|
||||
"nixvim",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1761730856,
|
||||
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"chaotic": "chaotic",
|
||||
"daeuniverse": "daeuniverse",
|
||||
"disko": "disko",
|
||||
"home-manager": "home-manager",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nixvim": "nixvim",
|
||||
"stylix": "stylix"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"chaotic",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1763087910,
|
||||
"narHash": "sha256-eB9Z1mWd1U6N61+F8qwDggX0ihM55s4E0CluwNukJRU=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "cf4a68749733d45c0420726596367acd708eb2e8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"stylix": {
|
||||
"inputs": {
|
||||
"base16": "base16",
|
||||
@@ -236,13 +573,11 @@
|
||||
"base16-helix": "base16-helix",
|
||||
"base16-vim": "base16-vim",
|
||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-parts": "flake-parts_3",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
],
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nur": "nur",
|
||||
"systems": "systems",
|
||||
"systems": "systems_3",
|
||||
"tinted-foot": "tinted-foot",
|
||||
"tinted-kitty": "tinted-kitty",
|
||||
"tinted-schemes": "tinted-schemes",
|
||||
@@ -250,11 +585,11 @@
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1765897595,
|
||||
"narHash": "sha256-NgTRxiEC5y96zrhdBygnY+mSzk5FWMML39PcRGVJmxg=",
|
||||
"lastModified": 1763314990,
|
||||
"narHash": "sha256-gs98KFE3X2HQ64gsIpQNsj1lKFTdkNdX+1KMQTDXEus=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "e6829552d4bb659ebab00f08c61d8c62754763f3",
|
||||
"rev": "b68e8220689a6f0393204b07be1bc14bb973a0ed",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -278,6 +613,36 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_3": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tinted-foot": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -314,11 +679,11 @@
|
||||
"tinted-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1763914658,
|
||||
"narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=",
|
||||
"lastModified": 1757716333,
|
||||
"narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c",
|
||||
"rev": "317a5e10c35825a6c905d912e480dfe8e71c7559",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -330,11 +695,11 @@
|
||||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1764465359,
|
||||
"narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=",
|
||||
"lastModified": 1757811970,
|
||||
"narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "edf89a780e239263cc691a987721f786ddc4f6aa",
|
||||
"rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -346,11 +711,11 @@
|
||||
"tinted-zed": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1764464512,
|
||||
"narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=",
|
||||
"lastModified": 1757811247,
|
||||
"narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a",
|
||||
"rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -2,16 +2,15 @@
|
||||
description = "🥶";
|
||||
|
||||
inputs = {
|
||||
# chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
||||
# daeuniverse.url = "github:daeuniverse/flake.nix";
|
||||
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
||||
daeuniverse.url = "github:daeuniverse/flake.nix";
|
||||
disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||
disko.url = "github:nix-community/disko";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
home-manager.url = "github:nix-community/home-manager";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
# nixvim.inputs.nixpkgs.follows = "nixpkgs";
|
||||
# nixvim.url = "github:nix-community/nixvim";
|
||||
stylix.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nixvim.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nixvim.url = "github:nix-community/nixvim";
|
||||
stylix.url = "github:danth/stylix";
|
||||
};
|
||||
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
{ pkgs, ... }: {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
package = pkgs.gitFull;
|
||||
};
|
||||
|
||||
programs.gh.enable = true;
|
||||
|
||||
home.packages = with pkgs; [
|
||||
git-filter-repo
|
||||
];
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [
|
||||
firefox
|
||||
floorp-bin
|
||||
];
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
yazi
|
||||
vscodium
|
||||
];
|
||||
}
|
||||
5
home/gui/proxy/gui-for-singbox.nix
Normal file
5
home/gui/proxy/gui-for-singbox.nix
Normal file
@@ -0,0 +1,5 @@
|
||||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [
|
||||
gui-for-singbox
|
||||
];
|
||||
}
|
||||
@@ -45,7 +45,6 @@
|
||||
python312Packages.python-lsp-server
|
||||
|
||||
#JS/TS/Web
|
||||
biome
|
||||
prettierd
|
||||
nodePackages.prettier
|
||||
|
||||
|
||||
@@ -5,31 +5,27 @@
|
||||
local map = vim.keymap.set
|
||||
local opts = { noremap = true, silent = true }
|
||||
|
||||
-- === VSCode-like buffer/tab navigation ===
|
||||
-- === VSCode-like buffer/tab navigation ===
|
||||
map("n", "<C-Tab>", "<cmd>bnext<CR>", { desc = "Next buffer (like VSCode)" })
|
||||
map("n", "<C-S-Tab>", "<cmd>bprevious<CR>", { desc = "Previous buffer (like VSCode)" })
|
||||
|
||||
-- === Vscode-like Close buffer navigation ===
|
||||
vim.keymap.set("n", "<C-w>", function()
|
||||
local current = vim.api.nvim_get_current_buf()
|
||||
local buffers = vim.fn.getbufinfo({buflisted = 1})
|
||||
-- === Close buffer like Ctrl + W in VSCode ===
|
||||
vim.keymap.set("n", "<C-w>", "<cmd>BufferLinePickClose<CR>", { desc = "Close buffer (BufferLine)" })
|
||||
|
||||
local next_buf = nil
|
||||
for i, buf in ipairs(buffers) do
|
||||
if buf.bufnr == current then
|
||||
next_buf = buffers[i + 1] or buffers[i - 1]
|
||||
break
|
||||
end
|
||||
end
|
||||
vim.keymap.set("n", "<C-S-5>", function()
|
||||
if vim.bo.buftype == "terminal" then
|
||||
vim.cmd("vsplit | terminal")
|
||||
else
|
||||
vim.cmd("botright split | terminal")
|
||||
end
|
||||
end, { desc = "Split terminal" })
|
||||
|
||||
if next_buf then
|
||||
vim.api.nvim_set_current_buf(next_buf.bufnr)
|
||||
end
|
||||
-- 在终端模式下的快捷键
|
||||
vim.keymap.set("t", "<C-h>", "<C-\\><C-n><C-w>h", { desc = "Go to left window" })
|
||||
vim.keymap.set("t", "<C-j>", "<C-\\><C-n><C-w>j", { desc = "Go to lower window" })
|
||||
vim.keymap.set("t", "<C-k>", "<C-\\><C-n><C-w>k", { desc = "Go to upper window" })
|
||||
vim.keymap.set("t", "<C-l>", "<C-\\><C-n><C-w>l", { desc = "Go to right window" })
|
||||
|
||||
vim.api.nvim_buf_delete(current, { force = true })
|
||||
end, { desc = "Close current buffer like VSCode" })
|
||||
|
||||
-- XDG Open
|
||||
vim.keymap.set("n", "<leader>xo", function()
|
||||
vim.fn.jobstart({ "xdg-open", vim.fn.expand("%:p") }, { detach = true })
|
||||
end, { desc = "使用系统默认应用程序打开当前文件" })
|
||||
|
||||
@@ -1,16 +1,4 @@
|
||||
-- Options are automatically loaded before lazy.nvim startup
|
||||
-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua
|
||||
-- Add any additional options here
|
||||
|
||||
-- Disable autoformat
|
||||
vim.g.autoformat = false
|
||||
-- Let terminal just one
|
||||
vim.g.root_spec = { "cwd" }
|
||||
-- Disable markdown views
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "markdown",
|
||||
callback = function()
|
||||
vim.opt_local.conceallevel = 0
|
||||
vim.opt_local.concealcursor = ""
|
||||
end,
|
||||
})
|
||||
vim.g.autoformat = false
|
||||
@@ -1,28 +0,0 @@
|
||||
return {
|
||||
{
|
||||
"zbirenbaum/copilot.lua",
|
||||
cmd = "Copilot",
|
||||
event = "InsertEnter",
|
||||
config = function()
|
||||
require("copilot").setup({
|
||||
suggestion = { enabled = true, auto_trigger = true },
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
{
|
||||
"CopilotC-Nvim/CopilotChat.nvim",
|
||||
branch = "main",
|
||||
dependencies = {
|
||||
{ "zbirenbaum/copilot.lua" },
|
||||
{ "nvim-lua/plenary.nvim" },
|
||||
},
|
||||
opts = {
|
||||
debug = false,
|
||||
},
|
||||
keys = {
|
||||
{ "<leader>cc", "<cmd>CopilotChatToggle<cr>", desc = "CopilotChat - Toggle" },
|
||||
{ "<leader>ce", "<cmd>CopilotChatExplain<cr>", mode = "v", desc = "CopilotChat - Explain code" },
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -34,11 +34,11 @@ return {
|
||||
-- Python
|
||||
opts.formatters_by_ft.python = { "black", "ruff_format" }
|
||||
-- JS/TS/Web
|
||||
opts.formatters_by_ft.javascript = { "biome" }
|
||||
opts.formatters_by_ft.typescript = { "biome" }
|
||||
opts.formatters_by_ft.javascriptreact = { "biome" }
|
||||
opts.formatters_by_ft.typescriptreact = { "biome" }
|
||||
opts.formatters_by_ft.vue = { "biome" }
|
||||
opts.formatters_by_ft.javascript = { "prettierd" }
|
||||
opts.formatters_by_ft.typescript = { "prettierd" }
|
||||
opts.formatters_by_ft.javascriptreact = { "prettierd" }
|
||||
opts.formatters_by_ft.typescriptreact = { "prettierd" }
|
||||
opts.formatters_by_ft.vue = { "prettierd" }
|
||||
-- JSON
|
||||
opts.formatters_by_ft.json = { "jq" }
|
||||
-- YAML
|
||||
|
||||
3
home/wayland/hyprpolkitagent.nix
Normal file
3
home/wayland/hyprpolkitagent.nix
Normal file
@@ -0,0 +1,3 @@
|
||||
_: {
|
||||
services.hyprpolkitagent.enable = true;
|
||||
}
|
||||
@@ -8,45 +8,39 @@
|
||||
in
|
||||
with lib;
|
||||
mkIf (WM == "niri") {
|
||||
systemd.user.targets.niri-session = {
|
||||
Unit = {
|
||||
Description = "niri compositor session";
|
||||
Documentation = "man:systemd.special(7)";
|
||||
};
|
||||
Target = {
|
||||
After = "graphical-session-pre.target";
|
||||
BindsTo = "graphical-session.target";
|
||||
Wants = "graphical-session-pre.target";
|
||||
DefaultDependencies = false;
|
||||
};
|
||||
};
|
||||
systemd.user.services.xdg-desktop-portal-gnome = {
|
||||
Unit = {
|
||||
Description = "Portal service (GNOME implementation)";
|
||||
};
|
||||
Service = {
|
||||
Type = "dbus";
|
||||
BusName = "org.freedesktop.impl.portal.desktop.gnome";
|
||||
ExecStart = "${pkgs.xdg-desktop-portal-gnome}/libexec/xdg-desktop-portal-gnome";
|
||||
};
|
||||
};
|
||||
home.packages = with pkgs; [
|
||||
niri
|
||||
xwayland-satellite
|
||||
];
|
||||
systemd.user.services.xdg-desktop-portal-gtk = {
|
||||
Unit = {
|
||||
Description = "Portal service (GTK implementation)";
|
||||
PartOf = ["graphical-session.target"];
|
||||
After = ["graphical-session.target"];
|
||||
};
|
||||
Service = {
|
||||
Type = "dbus";
|
||||
BusName = "org.freedesktop.impl.portal.desktop.gtk";
|
||||
ExecStart = "${pkgs.xdg-desktop-portal-gtk}/libexec/xdg-desktop-portal-gtk";
|
||||
Slice = "session.slice";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = ["xdg-desktop-portal.service"];
|
||||
};
|
||||
};
|
||||
systemd.user.targets.niri-session = {
|
||||
Unit = {
|
||||
After = "graphical-session-pre.target graphical-session.target";
|
||||
BindsTo = "graphical-session.target";
|
||||
Conflicts = "shutdown.target";
|
||||
DefaultDependencies = false;
|
||||
Description = "niri compositor session";
|
||||
Documentation = "man:systemd.special(7)";
|
||||
Wants = "graphical-session-pre.target";
|
||||
};
|
||||
};
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
config = {
|
||||
common = {
|
||||
default = ["gtk"];
|
||||
"org.freedesktop.impl.portal.RemoteDesktop" = "gnome";
|
||||
"org.freedesktop.impl.portal.ScreenCast" = "gnome";
|
||||
"org.freedesktop.impl.portal.Screenshot" = "gnome";
|
||||
default = [
|
||||
"gnome"
|
||||
"gtk"
|
||||
];
|
||||
};
|
||||
};
|
||||
extraPortals = [
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
autoEnable = true;
|
||||
targets = {
|
||||
fcitx5.enable = false;
|
||||
firefox.enable = false;
|
||||
floorp.enable = false;
|
||||
hyprland.enable = false;
|
||||
kde.enable = false;
|
||||
mpv.enable = false;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"peazip-extract-downloads.desktop"
|
||||
"peazip-extract-here.desktop"
|
||||
];
|
||||
browser = ["firefox.desktop"];
|
||||
browser = ["floorp.desktop"];
|
||||
editor = ["neovim"];
|
||||
filemanager = ["nemo.desktop"];
|
||||
image-viewer = ["org.gnome.Loupe.desktop"];
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}: {
|
||||
imports = with inputs; [
|
||||
./${hostname}
|
||||
# chaotic.nixosModules.default
|
||||
chaotic.nixosModules.default
|
||||
disko.nixosModules.disko
|
||||
stylix.nixosModules.stylix
|
||||
home-manager.nixosModules.home-manager
|
||||
|
||||
@@ -1,65 +1,52 @@
|
||||
{
|
||||
# -------------------- Hardware --------------------
|
||||
# See: https://github.com/blueman-project/blueman
|
||||
# Specific Use Cases
|
||||
## Hardware related
|
||||
Bluetooth = true;
|
||||
### See https://github.com/blueman-project/blueman
|
||||
|
||||
# See: https://nixos.wiki/wiki/AMD_GPU
|
||||
GPU-AMD = true;
|
||||
### See https://nixos.wiki/wiki/AMD_GPU
|
||||
|
||||
# See: https://nixos.wiki/wiki/Nvidia
|
||||
GPU-Nvidia = false;
|
||||
## Software related
|
||||
QEMU-VM-Use-Case = true;
|
||||
|
||||
# See: https://nixos.wiki/wiki/Intel_Graphics
|
||||
GPU-Intel = false;
|
||||
Database-Use-Case = true;
|
||||
### See https://github.com/qemu/qemu ; https://github.com/virt-manager/virt-manager
|
||||
|
||||
# See: https://github.com/linrunner/TLP
|
||||
Power-control = "TLP"; ## Possible options: PPD ; TLP
|
||||
# Options
|
||||
## System related
|
||||
BootLoader = "systemd-boot";
|
||||
### Possible options: grub ; grub-mirror ; systemd-boot # See https://nixos.wiki/wiki/Bootloader https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=mirroredBoots
|
||||
|
||||
# -------------------- System --------------------
|
||||
# See https://nixos.wiki/wiki/Bootloader
|
||||
# See: https://search.nixos.org/options?show=boot.loader.grub.mirroredBoots
|
||||
BootLoader = "systemd-boot"; ## Possible options: grub ; grub-mirror ; systemd-boot
|
||||
KernelPackages = "linuxPackages_cachyos";
|
||||
### See https://search.nixos.org/options?show=boot.kernelPackages https://www.nyx.chaotic.cx/#using-sched-ext-schedulers
|
||||
|
||||
# See: https://search.nixos.org/options?show=boot.kernelPackages
|
||||
# See: https://www.nyx.chaotic.cx/#using-sched-ext-schedulers
|
||||
KernelPackages = "linuxPackages_zen";
|
||||
|
||||
# See: https://mynixos.com/nixpkgs/option/system.stateVersion
|
||||
StateVersion = "26.05";
|
||||
|
||||
# See: https://docs.moodle.org/405/en/Table_of_locales
|
||||
Locale = "en_US.UTF-8";
|
||||
|
||||
# See: https://en.wikipedia.org/wiki/Keyboard_layout
|
||||
KeyboardLayout = "us";
|
||||
### See https://en.wikipedia.org/wiki/Keyboard_layout
|
||||
|
||||
Locale = "en_US.UTF-8";
|
||||
### See https://docs.moodle.org/405/en/Table_of_locales
|
||||
|
||||
StateVersion = "25.11";
|
||||
### See https://mynixos.com/nixpkgs/option/system.stateVersion
|
||||
|
||||
# See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
|
||||
TimeZone = "Asia/Singapore";
|
||||
### See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
|
||||
|
||||
# -------------------- Display --------------------
|
||||
WM = "niri"; ## Options: "Hyprland" | "niri" | "sway"
|
||||
|
||||
# See: https://wiki.hyprland.org/Configuring/XWayland/#hidpi-xwayland
|
||||
# See: https://github.com/swaywm/sway/wiki#hidpi
|
||||
ScaleLevel = "1";
|
||||
|
||||
# See: https://github.com/swaywm/sway/wiki#display-configuration
|
||||
OutputSettings = "output * scale 1";
|
||||
|
||||
# See: https://wiki.hyprland.org/Configuring/Monitors
|
||||
## Wayland related
|
||||
MonitorSettings = "
|
||||
monitor=eDP-1, 2560x1600@165, 0x0, 1.25
|
||||
monitor=DP-1, 2560x1440@144, 2560x0, 1.25
|
||||
";
|
||||
### MonitorSettings For Hyprland See https://wiki.hyprland.org/Configuring/Monitors/
|
||||
|
||||
# -------------------- Software --------------------
|
||||
# See: https://sing-box.sagernet.org
|
||||
SingBox = true;
|
||||
OutputSettings = "output * scale 1";
|
||||
### OutputSettings For sway See https://github.com/swaywm/sway/wiki#display-configuration
|
||||
|
||||
# See: https://github.com/qemu/qemu
|
||||
# See: https://github.com/virt-manager/virt-manager
|
||||
QEMU-VM-Use-Case = true;
|
||||
ScaleLevel = "1";
|
||||
### For Hyprland see https://wiki.hyprland.org/Configuring/XWayland/#hidpi-xwayland
|
||||
### For sway see https://github.com/swaywm/sway/wiki#hidpi
|
||||
|
||||
# See: https://github.com/dbeaver/dbeaver
|
||||
Database-Use-Case = true;
|
||||
WM = "niri";
|
||||
### Possible options: Hyprland ; niri ; sway
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/mapper/luks-6647cbcd-ed3a-4205-9a2c-78e337e2f3bf";
|
||||
{ device = "/dev/disk/by-uuid/67e9d418-8f31-4af7-9178-ae9641099844";
|
||||
fsType = "xfs";
|
||||
};
|
||||
|
||||
@@ -28,6 +28,13 @@
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -1,62 +1,56 @@
|
||||
{
|
||||
# -------------------- Hardware --------------------
|
||||
# See: https://github.com/blueman-project/blueman
|
||||
# Specific Use Cases
|
||||
## Hardware related
|
||||
Bluetooth = false;
|
||||
### See https://github.com/blueman-project/blueman
|
||||
|
||||
# See: https://nixos.wiki/wiki/AMD_GPU
|
||||
GPU-AMD = false;
|
||||
### See https://nixos.wiki/wiki/AMD_GPU
|
||||
|
||||
# See: https://nixos.wiki/wiki/Nvidia
|
||||
GPU-Nvidia = false;
|
||||
### See https://nixos.wiki/wiki/Nvidia
|
||||
|
||||
# See: https://nixos.wiki/wiki/Intel_Graphics
|
||||
GPU-Intel = false;
|
||||
### See https://nixos.wiki/wiki/Intel_Graphics
|
||||
|
||||
# See: https://github.com/linrunner/TLP
|
||||
Power-control = "PPD"; ## Possible options: PPD ; TLP
|
||||
HotSpot-Use-Case = false;
|
||||
### See https://nixos.wiki/wiki/Internet_Connection_Sharing
|
||||
|
||||
# -------------------- System --------------------
|
||||
# See https://nixos.wiki/wiki/Bootloader
|
||||
# See: https://search.nixos.org/options?show=boot.loader.grub.mirroredBoots
|
||||
BootLoader = "systemd-boot"; ## Possible options: grub ; grub-mirror ; systemd-boot
|
||||
|
||||
# See: https://search.nixos.org/options?show=boot.kernelPackages
|
||||
# See: https://www.nyx.chaotic.cx/#using-sched-ext-schedulers
|
||||
KernelPackages = "linuxPackages_zen";
|
||||
|
||||
# See: https://mynixos.com/nixpkgs/option/system.stateVersion
|
||||
StateVersion = "26.05";
|
||||
|
||||
# See: https://docs.moodle.org/405/en/Table_of_locales
|
||||
Locale = "en_US.UTF-8";
|
||||
|
||||
# See: https://en.wikipedia.org/wiki/Keyboard_layout
|
||||
KeyboardLayout = "us";
|
||||
|
||||
# See: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
|
||||
TimeZone = "Asia/Singapore";
|
||||
|
||||
# -------------------- Display --------------------
|
||||
WM = "Hyprland"; ## Options: "Hyprland" | "niri" | "sway"
|
||||
|
||||
# See: https://wiki.hyprland.org/Configuring/XWayland/#hidpi-xwayland
|
||||
# See: https://github.com/swaywm/sway/wiki#hidpi
|
||||
ScaleLevel = "1";
|
||||
|
||||
# See: https://github.com/swaywm/sway/wiki#display-configuration
|
||||
OutputSettings = "output * scale 1";
|
||||
|
||||
# See: https://wiki.hyprland.org/Configuring/Monitors
|
||||
MonitorSettings = "monitor = , preferred, auto, auto";
|
||||
|
||||
# -------------------- Software --------------------
|
||||
# See: https://sing-box.sagernet.org
|
||||
SingBox = true;
|
||||
|
||||
# See: https://github.com/qemu/qemu
|
||||
# See: https://github.com/virt-manager/virt-manager
|
||||
## Software related
|
||||
QEMU-VM-Use-Case = false;
|
||||
### See https://github.com/qemu/qemu ; https://github.com/virt-manager/virt-manager
|
||||
|
||||
# See: https://github.com/dbeaver/dbeaver
|
||||
Database-Use-Case = true;
|
||||
# Options
|
||||
## System related
|
||||
BootLoader = "systemd-boot";
|
||||
### Possible options: grub ; grub-mirror ; systemd-boot # See https://nixos.wiki/wiki/Bootloader https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=mirroredBoots
|
||||
|
||||
KernelPackages = "linuxPackages_cachyos";
|
||||
### See https://search.nixos.org/options?show=boot.kernelPackages https://www.nyx.chaotic.cx/#using-sched-ext-schedulers
|
||||
|
||||
KeyboardLayout = "us";
|
||||
### See https://en.wikipedia.org/wiki/Keyboard_layout
|
||||
|
||||
Locale = "en_US.UTF-8";
|
||||
### See https://docs.moodle.org/405/en/Table_of_locales
|
||||
|
||||
StateVersion = "25.11";
|
||||
### See https://mynixos.com/nixpkgs/option/system.stateVersion
|
||||
|
||||
TimeZone = "Asia/Singapore";
|
||||
### See https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
|
||||
|
||||
## Wayland related
|
||||
MonitorSettings = "monitor = , preferred, auto, auto";
|
||||
### MonitorSettings For Hyprland See https://wiki.hyprland.org/Configuring/Monitors/
|
||||
|
||||
OutputSettings = "output * scale 1";
|
||||
### OutputSettings For sway See https://github.com/swaywm/sway/wiki#display-configuration
|
||||
|
||||
ScaleLevel = "1";
|
||||
### For Hyprland see https://wiki.hyprland.org/Configuring/XWayland/#hidpi-xwayland
|
||||
### For sway see https://github.com/swaywm/sway/wiki#hidpi
|
||||
|
||||
WM = "Hyprland";
|
||||
### Possible options: Hyprland ; niri ; sway
|
||||
}
|
||||
|
||||
@@ -9,7 +9,7 @@ in
|
||||
config = mkIf Bluetooth {
|
||||
hardware.bluetooth = {
|
||||
enable = lib.mkDefault true;
|
||||
powerOnBoot = lib.mkDefault false;
|
||||
powerOnBoot = lib.mkDefault true;
|
||||
};
|
||||
services.blueman.enable = lib.mkDefault true;
|
||||
};
|
||||
|
||||
@@ -8,14 +8,10 @@ in {
|
||||
services = {
|
||||
greetd = {
|
||||
enable = true;
|
||||
useTextGreeter = true;
|
||||
settings = {
|
||||
default_session = {
|
||||
user = "greeter";
|
||||
command =
|
||||
if WM == "niri"
|
||||
then "${pkgs.tuigreet}/bin/tuigreet -c niri-session -t --user-menu"
|
||||
else "${pkgs.tuigreet}/bin/tuigreet -c ${WM} -t --user-menu";
|
||||
command = "${pkgs.tuigreet}/bin/tuigreet -c ${WM} -t --user-menu";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -9,12 +9,9 @@ in
|
||||
package = pkgs.mysql84;
|
||||
};
|
||||
|
||||
systemd.services.mysql = {
|
||||
wantedBy = lib.mkForce [ ];
|
||||
};
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.dbeaver-bin
|
||||
];
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
{ hostname, lib, pkgs, ... }:
|
||||
with lib; let
|
||||
inherit (import ../../hosts/${hostname}/env.nix) Power-control;
|
||||
in
|
||||
{
|
||||
services.power-profiles-daemon.enable = (Power-control == "PPD");
|
||||
|
||||
services.tlp = lib.mkIf (Power-control == "TLP") {
|
||||
enable = true;
|
||||
settings = {
|
||||
CPU_SCALING_GOVERNOR_ON_AC = "performance";
|
||||
CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
|
||||
|
||||
CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
|
||||
CPU_ENERGY_PERF_POLICY_ON_BAT = "powersave";
|
||||
|
||||
CPU_MIN_PERF_ON_AC = 0;
|
||||
CPU_MAX_PERF_ON_AC = 100;
|
||||
CPU_MIN_PERF_ON_BAT = 0;
|
||||
CPU_MAX_PERF_ON_BAT = 85;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -3,6 +3,7 @@
|
||||
{
|
||||
services = {
|
||||
gvfs.enable = true;
|
||||
power-profiles-daemon.enable = true;
|
||||
scx = {
|
||||
enable = true;
|
||||
scheduler = "scx_lavd";
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
{ 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;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -17,22 +17,12 @@
|
||||
in
|
||||
with lib; {
|
||||
boot = {
|
||||
blacklistedKernelModules = [
|
||||
"iTCO_wdt"
|
||||
"iTCO_vendor_support"
|
||||
"intel_pmc_bxt"
|
||||
"mei"
|
||||
"mei_hdcp"
|
||||
"mei_me"
|
||||
"mei_pxp"
|
||||
"pstore"
|
||||
"sp5100_tco"
|
||||
"wdat_wdt"
|
||||
];
|
||||
bcache.enable = false;
|
||||
consoleLogLevel = 2; # Only errors and warnings are displayed
|
||||
# extraModulePackages = [
|
||||
# config.boot.kernelPackages.v4l2loopback # v4l2loopback is for OBS Virtual Cam Support
|
||||
# ];
|
||||
extraModprobeConfig = "blacklist mei mei_hdcp mei_me mei_pxp iTCO_wdt pstore sp5100_tco";
|
||||
extraModulePackages = [
|
||||
config.boot.kernelPackages.v4l2loopback # v4l2loopback is for OBS Virtual Cam Support
|
||||
];
|
||||
initrd = {
|
||||
compressor = "zstd";
|
||||
compressorArgs = ["-T0" "-19" "--long"];
|
||||
@@ -43,7 +33,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 = {
|
||||
@@ -144,6 +134,7 @@ in
|
||||
};
|
||||
|
||||
system = {
|
||||
rebuild.enableNg = true;
|
||||
stateVersion = StateVersion;
|
||||
};
|
||||
|
||||
|
||||
@@ -55,10 +55,10 @@ in {
|
||||
yt-dlp
|
||||
|
||||
#Android
|
||||
edl
|
||||
xxd
|
||||
file
|
||||
binwalk
|
||||
qtscrcpy
|
||||
android-tools
|
||||
payload-dumper-go
|
||||
|
||||
@@ -68,7 +68,6 @@ in {
|
||||
libvirt
|
||||
lm_sensors
|
||||
usbutils
|
||||
libsecret
|
||||
|
||||
# Niri
|
||||
wlr-randr
|
||||
@@ -90,13 +89,17 @@ in {
|
||||
jdk17
|
||||
python312
|
||||
pnpm
|
||||
nodejs_24
|
||||
nodejs_20
|
||||
];
|
||||
};
|
||||
|
||||
programs = {
|
||||
dconf.enable = true;
|
||||
fuse.userAllowOther = true;
|
||||
git = {
|
||||
enable = true;
|
||||
package = pkgs.gitFull;
|
||||
};
|
||||
ssh.startAgent = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -31,20 +31,20 @@ with lib; {
|
||||
substituters = [
|
||||
"https://cache.garnix.io" # See https://github.com/daeuniverse/flake.nix
|
||||
"https://cache.nixos.org" # See https://nixos.wiki/wiki/Binary_Cache
|
||||
# "https://chaotic-nyx.cachix.org" # See https://github.com/chaotic-cx/nyx
|
||||
"https://chaotic-nyx.cachix.org" # See https://github.com/chaotic-cx/nyx
|
||||
"https://nix-community.cachix.org" # See https://nix-community.org/cache/
|
||||
];
|
||||
trusted-public-keys = [
|
||||
"cache.garnix.io:CTFPyKSLcx5RMJKfLo5EEPUObbA78b0YQ2DTCJXqr9g="
|
||||
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
|
||||
# "chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
|
||||
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
|
||||
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
|
||||
];
|
||||
warn-dirty = false;
|
||||
};
|
||||
};
|
||||
nixpkgs = {
|
||||
config.allowUnfree = false;
|
||||
config.allowUnfree = true;
|
||||
hostPlatform = "x86_64-linux";
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user