Compare commits
2 commits
ecdf17b2c9
...
d770575ff9
Author | SHA1 | Date | |
---|---|---|---|
|
d770575ff9 | ||
|
13f73b5c2b |
24
flake.lock
24
flake.lock
|
@ -72,11 +72,11 @@
|
||||||
"rust-overlay": "rust-overlay"
|
"rust-overlay": "rust-overlay"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700930220,
|
"lastModified": 1701223272,
|
||||||
"narHash": "sha256-feqq2O+0eUZDXiN/ZhfSH28ipWEj9m9xAa098V7OONk=",
|
"narHash": "sha256-LK+xBFZgi1tbhVErtHFHBmF71x84amnxNmmL/cTKjo4=",
|
||||||
"owner": "helix-editor",
|
"owner": "helix-editor",
|
||||||
"repo": "helix",
|
"repo": "helix",
|
||||||
"rev": "3f9788daaa0669a81e218d18636f9abb285b6c15",
|
"rev": "0c81ef73e17a3d45cd6240fd5933ad99b3a60d01",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -93,11 +93,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701040754,
|
"lastModified": 1701071203,
|
||||||
"narHash": "sha256-rHld3E3CeVI/GUxH3xE+mqAo+IX2hTbXVfXKahCrG5I=",
|
"narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "7c97c46dc4f45f2a78df536a6ebe15252831b800",
|
"rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -140,11 +140,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1700794826,
|
"lastModified": 1701068326,
|
||||||
"narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
|
"narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
|
"rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -156,11 +156,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1701050629,
|
"lastModified": 1701229502,
|
||||||
"narHash": "sha256-7XirQpplmxvzA7KJiGtyU+fV14+YIOo9dHS+LnN0Hpk=",
|
"narHash": "sha256-Nra5mV5mJKDYowy6OzPm7F10Nl4UPT4GDfXlb0yQt28=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "a0e751e325d83b0350a32afe946bc3ca46ebe095",
|
"rev": "f842b9130e824053881c6aa79b91981b64608cdb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
efiSupport = true;
|
efiSupport = true;
|
||||||
configurationLimit = 10;
|
configurationLimit = 10;
|
||||||
device = "nodev";
|
device = "nodev";
|
||||||
# extraEntriesBeforeNixOS = true; # still primarily using void
|
|
||||||
extraEntries = ''
|
extraEntries = ''
|
||||||
menuentry "Void" {
|
menuentry "Void" {
|
||||||
search --set=void --fs-uuid 987518fa-8ea0-49a6-b1e5-1fed4e4ae50f
|
search --set=void --fs-uuid 987518fa-8ea0-49a6-b1e5-1fed4e4ae50f
|
||||||
|
|
|
@ -10,17 +10,8 @@
|
||||||
|
|
||||||
programs.helix = {
|
programs.helix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
package = inputs.helix.packages.${pkgs.system}.default;
|
||||||
# add the following packages to helix's path
|
extraPackages = with pkgs; [
|
||||||
package = inputs.helix.packages.${pkgs.system}.default.overrideAttrs (self: {
|
|
||||||
makeWrapperArgs = with pkgs;
|
|
||||||
self.makeWrapperArgs
|
|
||||||
or []
|
|
||||||
++ [
|
|
||||||
"--suffix"
|
|
||||||
"PATH"
|
|
||||||
":"
|
|
||||||
(lib.makeBinPath [
|
|
||||||
clang-tools
|
clang-tools
|
||||||
marksman
|
marksman
|
||||||
nil
|
nil
|
||||||
|
@ -30,23 +21,15 @@
|
||||||
texlab
|
texlab
|
||||||
tectonic
|
tectonic
|
||||||
zathura
|
zathura
|
||||||
])
|
|
||||||
];
|
];
|
||||||
});
|
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
theme = "rose_pine_moon";
|
theme = "catppuccin_frappe";
|
||||||
editor = {
|
editor = {
|
||||||
line-number = "relative";
|
line-number = "relative";
|
||||||
lsp.display-messages = true;
|
lsp.display-messages = true;
|
||||||
scrolloff = 10;
|
scrolloff = 10;
|
||||||
middle-click-paste = false;
|
middle-click-paste = false;
|
||||||
cursorline = true;
|
cursorline = true;
|
||||||
cursor-shape = {
|
|
||||||
insert = "bar";
|
|
||||||
normal = "block";
|
|
||||||
select = "block";
|
|
||||||
};
|
|
||||||
auto-format = false;
|
auto-format = false;
|
||||||
idle-timeout = 400;
|
idle-timeout = 400;
|
||||||
color-modes = true;
|
color-modes = true;
|
||||||
|
|
|
@ -5,44 +5,20 @@
|
||||||
}: {
|
}: {
|
||||||
programs.helix.languages = {
|
programs.helix.languages = {
|
||||||
language = [
|
language = [
|
||||||
# {
|
|
||||||
# name = "bash";
|
|
||||||
# auto-format = false;
|
|
||||||
# formatter = {
|
|
||||||
# command = "${pkgs.shfmt}/bin/shfmt";
|
|
||||||
# args = ["-i" "2"];
|
|
||||||
# };
|
|
||||||
# }
|
|
||||||
|
|
||||||
{
|
|
||||||
name = "java";
|
|
||||||
language-servers = ["java-language-server"];
|
|
||||||
}
|
|
||||||
|
|
||||||
{
|
{
|
||||||
name = "latex";
|
name = "latex";
|
||||||
indent.tab-width = 2;
|
indent = {
|
||||||
indent.unit = "\t";
|
tab-width = 2;
|
||||||
|
unit = "\t";
|
||||||
|
};
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
language-server = {
|
language-server = {
|
||||||
# bash-language-server = {
|
|
||||||
# command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";
|
|
||||||
# args = ["start"];
|
|
||||||
# };
|
|
||||||
|
|
||||||
# clangd = {
|
|
||||||
# command = "${pkgs.clang-tools}/bin/clangd";
|
|
||||||
# clangd.fallbackFlags = ["-std=c++2b"];
|
|
||||||
# };
|
|
||||||
|
|
||||||
nil = {
|
nil = {
|
||||||
# command = lib.getExe pkgs.nil;
|
|
||||||
config.nil.formatting.command = ["${lib.getExe pkgs.alejandra}" "-q"];
|
config.nil.formatting.command = ["${lib.getExe pkgs.alejandra}" "-q"];
|
||||||
};
|
};
|
||||||
|
|
||||||
texlab = {
|
texlab = {
|
||||||
# command = "${pkgs.texlab}/bin/texlab";
|
|
||||||
config.texlab = {
|
config.texlab = {
|
||||||
forwardSearch.executable = "zathura";
|
forwardSearch.executable = "zathura";
|
||||||
forwardSearch.args = ["--synctex-forward" "%l:1:%f" "%p"];
|
forwardSearch.args = ["--synctex-forward" "%l:1:%f" "%p"];
|
||||||
|
@ -66,10 +42,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# java-language-server = {
|
|
||||||
# command = "${pkgs.java-language-server}/bin/java-language-server";
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
dunst
|
dunst
|
||||||
grim
|
grim
|
||||||
slurp
|
slurp
|
||||||
|
sway-contrib.grimshot
|
||||||
];
|
];
|
||||||
|
|
||||||
home.sessionVariables = {
|
home.sessionVariables = {
|
||||||
|
|
|
@ -252,7 +252,7 @@ bindsym $mod+r mode "resize"
|
||||||
# }
|
# }
|
||||||
|
|
||||||
# Screenshot
|
# Screenshot
|
||||||
bindsym Print exec IMG=~/Pictures/screenshots/$(date | sed "s/\s/-/g" | sed "s/--/-/g").png&&grim -g "$(slurp)" $IMG && cat $IMG | wl-copy
|
bindsym Print exec grimshot copy area
|
||||||
|
|
||||||
#
|
#
|
||||||
# Player
|
# Player
|
||||||
|
|
Loading…
Reference in a new issue