This commit is contained in:
parent
ae9854f178
commit
ca66e8d7b2
13 changed files with 171 additions and 157 deletions
|
|
@ -3,7 +3,6 @@
|
|||
|
||||
imports = lib.concatLists [
|
||||
[
|
||||
./xdg.nix
|
||||
./ssh.nix
|
||||
./less.nix
|
||||
./nvim
|
||||
|
|
@ -16,6 +15,7 @@
|
|||
./niri
|
||||
./zed
|
||||
./firefox
|
||||
./xdg
|
||||
]
|
||||
|
||||
(machine.program {
|
||||
|
|
|
|||
|
|
@ -201,7 +201,7 @@ inputs@{ machine, ... }:
|
|||
key = "~/.ssh/id_ed25519.pub";
|
||||
};
|
||||
|
||||
# remotes.origin.auto-track-bookmarks = true;
|
||||
remotes.origin.auto-track-bookmarks = "*";
|
||||
# remotes.upstream.auto-track-bookmarks = true;
|
||||
|
||||
git = {
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ let
|
|||
tab q w e r t y u i o p [ ] \
|
||||
@cap a s d f g h j k l ; ' ret
|
||||
lsft z x c v b n m , . / rsft
|
||||
lctl @lmet lalt spc ralt @rctl
|
||||
lctl @lmet lalt spc @ralt @rctl
|
||||
)
|
||||
|
||||
(deflayer control
|
||||
|
|
@ -30,7 +30,7 @@ let
|
|||
tab @mcleft @mup @mcright @replay t y u i o p @wup @wdown \
|
||||
@cap @mleft @mdown @mright f g left down up right ; ' bspc
|
||||
lsft z x C-c v bspc n @macro , . C-f rsft
|
||||
lctl lmet lalt spc ralt @rctl
|
||||
lctl lmet lalt spc @ralt @rctl
|
||||
)
|
||||
|
||||
(deflayermap (other)
|
||||
|
|
@ -82,6 +82,13 @@ let
|
|||
200 200
|
||||
C-k (layer-while-held other)
|
||||
)
|
||||
|
||||
ralt (
|
||||
tap-dance 200 (
|
||||
ralt
|
||||
rmet
|
||||
)
|
||||
)
|
||||
)
|
||||
'';
|
||||
in
|
||||
|
|
|
|||
|
|
@ -5,11 +5,12 @@ inputs@{ machine, ... }:
|
|||
inherit inputs;
|
||||
requirements = [ "graphical" ];
|
||||
home-config =
|
||||
{ config
|
||||
, pkgs
|
||||
, flakes
|
||||
, lib
|
||||
, ...
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
flakes,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
let
|
||||
noctalia =
|
||||
|
|
@ -115,7 +116,7 @@ inputs@{ machine, ... }:
|
|||
keyboard = {
|
||||
xkb = {
|
||||
layout = "us";
|
||||
options = "grp:win_space_toggle,compose:ralt";
|
||||
options = "grp:win_space_toggle,compose:rwin";
|
||||
};
|
||||
numlock = true;
|
||||
};
|
||||
|
|
@ -242,7 +243,7 @@ inputs@{ machine, ... }:
|
|||
}
|
||||
|
||||
{
|
||||
matches = [{ app-id = "firefox"; }];
|
||||
matches = [ { app-id = "firefox"; } ];
|
||||
open-on-workspace = "browser";
|
||||
}
|
||||
|
||||
|
|
@ -600,7 +601,7 @@ inputs@{ machine, ... }:
|
|||
id = "Volume";
|
||||
}
|
||||
]
|
||||
++ [{ id = "Battery"; }]
|
||||
++ [ { id = "Battery"; } ]
|
||||
++ [
|
||||
{
|
||||
id = "KeyboardLayout";
|
||||
|
|
|
|||
|
|
@ -13,24 +13,7 @@ inputs@{ machine, ... }:
|
|||
...
|
||||
}:
|
||||
let
|
||||
nvim_mime_types = [
|
||||
"application/x-zerosize"
|
||||
"text/english"
|
||||
"text/plain"
|
||||
"text/x-makefile"
|
||||
"text/x-c++hdr"
|
||||
"text/x-c++src"
|
||||
"text/x-chdr"
|
||||
"text/x-csrc"
|
||||
"text/x-java"
|
||||
"text/x-moc"
|
||||
"text/x-pascal"
|
||||
"text/x-tcl"
|
||||
"text/x-tex"
|
||||
"application/x-shellscript"
|
||||
"text/x-c"
|
||||
"text/x-c++"
|
||||
];
|
||||
nvim_mime_types = (import ../xdg/mimemap.nix).text;
|
||||
desktop-entry-name = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanvim";
|
||||
desktop-entry = pkgs.makeDesktopItem {
|
||||
name = desktop-entry-name;
|
||||
|
|
@ -55,6 +38,14 @@ inputs@{ machine, ... }:
|
|||
|
||||
packages = with pkgs-unstable; [
|
||||
tree-sitter
|
||||
(pkgs.stdenv.mkDerivation {
|
||||
name = "editor-hax";
|
||||
src = ./.;
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
cp ./editor-hax.py $out/bin/editor-hax
|
||||
'';
|
||||
})
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ in
|
|||
# pickers
|
||||
(luamap "n" "<leader><leader>" "${telescope}.find_files()")
|
||||
(luamap "n" "<leader>f" "${telescope}.live_grep()")
|
||||
(luamap "n" "<leader>F" "${telescope}.find_files()")
|
||||
(luamap "n" "<leader>t" "${telescope}.lsp_document_symbols()")
|
||||
(luamap "n" "<leader>T" "${telescope}.lsp_dynamic_workspace_symbols()")
|
||||
(luamap "n" "<leader>/" "${telescope}.current_buffer_fuzzy_find()")
|
||||
|
|
|
|||
|
|
@ -158,6 +158,7 @@ in
|
|||
};
|
||||
};
|
||||
};
|
||||
|
||||
rainbow-delimiters.enable = true;
|
||||
vim-surround.enable = true;
|
||||
lsp-format.enable = true;
|
||||
|
|
@ -179,6 +180,9 @@ in
|
|||
settings = {
|
||||
completion.completeopt = "noselect";
|
||||
preselect = "None";
|
||||
view.entries = {
|
||||
selection_order = "near_cursor";
|
||||
};
|
||||
|
||||
sources =
|
||||
let
|
||||
|
|
@ -727,6 +731,7 @@ in
|
|||
ui-select.enable = true;
|
||||
fzf-native.enable = true;
|
||||
frecency.enable = true;
|
||||
# ast-grep.enable = true;
|
||||
};
|
||||
|
||||
settings = {
|
||||
|
|
@ -739,11 +744,17 @@ in
|
|||
"^target/"
|
||||
];
|
||||
defaults = {
|
||||
path_display = [ "smart" ];
|
||||
path_display = {
|
||||
"filename_first" = {
|
||||
reverse_directories = true;
|
||||
};
|
||||
};
|
||||
dynamic_preview_title = true;
|
||||
layout_strategy = "flex";
|
||||
layout_config = {
|
||||
width = 0.99;
|
||||
height = 0.99;
|
||||
prompt_position = "top";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ inputs@{ machine, ... }:
|
|||
inherit inputs;
|
||||
requirements = [ "cli" ];
|
||||
home-config = _: {
|
||||
programs.mosh.enable = true;
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
|
|
|
|||
|
|
@ -25,86 +25,7 @@ let
|
|||
signal = [ "signal.desktop" ];
|
||||
};
|
||||
|
||||
mimeMap = {
|
||||
text = [
|
||||
"text/rust"
|
||||
"text/plain"
|
||||
"text/english"
|
||||
"application/x-zerosize"
|
||||
"text/x-makefile"
|
||||
"text/x-c++hdr"
|
||||
"text/x-c++src"
|
||||
"text/x-chdr"
|
||||
"text/x-csrc"
|
||||
"text/x-java"
|
||||
"text/x-moc"
|
||||
"text/x-pascal"
|
||||
"text/x-tcl"
|
||||
"text/x-tex"
|
||||
"application/x-shellscript"
|
||||
"text/x-c"
|
||||
"text/x-c++"
|
||||
];
|
||||
image = [
|
||||
"image/bmp"
|
||||
"image/gif"
|
||||
"image/jpeg"
|
||||
"image/jpg"
|
||||
"image/png"
|
||||
"image/svg+xml"
|
||||
"image/tiff"
|
||||
"image/vnd.microsoft.icon"
|
||||
"image/webp"
|
||||
];
|
||||
audio = [
|
||||
"audio/aac"
|
||||
"audio/mpeg"
|
||||
"audio/ogg"
|
||||
"audio/opus"
|
||||
"audio/wav"
|
||||
"audio/webm"
|
||||
"audio/x-matroska"
|
||||
];
|
||||
video = [
|
||||
"video/mp2t"
|
||||
"video/mp4"
|
||||
"video/mpeg"
|
||||
"video/ogg"
|
||||
"video/webm"
|
||||
"video/x-flv"
|
||||
"video/x-matroska"
|
||||
"video/x-msvideo"
|
||||
];
|
||||
directory = [ "inode/directory" ];
|
||||
mail = [ "x-scheme-handler/mailto" ];
|
||||
calendar = [
|
||||
"text/calendar"
|
||||
"x-scheme-handler/webcal"
|
||||
];
|
||||
browser = [
|
||||
"text/html"
|
||||
"x-scheme-handler/about"
|
||||
"x-scheme-handler/http"
|
||||
"x-scheme-handler/https"
|
||||
"x-scheme-handler/unknown"
|
||||
];
|
||||
office = [
|
||||
"application/vnd.oasis.opendocument.text"
|
||||
"application/vnd.oasis.opendocument.spreadsheet"
|
||||
"application/vnd.oasis.opendocument.presentation"
|
||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.document"
|
||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
|
||||
"application/vnd.openxmlformats-officedocument.presentationml.presentation"
|
||||
"application/msword"
|
||||
"application/vnd.ms-excel"
|
||||
"application/vnd.ms-powerpoint"
|
||||
"application/rtf"
|
||||
];
|
||||
pdf = [ "application/pdf" ];
|
||||
ebook = [ "application/epub+zip" ];
|
||||
magnet = [ "x-scheme-handler/magnet" ];
|
||||
signal = [ "signal.desktop" ];
|
||||
};
|
||||
mimeMap = import ./mimemap.nix;
|
||||
|
||||
associations =
|
||||
with inputs.lib;
|
||||
|
|
@ -123,8 +44,10 @@ in
|
|||
inherit inputs;
|
||||
requirements = [ ];
|
||||
home-config =
|
||||
{ config, ... }:
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
home.packages = with pkgs; [ xdg-utils ];
|
||||
|
||||
xdg = {
|
||||
enable = true;
|
||||
mime.enable = true;
|
||||
80
programs/xdg/mimemap.nix
Normal file
80
programs/xdg/mimemap.nix
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
{
|
||||
text = [
|
||||
"text/rust"
|
||||
"text/plain"
|
||||
"text/english"
|
||||
"application/x-zerosize"
|
||||
"text/x-makefile"
|
||||
"text/x-c++hdr"
|
||||
"text/x-c++src"
|
||||
"text/x-chdr"
|
||||
"text/x-csrc"
|
||||
"text/x-java"
|
||||
"text/x-moc"
|
||||
"text/x-pascal"
|
||||
"text/x-tcl"
|
||||
"text/x-tex"
|
||||
"application/x-shellscript"
|
||||
"text/x-c"
|
||||
"text/x-c++"
|
||||
];
|
||||
image = [
|
||||
"image/bmp"
|
||||
"image/gif"
|
||||
"image/jpeg"
|
||||
"image/jpg"
|
||||
"image/png"
|
||||
"image/svg+xml"
|
||||
"image/tiff"
|
||||
"image/vnd.microsoft.icon"
|
||||
"image/webp"
|
||||
];
|
||||
audio = [
|
||||
"audio/aac"
|
||||
"audio/mpeg"
|
||||
"audio/ogg"
|
||||
"audio/opus"
|
||||
"audio/wav"
|
||||
"audio/webm"
|
||||
"audio/x-matroska"
|
||||
];
|
||||
video = [
|
||||
"video/mp2t"
|
||||
"video/mp4"
|
||||
"video/mpeg"
|
||||
"video/ogg"
|
||||
"video/webm"
|
||||
"video/x-flv"
|
||||
"video/x-matroska"
|
||||
"video/x-msvideo"
|
||||
];
|
||||
directory = [ "inode/directory" ];
|
||||
mail = [ "x-scheme-handler/mailto" ];
|
||||
calendar = [
|
||||
"text/calendar"
|
||||
"x-scheme-handler/webcal"
|
||||
];
|
||||
browser = [
|
||||
"text/html"
|
||||
"x-scheme-handler/about"
|
||||
"x-scheme-handler/http"
|
||||
"x-scheme-handler/https"
|
||||
"x-scheme-handler/unknown"
|
||||
];
|
||||
office = [
|
||||
"application/vnd.oasis.opendocument.text"
|
||||
"application/vnd.oasis.opendocument.spreadsheet"
|
||||
"application/vnd.oasis.opendocument.presentation"
|
||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.document"
|
||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
|
||||
"application/vnd.openxmlformats-officedocument.presentationml.presentation"
|
||||
"application/msword"
|
||||
"application/vnd.ms-excel"
|
||||
"application/vnd.ms-powerpoint"
|
||||
"application/rtf"
|
||||
];
|
||||
pdf = [ "application/pdf" ];
|
||||
ebook = [ "application/epub+zip" ];
|
||||
magnet = [ "x-scheme-handler/magnet" ];
|
||||
signal = [ "signal.desktop" ];
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue