jana/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: jana:ae9854f178251a149561f4cd9b9240835445a615
Branches Tags
jana:main
jana:workflows
..
compare: jana:62ecb566ed3b4280a337dc685709408e9b80e5eb
Branches Tags
jana:main
jana:workflows

No commits in common. "ae9854f178251a149561f4cd9b9240835445a615" and "62ecb566ed3b4280a337dc685709408e9b80e5eb" have entirely different histories.
ae9854f178 ... 62ecb566ed

14 changed files with 337 additions and 491 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config.nix
View file

@ -3,7 +3,6 @@ inputs@{
deploy-rs, deploy-rs,
self, self,
pkgsForSystem, pkgsForSystem,
unstablePkgsForSystem,
... ...
}: }:
@ -64,7 +63,6 @@ rec {
}: }:
home-only: { home-only: {
pkgs = pkgsForSystem system; pkgs = pkgsForSystem system;
pkgs-unstable = unstablePkgsForSystem system;
flakes = inputs; flakes = inputs;
inherit inputs; inherit inputs;
inherit (inputs.secrets.packages.${system}) secrets; inherit (inputs.secrets.packages.${system}) secrets;

60
flake.lock generated
View file

@ -718,11 +718,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1774289893, "lastModified": 1772058280,
"narHash": "sha256-si2LHcNiLuF01yOuaUs90p1U09hhaketA8tyanWwiP0=", "narHash": "sha256-8gZ6wh++43JAe6PH0hmm4Q8gPEScf0S7rkb0MmIxu2U=",
"owner": "jdonszelmann", "owner": "jdonszelmann",
"repo": "homepage", "repo": "homepage",
"rev": "635f900ce31b7f901da33c6fa830a2e7c116552f", "rev": "ead7bebdfa71b207d2513d7f002e164d0b17a264",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1123,22 +1123,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": {
"locked": {
"lastModified": 1766185129,
"narHash": "sha256-ldujgxS7lslpNf3oV2DHCEgNutfzEtMPv5O6l22XHNY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5d9ea8caac0dda3bc216047d29943b8a59e431b7",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5d9ea8caac0dda3bc216047d29943b8a59e431b7",
"type": "github"
}
},
"nixpkgs_10": { "nixpkgs_10": {
"locked": { "locked": {
"lastModified": 1757967192, "lastModified": 1757967192,
@ -1342,22 +1326,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_22": {
"locked": {
"lastModified": 1745930157,
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1732521221, "lastModified": 1732521221,
@ -1474,7 +1442,7 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs"
], ],
"systems": "systems_10" "systems": "systems_10"
}, },
@ -1728,7 +1696,6 @@
"niri": "niri", "niri": "niri",
"niri-unstable": "niri-unstable", "niri-unstable": "niri-unstable",
"nixpkgs": "nixpkgs_11", "nixpkgs": "nixpkgs_11",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim", "nixvim": "nixvim",
"noctalia": "noctalia", "noctalia": "noctalia",
"p1n3appl3": "p1n3appl3", "p1n3appl3": "p1n3appl3",
@ -1740,7 +1707,6 @@
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"t": "t", "t": "t",
"totpal": "totpal", "totpal": "totpal",
"vimium-options": "vimium-options",
"vpn-confinement": "vpn-confinement" "vpn-confinement": "vpn-confinement"
} }
}, },
@ -2307,24 +2273,6 @@
"type": "github" "type": "github"
} }
}, },
"vimium-options": {
"inputs": {
"nixpkgs": "nixpkgs_22"
},
"locked": {
"lastModified": 1746118178,
"narHash": "sha256-MtIuTMLMF/Cl3MEJwO56rVhtXUtRhZ/i2hG49jcosEE=",
"owner": "uimataso",
"repo": "vimium-nixos",
"rev": "a9e4b051cf944718fd3fbb638bc1c08057507c31",
"type": "github"
},
"original": {
"owner": "uimataso",
"repo": "vimium-nixos",
"type": "github"
}
},
"vpn-confinement": { "vpn-confinement": {
"locked": { "locked": {
"lastModified": 1767604552, "lastModified": 1767604552,

17
flake.nix
View file

@ -2,7 +2,6 @@
description = "jana's server infrastructure"; description = "jana's server infrastructure";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs"; nixpkgs.url = "github:NixOS/nixpkgs";
nixpkgs-unstable.url = "github:nixos/nixpkgs/5d9ea8caac0dda3bc216047d29943b8a59e431b7";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
@ -30,7 +29,7 @@
# home # home
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs";
}; };
t.url = "github:jdonszelmann/t-rs"; t.url = "github:jdonszelmann/t-rs";
dumpasm.url = "github:jdonszelmann/dumpasm"; dumpasm.url = "github:jdonszelmann/dumpasm";
@ -69,12 +68,11 @@
url = "github:drannex/FirefoxSidebar"; url = "github:drannex/FirefoxSidebar";
flake = false; flake = false;
}; };
vimium-options.url = "github:uimataso/vimium-nixos";
}; };
outputs = outputs =
{ {
nixpkgs, nixpkgs,
nixpkgs-unstable,
flake-utils, flake-utils,
sops-nix, sops-nix,
vpn-confinement, vpn-confinement,
@ -83,10 +81,9 @@
}@inputs: }@inputs:
let let
custom = pkgs: import ./pkgs/custom.nix (inputs // { inherit pkgs; }); custom = pkgs: import ./pkgs/custom.nix (inputs // { inherit pkgs; });
pkgsForSystem =
pkgsForSystemShared = system:
np: system: import nixpkgs {
import np {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
overlays = [ overlays = [
@ -95,9 +92,7 @@
}) })
]; ];
}; };
pkgsForSystem = pkgsForSystemShared nixpkgs; configs = import ./config.nix (inputs // { inherit pkgsForSystem; });
unstablePkgsForSystem = pkgsForSystemShared nixpkgs-unstable;
configs = import ./config.nix (inputs // { inherit pkgsForSystem unstablePkgsForSystem; });
in in
(configs.configs [ (configs.configs [
{ {

11
programs/default.nix
View file

@ -5,7 +5,6 @@
[ [
./xdg.nix ./xdg.nix
./ssh.nix ./ssh.nix
./less.nix
./nvim ./nvim
./fish ./fish
./kanata ./kanata
@ -45,11 +44,10 @@
inherit inputs; inherit inputs;
requirements = [ "graphical" ]; requirements = [ "graphical" ];
home-config = home-config =
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
let let
disableFeatures = [ disableFeatures = [
@ -214,7 +212,6 @@
just just
uv uv
llvmPackages.bintools llvmPackages.bintools
nodejs
(writeShellScriptBin "nas" '' (writeShellScriptBin "nas" ''
mkdir -p ~/Documents/nas mkdir -p ~/Documents/nas

56
programs/firefox/default.nix
View file

@ -23,48 +23,6 @@ inputs@{ machine, ... }:
# }; # };
in in
{ {
imports = [ flakes.vimium-options.homeManagerModules.vimium-options ];
home.vimiumOptions = {
enable = true;
outputFilePath = ".cache/vimium-options.json";
keyMappings = {
unmapAll = true;
map = {
"j" = "scrollDown";
"k" = "scrollUp";
"<" = "goBack";
">" = "goForward";
"gi" = "focusInput";
"gr" = "goToRoot";
"gu" = "goUp";
"g[" = "goNext";
"g]" = "goPrevious";
"gF" = "mainFrame";
"gf" = "nextFrame";
"p" = "openCopiedUrlInCurrentTab";
"P" = "openCopiedUrlInNewTab";
"G" = "scrollToBottom";
"gg" = "scrollToTop";
"C-o" = "visitPreviousTab";
"f" = "LinkHints.activateMode";
"F" = "LinkHints.activateModeToOpenInNewTab";
"<a-f>" = "LinkHints.activateModeWithQueue";
"yf" = "LinkHints.activateModeToCopyLinkUrl";
};
};
exclusionRules = [
{
pattern = "https?://mail.google.com/*";
}
{
pattern = "https?://squaredle.app/*";
}
];
};
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.wrapFirefox pkgs.firefox-unwrapped { package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
@ -130,7 +88,7 @@ inputs@{ machine, ... }:
ublock-origin ublock-origin
sidebery sidebery
sponsorblock sponsorblock
vimium # vimium
]; ];
bookmarks = { bookmarks = {
@ -196,16 +154,16 @@ inputs@{ machine, ... }:
}; };
}; };
xdg.mimeApps.defaultApplications = { xdg.mimeApps = {
"x-scheme-handler/http" = [ defaultApplications."x-scheme-handler/http" = [
"firefox.desktop" "firefox.desktop"
]; ];
"x-scheme-handler/https" = [ defaultApplications."x-scheme-handler/https" = [
"firefox.desktop" "firefox.desktop"
]; ];
"text/html" = [ "firefox.desktop" ]; defaultApplications."text/html" = [ "firefox.desktop" ];
"x-scheme-handler/about" = [ "firefox.desktop" ]; defaultApplications."x-scheme-handler/about" = [ "firefox.desktop" ];
"x-scheme-handler/unknown" = [ "firefox.desktop" ]; defaultApplications."x-scheme-handler/unknown" = [ "firefox.desktop" ];
}; };
}; };
}; };

434
programs/fish/default.nix
View file

@ -5,251 +5,245 @@ inputs@{ machine, ... }:
inherit inputs; inherit inputs;
requirements = [ "cli" ]; requirements = [ "cli" ];
home-config = home-config =
{ { config
config, , pkgs
pkgs, , lib
lib, , ...
...
}: }:
with builtins; with builtins;
with lib.attrsets; with lib.attrsets;
let let
scripts = (import ./scripts.nix) pkgs; scripts = (import ./scripts.nix) pkgs;
aliases = with scripts; { aliases = with scripts; {
"cp-mov" = cp-media "mov" "movies"; "cp-mov" = cp-media "mov" "movies";
"cp-ser" = cp-media "ser" "shows"; "cp-ser" = cp-media "ser" "shows";
"cp-ani" = cp-media "ani" "anime"; "cp-ani" = cp-media "ani" "anime";
"ragdoll" = ragdoll; "ragdoll" = ragdoll;
"dumpasm" = "${pkgs.custom.dumpasm}/bin/dumpasm"; "dumpasm" = "${pkgs.custom.dumpasm}/bin/dumpasm";
"p" = calc; "p" = calc;
"s" = "systemctl"; "s" = "systemctl";
"j" = "journalctl"; "j" = "journalctl";
"ju" = "journalctl -u"; "ju" = "journalctl -u";
"jfu" = "journalctl -fu"; "jfu" = "journalctl -fu";
"ls" = "${pkgs.eza}/bin/eza --git"; "ls" = "${pkgs.eza}/bin/eza --git";
"ll" = "${pkgs.eza}/bin/eza --git"; "ll" = "${pkgs.eza}/bin/eza --git";
"lt" = "${pkgs.eza}/bin/eza --long --tree -L 3"; "lt" = "${pkgs.eza}/bin/eza --long --tree -L 3";
"open" = "${pkgs.xdg-utils}/bin/xdg-open"; "open" = "${pkgs.xdg-utils}/bin/xdg-open";
"cb" = "${pkgs.wl-clipboard-rs}/bin/wl-copy"; "cb" = "${pkgs.wl-clipboard-rs}/bin/wl-copy";
"cat" = "${pkgs.bat}/bin/bat"; "cat" = "${pkgs.bat}/bin/bat";
# "pull" = "${pkgs.git}/bin/git pull"; # "pull" = "${pkgs.git}/bin/git pull";
# "push" = "${pkgs.git}/bin/git push"; # "push" = "${pkgs.git}/bin/git push";
# "commit" = "${pkgs.git}/bin/git commit"; # "commit" = "${pkgs.git}/bin/git commit";
# "add" = "${pkgs.git}/bin/git add"; # "add" = "${pkgs.git}/bin/git add";
# "patch" = "${pkgs.git}/bin/git add -p"; # "patch" = "${pkgs.git}/bin/git add -p";
# "amend" = "${pkgs.git}/bin/git commit --amend"; # "amend" = "${pkgs.git}/bin/git commit --amend";
# "log" = "${pkgs.git}/bin/git log --all --graph --decorate"; # "log" = "${pkgs.git}/bin/git log --all --graph --decorate";
# "st" = "${pkgs.git}/bin/git status"; # "st" = "${pkgs.git}/bin/git status";
# "checkout" = "${pkgs.git}/bin/git checkout"; # "checkout" = "${pkgs.git}/bin/git checkout";
# "rebase" = "${pkgs.git}/bin/git rebase"; # "rebase" = "${pkgs.git}/bin/git rebase";
# "stash" = "${pkgs.git}/bin/git stash"; # "stash" = "${pkgs.git}/bin/git stash";
"edit" = "jj edit"; "edit" = "jj edit";
"old" = "jj edit @-"; "old" = "jj edit @-";
"new" = "jj edit @+"; "new" = "jj edit @+";
"rebase" = "jj rebase"; "rebase" = "jj rebase";
"pull" = "jj git fetch; jj catchup"; "pull" = "jj git fetch; jj catchup";
"msg" = "jj describe -m"; "msg" = "jj describe -m";
"branch" = "jj bookmark set"; "branch" = "jj bookmark set";
"stat" = "jj status"; "stat" = "jj status";
"push" = "jj git push"; "push" = "jj git push";
"tidy" = "x test tidy --bless"; "tidy" = "x test tidy --bless";
"ui" = "x test tests/ui/"; "ui" = "x test tests/ui/";
"f" = "nautilus --no-desktop . &"; "f" = "nautilus --no-desktop . &";
}; };
# extracting any compressed format # extracting any compressed format
extract = '' extract = ''
function extract -a file -d "decompress a file" function extract -a file -d "decompress a file"
if not test -f $file if not test -f $file
echo "'$file' is not a valid file" echo "'$file' is not a valid file"
return 1
end
switch $file
# tar can automatically figure out how to decompress
case '*.{tar,tar.{bz2,zst,gz,xz},tbz2,tgz'; ${pkgs.gnutar}/bin/tar xf $file; end
case '*.bz2'; bunzip2 $file; end
case '*.rar'; unrar e $file; end
case '*.gz'; gunzip $file; end
case '*.zip'; ${pkgs.unzip}/bin/unzip $file; end
case '*.Z'; uncompress $file; end
case '*.7z'; 7z x $file; end
case '*';
echo "'$file' cannot be extracted"
return 1 return 1
end
switch $file
# tar can automatically figure out how to decompress
case '*.{tar,tar.{bz2,zst,gz,xz},tbz2,tgz'; ${pkgs.gnutar}/bin/tar xf $file; end
case '*.bz2'; bunzip2 $file; end
case '*.rar'; unrar e $file; end
case '*.gz'; gunzip $file; end
case '*.zip'; ${pkgs.unzip}/bin/unzip $file; end
case '*.Z'; uncompress $file; end
case '*.7z'; 7z x $file; end
case '*';
echo "'$file' cannot be extracted"
return 1
end
end end
end '';
''; in
in {
{ programs = {
programs = { atuin = {
atuin = { enable = true;
enable = true; enableFishIntegration = true;
enableFishIntegration = true;
settings = { settings = {
filter_mode_shell_up_key_binding = "workspace"; filter_mode_shell_up_key_binding = "workspace";
exit_mode = "return-original"; exit_mode = "return-original";
inline_height = 20; inline_height = 20;
workspaces = true; workspaces = true;
};
}; };
};
zoxide = { zoxide = {
enable = true; enable = true;
enableFishIntegration = true; enableFishIntegration = true;
}; };
direnv = { direnv = {
enable = true; enable = true;
# enableFishIntegration = lib.mkDefault true; # enableFishIntegration = lib.mkDefault true;
}; };
fzf = { fzf = {
enable = true; enable = true;
enableFishIntegration = true; enableFishIntegration = true;
}; };
fish = { fish = {
enable = true; enable = true;
shellAliases = aliases; shellAliases = aliases;
plugins = with pkgs.fishPlugins; [ plugins = with pkgs.fishPlugins; [
{ {
name = "bang-bang"; name = "bang-bang";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "oh-my-fish"; owner = "oh-my-fish";
repo = "plugin-bang-bang"; repo = "plugin-bang-bang";
rev = "ec991b80ba7d4dda7a962167b036efc5c2d79419"; rev = "ec991b80ba7d4dda7a962167b036efc5c2d79419";
hash = "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0="; hash = "sha256-oPPCtFN2DPuM//c48SXb4TrFRjJtccg0YPXcAo0Lxq0=";
};
}
{
name = "tide";
inherit (tide) src;
}
{
name = "sponge";
inherit (sponge) src;
}
{
name = "autopair";
inherit (autopair) src;
}
];
functions = {
fish_jj_prompt = {
body = ''
if not ${config.programs.jujutsu.package}/bin/jj root --quiet &>/dev/null
return 1
end
${config.programs.jujutsu.package}/bin/jj log --ignore-working-copy --no-graph --color always -r @ -T '
separate(
" ",
bookmarks.join(", "),
change_id.shortest(),
commit_id.shortest(),
if(conflict, "conflict"),
if(empty, "empty"),
if(divergent, "divergent"),
if(hidden, "hidden"),
)
'
'';
}; };
}
{
name = "tide";
inherit (tide) src;
}
{
name = "sponge";
inherit (sponge) src;
}
{
name = "autopair";
inherit (autopair) src;
}
];
functions = { _tide_item_jj = {
fish_jj_prompt = { body = ''
body = '' set -l _tide_item_jj_color $_tide_location_color
if not ${config.programs.jujutsu.package}/bin/jj root --quiet &>/dev/null echo -ns $_tide_item_jj_color" ("(fish_jj_prompt)$_tide_item_jj_color")"
return 1 '';
end };
${config.programs.jujutsu.package}/bin/jj log --ignore-working-copy --no-graph --color always -r @ -T ' _tide_item_git = {
separate( body = ''
" ", if not test -d .jj
bookmarks.join(", "), fish_git_prompt '%s'
change_id.shortest(), end
commit_id.shortest(), '';
if(conflict, "conflict"), };
if(empty, "empty"),
if(divergent, "divergent"),
if(hidden, "hidden"),
)
'
'';
}; };
_tide_item_jj = { interactiveShellInit = ''
body = '' fish_vi_key_bindings
set -l _tide_item_jj_color $_tide_location_color
echo -ns $_tide_item_jj_color" ("(fish_jj_prompt)$_tide_item_jj_color")"
'';
};
_tide_item_git = { bind \e\[3\;5~ kill-word
body = '' bind \cH backward-kill-word
if not test -d .jj bind \cV beginning-of-line
fish_git_prompt '%s' bind \f end-of-line
end
'';
};
};
interactiveShellInit = '' bind -M insert \e\[3\;5~ kill-word
fish_vi_key_bindings bind -M insert \cH backward-kill-word
bind -M insert \cV beginning-of-line
bind -M insert \f end-of-line
bind \e\[3\;5~ kill-word bind \cl 'clear; commandline -f repaint'
bind \cH backward-kill-word bind -M insert \cl 'clear; commandline -f repaint'
bind \cV beginning-of-line
bind \f end-of-line
bind -M insert \e\[3\;5~ kill-word set -g sponge_successful_exit_codes 0
bind -M insert \cH backward-kill-word set -g sponge_allow_previously_successful false
bind -M insert \cV beginning-of-line set -g sponge_delay 10
bind -M insert \f end-of-line
bind \cl 'clear; commandline -f repaint' ${config.programs.jujutsu.package}/bin/jj util completion fish | source
bind -M insert \cl 'clear; commandline -f repaint'
set -g sponge_successful_exit_codes 0 # if set -q tide_left_prompt_items; and not contains "jj" $tide_left_prompt_items
set -g sponge_allow_previously_successful false # set -l tide_item_jj_idx (contains -i "pwd" $tide_left_prompt_items)
set -g sponge_delay 10 # if test $tide_item_jj_idx
# set tide_left_prompt_items \
# $tide_left_prompt_items[1..$tide_item_jj_idx] \
# jj \
# $tide_left_prompt_items[(math $tide_item_jj_idx + 1)..-1]
# end
# end
${config.programs.jujutsu.package}/bin/jj util completion fish | source function t
cd "$(${pkgs.custom.t}/bin/t-rs $argv | tail -n 1)"
# if set -q tide_left_prompt_items; and not contains "jj" $tide_left_prompt_items
# set -l tide_item_jj_idx (contains -i "pwd" $tide_left_prompt_items)
# if test $tide_item_jj_idx
# set tide_left_prompt_items \
# $tide_left_prompt_items[1..$tide_item_jj_idx] \
# jj \
# $tide_left_prompt_items[(math $tide_item_jj_idx + 1)..-1]
# end
# end
function t
cd "$(${pkgs.custom.t}/bin/t-rs $argv | tail -n 1)"
end
function temp
t $argv
end
function rs
cd "$(${pkgs.custom.t}/bin/t-rs $argv | tail -n 1)"
cargo init . --bin --name $(basename "$PWD")
vim src/main.rs
end
fish_add_path "$HOME/.cargo/bin"
fish_add_path "$HOME/.local/bin"
fish_add_path "$HOME/Documents/scripts"
fish_add_path "$HOME/.nix-profile/bin"
function fish_greeting
if test -e /etc/motd
else
${pkgs.blahaj}/bin/blahaj -s
end end
echo "mrow! This is $(uname -n) and ur $(whoami) :3"
end
'';
};
};
home.activation = { function temp
setupTide = lib.hm.dag.entryAfter [ "writeBoundary" ] '' t $argv
setupTide() { end
${pkgs.fish}/bin/fish -c ${lib.escapeShellArg "tide configure ${
lib.cli.toCommandLineShell function rs
(optionName: { cd "$(${pkgs.custom.t}/bin/t-rs $argv | tail -n 1)"
cargo init . --bin --name $(basename "$PWD")
vim src/main.rs
end
fish_add_path "$HOME/.cargo/bin"
fish_add_path "$HOME/.local/bin"
fish_add_path "$HOME/Documents/scripts"
fish_add_path "$HOME/.nix-profile/bin"
function fish_greeting
${pkgs.blahaj}/bin/blahaj -s
echo "mrow! This is $(uname -n) and ur $(whoami) :3"
end
'';
};
};
home.activation = {
setupTide = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
setupTide() {
${pkgs.fish}/bin/fish -c ${lib.escapeShellArg "tide configure ${
lib.cli.toCommandLineShell (optionName: {
option = if builtins.stringLength optionName > 1 then "--${optionName}" else "-${optionName}"; option = if builtins.stringLength optionName > 1 then "--${optionName}" else "-${optionName}";
sep = null; sep = null;
explicitBool = false; explicitBool = false;
}) }) {
{
auto = true; auto = true;
style = "Lean"; style = "Lean";
prompt_colors = "True color"; prompt_colors = "True color";
@ -260,11 +254,11 @@ inputs@{ machine, ... }:
icons = "Few icons"; icons = "Few icons";
transient = "Yes"; transient = "Yes";
} }
}"} >/dev/null 2>&1 }"} >/dev/null 2>&1
} }
setupTide setupTide
''; '';
};
}; };
};
}; };
} }

28
programs/jj/default.nix
View file

@ -13,12 +13,12 @@ inputs@{ machine, ... }:
settings = { settings = {
user = { user = {
inherit (config.programs.git.settings.user) email; email = config.programs.git.settings.user.email;
inherit (config.programs.git.settings.user) name; name = config.programs.git.settings.user.name;
}; };
ui = { ui = {
# paginate = "never"; paginate = "never";
# pager = "${pkgs.delta}/bin/delta"; # pager = "${pkgs.delta}/bin/delta";
# for delta # for delta
# diff-formatter = ":git"; # diff-formatter = ":git";
@ -31,6 +31,8 @@ inputs@{ machine, ... }:
default-command = [ default-command = [
"log" "log"
"--reversed"
"--no-pager"
]; ];
merge-editor = [ merge-editor = [
"${pkgs.meld}/bin/meld" "${pkgs.meld}/bin/meld"
@ -152,26 +154,14 @@ inputs@{ machine, ... }:
"--from" "--from"
"trunk()" "trunk()"
]; ];
n = [ n = [ "edit" "@+" ];
"edit" p = [ "edit" "@-" ];
"@+"
];
p = [
"edit"
"@-"
];
gp = [ gp = [ "git" "push" ];
"git"
"push"
];
t = tug; t = tug;
d = "describe"; d = "describe";
dm = [ dm = [ "describe" "-m" ];
"describe"
"-m"
];
e = "edit"; e = "edit";
s = "squash"; s = "squash";
si = "squash -i"; si = "squash -i";

22
programs/less.nix
View file

@ -1,22 +0,0 @@
inputs@{ machine, ... }:
{
imports = machine.program {
name = "less";
inherit inputs;
requirements = [ "cli" ];
home-config =
{ pkgs, ... }:
{
home.packages = with pkgs; [ less ];
programs.less = {
enable = true;
config = ''
#command
#env
LESS=--quit-if-one-screen --ignore-case --long-prompt --tabs=4 --redraw-on-quit --use-color --RAW-CONTROL-CHARS --chop-long-lines --exit-follow-on-close
'';
};
};
};
}

7
programs/nvim/config.lua
View file

@ -28,10 +28,9 @@ end, { remap = true })
vim.keymap.set('n', 'gr', (function() builtin.lsp_references({}) end), {}) -- vim.keymap.set('n', 'gr', (function() builtin.lsp_references({jump_type="vsplit"}) end), {})
vim.keymap.set('n', 'gd', (function() builtin.lsp_definitions({}) end), {}) -- vim.keymap.set('n', 'gd', (function() builtin.lsp_definitions({jump_type="vsplit"}) end), {})
vim.keymap.set('n', 'gt', (function() builtin.lsp_type_definitions({}) end), {}) -- vim.keymap.set('n', 'gt', (function() builtin.lsp_type_definitions({jump_type="vsplit"}) end), {})
vim.keymap.set('n', 'gi', (function() builtin.lsp_implementations({}) end), {})
-- vim.keymap.set('n', 'gt', (function() builtin.lsp_type_definitions({jump_type="vsplit"}) end), {}) -- vim.keymap.set('n', 'gt', (function() builtin.lsp_type_definitions({jump_type="vsplit"}) end), {})

28
programs/nvim/default.nix
View file

@ -5,12 +5,10 @@ inputs@{ machine, ... }:
inherit inputs; inherit inputs;
requirements = [ "cli" ]; requirements = [ "cli" ];
home-config = home-config =
{ { pkgs
pkgs, , flakes
pkgs-unstable, , lib
flakes, , ...
lib,
...
}: }:
let let
nvim_mime_types = [ nvim_mime_types = [
@ -52,10 +50,6 @@ inputs@{ machine, ... }:
sessionVariables = { sessionVariables = {
EDITOR = "nvim"; EDITOR = "nvim";
}; };
packages = with pkgs-unstable; [
tree-sitter
];
}; };
home.file.".local/share/applications/${desktop-entry-name}.desktop" = { home.file.".local/share/applications/${desktop-entry-name}.desktop" = {
@ -63,9 +57,11 @@ inputs@{ machine, ... }:
}; };
xdg.mimeApps.associations.added = lib.mergeAttrsList ( xdg.mimeApps.associations.added = lib.mergeAttrsList (
map (mime: { map
${mime} = [ "${desktop-entry-name}.desktop" ]; (mime: {
}) nvim_mime_types ${mime} = [ "${desktop-entry-name}.desktop" ];
})
nvim_mime_types
); );
imports = [ imports = [
@ -94,10 +90,11 @@ inputs@{ machine, ... }:
performance = { performance = {
byteCompileLua.enable = true; byteCompileLua.enable = true;
combinePlugins = { combinePlugins = {
enable = false; enable = true;
standalonePlugins = [ standalonePlugins = [
# clashes with lualine # clashes with lualine
"onedark.nvim"
]; ];
}; };
}; };
@ -106,8 +103,7 @@ inputs@{ machine, ... }:
extraPackages = [ pkgs.imagemagick ]; extraPackages = [ pkgs.imagemagick ];
# package = (import inputs.unstable { inherit (pkgs) system; }).neovim-unwrapped; # package = (import inputs.unstable { inherit (pkgs) system; }).neovim-unwrapped;
# package = pkgs.neovim-unwrapped; package = pkgs.neovim-unwrapped;
package = with pkgs-unstable; neovim-unwrapped;
colorschemes.onedark = { colorschemes.onedark = {
enable = true; enable = true;

3
programs/nvim/keys.nix
View file

@ -19,7 +19,8 @@ in
# jumplist # jumplist
(map "" "<C-a>" "<C-i>") # note: C-a is actually C-i, remapped through kitty. (map "" "<C-a>" "<C-i>") # note: C-a is actually C-i, remapped through kitty.
(luamap "n" "<leader>j" "${telescope}.jumplist()") (luamap "n" "<leader>r" "${telescope}.jumplist()")
(luamap "n" "<leader>R" "${telescope}.loclist()")
# pickers # pickers
(luamap "n" "<leader><leader>" "${telescope}.find_files()") (luamap "n" "<leader><leader>" "${telescope}.find_files()")

86
programs/nvim/plugins.nix
View file

@ -1,9 +1,4 @@
{ { pkgs, config, ... }:
pkgs,
pkgs-unstable,
config,
...
}:
let let
render-markdown = pkgs.vimUtils.buildVimPlugin { render-markdown = pkgs.vimUtils.buildVimPlugin {
name = "render-markdown"; name = "render-markdown";
@ -132,19 +127,17 @@ in
treesitter = { treesitter = {
enable = true; enable = true;
nixGrammars = true; nixGrammars = false;
grammarPackages = pkgs.vimPlugins.nvim-treesitter.allGrammars;
nixvimInjections = false; nixvimInjections = false;
# package = with pkgs-unstable; tree-sitter;
settings = { settings = {
indent.enable = true; indent.enable = true;
# ensure_installed = "all"; ensure_installed = "all";
# ignore_install = [ ignore_install = [
# "wing" "wing"
# "brightscript" "brightscript"
# ]; ];
highlight.enable = true; highlight.enable = true;
@ -442,8 +435,8 @@ in
__unkeyed-1 = "filetype"; __unkeyed-1 = "filetype";
} }
]; ];
lualine_y = [ { __unkeyed-1 = "progress"; } ]; lualine_y = [{ __unkeyed-1 = "progress"; }];
lualine_z = [ { __unkeyed-1 = "location"; } ]; lualine_z = [{ __unkeyed-1 = "location"; }];
}; };
}; };
}; };
@ -630,37 +623,36 @@ in
}; };
options = { options = {
# pipeline = config.lib.nixvim.mkRaw ""; pipeline = config.lib.nixvim.mkRaw ''
#'' wilder.branch(
# wilder.branch( wilder.cmdline_pipeline({
# wilder.cmdline_pipeline({ language = 'python',
# language = 'python', fuzzy = 2,
# fuzzy = 2, }),
# }), wilder.python_search_pipeline({
# wilder.python_search_pipeline({ pattern = wilder.python_fuzzy_pattern(),
# pattern = wilder.python_fuzzy_pattern(), sorter = wilder.python_difflib_sorter(),
# sorter = wilder.python_difflib_sorter(), engine = 're',
# engine = 're', }),
# }), wilder.substitute_pipeline({
# wilder.substitute_pipeline({ pipeline = wilder.python_search_pipeline({
# pipeline = wilder.python_search_pipeline({ skip_cmdtype_check = 1,
# skip_cmdtype_check = 1, pattern = wilder.python_fuzzy_pattern({
# pattern = wilder.python_fuzzy_pattern({ start_at_boundary = 0,
# start_at_boundary = 0, }),
# }), }),
# }), }),
# }), {
# { wilder.check(function(ctx, x) return x == "" end),
# wilder.check(function(ctx, x) return x == "" end), wilder.history(),
# wilder.history(), },
# }, wilder.python_file_finder_pipeline({
# wilder.python_file_finder_pipeline({ file_command = {'${pkgs.ripgrep}/bin/rg', '--files'},
# file_command = {'${pkgs.ripgrep}/bin/rg', '--files'}, dir_command = {'${pkgs.fd}/bin/fd', '-td'},
# dir_command = {'${pkgs.fd}/bin/fd', '-td'}, filters = {'cpsm_filter'},
# filters = {'cpsm_filter'}, })
# }) )
# ) '';
# '';
renderer = config.lib.nixvim.mkRaw '' renderer = config.lib.nixvim.mkRaw ''
(function() (function()

73
programs/ssh.nix
View file

@ -1,41 +1,42 @@
inputs@{ machine, ... }: inputs@{ machine, ... }: {
{ imports =
imports = machine.program { machine.program {
name = "ssh"; name = "ssh";
inherit inputs; inherit inputs;
requirements = [ "cli" ]; requirements = [ "cli" ];
home-config = _: { home-config = _: {
programs.ssh = { programs.ssh = {
enable = true; enable = true;
enableDefaultConfig = false; enableDefaultConfig = false;
matchBlocks = { matchBlocks = {
fili = { fili = {
user = "jana"; user = "jana";
hostname = "donsz.nl"; hostname = "donsz.nl";
}; };
icecube = { icecube = {
hostname = "192.168.178.138"; hostname = "192.168.178.138";
proxyJump = "fili"; proxyJump = "fili";
}; };
ragdoll = { ragdoll = {
hostname = "192.168.178.138"; hostname = "192.168.178.138";
proxyJump = "fili"; proxyJump = "fili";
}; };
"*" = { "*" = {
forwardAgent = false; forwardAgent = false;
serverAliveInterval = 0; serverAliveInterval = 0;
serverAliveCountMax = 3; serverAliveCountMax = 3;
compression = false; compression = false;
addKeysToAgent = null; addKeysToAgent = null;
hashKnownHosts = false; hashKnownHosts = false;
userKnownHostsFile = "~/.ssh/known_hosts"; userKnownHostsFile = "~/.ssh/known_hosts";
controlMaster = "no"; controlMaster = "no";
controlPath = "~/.ssh/master-%r@%n:%p"; controlPath = "~/.ssh/master-%r@%n:%p";
controlPersist = null; controlPersist = null;
};
}; };
}; };
}; };
}; }
}; ;
} }

1
programs/xdg.nix
View file

@ -27,7 +27,6 @@ let
mimeMap = { mimeMap = {
text = [ text = [
"text/rust"
"text/plain" "text/plain"
"text/english" "text/english"
"application/x-zerosize" "application/x-zerosize"