Squash merge testing into main
This commit is contained in:
Don Harper
parent
fa956f5da2
commit
30bb818058
18 changed files with 289 additions and 97 deletions
|
|
@ -19,7 +19,8 @@
|
|||
./mail.nix
|
||||
./naviterm.nix
|
||||
./newsboat.nix
|
||||
./nvf.nix
|
||||
./nixvim.nix
|
||||
# ./nvf.nix
|
||||
./ssh.nix
|
||||
./taskwarrior.nix
|
||||
./topgrade.nix
|
||||
|
|
@ -65,7 +66,6 @@
|
|||
keychain
|
||||
keyutils
|
||||
lazygit
|
||||
librewolf
|
||||
links2
|
||||
liquidprompt
|
||||
lynx
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
{ pkgs, ... }: {
|
||||
home.packages = with pkgs; [ tree-sitter fd ripgrep ];
|
||||
{pkgs, ...}: {
|
||||
home.packages = with pkgs; [tree-sitter fd ripgrep];
|
||||
programs.nvf = {
|
||||
enable = true;
|
||||
enableManpages = true;
|
||||
settings = {
|
||||
# https://nvf.notashelf.dev/options.html
|
||||
vim = {
|
||||
luaConfigPost = ''
|
||||
vim.o.tabstop = 2
|
||||
|
|
@ -14,12 +15,12 @@
|
|||
vim.o.sidescrolloff = 8
|
||||
'';
|
||||
autocomplete.blink-cmp.enable = true;
|
||||
binds = { cheatsheet.enable = true; };
|
||||
binds = {cheatsheet.enable = true;};
|
||||
dashboard.alpha = {
|
||||
enable = true;
|
||||
theme = "dashboard";
|
||||
};
|
||||
filetree.neo-tree = { enable = true; };
|
||||
filetree.neo-tree = {enable = true;};
|
||||
comments.comment-nvim.enable = true;
|
||||
autopairs.nvim-autopairs.enable = true;
|
||||
snippets.luasnip.enable = true;
|
||||
|
|
@ -31,7 +32,7 @@
|
|||
terminal = {
|
||||
toggleterm = {
|
||||
enable = true;
|
||||
lazygit = { enable = true; };
|
||||
lazygit = {enable = true;};
|
||||
};
|
||||
};
|
||||
treesitter = {
|
||||
|
|
@ -39,48 +40,49 @@
|
|||
context.enable = true;
|
||||
fold = true;
|
||||
autotagHtml.enable = true;
|
||||
indent.enable = true;
|
||||
};
|
||||
syntaxHighlighting = true;
|
||||
keymaps = [
|
||||
{
|
||||
key = "<Tab>";
|
||||
action = ":bnext<CR>";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>t";
|
||||
action = ":Telescope buffers<CR>";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>T";
|
||||
action = ":terminal<CR>";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>e";
|
||||
action = ":Neotree toggle<CR>";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>ow";
|
||||
action = ":ObsidianWorkspace<CR>";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>od";
|
||||
action = ":ObsidianDailies<CR>";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>on";
|
||||
action = ":ObsidianNew<CR>";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
}
|
||||
{
|
||||
key = "<leader>oN";
|
||||
action = ":ObsidianNewFromTemplate<CR>";
|
||||
mode = [ "n" ];
|
||||
mode = ["n"];
|
||||
}
|
||||
];
|
||||
git = {
|
||||
|
|
@ -117,9 +119,9 @@
|
|||
codewindow.enable = true;
|
||||
};
|
||||
|
||||
notify = { nvim-notify.enable = true; };
|
||||
notify = {nvim-notify.enable = true;};
|
||||
|
||||
options = { conceallevel = 1; };
|
||||
options = {conceallevel = 1;};
|
||||
|
||||
statusline.lualine = {
|
||||
enable = true;
|
||||
|
|
@ -141,7 +143,7 @@
|
|||
legacy_commands = true;
|
||||
ui.enable = false;
|
||||
completion.nvim-cmp = true;
|
||||
templates = { subdir = "Templates"; };
|
||||
templates = {subdir = "Templates";};
|
||||
daily_notes = {
|
||||
date_format = "%Y-%m-%d";
|
||||
folder = "Daily";
|
||||
|
|
|
|||
|
|
@ -19,14 +19,14 @@
|
|||
don = {
|
||||
imports = [
|
||||
inputs.catppuccin.homeModules.catppuccin
|
||||
inputs.nvf.homeManagerModules.default
|
||||
# inputs.nixvim.homeModules.nixvim
|
||||
# inputs.nvf.homeManagerModules.default
|
||||
inputs.nixvim.homeModules.nixvim
|
||||
./common
|
||||
];
|
||||
home = {
|
||||
username = "don";
|
||||
homeDirectory = "/home/don";
|
||||
stateVersion = "23.05";
|
||||
stateVersion = "25.11";
|
||||
};
|
||||
programs = {
|
||||
home-manager = {enable = true;};
|
||||
|
|
|
|||
|
|
@ -14,10 +14,9 @@ in {
|
|||
imports = [
|
||||
./alacritty.nix
|
||||
./autostart.nix
|
||||
# ./fuzzel.nix
|
||||
# ./kde.nix
|
||||
./librewolf.nix
|
||||
./mpv.nix
|
||||
# ./redshift.nix
|
||||
./qutebrowser.nix
|
||||
./services.nix
|
||||
./sway.nix
|
||||
|
|
@ -41,7 +40,7 @@ in {
|
|||
clipman
|
||||
darktable
|
||||
# element-desktop
|
||||
firefox
|
||||
# firefox
|
||||
gnumeric
|
||||
headset-charge-indicator
|
||||
ibm-plex
|
||||
|
|
@ -57,7 +56,6 @@ in {
|
|||
nvd
|
||||
obsidian
|
||||
overpass
|
||||
pasystray
|
||||
pavucontrol
|
||||
pwvucontrol
|
||||
qpwgraph
|
||||
|
|
@ -74,7 +72,7 @@ in {
|
|||
# watchmate
|
||||
widevine-cdm
|
||||
wlsunset
|
||||
yt-dlp
|
||||
# yt-dlp
|
||||
];
|
||||
# ] ++ lib.optional (pkgs.hostPlatform.system == "x86_64-linux") feishin;
|
||||
# ] ++ lib.optional (pkgs.hostPlatform.system == "x86_64-linux") sonixd;
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
{ config, pkgs, ... }: {
|
||||
home.packages = with pkgs; [ fuzzel ];
|
||||
programs.fuzzel = {
|
||||
enable = true;
|
||||
settings = {
|
||||
main = {
|
||||
icon-theme = "Papirus-Dark";
|
||||
width = 50;
|
||||
# font = "Ubuntu:style=Bold:size=12, Hack:weight=bold:size=12";
|
||||
fields = "name,generic,comment,categories,filename,keywords";
|
||||
prompt = "❯ ";
|
||||
layer = "overlay";
|
||||
};
|
||||
border = { radius = 20; };
|
||||
dmenu = {
|
||||
exit-immediately-if-empty = true;
|
||||
mode = "index";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
73
home/gui/librewolf.nix
Normal file
73
home/gui/librewolf.nix
Normal file
|
|
@ -0,0 +1,73 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
programs.firefox = {
|
||||
enable = true;
|
||||
package = pkgs.librewolf;
|
||||
policies = {
|
||||
Cookies = {
|
||||
"Allow" = [
|
||||
"https://addy.io"
|
||||
"https://element.io"
|
||||
"https://discord.com"
|
||||
"https://github.com"
|
||||
"https://lemmy.cafe"
|
||||
"https://proton.me"
|
||||
];
|
||||
"Locked" = true;
|
||||
};
|
||||
DisableTelemetry = true;
|
||||
DisableFirefoxStudies = true;
|
||||
ExtensionSettings = {
|
||||
# Catpuccin Mocha - Lavender
|
||||
"{8446b178-c865-4f5c-8ccc-1d7887811ae3}" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-mocha-lavender-git/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
# Tridactyl
|
||||
"tridactyl.vim@cmcaine.co.uk" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/tridactyl-vim/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
# uBlock Origin
|
||||
"uBlock0@raymondhill.net" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
# Bitwarden
|
||||
"{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
# Dark Reader
|
||||
"addon@darkreader.org" = {
|
||||
install_url = "https://addons.mozilla.org/firefox/downloads/latest/darkreader/latest.xpi";
|
||||
installation_mode = "force_installed";
|
||||
};
|
||||
};
|
||||
FirefoxHome = {
|
||||
"Search" = false;
|
||||
};
|
||||
HardwareAcceleration = true;
|
||||
Preferences = {
|
||||
"browser.preferences.defaultPerformanceSettings.enabled" = false;
|
||||
"browser.startup.homepage" = "about:home";
|
||||
"browser.toolbar.bookmarks.visibility" = "newtab";
|
||||
"browser.toolbars.bookmarks.visibility" = "newtab";
|
||||
"browser.urlbar.suggest.bookmark" = false;
|
||||
"browser.urlbar.suggest.engines" = false;
|
||||
"browser.urlbar.suggest.history" = false;
|
||||
"browser.urlbar.suggest.openpage" = false;
|
||||
"browser.urlbar.suggest.recentsearches" = false;
|
||||
"browser.urlbar.suggest.topsites" = false;
|
||||
"browser.warnOnQuit" = false;
|
||||
"browser.warnOnQuitShortcut" = false;
|
||||
"places.history.enabled" = "false";
|
||||
"privacy.resistFingerprinting" = true;
|
||||
"privacy.resistFingerprinting.autoDeclineNoUserInputCanvasPrompts" = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -35,8 +35,8 @@
|
|||
ytdl = "yes";
|
||||
ytdl-format = "bestvideo+bestaudio";
|
||||
# Only needed when/if youtube blocks annon access again
|
||||
# ytdl-raw-options = "no-playlist=,cookies-from-browser=firefox,force-ipv4=";
|
||||
ytdl-raw-options = "no-playlist=,force-ipv4=";
|
||||
# ytdl-raw-options = "mark-watched=,no-playlist=,cookies-from-browser=firefox,force-ipv4=";
|
||||
ytdl-raw-options = "mark-watched=,no-playlist=,force-ipv4=";
|
||||
};
|
||||
profiles = {
|
||||
utube = {
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@
|
|||
cnn = "https://www.cnn.com";
|
||||
crhs = "https://www.katyisd.org/CRHS";
|
||||
crhs-absence = "https://www.katyisd.org/domain/5809";
|
||||
cultpens = "https://cultpens.com/";
|
||||
cups = "http://localhost:631/printers/printer";
|
||||
disk = "https://smart.trex-halfbeak.ts.net/web/dashboard";
|
||||
ercot = "https://www.ercot.com/gridmktinfo/dashboards";
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
{ config, pkgs, ... }: {
|
||||
services.redshift = {
|
||||
enable = true;
|
||||
latitude = "29.74";
|
||||
longitude = "-95.77";
|
||||
provider = "manual";
|
||||
settings = {
|
||||
redshift = {
|
||||
tray = true;
|
||||
adjustment-method = "vidmode";
|
||||
brightness-day = "1.0";
|
||||
brightness-night = "0.7";
|
||||
# This *should work*
|
||||
#temperature = {
|
||||
#day = 6500;
|
||||
#night = 3500;
|
||||
#};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -38,17 +38,17 @@
|
|||
title_align center
|
||||
# Music control
|
||||
bindsym XF86AudioPlay exec --no-startup-id control-music --pause
|
||||
bindsym Control+Shift+F7 exec --no-startup-id control-music --pause
|
||||
bindsym XF86AudioNext exec --no-startup-id control-music --next
|
||||
bindsym Control+Shift+F2 exec --no-startup-id control-music --next
|
||||
bindsym XF86AudioPrev exec --no-startup-id control-music --prev
|
||||
bindsym Control+Shift+F1 exec --no-startup-id control-music --prev
|
||||
bindsym XF86AudioStop exec --no-startup-id control-music --stop
|
||||
bindsym Control+Shift+F7 exec --no-startup-id control-music --pause
|
||||
bindsym Control+Shift+F2 exec --no-startup-id control-music --next
|
||||
bindsym Control+Shift+F1 exec --no-startup-id control-music --prev
|
||||
|
||||
# Brightness
|
||||
bindsym XF86MonBrightnessDown exec light -U 10
|
||||
bindsym Control+Shift+F5 exec light -U 10
|
||||
bindsym XF86MonBrightnessUp exec light -A 10
|
||||
bindsym Control+Shift+F5 exec light -U 10
|
||||
bindsym Control+Shift+F6 exec light -A 10
|
||||
|
||||
# Volume
|
||||
|
|
@ -82,7 +82,6 @@
|
|||
bindsym menu exec $menu_command
|
||||
bindsym $mod+Shift+w exec dwifi
|
||||
bindsym $mod+d exec --no-startup-id $menu
|
||||
bindsym $mod+t exec --no-startup-id $HOME/bin/mynewterm -e ttmenu
|
||||
|
||||
# change focus
|
||||
bindsym $mod+j focus left
|
||||
|
|
@ -303,7 +302,6 @@
|
|||
client.placeholder #282A36 #282A36 #F8F8F2 #282A36 #282A36
|
||||
client.background #F8F8F2
|
||||
|
||||
exec ${pkgs.pasystray}/bin/pasystray
|
||||
exec_always ${pkgs.keyutils}/bin/keyctl link @u @s
|
||||
exec ${pkgs.shikane}/bin/shikane
|
||||
exec ${pkgs.wayland-pipewire-idle-inhibit}/bin/wayland-pipewire-idle-inhibit
|
||||
|
|
@ -314,8 +312,6 @@
|
|||
exec ${pkgs.dbus}/bin/dbus-update-activation-environment --all 2>/dev/null && dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
|
||||
exec ${pkgs.udiskie}/bin/udiskie
|
||||
exec ${pkgs.wl-clipboard}/bin/wl-paste -t text --watch clipman store
|
||||
exec ~/bin/configure-gtk
|
||||
exec ~/bin/dovideo.sh
|
||||
exec ~/bin/auto-start
|
||||
exec ${pkgs.sway-audio-idle-inhibit}/bin/sway-audio-idle-inhibit
|
||||
exec ${pkgs.swaynotificationcenter}/bin/swaync
|
||||
|
|
@ -325,7 +321,7 @@
|
|||
exec ~/bin/myterm
|
||||
exec ${pkgs.headset-charge-indicator}/bin/headset-charge-indicator.py
|
||||
exec ${pkgs.wlsunset}/bin/wlsunset -l 29.7 -L -95.8
|
||||
exec ${pkgs.blueberry}/bin/blueberry-tray
|
||||
# exec ${pkgs.blueberry}/bin/blueberry-tray
|
||||
'';
|
||||
|
||||
programs = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue