flake update
This commit is contained in:
parent
ef5eac814d
commit
350885960e
6 changed files with 71 additions and 33 deletions
51
flake.lock
generated
51
flake.lock
generated
|
|
@ -222,11 +222,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759850138,
|
"lastModified": 1760323106,
|
||||||
"narHash": "sha256-fYHIxjTvVIAEDWzenUROuzDPxy1rBCXZNPgh4b1dfgo=",
|
"narHash": "sha256-HqVZwIwpDviDB1daJY/pPzkMKAC+dj5y0rDWEJbuKsE=",
|
||||||
"owner": "helix-editor",
|
"owner": "helix-editor",
|
||||||
"repo": "helix",
|
"repo": "helix",
|
||||||
"rev": "5b0563419eeeaf0595c848865c46be4abad246a7",
|
"rev": "10c6a100c6e93b0dc175bf2f8b5a1afd66aebe2a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -242,11 +242,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760103600,
|
"lastModified": 1760312644,
|
||||||
"narHash": "sha256-R4cltQFceN3POiPhBu7aTKsrwqTiwo6zjzmitrHD80E=",
|
"narHash": "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "bcccb01d0a353c028cc8cb3254cac7ebae32929e",
|
"rev": "e121f3773fa596ecaba5b22e518936a632d72a90",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -456,6 +456,26 @@
|
||||||
"url": "https://git.xyno.systems/xyno/nix-ci"
|
"url": "https://git.xyno.systems/xyno/nix-ci"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nix-index-database": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1760241904,
|
||||||
|
"narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=",
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nix-index-database",
|
||||||
|
"rev": "c9f5ea45f25652ec2f771f9426ccacb21cbbaeaa",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nix-community",
|
||||||
|
"repo": "nix-index-database",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760106635,
|
"lastModified": 1760106635,
|
||||||
|
|
@ -505,11 +525,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760116522,
|
"lastModified": 1760353201,
|
||||||
"narHash": "sha256-UlZbPVN6Ee3iBk5y4f2rTJke5w84vLF81ioB1QF+SxI=",
|
"narHash": "sha256-lApR6u9s3ymKIAXofVPS+eo/y6HO8OrUp8Hl0S30tOE=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "10ad44f66fdaededd60d6eb5af562e569cabb4e4",
|
"rev": "d559772cb55d806536aef3cf4ba3f7ce25fe4be9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -625,6 +645,7 @@
|
||||||
"nheko": "nheko",
|
"nheko": "nheko",
|
||||||
"niri": "niri",
|
"niri": "niri",
|
||||||
"nix-ci": "nix-ci",
|
"nix-ci": "nix-ci",
|
||||||
|
"nix-index-database": "nix-index-database",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-master": "nixpkgs-master",
|
"nixpkgs-master": "nixpkgs-master",
|
||||||
|
|
@ -746,11 +767,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759635238,
|
"lastModified": 1760240450,
|
||||||
"narHash": "sha256-UvzKi02LMFP74csFfwLPAZ0mrE7k6EiYaKecplyX9Qk=",
|
"narHash": "sha256-sa9bS9jSyc4vH0jSWrUsPGdqtMvDwmkLg971ntWOo2U=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "6e5a38e08a2c31ae687504196a230ae00ea95133",
|
"rev": "41fd1f7570c89f645ee0ada0be4e2d3c4b169549",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -881,11 +902,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759965431,
|
"lastModified": 1760329437,
|
||||||
"narHash": "sha256-HvXr+rOkSZeseOYCruuMKMAUedcDkHOuYpFbnlIPs8Y=",
|
"narHash": "sha256-TbTTbn2pr0urylodXUi0r9sUB/AjvaZuLclG4b0wLp8=",
|
||||||
"owner": "0xc000022070",
|
"owner": "0xc000022070",
|
||||||
"repo": "zen-browser-flake",
|
"repo": "zen-browser-flake",
|
||||||
"rev": "391a133511ad7e09651b9c3939d8cf8d379766b1",
|
"rev": "df8f0729adfcb72b1e6bb2751f92dec0f54283c3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,9 @@
|
||||||
mtxclient.flake = false;
|
mtxclient.flake = false;
|
||||||
nix-ci.url = "git+https://git.xyno.systems/xyno/nix-ci";
|
nix-ci.url = "git+https://git.xyno.systems/xyno/nix-ci";
|
||||||
nix-ci.inputs.nixpkgs.follows = "nixpkgs";
|
nix-ci.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
|
nix-index-database.url = "github:nix-community/nix-index-database";
|
||||||
|
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
# helix
|
# helix
|
||||||
helix.url = "github:helix-editor/helix";
|
helix.url = "github:helix-editor/helix";
|
||||||
|
|
@ -96,6 +99,7 @@
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
inputs.impermanence.nixosModules.impermanence
|
inputs.impermanence.nixosModules.impermanence
|
||||||
inputs.authentik.nixosModules.default
|
inputs.authentik.nixosModules.default
|
||||||
|
inputs.nix-index-database.nixosModules.nix-index
|
||||||
]
|
]
|
||||||
++ (import ./modules/module-list.nix);
|
++ (import ./modules/module-list.nix);
|
||||||
in
|
in
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ in
|
||||||
# nodePackages_latest.prettier
|
# nodePackages_latest.prettier
|
||||||
dprint
|
dprint
|
||||||
markdown-oxide
|
markdown-oxide
|
||||||
|
codebook
|
||||||
## python
|
## python
|
||||||
# ruff-lsp
|
# ruff-lsp
|
||||||
# nodePackages_latest.pyright
|
# nodePackages_latest.pyright
|
||||||
|
|
@ -32,8 +33,8 @@ in
|
||||||
nodePackages_latest.typescript-language-server
|
nodePackages_latest.typescript-language-server
|
||||||
nodePackages_latest.vscode-langservers-extracted
|
nodePackages_latest.vscode-langservers-extracted
|
||||||
typescript
|
typescript
|
||||||
jsonnet-language-server
|
# jsonnet-language-server
|
||||||
jsonnet
|
# jsonnet
|
||||||
lazygit
|
lazygit
|
||||||
|
|
||||||
]);
|
]);
|
||||||
|
|
@ -142,6 +143,10 @@ in
|
||||||
language-server.csharp = {
|
language-server.csharp = {
|
||||||
command = "csharp-language-server";
|
command = "csharp-language-server";
|
||||||
};
|
};
|
||||||
|
language-server.codebook = {
|
||||||
|
command = "codebook-lsp";
|
||||||
|
args = ["serve"];
|
||||||
|
};
|
||||||
language = flatten [
|
language = flatten [
|
||||||
(map
|
(map
|
||||||
(x: {
|
(x: {
|
||||||
|
|
@ -173,6 +178,10 @@ in
|
||||||
"ruff"
|
"ruff"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
{
|
||||||
|
name = "markdown";
|
||||||
|
language-servers = ["codebook"];
|
||||||
|
}
|
||||||
{
|
{
|
||||||
name = "c-sharp";
|
name = "c-sharp";
|
||||||
language-servers = [ "csharp" ];
|
language-servers = [ "csharp" ];
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,7 @@ in
|
||||||
unitConfig.Requisite = "graphical-session.target";
|
unitConfig.Requisite = "graphical-session.target";
|
||||||
serviceConfig.Restart = "on-failure";
|
serviceConfig.Restart = "on-failure";
|
||||||
wantedBy = [ "swww-daemon.service" ];
|
wantedBy = [ "swww-daemon.service" ];
|
||||||
|
path = with pkgs;[ coreutils findutils cfg.package gnused];
|
||||||
script = ''
|
script = ''
|
||||||
set -eox
|
set -eox
|
||||||
export DEFAULT_INTERVAL=300 # In seconds
|
export DEFAULT_INTERVAL=300 # In seconds
|
||||||
|
|
@ -61,23 +62,25 @@ in
|
||||||
export SWWW_TRANSITION="fade"
|
export SWWW_TRANSITION="fade"
|
||||||
export SWWW_TRANSITION_DURATION="1"
|
export SWWW_TRANSITION_DURATION="1"
|
||||||
# export SWWW_TRANSITION_STEP="90"
|
# export SWWW_TRANSITION_STEP="90"
|
||||||
|
|
||||||
|
# queue of images to show
|
||||||
|
images=( $(find $DIR -type f | shuf) )
|
||||||
|
function get_img() {
|
||||||
|
item=''${images[0]}
|
||||||
|
images=("''${images[@]:1}")
|
||||||
|
if [[ ''${#images[@]} == 0 ]]; then
|
||||||
|
images=( $(find $DIR -type f | shuf) )
|
||||||
|
fi
|
||||||
|
echo $item
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
while true; do
|
while true; do
|
||||||
find "''$DIR" -type f \
|
img=$(get_img)
|
||||||
| while read -r img; do
|
for d in ''$(swww query | sed -nE 's/^: ([^:]+).*/\1/p'); do # see swww-query(1)
|
||||||
echo "''$(</dev/urandom tr -dc a-zA-Z0-9 | head -c 8):''$img"
|
swww img --resize "''$RESIZE_TYPE" --outputs "''$d" "''$img"
|
||||||
done \
|
|
||||||
| sort -n | cut -d':' -f2- \
|
|
||||||
| while read -r img; do
|
|
||||||
for d in ''$(${cfg.package}/bin/swww query | grep -Po "^[^:]+"); do # see ${cfg.package}/bin/swww-query(1)
|
|
||||||
# Get next random image for this display, or re-shuffle images
|
|
||||||
# and pick again if no more unused images are remaining
|
|
||||||
[ -z "''$img" ] && if read -r img; then true; else break 2; fi
|
|
||||||
${cfg.package}/bin/swww img --resize "''$RESIZE_TYPE" --outputs "''$d" "''$img"
|
|
||||||
unset -v img # Each image should only be used once per loop
|
|
||||||
done
|
|
||||||
sleep "''${DEFAULT_INTERVAL}"
|
|
||||||
done
|
done
|
||||||
|
sleep "''${DEFAULT_INTERVAL}"
|
||||||
done
|
done
|
||||||
'';
|
'';
|
||||||
# restartTriggers = [wpaperdConf];
|
# restartTriggers = [wpaperdConf];
|
||||||
|
|
|
||||||
|
|
@ -11,6 +11,8 @@ in
|
||||||
options.xyno.presets.cli.enable =
|
options.xyno.presets.cli.enable =
|
||||||
lib.mkEnableOption "enables xynos cli config with fish and helix and stuff";
|
lib.mkEnableOption "enables xynos cli config with fish and helix and stuff";
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
|
programs.nix-index-database.comma.enable = true;
|
||||||
|
|
||||||
home-manager.users.${config.xyno.system.user.name} =
|
home-manager.users.${config.xyno.system.user.name} =
|
||||||
lib.mkIf config.xyno.presets.home-manager.enable
|
lib.mkIf config.xyno.presets.home-manager.enable
|
||||||
(
|
(
|
||||||
|
|
@ -117,7 +119,6 @@ in
|
||||||
bottom
|
bottom
|
||||||
curl
|
curl
|
||||||
croc
|
croc
|
||||||
comma
|
|
||||||
dig
|
dig
|
||||||
fd
|
fd
|
||||||
ffmpeg
|
ffmpeg
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ in
|
||||||
qt = {
|
qt = {
|
||||||
enable = true;
|
enable = true;
|
||||||
style = "breeze";
|
style = "breeze";
|
||||||
platformTheme = "gnome";
|
# platformTheme = "gnome";
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.yazi = {
|
programs.yazi = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue