Compare commits
3 commits
ab7ac580be
...
89f09efb95
| Author | SHA1 | Date | |
|---|---|---|---|
|
89f09efb95 | ||
|
|
de6a60bca7 | ||
|
|
f97c8ab307 |
13
flake.nix
13
flake.nix
|
|
@ -1,6 +1,17 @@
|
|||
{
|
||||
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 = {
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
helix = {
|
||||
|
|
@ -27,6 +38,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 {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,18 @@
|
|||
|
||||
{
|
||||
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 = {
|
||||
|
|
@ -25,10 +36,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 +48,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 = {
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
jetbrains-mono
|
||||
fira-code
|
||||
mononoki
|
||||
(nerdfonts.override {fonts = ["FiraCode"]; } )
|
||||
(nerdfonts.override {fonts = ["FiraCode"];})
|
||||
gnupg
|
||||
pandoc
|
||||
jdk20
|
||||
|
|
@ -35,7 +35,6 @@
|
|||
networkmanagerapplet
|
||||
htop
|
||||
p7zip
|
||||
gitui
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -10,4 +10,32 @@
|
|||
programs.bat = {
|
||||
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,
|
||||
)
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{pkgs, ...}:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
services.nextcloud-client = {
|
||||
enable = true;
|
||||
startInBackground = true;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{lib, ...}:
|
||||
{
|
||||
{lib, ...}: {
|
||||
imports = [
|
||||
./zsh.nix
|
||||
./bash.nix
|
||||
|
|
@ -7,7 +6,7 @@
|
|||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableBashIntegration = true;
|
||||
# enableBashIntegration = true;
|
||||
enableZshIntegration = true;
|
||||
settings = {
|
||||
add_newline = false;
|
||||
|
|
|
|||
|
|
@ -19,17 +19,6 @@
|
|||
};
|
||||
historySubstringSearch.enable = true;
|
||||
plugins = [
|
||||
# {
|
||||
# name = "powerlevel10k";
|
||||
# file = "powerlevel10k.zsh-theme";
|
||||
# src = pkgs.fetchFromGitHub {
|
||||
# owner = "romkatv";
|
||||
# repo = "powerlevel10k";
|
||||
# rev = "v1.19.0";
|
||||
# sha256 = "+hzjSbbrXr0w1rGHm6m2oZ6pfmD6UUDBfPd7uMg5l5c=";
|
||||
# };
|
||||
# }
|
||||
|
||||
{
|
||||
name = "z.lua";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
|
|
@ -53,9 +42,9 @@
|
|||
# initExtra = ''
|
||||
# source $HOME/.config/zsh/.p10k.zsh
|
||||
# '';
|
||||
# localVariables = {
|
||||
# POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD = true;
|
||||
# };
|
||||
localVariables = {
|
||||
ZVM_TERM = "xterm-256color";
|
||||
};
|
||||
};
|
||||
# home.file.".config/zsh/.p10k.zsh".source = ./.p10k.zsh;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
{pkgs, ...}:
|
||||
{
|
||||
{pkgs, ...}: {
|
||||
imports = [
|
||||
./waybar
|
||||
./foot.nix
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
main = {
|
||||
shell = "/usr/bin/env zsh";
|
||||
font = "Mononoki:size=14,FiraCode Nerd Font:size=14";
|
||||
term = "xterm-256color";
|
||||
};
|
||||
colors = {
|
||||
background = "232136";
|
||||
|
|
@ -27,7 +26,7 @@
|
|||
bright5 = "c4a7e7";
|
||||
bright6 = "ea9a97";
|
||||
bright7 = "e0def4";
|
||||
alpha = "0.9";
|
||||
alpha = "0.85";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -13,29 +13,29 @@
|
|||
"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;
|
||||
};
|
||||
|
|
@ -67,8 +67,8 @@
|
|||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
tooltip = false;
|
||||
};
|
||||
|
|
@ -104,11 +104,11 @@
|
|||
format-full = "{icon} {capacity}%";
|
||||
format-alt = "{icon} {power}W";
|
||||
format-icons = [
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
""
|
||||
];
|
||||
tooltip = false;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue