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

lix/cachix

Browse source
This commit is contained in:
Jana Dönszelmann 2025-02-09 13:34:47 +01:00
parent 9fe35e28a4
commit 3c758d5346
No known key found for this signature in database
8 changed files with 732 additions and 1040 deletions
Download patch file Download diff file Expand all files Collapse all files

1518
flake.lock generated
View file

File diff suppressed because it is too large Load diff

30
flake.nix
View file

@ -1,9 +1,9 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
flake-utils.url = "github:numtide/flake-utils";
home-manager = {
url = "github:nix-community/home-manager";
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
@ -25,15 +25,11 @@
inputs.nixpkgs.follows = "nixpkgs";
};
ghostty = {
url = "github:ghostty-org/ghostty";
inputs.nixpkgs-stable.follows = "nixpkgs";
inputs.nixpkgs-unstable.follows = "nixpkgs";
p1n3appl3 = {
url = "github:p1n3appl3/config";
inputs.rahul-config.follows = "rahul-config";
};
# sorry, secret... for now
noteslsp.url = "git+ssh://git@github.com/jdonszelmann/notes";
rahul-config.url = "github:jdonszelmann/nix-config";
};
outputs =
@ -45,8 +41,6 @@
t,
dumpasm,
jujutsu,
ghostty,
noteslsp,
...
}@inputs:
let
@ -63,9 +57,8 @@
t = t.packages.${system}.default;
inherit (dumpasm.packages.${system}) dumpasm;
inherit (jujutsu.packages.${system}) jujutsu;
inherit (ghostty.packages.${system}) ghostty;
inherit (noteslsp.packages.${system}) noteslsp;
};
p1n3appl3 = inputs.p1n3appl3.packages.${system};
})
];
};
@ -94,7 +87,7 @@
(pkgs.writeShellScriptBin "apply-home" ''
export NIX_BUILD_CORES=$(($(nproc) * 2))
nix run .#home-manager -j $NIX_BUILD_CORES --cores $NIX_BUILD_CORES -- switch --flake .#$@ --max-jobs $NIX_BUILD_CORES
nix run .#home-manager -- switch --flake .#$@ -j $(nproc) --cores $(nproc)
'')
(pkgs.writeShellScriptBin "apply" ''
@ -120,4 +113,11 @@
inherit home-manager;
inherit (home-manager) packages;
};
nixConfig = {
extra-substituters = [ "https://jana.cachix.org" ];
extra-trusted-public-keys = [
"jana.cachix.org-1:LN0lzHx7QH1RBoDn3+psi4HOEAXW3EqRa/u0ncQ1XBE="
];
};
}

5
hosts/kili/home.nix
View file

@ -4,7 +4,10 @@
stateVersion = "24.05";
username = "jana";
homeDirectory = "/home/jana";
packages = with pkgs; [ config.programs.neovim.package ];
packages = with pkgs; [
p1n3appl3.tab
];
};
imports = [

4
programs/fish/default.nix
View file

@ -193,6 +193,10 @@ in
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
end
'';
};
};

2
programs/git/default.nix
View file

