some cleanup, back to wpa_supplicant, about to branch for refactor

This commit is contained in:
Matt Nish-Lapidus 2025-02-03 17:09:12 -05:00
parent 29f9ba670f
commit 7b061e6cd8
33 changed files with 2225 additions and 449 deletions

BIN
home/akira.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View file

@ -1,4 +1,4 @@
{ config, pkgs, inputs, outputs, ... }:
{ config, lib, pkgs, inputs, outputs, ... }:
{
nixpkgs = {
@ -6,10 +6,7 @@
outputs.overlays.additions
outputs.overlays.modifications
outputs.overlays.unstable-packages
(import (builtins.fetchTarball {
url = "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
sha256 = "0cfz3178ija6s37pa5rdfmqpcqj38gchn1y9q4iln2jrqh8v600i";
}))
outputs.overlays.emacs-overlay
];
config = {
@ -22,6 +19,7 @@
inputs.affinity-nix.packages.x86_64-linux.photo
inputs.affinity-nix.packages.x86_64-linux.publisher
inputs.affinity-nix.packages.x86_64-linux.designer
inputs.shikane.packages.x86_64-linux.default
guix
unstable.thonny
inputs.isd.packages.x86_64-linux.default
@ -36,6 +34,7 @@
pinentry
gcr
gnutar
libnotify
unzip
zip
stdenv
@ -47,7 +46,6 @@
readline
gnupg
imagemagick
# gcc
gnutls
gettext
xorg.libX11
@ -73,7 +71,7 @@
gst_all_1.gstreamer
alsa-oss
powertop
unstable.hypridle
age
sops
@ -84,10 +82,6 @@
util-linux
coreutils
binutils
# libgcc
# cmake
# libuv.dev
# SDL2.dev
protonplus
ispell
(aspellWithDicts (dicts: with dicts; [ en en-computers en-science es fr ]))
@ -96,9 +90,6 @@
libappimage
transmission_4-gtk
lsof
# ruby
# janet
# jpm
guile
python311
python311Packages.pip
@ -114,7 +105,6 @@
ruff
(sbcl.withPackages (ps: with ps; [
# asdf_3_3
cffi
arrow-macros
alexandria
@ -140,7 +130,6 @@
rustup
shfmt
html-tidy
tree-sitter
libsecret
samba4Full
shellcheck
@ -218,7 +207,7 @@
gnome-photos
gnome-keyring
ulauncher
wl-mirror
unstable.nwg-look
soundconverter
gtop
@ -284,10 +273,8 @@
resources
carla
switcheroo
# audacity
tenacity
supercollider-with-plugins
#unstable.bitwig-studio
bitwig-studio-beta
blender
davinci-resolve-studio
@ -311,7 +298,6 @@
openscad-lsp
picard
evolutionWithPlugins
mpv
plugdata
pavucontrol
qpwgraph
@ -326,9 +312,12 @@
unstable.playerctl
mioctl
unstable.door-knocker
unstable.hyprpicker
inputs.hyprpicker.packages.x86_64-linux.default
farge
unstable.halloy
paleta
tree-sitter
(tree-sitter.withPlugins (_: tree-sitter.allGrammars))
# Audio plugins (LV2, VST2, VST3, LADSPA)
eq10q
@ -408,10 +397,10 @@
stateVersion = "24.05";
};
# gtk.cursorTheme = {
# name = "Bibata-Modern-Classic";
# package = pkgs.bibata-cursors;
# };
gtk.cursorTheme = {
name = "Bibata-Modern-Classic";
package = pkgs.bibata-cursors;
};
fonts.fontconfig = {
enable = true;
@ -441,31 +430,27 @@
};
programs = {
home-manager.enable = true;
fuzzel = {
home-manager = {
enable = true;
settings = {
main = {
terminal = "${pkgs.wezterm}/bin/wezterm";
dpi-aware = true;
};
border = {
radius = 8;
width = 2;
};
colors = {
background="1e1e2edd";
text="cdd6f4ff";
prompt="bac2deff";
placeholder="7f849cff";
input="cdd6f4ff";
match="f5c2e7ff";
selection="585b70ff";
selection-text="cdd6f4ff";
selection-match="f5c2e7ff";
counter="7f849cff";
border="f5c2e7ff";
};
mpv = {
enable = true;
package = (pkgs.unstable.mpv-unwrapped.wrapper {
scripts = with pkgs.unstable.mpvScripts; [
thumbfast
modernz
];
mpv = pkgs.unstable.mpv-unwrapped.override {
waylandSupport = true;
ffmpeg = pkgs.ffmpeg-full;
};
});
config = {
osc = "no";
profile = "high-quality";
ytdl-format = "bestvideo+bestaudio";
cache-default = 4000000;
};
};
direnv = {
@ -476,17 +461,6 @@
enable = true;
enableFishIntegration = true;
package = inputs.yazi.packages.x86_64-linux.default;
keymap = {
manager.prepend_keymap = [
{
on = "<C-d>";
run = ''shell 'ripdrag "$@" -x 2>/dev/null &' --confirm'';
}
];
};
settings = {
};
};
fish = {
enable = true;
@ -525,6 +499,7 @@
package = ((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages (
epkgs: [
epkgs.vterm
epkgs.all-the-icons
epkgs.mu4e
epkgs.sly
epkgs.sly-quicklisp
@ -534,8 +509,8 @@
epkgs.nixpkgs-fmt
epkgs.nixfmt
epkgs.parinfer-rust-mode
epkgs.tree-sitter-langs
epkgs.treesit-grammars.with-all-grammars
epkgs.manualPackages.tree-sitter-langs
epkgs.manualPackages.treesit-grammars.with-all-grammars
epkgs.pretty-sha-path
epkgs.pdf-tools
]
@ -547,11 +522,6 @@
thefuck = {
enable = true;
};
ghostty = {
enable = true;
package = inputs.ghostty.packages.x86_64-linux.ghostty;
enableFishIntegration = true;
};
wezterm = {
enable = true;
package = inputs.wezterm.packages.${pkgs.system}.default;
@ -616,40 +586,10 @@
wlogout = {
enable = true;
};
swaylock = {
hyprlock = {
enable = true;
settings = {
color="000000";
bs-hl-color="f5e0dc";
caps-lock-bs-hl-color="f5e0dc";
caps-lock-key-hl-color="a6e3a1";
inside-color="00000000";
inside-clear-color="00000000";
inside-caps-lock-color="00000000";
inside-ver-color="00000000";
inside-wrong-color="00000000";
key-hl-color="a6e3a1";
layout-bg-color="00000000";
layout-border-color="00000000";
layout-text-color="cdd6f4";
line-color="00000000";
line-clear-color="00000000";
line-caps-lock-color="00000000";
line-ver-color="00000000";
line-wrong-color="00000000";
ring-color="b4befe";
ring-clear-color="f5e0dc";
ring-caps-lock-color="fab387";
ring-ver-color="89b4fa";
ring-wrong-color="eba0ac";
separator-color="00000000";
text-color="cdd6f4";
text-clear-color="f5e0dc";
text-caps-lock-color="fab387";
text-ver-color="89b4fa";
text-wrong-color="eba0ac";
};
};
waybar = {
enable = true;
package = pkgs.unstable.waybar;
@ -674,7 +614,7 @@
dconf.settings = {
"org/gnome/desktop/background" = {
picture-options = "none";
primary-color = "#333333";
primary-color = "#000000";
};
"org/gnome/desktop/interface" = {
@ -711,25 +651,12 @@
};
services = {
swayidle = {
enable = true;
extraArgs = [ "-w" ];
timeouts = [
{ timeout = 120; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
{ timeout = 300; command = "${pkgs.systemd}/bin/systemctl suspend"; }
];
events = [
{ event = "before-sleep"; command = "${pkgs.swaylock}/bin/swaylock -fF"; }
{ event = "lock"; command = "lock"; }
];
};
playerctld = {
enable = true;
package = pkgs.unstable.playerctl;
};
mako = {
enable = true;
defaultTimeout = 10000;
};
flatpak.enable = true;
syncthing = {
@ -757,8 +684,8 @@
epkgs.nixpkgs-fmt
epkgs.nixfmt
epkgs.parinfer-rust-mode
epkgs.tree-sitter-langs
epkgs.treesit-grammars.with-all-grammars
epkgs.manualPackages.tree-sitter-langs
epkgs.manualPackages.treesit-grammars.with-all-grammars
epkgs.pretty-sha-path
epkgs.pdf-tools
]
@ -771,6 +698,17 @@
};
};
# stylix = {
# enable = true;
# base16Scheme = "${pkgs.base16-schemes}/share/themes/oxocarbon-dark.yaml";
# image = ./akira.png;
# cursor = {
# package = pkgs.bibata-cursors;
# name = "Bibtata-Modern-Classic";
# size = 24;
# };
# };
xdg.systemDirs.data = [
"/home/emenel/.local/share/applications/wine/Programs"
"/home/emenel/.local/share/applications"
@ -792,31 +730,11 @@
GSK_RENDERER = "ngl";
MOZ_ENABLE_WAYLAND = 1;
};
services = {
# syncthingtray = {
# Service.ExecStart = lib.mkForce "${pkgs.syncthingtray}/bin/syncthingtray --wait";
# };
# ulauncher = {
# Unit = {
# Description = "Start Ulauncher";
# After = "graphical-session.target";
# };
# Install = {
# WantedBy = [ "graphical-session.target" ];
# };
# Service = {
# Restart = "always";
# RestartSec = 1;
# ExecStart = "${pkgs.ulauncher}/bin/ulauncher --hide-window";
# };
# };
};
};
# moving files!
xdg.configFile."mako".source = ../dotfiles/dot_config/mako;
xdg.configFile."hypr".source = ../dotfiles/dot_config/hypr;
xdg.configFile."halloy/config.toml".source = ../dotfiles/dot_config/halloy/config.toml;
xdg.configFile."waybar".source = ../dotfiles/dot_config/waybar;
xdg.configFile."just/justfile".source = ../dotfiles/dot_config/just/justfile;
@ -826,6 +744,7 @@
xdg.configFile."git".source = ../dotfiles/dot_config/git;
xdg.configFile."rbw".source = ../dotfiles/dot_config/rbw;
xdg.configFile."niri/config.kdl".source = ../dotfiles/dot_config/niri/config.kdl;
xdg.configFile."shikane".source = ../dotfiles/dot_config/shikane;
home.file.".ssh/config".source = ../dotfiles/dot_ssh/config;
home.file.".npmrc".source = ../dotfiles/dot_npmrc;
home.file.".vst3/yabridge/yabridge.toml".source = ../dotfiles/dot_vst3/yabridge.toml;
@ -839,6 +758,10 @@
source = ../dotfiles/dot_config/fish/completions;
recursive = true;
};
xdg.configFile."yazi" = {
source = ../dotfiles/dot_config/yazi;
recursive = true;
};
xdg.configFile."emacs".enable = false;
@ -850,6 +773,7 @@
source = ../dotfiles/dot_local/bin;
recursive = true;
};
home.file.".local/share/flf".source = ../dotfiles/dot_local/share/flf;
home.file.".local/share/The Usual Suspects/Vavra" = {