Compare commits

..

No commits in common. "d770575ff9092d5efaccc4851fe34ce4dcdba980" and "ecdf17b2c939031cb0e459ed4a1d9d2933b25b27" have entirely different histories.

6 changed files with 76 additions and 31 deletions

View file

@ -72,11 +72,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1701223272, "lastModified": 1700930220,
"narHash": "sha256-LK+xBFZgi1tbhVErtHFHBmF71x84amnxNmmL/cTKjo4=", "narHash": "sha256-feqq2O+0eUZDXiN/ZhfSH28ipWEj9m9xAa098V7OONk=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "0c81ef73e17a3d45cd6240fd5933ad99b3a60d01", "rev": "3f9788daaa0669a81e218d18636f9abb285b6c15",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -93,11 +93,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701071203, "lastModified": 1701040754,
"narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", "narHash": "sha256-rHld3E3CeVI/GUxH3xE+mqAo+IX2hTbXVfXKahCrG5I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", "rev": "7c97c46dc4f45f2a78df536a6ebe15252831b800",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -140,11 +140,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1701068326, "lastModified": 1700794826,
"narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", "narHash": "sha256-RyJTnTNKhO0yqRpDISk03I/4A67/dp96YRxc86YOPgU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", "rev": "5a09cb4b393d58f9ed0d9ca1555016a8543c2ac8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +156,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1701229502, "lastModified": 1701050629,
"narHash": "sha256-Nra5mV5mJKDYowy6OzPm7F10Nl4UPT4GDfXlb0yQt28=", "narHash": "sha256-7XirQpplmxvzA7KJiGtyU+fV14+YIOo9dHS+LnN0Hpk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "f842b9130e824053881c6aa79b91981b64608cdb", "rev": "a0e751e325d83b0350a32afe946bc3ca46ebe095",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -24,6 +24,7 @@
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

View file

@ -10,8 +10,17 @@
programs.helix = { programs.helix = {
enable = true; enable = true;
package = inputs.helix.packages.${pkgs.system}.default;
extraPackages = with pkgs; [ # add the following packages to helix's path
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
@ -21,15 +30,23 @@
texlab texlab
tectonic tectonic
zathura zathura
])
]; ];
});
settings = { settings = {
theme = "catppuccin_frappe"; theme = "rose_pine_moon";
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;

View file

@ -5,20 +5,44 @@
}: { }: {
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 = { indent.tab-width = 2;
tab-width = 2; indent.unit = "\t";
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"];
@ -42,6 +66,10 @@
}; };
}; };
}; };
# java-language-server = {
# command = "${pkgs.java-language-server}/bin/java-language-server";
# };
}; };
}; };
} }

View file

@ -17,7 +17,6 @@
dunst dunst
grim grim
slurp slurp
sway-contrib.grimshot
]; ];
home.sessionVariables = { home.sessionVariables = {

View file

@ -252,7 +252,7 @@ bindsym $mod+r mode "resize"
# } # }
# Screenshot # Screenshot
bindsym Print exec grimshot copy area bindsym Print exec IMG=~/Pictures/screenshots/$(date | sed "s/\s/-/g" | sed "s/--/-/g").png&&grim -g "$(slurp)" $IMG && cat $IMG | wl-copy
# #
# Player # Player