@ -3,7 +3,7 @@ _: {
enable = true;
userEmail = "jana@donsz.nl";
userName = "Jana Dönszelmann";
signing.key = "/home/jonathan/.ssh/id_ed25519.pub";
signing.key = "/home/jana/.ssh/id_ed25519.pub";
signing.signByDefault = true;
delta.enable = true;

96
programs/kitty/default.nix
View file

@ -1,51 +1,53 @@
{ pkgs, inputs, ... }:
{
programs.kitty = {
enable = true;
font = {
name = "Jetbrains Mono";
size = 13.0;
package = pkgs.jetbrains-mono;
};
settings = {
scrollback_lines = 20000;
allow_hyperlinks = true;
repaint_delay = 10;
input_delay = 3;
enable_audio_bell = false;
update_check_interval = 0;
initial_window_width = "95c";
initial_window_height = "30c";
remember_window_size = "no";
draw_minimal_borders = false;
hide_window_decorations = true;
shell = "${pkgs.tmux}/bin/tmux";
clipboard_control = "write-clipboard write-primary read-clipboard read-primary";
foreground = "#fcfcfc";
background = "#232627";
linux_display_server = "auto";
};
keybindings = {
"ctrl+f" = "launch --location=hsplit --allow-remote-control kitty +kitten ${inputs.kitty-search}/search.py @active-kitty-window-id";
"ctrl+alt+r" = "load_config_file";
"ctrl+shift+r" = "no_op";
"super+`" = "no_op";
"ctrl+EQUAL" = "change_font_size all +2.0";
"ctrl+minus" = "change_font_size all -2.0";
"ctrl+0" = "change_font_size all 0";
# "ctrl+/" = "send_text all ";
};
extraConfig = ''
mouse_map left click ungrabbed no-op
'';
programs.kitty = {
enable = true;
font = {
name = "Jetbrains Mono";
size = 13.0;
package = pkgs.jetbrains-mono;
};
settings = {
scrollback_lines = 20000;
allow_hyperlinks = true;
repaint_delay = 10;
input_delay = 3;
enable_audio_bell = false;
update_check_interval = 0;
initial_window_width = "95c";
initial_window_height = "30c";
remember_window_size = "no";
draw_minimal_borders = false;
hide_window_decorations = true;
shell = "${pkgs.tmux}/bin/tmux";
clipboard_control = "write-clipboard write-primary read-clipboard read-primary";
foreground = "#fcfcfc";
background = "#232627";
linux_display_server = "auto";
};
keybindings = {
"ctrl+f" =
"launch --location=hsplit --allow-remote-control kitty +kitten ${inputs.kitty-search}/search.py @active-kitty-window-id";
"ctrl+alt+r" = "load_config_file";
"ctrl+shift+r" = "no_op";
"super+`" = "no_op";
"ctrl+EQUAL" = "change_font_size all +2.0";
"ctrl+minus" = "change_font_size all -2.0";
"ctrl+0" = "change_font_size all 0";
# "ctrl+/" = "send_text all ";
"super+~" = "no_op";
};
extraConfig = ''
mouse_map left click ungrabbed no-op
'';
};
}

39
programs/nvim/default.nix
View file

@ -130,26 +130,27 @@ in
require("render-markdown").setup {
latex_converter = '${pkgs.python312Packages.pylatexenc}/bin/latex2text',
}
local lspconfig = require 'lspconfig'
local configs = require 'lspconfig.configs'
if not configs.foo_lsp then
configs.noteslsp = {
default_config = {
-- cmd = {'${pkgs.custom.noteslsp}/bin/noteslsp'},
cmd = {'./noteslsp/target/debug/noteslsp'},
filetypes = {'markdown'},
root_dir = function(fname)
return lspconfig.util.find_git_ancestor(fname)
end,
settings = {}
,
},
}
end
lspconfig.noteslsp.setup{}
''
# local lspconfig = require 'lspconfig'
# local configs = require 'lspconfig.configs'
# if not configs.foo_lsp then
# configs.noteslsp = {
# default_config = {
# -- cmd = {'${pkgs.custom.noteslsp}/bin/noteslsp'},
# cmd = {'./noteslsp/target/debug/noteslsp'},
# filetypes = {'markdown'},
# root_dir = function(fname)
# return lspconfig.util.find_git_ancestor(fname)
# end,
# settings = {}
# ,
# },
# }
# end
#
# lspconfig.noteslsp.setup{}
# ''
+ (builtins.readFile ./config.lua);
};

78
programs/nvim/plugins.nix
View file

@ -163,7 +163,7 @@ in
lsp-format.enable = true;
fugitive.enable = false;
lspkind.enable = true;
crates-nvim.enable = true;
crates.enable = true;
fidget.enable = true;
cmp.enable = true;
nvim-autopairs.enable = true;
@ -257,36 +257,36 @@ in
};
};
# git-conflict = {
# enable = true;
# settings = {
# default_mappings = {
# both = "<leader>cb";
# none = "<leader>c0";
# ours = "<leader>co";
# prev = "]x";
# next = "[x";
# theirs = "<leader>ct";
# };
# disable_diagnostics = false;
# highlights = {
# current = "DiffText";
# incoming = "DiffAdd";
# };
# list_opener = "conflicts";
# };
# };
# gitsigns = {
# enable = true;
#
# settings = {
# current_line_blame = true;
# current_line_blame_opts = {
# virt_text = true;
# virt_text_pos = "eol";
# };
# };
# };
git-conflict = {
enable = true;
settings = {
default_mappings = {
both = "<leader>cb";
none = "<leader>c0";
ours = "<leader>co";
prev = "]x";
next = "[x";
theirs = "<leader>ct";
};
disable_diagnostics = false;
highlights = {
current = "DiffText";
incoming = "DiffAdd";
};
list_opener = "conflicts";
};
};
gitsigns = {
enable = true;
settings = {
current_line_blame = true;
current_line_blame_opts = {
virt_text = true;
virt_text_pos = "eol";
};
};
};
lspsaga = {
enable = true;
@ -322,10 +322,10 @@ in
rust-analyzer = {
inlayHints = {
lifetimeElisionHints.enable = "always";
expressionAdjustmentHints = {
enable = "always";
mode = "prefer_postfix";
};
# expressionAdjustmentHints = {
# enable = "always";
# mode = "prefer_postfix";
# };
discriminantHints.enable = "always";
};
# check = {
@ -567,9 +567,11 @@ in
floaterm = {
enable = true;
opener = "edit";
width = 0.8;
height = 0.8;
settings = {
opener = "edit";
width = 0.8;
height = 0.8;
};
};
telescope = {
enable = true;