Compare commits

...

3 commits

Author SHA1 Message Date
Aria Nolan 89f09efb95 added cachix substituter 2023-11-04 23:06:38 -04:00
Aria Nolan de6a60bca7 fixed helix texlab, formatted 2023-11-04 22:44:54 -04:00
Aria Nolan f97c8ab307 fixed gitui theme and zvm cursor 2023-11-01 10:21:19 -04:00
12 changed files with 205 additions and 157 deletions

View file

@ -1,6 +1,17 @@
{ {
description = "tacocat's nix configuration"; description = "tacocat's nix configuration";
nixConfig = {
experimental-features = ["nix-command" "flakes"];
extra-substituters = [
# Nix community's cache server
"https://nix-community.cachix.org"
];
extra-trusted-public-keys = [
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
];
};
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
helix = { helix = {
@ -27,6 +38,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,11 +1,15 @@
# 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"];
@ -13,28 +17,28 @@
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

View file

@ -34,9 +34,6 @@
(require 'evil-org-agenda) (require 'evil-org-agenda)
(evil-org-agenda-set-keys) (evil-org-agenda-set-keys)
(require 'smooth-scrolling)
(smooth-scrolling-mode 1)
(setq org-startup-with-inline-images 1) (setq org-startup-with-inline-images 1)
(setq org-startup-indented 1) (setq org-startup-indented 1)
@ -94,8 +91,8 @@
evil evil
evil-org evil-org
org-download org-download
smooth-scrolling
ox-pandoc ox-pandoc
monokai-theme
]; ];
}; };
} }

View file

@ -18,6 +18,17 @@
name = "java"; name = "java";
language-servers = ["java-language-server"]; language-servers = ["java-language-server"];
} }
{
name = "nix";
auto-format = true;
}
{
name = "latex";
indent.tab-width = 2;
indent.unit = "\t";
}
]; ];
language-server = { language-server = {
# bash-language-server = { # bash-language-server = {
@ -25,10 +36,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,16 +48,27 @@
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"];
build = {
executable = "${pkgs.tectonic}/bin/tectonic";
onSave = true;
auxDirectory = "build";
logDirectory = "build";
pdfDirectory = "build";
args = [
"-X" "-X"
"compile" "compile"
"%f" "%f"
"--keep-logs" "--keep-logs"
"--keep-intermediates" "--keep-intermediates"
"--outdir"
"build"
]; ];
}; };
};
};
java-language-server = { java-language-server = {
command = "${pkgs.java-language-server}/bin/java-language-server"; command = "${pkgs.java-language-server}/bin/java-language-server";

View file

@ -35,7 +35,6 @@
networkmanagerapplet networkmanagerapplet
htop htop
p7zip p7zip
gitui
]; ];
}; };

View file

@ -10,4 +10,32 @@
programs.bat = { programs.bat = {
enable = true; enable = true;
}; };
programs.gitui = {
enable = true;
theme = ''
(
selected_tab: Reset,
command_fg: DarkGray,
selection_bg: Green,
selection_fg: White,
cmdbar_bg: Blue,
cmdbar_extra_lines_bg: Blue,
disabled_fg: Magenta,
diff_line_add: Green,
diff_line_delete: Red,
diff_file_added: LightGreen,
diff_file_removed: LightRed,
diff_file_moved: LightMagenta,
diff_file_modified: Yellow,
commit_hash: Magenta,
commit_time: LightCyan,
commit_author: Green,
danger_fg: Red,
push_gauge_bg: Blue,
push_gauge_fg: Reset,
tag_fg: LightMagenta,
branch_fg: LightYellow,
)
'';
};
} }

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
@ -7,7 +6,7 @@
programs.starship = { programs.starship = {
enable = true; enable = true;
enableBashIntegration = true; # enableBashIntegration = true;
enableZshIntegration = true; enableZshIntegration = true;
settings = { settings = {
add_newline = false; add_newline = false;

View file

@ -19,17 +19,6 @@
}; };
historySubstringSearch.enable = true; historySubstringSearch.enable = true;
plugins = [ plugins = [
# {
# name = "powerlevel10k";
# file = "powerlevel10k.zsh-theme";
# src = pkgs.fetchFromGitHub {
# owner = "romkatv";
# repo = "powerlevel10k";
# rev = "v1.19.0";
# sha256 = "+hzjSbbrXr0w1rGHm6m2oZ6pfmD6UUDBfPd7uMg5l5c=";
# };
# }
{ {
name = "z.lua"; name = "z.lua";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
@ -53,9 +42,9 @@
# initExtra = '' # initExtra = ''
# source $HOME/.config/zsh/.p10k.zsh # source $HOME/.config/zsh/.p10k.zsh
# ''; # '';
# localVariables = { localVariables = {
# POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD = true; ZVM_TERM = "xterm-256color";
# }; };
}; };
# home.file.".config/zsh/.p10k.zsh".source = ./.p10k.zsh; # home.file.".config/zsh/.p10k.zsh".source = ./.p10k.zsh;
} }

View file

@ -1,5 +1,4 @@
{pkgs, ...}: {pkgs, ...}: {
{
imports = [ imports = [
./waybar ./waybar
./foot.nix ./foot.nix

View file

@ -6,7 +6,6 @@
main = { main = {
shell = "/usr/bin/env zsh"; shell = "/usr/bin/env zsh";
font = "Mononoki:size=14,FiraCode Nerd Font:size=14"; font = "Mononoki:size=14,FiraCode Nerd Font:size=14";
term = "xterm-256color";
}; };
colors = { colors = {
background = "232136"; background = "232136";
@ -27,7 +26,7 @@
bright5 = "c4a7e7"; bright5 = "c4a7e7";
bright6 = "ea9a97"; bright6 = "ea9a97";
bright7 = "e0def4"; bright7 = "e0def4";
alpha = "0.9"; alpha = "0.85";
}; };
}; };
}; };