diff --git a/flake.nix b/flake.nix index 8316563..a46b3de 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,8 @@ system = "x86_64-linux"; pkgs = inputs.nixpkgs.legacyPackages.${system}; in { + formatter.${system} = pkgs.alejandra; + # nixosConfigurations: define options for different systems # desktop nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem { diff --git a/hosts/JWST/hardware-configuration.nix b/hosts/JWST/hardware-configuration.nix index b6c6c55..214569c 100644 --- a/hosts/JWST/hardware-configuration.nix +++ b/hosts/JWST/hardware-configuration.nix @@ -1,41 +1,45 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: - { - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + config, + 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.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" "rtsx_pci_sdmmc"]; + boot.initrd.kernelModules = []; + boot.kernelModules = ["kvm-intel"]; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/d05d358d-19d4-4629-b0bd-594a754ad76d"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/d05d358d-19d4-4629-b0bd-594a754ad76d"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/6DD4-5A29"; - fsType = "vfat"; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/6DD4-5A29"; + fsType = "vfat"; + }; - fileSystems."/mnt/void" = - { device = "/dev/disk/by-uuid/987518fa-8ea0-49a6-b1e5-1fed4e4ae50f"; - fsType = "ext4"; - }; + fileSystems."/mnt/void" = { + device = "/dev/disk/by-uuid/987518fa-8ea0-49a6-b1e5-1fed4e4ae50f"; + fsType = "ext4"; + }; - fileSystems."/mnt/secondary" = - { device = "/dev/disk/by-uuid/3b424592-6b20-42e0-9d28-8bf562c15913"; - fsType = "ext4"; - }; + fileSystems."/mnt/secondary" = { + device = "/dev/disk/by-uuid/3b424592-6b20-42e0-9d28-8bf562c15913"; + fsType = "ext4"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/802e89ce-52b8-41b9-85ea-b969ab08765f"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/802e89ce-52b8-41b9-85ea-b969ab08765f";} + ]; # 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 diff --git a/users/tacocat/emacs/default.nix b/users/tacocat/emacs/default.nix index b6372d2..65c428e 100644 --- a/users/tacocat/emacs/default.nix +++ b/users/tacocat/emacs/default.nix @@ -3,87 +3,84 @@ enable = true; package = pkgs.emacs29-gtk3; extraConfig = '' - (menu-bar-mode -1) - (tool-bar-mode -1) - (scroll-bar-mode -1) - (blink-cursor-mode 0) + (menu-bar-mode -1) + (tool-bar-mode -1) + (scroll-bar-mode -1) + (blink-cursor-mode 0) - ;; scale headings in org-mode - (setq zenburn-scale-org-headlines t) + ;; scale headings in org-mode + (setq zenburn-scale-org-headlines t) - ;; scale headings in outline-mode - (setq zenburn-scale-outline-headlines t) - (load-theme 'zenburn :no-confirm) + ;; scale headings in outline-mode + (setq zenburn-scale-outline-headlines t) + (load-theme 'zenburn :no-confirm) - (add-to-list 'default-frame-alist - '(font . "Maple Mono-12")) + (add-to-list 'default-frame-alist + '(font . "Maple Mono-12")) - (global-set-key (kbd "C-c a") #'org-agenda) - (global-set-key (kbd "C-c f") #'recentf-open) - (global-hl-line-mode 1) + (global-set-key (kbd "C-c a") #'org-agenda) + (global-set-key (kbd "C-c f") #'recentf-open) + (global-hl-line-mode 1) - (global-visual-line-mode 1) - (setq evil-respect-visual-line-mode 1) + (global-visual-line-mode 1) + (setq evil-respect-visual-line-mode 1) - (require 'evil) - (evil-mode 1) + (require 'evil) + (evil-mode 1) - (require 'evil-org) - (add-hook 'org-mode-hook 'evil-org-mode) - (evil-org-set-key-theme '(textobjects insert navigation additional shift todo heading)) - (require 'evil-org-agenda) - (evil-org-agenda-set-keys) + (require 'evil-org) + (add-hook 'org-mode-hook 'evil-org-mode) + (evil-org-set-key-theme '(textobjects insert navigation additional shift todo heading)) + (require 'evil-org-agenda) + (evil-org-agenda-set-keys) - (require 'smooth-scrolling) - (smooth-scrolling-mode 1) + (setq org-startup-with-inline-images 1) + (setq org-startup-indented 1) - (setq org-startup-with-inline-images 1) - (setq org-startup-indented 1) + ;;(global-display-line-numbers-mode 1) + ;;(setq display-line-numbers-type 'visual) - ;;(global-display-line-numbers-mode 1) - ;;(setq display-line-numbers-type 'visual) + (require 'org-download) - (require 'org-download) + ;; Drag-and-drop to `dired` + (add-hook 'dired-mode-hook 'org-download-enable) - ;; Drag-and-drop to `dired` - (add-hook 'dired-mode-hook 'org-download-enable) + (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) - (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" - :base-directory "~/sync/org/" - :base-extension "org" - :publishing-directory "~/public_html/" - :recursive t - :publishing-function org-html-publish-to-html - :headline-levels 4 ; Just the default for this project. - :auto-preamble t - ) + ("org-notes" + :base-directory "~/sync/org/" + :base-extension "org" + :publishing-directory "~/public_html/" + :recursive t + :publishing-function org-html-publish-to-html + :headline-levels 4 ; Just the default for this project. + :auto-preamble t + ) - ("org-static" - :base-directory "~/sync/org/" - :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf" - :publishing-directory "~/public_html/" - :recursive t - :publishing-function org-publish-attachment - ) + ("org-static" + :base-directory "~/sync/org/" + :base-extension "css\\|js\\|png\\|jpg\\|gif\\|pdf\\|mp3\\|ogg\\|swf" + :publishing-directory "~/public_html/" + :recursive t + :publishing-function org-publish-attachment + ) - ;; publish component - ("org" :components ("org-notes" "org-static")) + ;; publish component + ("org" :components ("org-notes" "org-static")) - )) + )) ''; # TODO move plugin setup into a seperate file to keep things organized # also add autoloading so emacs starts faster @@ -94,8 +91,8 @@ evil evil-org org-download - smooth-scrolling ox-pandoc + monokai-theme ]; }; } diff --git a/users/tacocat/helix/languages.nix b/users/tacocat/helix/languages.nix index 1915977..1d38529 100644 --- a/users/tacocat/helix/languages.nix +++ b/users/tacocat/helix/languages.nix @@ -14,9 +14,15 @@ # }; # } + { + name = "latex"; + indent.tab-width = 2; + indent.unit = "\t"; + } + { name = "java"; - language-servers = [ "java-language-server" ]; + language-servers = ["java-language-server"]; } ]; language-server = { @@ -25,10 +31,10 @@ # args = ["start"]; # }; - clangd = { - command = "${pkgs.clang-tools}/bin/clangd"; - clangd.fallbackFlags = ["-std=c++2b"]; - }; + # clangd = { + # command = "${pkgs.clang-tools}/bin/clangd"; + # clangd.fallbackFlags = ["-std=c++2b"]; + # }; nil = { command = lib.getExe pkgs.nil; @@ -37,15 +43,26 @@ texlab = { command = "${pkgs.texlab}/bin/texlab"; - config.texlab.executable = "${pkgs.tectonic}/bin/tectonic"; - config.texlab.build.onSave = true; - config.texlab.args = [ - "-X" - "compile" - "%f" - "--keep-logs" - "--keep-intermediates" - ]; + config.texlab = { + forwardSearch.executable = "${pkgs.zathura}"; + forwardSearch.args = ["--synctex-forward" "%l:1:%f"]; + build = { + executable = "${pkgs.tectonic}/bin/tectonic"; + onSave = true; + auxDirectory = "build"; + logDirectory = "build"; + pdfDirectory = "build"; + args = [ + "-X" + "compile" + "%f" + "--keep-logs" + "--keep-intermediates" + "--outdir" + "build" + ]; + }; + }; }; java-language-server = { diff --git a/users/tacocat/home.nix b/users/tacocat/home.nix index 86f628a..25d6f47 100644 --- a/users/tacocat/home.nix +++ b/users/tacocat/home.nix @@ -24,7 +24,7 @@ jetbrains-mono fira-code mononoki - (nerdfonts.override {fonts = ["FiraCode"]; } ) + (nerdfonts.override {fonts = ["FiraCode"];}) gnupg pandoc jdk20 diff --git a/users/tacocat/services/default.nix b/users/tacocat/services/default.nix index 004670f..fa24a58 100644 --- a/users/tacocat/services/default.nix +++ b/users/tacocat/services/default.nix @@ -1,5 +1,4 @@ -{pkgs, ...}: -{ +{pkgs, ...}: { services.nextcloud-client = { enable = true; startInBackground = true; diff --git a/users/tacocat/shell/default.nix b/users/tacocat/shell/default.nix index c4790f0..9e413b5 100644 --- a/users/tacocat/shell/default.nix +++ b/users/tacocat/shell/default.nix @@ -1,5 +1,4 @@ -{lib, ...}: -{ +{lib, ...}: { imports = [ ./zsh.nix ./bash.nix diff --git a/users/tacocat/wayland/default.nix b/users/tacocat/wayland/default.nix index 3213bc9..875d292 100644 --- a/users/tacocat/wayland/default.nix +++ b/users/tacocat/wayland/default.nix @@ -1,5 +1,4 @@ -{pkgs, ...}: -{ +{pkgs, ...}: { imports = [ ./waybar ./foot.nix @@ -17,7 +16,7 @@ wl-clipboard # swaylock # swayidle - wbg + wbg dunst grim slurp diff --git a/users/tacocat/wayland/waybar/default.nix b/users/tacocat/wayland/waybar/default.nix index 73ad968..9382ed1 100644 --- a/users/tacocat/wayland/waybar/default.nix +++ b/users/tacocat/wayland/waybar/default.nix @@ -13,31 +13,31 @@ "river/window" ]; modules-right = [ - "custom/arrow9" - "pulseaudio" - "custom/arrow8" - "network" - "custom/arrow7" - "memory" - "custom/arrow6" - "cpu" - "custom/arrow5" - "temperature" - "custom/arrow4" - "battery" - "custom/arrow2" - "tray" - "clock#date" - "custom/arrow1" - "clock#time" + "custom/arrow9" + "pulseaudio" + "custom/arrow8" + "network" + "custom/arrow7" + "memory" + "custom/arrow6" + "cpu" + "custom/arrow5" + "temperature" + "custom/arrow4" + "battery" + "custom/arrow2" + "tray" + "clock#date" + "custom/arrow1" + "clock#time" ]; "pulseaudio" = { format = "{icon} {volume}%"; format-bluetooth = "{icon} {volume}%"; format-muted = ""; - format-icons.default = [ "" "" ]; + format-icons.default = ["" ""]; scroll-step = 1; - tooltip = false; + tooltip = false; }; "network" = { interval = 5; @@ -67,8 +67,8 @@ "" "" "" - "" - "" + "" + "" ]; tooltip = false; }; @@ -104,11 +104,11 @@ format-full = "{icon} {capacity}%"; format-alt = "{icon} {power}W"; format-icons = [ - "" - "" - "" - "" - "" + "" + "" + "" + "" + "" ]; tooltip = false; };