fixed helix texlab, formatted

This commit is contained in:
Aria Nolan 2023-11-04 22:44:54 -04:00
parent f97c8ab307
commit de6a60bca7
9 changed files with 156 additions and 139 deletions

View file

@ -27,6 +27,8 @@
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = inputs.nixpkgs.legacyPackages.${system}; pkgs = inputs.nixpkgs.legacyPackages.${system};
in { in {
formatter.${system} = pkgs.alejandra;
# nixosConfigurations: define options for different systems # nixosConfigurations: define options for different systems
# desktop # desktop
nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem { nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem {

View file

@ -1,41 +1,45 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
imports = config,
[ (modulesPath + "/installer/scan/not-detected.nix") lib,
]; pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = ["kvm-intel"];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/d05d358d-19d4-4629-b0bd-594a754ad76d"; device = "/dev/disk/by-uuid/d05d358d-19d4-4629-b0bd-594a754ad76d";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/6DD4-5A29"; device = "/dev/disk/by-uuid/6DD4-5A29";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/mnt/void" = fileSystems."/mnt/void" = {
{ device = "/dev/disk/by-uuid/987518fa-8ea0-49a6-b1e5-1fed4e4ae50f"; device = "/dev/disk/by-uuid/987518fa-8ea0-49a6-b1e5-1fed4e4ae50f";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/mnt/secondary" = fileSystems."/mnt/secondary" = {
{ device = "/dev/disk/by-uuid/3b424592-6b20-42e0-9d28-8bf562c15913"; device = "/dev/disk/by-uuid/3b424592-6b20-42e0-9d28-8bf562c15913";
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = swapDevices = [
[ { device = "/dev/disk/by-uuid/802e89ce-52b8-41b9-85ea-b969ab08765f"; } {device = "/dev/disk/by-uuid/802e89ce-52b8-41b9-85ea-b969ab08765f";}
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's

View file

@ -3,87 +3,84 @@
enable = true; enable = true;
package = pkgs.emacs29-gtk3; package = pkgs.emacs29-gtk3;
extraConfig = '' extraConfig = ''
(menu-bar-mode -1) (menu-bar-mode -1)
(tool-bar-mode -1) (tool-bar-mode -1)
(scroll-bar-mode -1) (scroll-bar-mode -1)
(blink-cursor-mode 0) (blink-cursor-mode 0)
;; scale headings in org-mode ;; scale headings in org-mode
(setq zenburn-scale-org-headlines t) (setq zenburn-scale-org-headlines t)
;; scale headings in outline-mode ;; scale headings in outline-mode
(setq zenburn-scale-outline-headlines t) (setq zenburn-scale-outline-headlines t)
(load-theme 'zenburn :no-confirm) (load-theme 'zenburn :no-confirm)
(add-to-list 'default-frame-alist (add-to-list 'default-frame-alist
'(font . "Maple Mono-12")) '(font . "Maple Mono-12"))
(global-set-key (kbd "C-c a") #'org-agenda) (global-set-key (kbd "C-c a") #'org-agenda)
(global-set-key (kbd "C-c f") #'recentf-open) (global-set-key (kbd "C-c f") #'recentf-open)
(global-hl-line-mode 1) (global-hl-line-mode 1)
(global-visual-line-mode 1) (global-visual-line-mode 1)
(setq evil-respect-visual-line-mode 1) (setq evil-respect-visual-line-mode 1)
(require 'evil) (require 'evil)
(evil-mode 1) (evil-mode 1)
(require 'evil-org) (require 'evil-org)
(add-hook 'org-mode-hook 'evil-org-mode) (add-hook 'org-mode-hook 'evil-org-mode)
(evil-org-set-key-theme '(textobjects insert navigation additional shift todo heading)) (evil-org-set-key-theme '(textobjects insert navigation additional shift todo heading))
(require 'evil-org-agenda) (require 'evil-org-agenda)
(evil-org-agenda-set-keys) (evil-org-agenda-set-keys)
(require 'smooth-scrolling) (setq org-startup-with-inline-images 1)
(smooth-scrolling-mode 1) (setq org-startup-indented 1)
(setq org-startup-with-inline-images 1) ;;(global-display-line-numbers-mode 1)
(setq org-startup-indented 1) ;;(setq display-line-numbers-type 'visual)
;;(global-display-line-numbers-mode 1) (require 'org-download)
;;(setq display-line-numbers-type 'visual)
(require 'org-download) ;; Drag-and-drop to `dired`
(add-hook 'dired-mode-hook 'org-download-enable)
;; Drag-and-drop to `dired` (setq org-image-actual-width nil)
(add-hook 'dired-mode-hook 'org-download-enable) (setq ring-bell-function 'ignore)
(setq org-agenda-files '(
"~/sync/org/agenda.org"
"~/sync/org/school/agendas/"
))
(setq org-agenda-span 'fortnight)
(setq org-image-actual-width nil)
(setq ring-bell-function 'ignore)
(setq org-agenda-files '(
"~/sync/org/agenda.org"
"~/sync/org/school/agendas/"
))
(setq org-agenda-span 'fortnight)
(require 'ox-publish) (setq org-publish-project-alist
(require 'ox-publish) (setq org-publish-project-alist '(
'(
;; ... add all the components here (see below)... ;; ... add all the components here (see below)...
("org-notes" ("org-notes"
:base-directory "~/sync/org/" :base-directory "~/sync/org/"
:base-extension "org" :base-extension "org"
:publishing-directory "~/public_html/" :publishing-directory "~/public_html/"
:recursive t :recursive t
:publishing-function org-html-publish-to-html :publishing-function org-html-publish-to-html
:headline-levels 4 ; Just the default for this project. :headline-levels 4 ; Just the default for this project.
:auto-preamble t :auto-preamble t
) )
("org-static" ("org-static"
:base-directory "~/sync/org/" :base-directory "~/sync/org/"
:base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf" :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf"
:publishing-directory "~/public_html/" :publishing-directory "~/public_html/"
:recursive t :recursive t
:publishing-function org-publish-attachment :publishing-function org-publish-attachment
) )
;; publish component ;; publish component
("org" :components ("org-notes" "org-static")) ("org" :components ("org-notes" "org-static"))
)) ))
''; # TODO move plugin setup into a seperate file to keep things organized ''; # TODO move plugin setup into a seperate file to keep things organized
# also add autoloading so emacs starts faster # also add autoloading so emacs starts faster
@ -94,8 +91,8 @@
evil evil
evil-org evil-org
org-download org-download
smooth-scrolling
ox-pandoc ox-pandoc
monokai-theme
]; ];
}; };
} }

View file

@ -14,9 +14,15 @@
# }; # };
# } # }
{
name = "latex";
indent.tab-width = 2;
indent.unit = "\t";
}
{ {
name = "java"; name = "java";
language-servers = [ "java-language-server" ]; language-servers = ["java-language-server"];
} }
]; ];
language-server = { language-server = {
@ -25,10 +31,10 @@
# args = ["start"]; # args = ["start"];
# }; # };
clangd = { # clangd = {
command = "${pkgs.clang-tools}/bin/clangd"; # command = "${pkgs.clang-tools}/bin/clangd";
clangd.fallbackFlags = ["-std=c++2b"]; # clangd.fallbackFlags = ["-std=c++2b"];
}; # };
nil = { nil = {
command = lib.getExe pkgs.nil; command = lib.getExe pkgs.nil;
@ -37,15 +43,26 @@
texlab = { texlab = {
command = "${pkgs.texlab}/bin/texlab"; command = "${pkgs.texlab}/bin/texlab";
config.texlab.executable = "${pkgs.tectonic}/bin/tectonic"; config.texlab = {
config.texlab.build.onSave = true; forwardSearch.executable = "${pkgs.zathura}";
config.texlab.args = [ forwardSearch.args = ["--synctex-forward" "%l:1:%f"];
"-X" build = {
"compile" executable = "${pkgs.tectonic}/bin/tectonic";
"%f" onSave = true;
"--keep-logs" auxDirectory = "build";
"--keep-intermediates" logDirectory = "build";
]; pdfDirectory = "build";
args = [
"-X"
"compile"
"%f"
"--keep-logs"
"--keep-intermediates"
"--outdir"
"build"
];
};
};
}; };
java-language-server = { java-language-server = {

View file

@ -24,7 +24,7 @@
jetbrains-mono jetbrains-mono
fira-code fira-code
mononoki mononoki
(nerdfonts.override {fonts = ["FiraCode"]; } ) (nerdfonts.override {fonts = ["FiraCode"];})
gnupg gnupg
pandoc pandoc
jdk20 jdk20

View file

@ -1,5 +1,4 @@
{pkgs, ...}: {pkgs, ...}: {
{
services.nextcloud-client = { services.nextcloud-client = {
enable = true; enable = true;
startInBackground = true; startInBackground = true;

View file

@ -1,5 +1,4 @@
{lib, ...}: {lib, ...}: {
{
imports = [ imports = [
./zsh.nix ./zsh.nix
./bash.nix ./bash.nix

View file

@ -1,5 +1,4 @@
{pkgs, ...}: {pkgs, ...}: {
{
imports = [ imports = [
./waybar ./waybar
./foot.nix ./foot.nix
@ -17,7 +16,7 @@
wl-clipboard wl-clipboard
# swaylock # swaylock
# swayidle # swayidle
wbg wbg
dunst dunst
grim grim
slurp slurp

View file

@ -13,31 +13,31 @@
"river/window" "river/window"
]; ];
modules-right = [ modules-right = [
"custom/arrow9" "custom/arrow9"
"pulseaudio" "pulseaudio"
"custom/arrow8" "custom/arrow8"
"network" "network"
"custom/arrow7" "custom/arrow7"
"memory" "memory"
"custom/arrow6" "custom/arrow6"
"cpu" "cpu"
"custom/arrow5" "custom/arrow5"
"temperature" "temperature"
"custom/arrow4" "custom/arrow4"
"battery" "battery"
"custom/arrow2" "custom/arrow2"
"tray" "tray"
"clock#date" "clock#date"
"custom/arrow1" "custom/arrow1"
"clock#time" "clock#time"
]; ];
"pulseaudio" = { "pulseaudio" = {
format = "{icon} {volume}%"; format = "{icon} {volume}%";
format-bluetooth = "{icon} {volume}%"; format-bluetooth = "{icon} {volume}%";
format-muted = ""; format-muted = "";
format-icons.default = [ "" "" ]; format-icons.default = ["" ""];
scroll-step = 1; scroll-step = 1;
tooltip = false; tooltip = false;
}; };
"network" = { "network" = {
interval = 5; interval = 5;
@ -67,8 +67,8 @@
"" ""
"" ""
"" ""
"" ""
"" ""
]; ];
tooltip = false; tooltip = false;
}; };
@ -104,11 +104,11 @@
format-full = "{icon} {capacity}%"; format-full = "{icon} {capacity}%";
format-alt = "{icon} {power}W"; format-alt = "{icon} {power}W";
format-icons = [ format-icons = [
"" ""
"" ""
"" ""
"" ""
"" ""
]; ];
tooltip = false; tooltip = false;
}; };