1
1
Fork 0

Compare commits

..

No commits in common. "9c23eb94605545948d70d568fe1bccf988feac4f" and "66c36e9203367363502a016b059f5e070845492c" have entirely different histories.

4 changed files with 206 additions and 210 deletions

84
flake.lock generated
View file

@ -30,11 +30,11 @@
]
},
"locked": {
"lastModified": 1726532433,
"narHash": "sha256-xyUZGXg38oXhWxbMPC4AJWpOn1IsB+w+taYkZomHupY=",
"lastModified": 1726358321,
"narHash": "sha256-60fXvcgMnTsdSZ7npH+AI5qNxVdrqgF+Wn9iJsaaz5U=",
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"rev": "f27ebcdcaf296f24b7a662facefec6b4d492b5c5",
"rev": "bcaea0865985eb3e24ce978e2ca5bb4f680f150b",
"type": "github"
},
"original": {
@ -291,11 +291,11 @@
"onchg": "onchg"
},
"locked": {
"lastModified": 1727101025,
"narHash": "sha256-2mYtBzvhJsCmp8mXzgy+4HIGlA1aEUGZMfRp5LcqqZg=",
"lastModified": 1725129412,
"narHash": "sha256-gr9ln5YklrMXR0x5emR7ap4/ZKFgic/5QwT7UrMadRg=",
"owner": "aksiksi",
"repo": "compose2nix",
"rev": "6f63b6706580726f43f4d0788f837313922bf7d3",
"rev": "971f843acd3c25ed32272257a9a648b7d10858c1",
"type": "github"
},
"original": {
@ -476,11 +476,11 @@
]
},
"locked": {
"lastModified": 1727097838,
"narHash": "sha256-URruiiuIyKzao6QcGXQXFaX3RRvlNFHHm19uOGmB0Dw=",
"lastModified": 1726396892,
"narHash": "sha256-KRGuT5nGRAOT3heigRWg41tbYpTpapGhsWc+XjnIx0w=",
"owner": "nix-community",
"repo": "disko",
"rev": "b1d6bed240abef5f5373e88fc7909f493013e557",
"rev": "51e3a7e51279fedfb6669a00d21dc5936c78a6ce",
"type": "github"
},
"original": {
@ -1021,11 +1021,11 @@
]
},
"locked": {
"lastModified": 1726989464,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
"lastModified": 1725703823,
"narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
"rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba",
"type": "github"
},
"original": {
@ -1042,11 +1042,11 @@
]
},
"locked": {
"lastModified": 1726985855,
"narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=",
"lastModified": 1726440980,
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d",
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
"type": "github"
},
"original": {
@ -1582,11 +1582,11 @@
]
},
"locked": {
"lastModified": 1727071274,
"narHash": "sha256-xG83n8zvL+fMFArU1ikcUpw0bhRkrzkSTDJPpBCLlUA=",
"lastModified": 1726115155,
"narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "03aa054340528d300711253a98f7dccca9378604",
"rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4",
"type": "github"
},
"original": {
@ -1743,11 +1743,11 @@
]
},
"locked": {
"lastModified": 1726975622,
"narHash": "sha256-bPDZosnom0+02ywmMZAvmj7zvsQ6mVv/5kmvSgbTkaY=",
"lastModified": 1726370017,
"narHash": "sha256-CJOV4JiLhd++w9K+h2z00DiB4R1CCuElWzhldrXSq5w=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "c7515c2fdaf2e1f3f49856cef6cec95bb2138417",
"rev": "0a2fba621b6bbf06be0b4edd974236e3d2fcc1a9",
"type": "github"
},
"original": {
@ -1763,11 +1763,11 @@
]
},
"locked": {
"lastModified": 1726975622,
"narHash": "sha256-bPDZosnom0+02ywmMZAvmj7zvsQ6mVv/5kmvSgbTkaY=",
"lastModified": 1726370017,
"narHash": "sha256-CJOV4JiLhd++w9K+h2z00DiB4R1CCuElWzhldrXSq5w=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "c7515c2fdaf2e1f3f49856cef6cec95bb2138417",
"rev": "0a2fba621b6bbf06be0b4edd974236e3d2fcc1a9",
"type": "github"
},
"original": {
@ -1808,11 +1808,11 @@
]
},
"locked": {
"lastModified": 1727055858,
"narHash": "sha256-JZldqP3uEzphER/63J8crL9O9uR7g+cNAkb+erRmN48=",
"lastModified": 1726365102,
"narHash": "sha256-FxjobZPWNGQGYlAwdglmCyzBCLhjSqI60Kc/mC5xJkc=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "de538d220bccc69ad940a53e2b50fef7e05501f2",
"rev": "18768cf8a9fad0e1cfb7a18199a269b2a22a88ee",
"type": "github"
},
"original": {
@ -1862,11 +1862,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1726707834,
"narHash": "sha256-1ZOtza9NBU/2t80IQc3TJFC+cEZhDUnvmg7f4pNeOi4=",
"lastModified": 1724296831,
"narHash": "sha256-+X9cc5fNEUtp6e+EZ2d9tjfPiXVcqkddEz1T/C9H5sc=",
"owner": "nix-community",
"repo": "nixd",
"rev": "a47ac2c1ea2349bdf31a41a9df2522af60a5b6e5",
"rev": "f6ca74330b49c45f50cead6d0ac0469f8f830f88",
"type": "github"
},
"original": {
@ -1877,11 +1877,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1727040444,
"narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
"lastModified": 1725885300,
"narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
"rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e",
"type": "github"
},
"original": {
@ -1990,11 +1990,11 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1726969270,
"narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=",
"lastModified": 1726320982,
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075",
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
"type": "github"
},
"original": {
@ -2006,11 +2006,11 @@
},
"nixpkgs-staging-next": {
"locked": {
"lastModified": 1727093136,
"narHash": "sha256-iZ/nd6Dn1KFx/HokkEkPombA5yL/xVmcy8DjJAldfcc=",
"lastModified": 1726423465,
"narHash": "sha256-KjzvVbfO9MdFZJWVYh5j70uwoF/ZQB2z385jv3Q4sjs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ac34133fb937be3d61f269e7cc8b69d295c653ad",
"rev": "415d74df69bc0f82832a3045ab541baef1401233",
"type": "github"
},
"original": {
@ -2022,11 +2022,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1726937504,
"narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
"lastModified": 1726243404,
"narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9357f4f23713673f310988025d9dc261c20e70c6",
"rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059",
"type": "github"
},
"original": {

View file

@ -11,12 +11,52 @@ in {
config = mkIf cfg.enable {
# https://wiki.nixos.org/wiki/Fish
# https://github.com/fish-shell/fish-shell
programs.fish.enable = true;
programs.fish = {
enable = true;
promptInit = ''
# Disable greeting
set -g fish_greeting
# Prompt
function fish_prompt --description 'Write out the prompt'
set -l last_status $status
set -l normal (set_color normal)
set -l status_color (set_color brgreen)
set -l cwd_color (set_color $fish_color_cwd)
set -l vcs_color (set_color brpurple)
set -l prompt_status ""
# Since we display the prompt on a new line allow the directory names to be longer.
set -q fish_prompt_pwd_dir_length
or set -lx fish_prompt_pwd_dir_length 0
# Color the prompt differently when we're root
set -l suffix ''
if functions -q fish_is_root_user; and fish_is_root_user
if set -q fish_color_cwd_root
set cwd_color (set_color $fish_color_cwd_root)
end
set suffix '#'
end
# Color the prompt in red on error
if test $last_status -ne 0
set status_color (set_color $fish_color_error)
set prompt_status $status_color "[" $last_status "]" $normal
end
echo -s (prompt_login) ' ' $cwd_color (prompt_pwd) $vcs_color (fish_vcs_prompt) $normal ' ' $prompt_status
echo -n -s $status_color $suffix ' ' $normal
end
'';
};
home-manager.users = {
# Inherit root configuration from user
root.programs.fish = with config.home-manager.users.${config.custom.username}.programs.fish; {
inherit enable interactiveShellInit shellAbbrs;
# Inherit root abbreviations from user
root.programs.fish = {
enable = true;
shellAbbrs = config.home-manager.users.${config.custom.username}.programs.fish.shellAbbrs;
};
${config.custom.username}.programs.fish = let
@ -42,77 +82,77 @@ in {
"/r" = any "/run";
"/rc" = any "/run/current-system";
jc = "journalctl";
jcs = "journalctl --system";
jcse = "journalctl --system --pager-end";
jcseu = "journalctl --system --pager-end --unit";
jcsf = "journalctl --system --follow";
jcsfu = "journalctl --system --follow --unit";
jcsi = "journalctl --system --identifier";
jcst = "journalctl --system --target";
jcsu = "journalctl --system --unit";
jcu = "journalctl --user";
jcue = "journalctl --user --pager-end";
jcueu = "journalctl --user --pager-end --unit";
jcuf = "journalctl --user --follow";
jcufu = "journalctl --user --follow --unit";
jcui = "journalctl --user --identifier";
jcut = "journalctl --user --target";
jcuu = "journalctl --user --unit";
jc = any "journalctl";
jcs = any "journalctl --system";
jcse = any "journalctl --system --pager-end";
jcseu = any "journalctl --system --pager-end --unit";
jcsf = any "journalctl --system --follow";
jcsfu = any "journalctl --system --follow --unit";
jcsi = any "journalctl --system --identifier";
jcst = any "journalctl --system --target";
jcsu = any "journalctl --system --unit";
jcu = any "journalctl --user";
jcue = any "journalctl --user --pager-end";
jcueu = any "journalctl --user --pager-end --unit";
jcuf = any "journalctl --user --follow";
jcufu = any "journalctl --user --follow --unit";
jcui = any "journalctl --user --identifier";
jcut = any "journalctl --user --target";
jcuu = any "journalctl --user --unit";
sc = "systemctl";
scp = "systemctl poweroff";
scr = "systemctl reboot";
scs = "systemctl --system";
scsd = "systemctl --system disable";
scsdn = "systemctl --system disable --now";
scse = "systemctl --system reenable";
scsen = "systemctl --system reenable --now";
scsh = "systemctl --system show";
scsl = "systemctl --system list-unit-files";
scsm = "systemctl --system mask";
scsr = "systemctl --system restart";
scsrr = "systemctl --system reload-or-restart";
scss = "systemctl --system status";
scst = "systemctl --system stop";
scsu = "systemctl --system unmask";
scu = "systemctl --user";
scud = "systemctl --user disable";
scudn = "systemctl --user disable --now";
scue = "systemctl --user reenable";
scuen = "systemctl --user reenable --now";
scuh = "systemctl --user show";
scul = "systemctl --user list-unit-files";
scum = "systemctl --user mask";
scur = "systemctl --user restart";
scurr = "systemctl --user reload-or-restart";
scus = "systemctl --user status";
scut = "systemctl --user stop";
scuu = "systemctl --user unmask";
sc = any "systemctl";
scp = any "systemctl poweroff";
scr = any "systemctl reboot";
scs = any "systemctl --system";
scsd = any "systemctl --system disable";
scsdn = any "systemctl --system disable --now";
scse = any "systemctl --system reenable";
scsen = any "systemctl --system reenable --now";
scsh = any "systemctl --system show";
scsl = any "systemctl --system list-unit-files";
scsm = any "systemctl --system mask";
scsr = any "systemctl --system restart";
scsrr = any "systemctl --system reload-or-restart";
scss = any "systemctl --system status";
scst = any "systemctl --system stop";
scsu = any "systemctl --system unmask";
scu = any "systemctl --user";
scud = any "systemctl --user disable";
scudn = any "systemctl --user disable --now";
scue = any "systemctl --user reenable";
scuen = any "systemctl --user reenable --now";
scuh = any "systemctl --user show";
scul = any "systemctl --user list-unit-files";
scum = any "systemctl --user mask";
scur = any "systemctl --user restart";
scurr = any "systemctl --user reload-or-restart";
scus = any "systemctl --user status";
scut = any "systemctl --user stop";
scuu = any "systemctl --user unmask";
d = "docker";
dc = "docker compose";
dcd = "docker compose down";
dce = "docker compose exec";
dcl = "docker compose logs";
dcp = "docker compose pull";
dcu = "docker compose up";
dcuf = "docker compose up --force-recreate";
de = "docker exec";
dei = "docker exec --interactive";
deit = "docker exec --interactive --tty";
det = "docker exec --tty";
di = "docker images";
dk = "docker kill";
dn = "docker network";
dnl = "docker network ls";
dp = "docker pull";
dps = "docker ps";
dpsa = "docker ps --all --size";
dr = "docker rm";
ds = "docker system";
dsp = "docker system prune";
dspav = "docker system prune --all --volumes";
d = any "docker";
dc = any "docker compose";
dcd = any "docker compose down";
dce = any "docker compose exec";
dcl = any "docker compose logs";
dcp = any "docker compose pull";
dcu = any "docker compose up";
dcuf = any "docker compose up --force-recreate";
de = any "docker exec";
dei = any "docker exec --interactive";
deit = any "docker exec --interactive --tty";
det = any "docker exec --tty";
di = any "docker images";
dk = any "docker kill";
dn = any "docker network";
dnl = any "docker network ls";
dp = any "docker pull";
dps = any "docker ps";
dpsa = any "docker ps --all --size";
dr = any "docker rm";
ds = any "docker system";
dsp = any "docker system prune";
dspav = any "docker system prune --all --volumes";
c = "clear";
e = "exit";
@ -162,42 +202,6 @@ in {
};
interactiveShellInit = ''
### Prompt
# Disable greeting
set -g fish_greeting
function fish_prompt --description 'Write out the prompt'
set -l last_status $status
set -l normal (set_color normal)
set -l status_color (set_color brgreen)
set -l cwd_color (set_color $fish_color_cwd)
set -l vcs_color (set_color brpurple)
set -l prompt_status ""
# Since we display the prompt on a new line allow the directory names to be longer.
set -q fish_prompt_pwd_dir_length
or set -lx fish_prompt_pwd_dir_length 0
# Color the prompt differently when we're root
set -l suffix ''
if functions -q fish_is_root_user; and fish_is_root_user
if set -q fish_color_cwd_root
set cwd_color (set_color $fish_color_cwd_root)
end
set suffix '#'
end
# Color the prompt in red on error
if test $last_status -ne 0
set status_color (set_color $fish_color_error)
set prompt_status $status_color "[" $last_status "]" $normal
end
echo -s (prompt_login) ' ' $cwd_color (prompt_pwd) $vcs_color (fish_vcs_prompt) $normal ' ' $prompt_status
echo -n -s $status_color $suffix ' ' $normal
end
### Interactive
# Default is brblack (bright0)
set -g fish_color_autosuggestion brgreen
@ -228,6 +232,10 @@ in {
function activate -d 'Activate Python venv'
source .venv/bin/activate.fish
end
function arknights -d 'Launch Arknights'
waydroid app launch com.YoStarEN.Arknights
end
'';
};
};

View file

@ -17,70 +17,58 @@ in {
programs.vscode = {
enable = true;
mutableExtensionsDir = false;
# Extension dependencies
# https://wiki.nixos.org/wiki/Visual_Studio_Code#Use_VS_Code_extensions_without_additional_configuration
package = pkgs.vscodium.fhsWithPackages (ps:
with ps; [
alejandra # nix-ide
blueprint-compiler # blueprint-gtk
nixd # nix-ide
shfmt # shell-format
]);
package = pkgs.vscodium;
# https://github.com/nix-community/nix-vscode-extensions
#?? nixos-rebuild repl > inputs.nix-vscode-extensions.extensions.${pkgs.system}.*
extensions = let
# Use configured version of vscode
# https://github.com/nix-community/nix-vscode-extensions?tab=readme-ov-file#extensions
#?? extension = with (repo "REPOSITORY"); AUTHOR.EXTENSION
repo = repo:
with inputs.nix-vscode-extensions.extensions.${pkgs.system};
(forVSCodeVersion config.home-manager.users.${config.custom.username}.programs.vscode.package.version).${repo};
in
with (repo "open-vsx");
[
aaron-bond.better-comments
antfu.iconify
antfu.unocss
bedsteler20.gnome-magic
bilelmoussaoui.flatpak-vscode
bmalehorn.vscode-fish
bmewburn.vscode-intelephense-client
bradlc.vscode-tailwindcss
csstools.postcss
dbaeumer.vscode-eslint
#// eamodio.gitlens
esbenp.prettier-vscode
foxundermoon.shell-format
ginfuru.ginfuru-better-solarized-dark-theme
gruntfuggly.todo-tree
jnoortheen.nix-ide
koihik.vscode-lua-format
mhutchie.git-graph
mkhl.direnv
ms-python.black-formatter
ms-python.debugpy
ms-python.isort
ms-python.python
natizyskunk.sftp
pkief.material-icon-theme
pkief.material-product-icons
sketchbuch.vsc-workspace-sidebar
svelte.svelte-vscode
timonwong.shellcheck
vincaslt.highlight-matching-tag
]
++ (with (repo "vscode-marketplace"); [
# Some extensions go missing from open-vsx, so use official marketplace as fallback
# https://github.com/nix-community/nix-vscode-extensions?tab=readme-ov-file#note
bodil.blueprint-gtk
cormoran.disable-default-keybinding
sirmspencer.vscode-autohide
]);
extensions = with inputs.nix-vscode-extensions.extensions.${pkgs.system}.vscode-marketplace; [
# Some extensions go missing from open-vsx, so use official marketplace
# https://github.com/nix-community/nix-vscode-extensions?tab=readme-ov-file#note
aaron-bond.better-comments
antfu.iconify
antfu.unocss
bedsteler20.gnome-magic
bilelmoussaoui.flatpak-vscode
bmalehorn.vscode-fish
bmewburn.vscode-intelephense-client
bodil.blueprint-gtk
bradlc.vscode-tailwindcss
cormoran.disable-default-keybinding
csstools.postcss
dbaeumer.vscode-eslint
#// eamodio.gitlens
esbenp.prettier-vscode
foxundermoon.shell-format
ginfuru.ginfuru-better-solarized-dark-theme
gruntfuggly.todo-tree
jnoortheen.nix-ide
koihik.vscode-lua-format
mhutchie.git-graph
mkhl.direnv
ms-python.black-formatter
ms-python.debugpy
ms-python.isort
ms-python.python
natizyskunk.sftp
pkief.material-icon-theme
pkief.material-product-icons
sirmspencer.vscode-autohide
sketchbuch.vsc-workspace-sidebar
svelte.svelte-vscode
timonwong.shellcheck
vincaslt.highlight-matching-tag
];
};
home = {
# Extension dependencies
packages = with pkgs; [
alejandra # nix-ide
blueprint-compiler # blueprint-gtk
nixd # nix-ide
shfmt # shell-format
];
# https://github.com/nix-community/nixd/blob/main/nixd/docs/features.md
sessionVariables.NIXD_FLAGS = "--inlay-hints=false"; # Disable package versions in the editor

View file

@ -84,7 +84,7 @@ in {
# https://github.com/abenz1267/walker/blob/master/internal/config/layout.default.json
layout.ui.window.box = rec {
height = 300 / config.custom.scale;
height = 250 / config.custom.scale;
width = 1000 / config.custom.scale;
scroll.list = {