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" ];
}; };
}; };
}; };

18
programs/fish/default.nix
View file

@ -5,11 +5,10 @@ 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;
@ -229,10 +228,7 @@ inputs@{ machine, ... }:
fish_add_path "$HOME/.nix-profile/bin" fish_add_path "$HOME/.nix-profile/bin"
function fish_greeting function fish_greeting
if test -e /etc/motd
else
${pkgs.blahaj}/bin/blahaj -s ${pkgs.blahaj}/bin/blahaj -s
end
echo "mrow! This is $(uname -n) and ur $(whoami) :3" echo "mrow! This is $(uname -n) and ur $(whoami) :3"
end end
''; '';
@ -243,13 +239,11 @@ inputs@{ machine, ... }:
setupTide = lib.hm.dag.entryAfter [ "writeBoundary" ] '' setupTide = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
setupTide() { setupTide() {
${pkgs.fish}/bin/fish -c ${lib.escapeShellArg "tide configure ${ ${pkgs.fish}/bin/fish -c ${lib.escapeShellArg "tide configure ${
lib.cli.toCommandLineShell lib.cli.toCommandLineShell (optionName: {
(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";

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), {})

26
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: {
${mime} = [ "${desktop-entry-name}.desktop" ]; ${mime} = [ "${desktop-entry-name}.desktop" ];
}) nvim_mime_types })
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()

9
programs/ssh.nix
View file

@ -1,6 +1,6 @@
inputs@{ machine, ... }: inputs@{ machine, ... }: {
{ imports =
imports = machine.program { machine.program {
name = "ssh"; name = "ssh";
inherit inputs; inherit inputs;
requirements = [ "cli" ]; requirements = [ "cli" ];
@ -37,5 +37,6 @@ inputs@{ machine, ... }:
}; };
}; };
}; };
}; }
;
} }

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"