more refactor. adding shikane
This commit is contained in:
parent
14ad4cd2c5
commit
7b26c73b59
18 changed files with 851 additions and 764 deletions
|
|
@ -6,7 +6,9 @@
|
|||
};
|
||||
overlays = builtins.attrValues nix-config.overlays
|
||||
++ [ inputs.emacs-overlay.overlays.default
|
||||
inputs.audio.overlays.default ];
|
||||
inputs.audio.overlays.default
|
||||
inputs.niri.overlays.niri
|
||||
inputs.shikane.overlays.default ];
|
||||
};
|
||||
|
||||
imports = with nix-config.homeModules; [
|
||||
|
|
@ -15,6 +17,11 @@
|
|||
yazi
|
||||
hyprlock
|
||||
hypridle
|
||||
shell-conf # shell, shell utils, cli tools, libs, tui's
|
||||
email
|
||||
gnome
|
||||
niri
|
||||
shikane
|
||||
];
|
||||
|
||||
home = {
|
||||
|
|
@ -23,8 +30,6 @@
|
|||
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
|
||||
inputs.isd.packages.x86_64-linux.default
|
||||
]
|
||||
|
||||
(with nix-config.packages.x86_64-linux; [
|
||||
|
|
@ -49,45 +54,18 @@
|
|||
bitwig-studio5-latest
|
||||
|
||||
wayback
|
||||
just
|
||||
yt-dlp
|
||||
erdtree
|
||||
age
|
||||
figlet
|
||||
ffmpeg-full
|
||||
rlwrap
|
||||
pinentry
|
||||
gcr
|
||||
gnutar
|
||||
libnotify
|
||||
unzip
|
||||
zip
|
||||
stdenv
|
||||
tldr
|
||||
delta
|
||||
htop
|
||||
|
||||
dconf
|
||||
dconf2nix
|
||||
readline
|
||||
gnupg
|
||||
imagemagick
|
||||
gnutls
|
||||
gettext
|
||||
xorg.libX11
|
||||
xorg.libxcb
|
||||
freetype
|
||||
gnumake
|
||||
flex
|
||||
bison
|
||||
mesa
|
||||
|
||||
neofetch
|
||||
nvd
|
||||
nitch
|
||||
ripgrep-all
|
||||
silver-searcher
|
||||
maestral
|
||||
maestral-gui
|
||||
nix-index
|
||||
fstl
|
||||
godot_4
|
||||
sane-airscan
|
||||
|
|
@ -99,13 +77,6 @@
|
|||
age
|
||||
sops
|
||||
|
||||
nix-du
|
||||
|
||||
usbutils
|
||||
pciutils
|
||||
util-linux
|
||||
coreutils
|
||||
binutils
|
||||
protonplus
|
||||
ispell
|
||||
(aspellWithDicts (dicts: with dicts; [ en en-computers en-science es fr ]))
|
||||
|
|
@ -113,7 +84,6 @@
|
|||
appimage-run
|
||||
libappimage
|
||||
transmission_4-gtk
|
||||
lsof
|
||||
guile
|
||||
python311
|
||||
python311Packages.pip
|
||||
|
|
@ -135,17 +105,17 @@
|
|||
serapeum
|
||||
]))
|
||||
|
||||
kdlfmt
|
||||
|
||||
kdotool
|
||||
ccl
|
||||
racket
|
||||
gdu
|
||||
poppler_utils
|
||||
editorconfig-core-c
|
||||
|
||||
cljfmt
|
||||
libxml2
|
||||
gdtoolkit_4
|
||||
openssl.out
|
||||
|
||||
nixfmt-rfc-style
|
||||
wl-clipboard
|
||||
clipse
|
||||
|
|
@ -154,22 +124,9 @@
|
|||
rustup
|
||||
shfmt
|
||||
html-tidy
|
||||
libsecret
|
||||
samba4Full
|
||||
shellcheck
|
||||
wayland-utils
|
||||
libffi.dev
|
||||
nodejs_18
|
||||
platformio-core
|
||||
icloudpd
|
||||
libheif.out
|
||||
openal
|
||||
pkg-config
|
||||
ftgl
|
||||
gperf
|
||||
numbat
|
||||
glpng
|
||||
nurl
|
||||
freecad
|
||||
procs
|
||||
rpi-imager
|
||||
|
|
@ -178,30 +135,6 @@
|
|||
|
||||
prusa-slicer
|
||||
|
||||
# global node packages
|
||||
nodePackages.typescript-language-server
|
||||
nodePackages.vscode-langservers-extracted
|
||||
nodePackages.prettier
|
||||
nodePackages.javascript-typescript-langserver
|
||||
nodePackages.stylelint
|
||||
nodePackages.svelte-language-server
|
||||
nodePackages.typescript
|
||||
nodePackages.js-beautify
|
||||
|
||||
nixd
|
||||
nixdoc
|
||||
nix-init
|
||||
|
||||
git-annex
|
||||
|
||||
fishPlugins.foreign-env
|
||||
fishPlugins.z
|
||||
fishPlugins.fzf-fish
|
||||
fishPlugins.bass
|
||||
fishPlugins.autopair
|
||||
fishPlugins.forgit
|
||||
fishPlugins.colored-man-pages
|
||||
imgcat
|
||||
via
|
||||
vial
|
||||
bitwarden-cli
|
||||
|
|
@ -214,30 +147,15 @@
|
|||
tdf
|
||||
pdfchain
|
||||
pdftk
|
||||
ghostscript
|
||||
zathura
|
||||
gpu-viewer
|
||||
mesa-demos
|
||||
|
||||
gnomeExtensions.just-perfection
|
||||
gnomeExtensions.dash-to-dock
|
||||
gnomeExtensions.paperwm
|
||||
gnomeExtensions.custom-hot-corners-extended
|
||||
gnomeExtensions.media-controls
|
||||
gnomeExtensions.looking-glass-button
|
||||
gnomeExtensions.auto-power-profile
|
||||
gnomeExtensions.appindicator
|
||||
gnome-software
|
||||
gnome-tweaks
|
||||
gnome-photos
|
||||
gnome-keyring
|
||||
ulauncher
|
||||
|
||||
|
||||
wl-mirror
|
||||
nwg-look
|
||||
|
||||
soundconverter
|
||||
# gtop
|
||||
wmctrl
|
||||
# colloid-gtk-theme
|
||||
colloid-icon-theme
|
||||
whitesur-gtk-theme
|
||||
whitesur-cursors
|
||||
|
|
@ -249,9 +167,8 @@
|
|||
squirreldisk
|
||||
papers
|
||||
newsflash
|
||||
planify
|
||||
|
||||
borgbackup
|
||||
vorta
|
||||
stirling-pdf
|
||||
trash-cli
|
||||
ripdrag
|
||||
|
|
@ -265,19 +182,19 @@
|
|||
wine = wineWowPackages.stagingFull;
|
||||
})
|
||||
|
||||
chayang
|
||||
sway-launcher-desktop
|
||||
swayosd
|
||||
|
||||
spice
|
||||
spice-gtk
|
||||
spice-protocol
|
||||
virt-viewer
|
||||
virt-manager
|
||||
bfg-repo-cleaner
|
||||
|
||||
thunderbird-latest
|
||||
emojify
|
||||
smile
|
||||
gnomeExtensions.smile-complementary-extension
|
||||
|
||||
impression
|
||||
zoom-us
|
||||
nyxt
|
||||
|
|
@ -289,14 +206,12 @@
|
|||
slack
|
||||
signal-desktop
|
||||
eyedropper
|
||||
calcurse
|
||||
onlyoffice-desktopeditors
|
||||
libreoffice
|
||||
hyphenDicts.en_US
|
||||
plex-mpv-shim
|
||||
plexamp
|
||||
rmpc
|
||||
resources
|
||||
|
||||
carla
|
||||
switcheroo
|
||||
tenacity
|
||||
|
|
@ -332,9 +247,11 @@
|
|||
ardour
|
||||
dockfmt
|
||||
impala
|
||||
playerctl
|
||||
|
||||
fractal
|
||||
|
||||
oculante
|
||||
door-knocker
|
||||
|
||||
farge
|
||||
halloy
|
||||
paleta
|
||||
|
|
@ -424,81 +341,11 @@
|
|||
};
|
||||
};
|
||||
|
||||
accounts.email = {
|
||||
maildirBasePath = "/home/emenel/.maildir";
|
||||
accounts = {
|
||||
"matt@emenel.ca" = {
|
||||
address = "matt@emenel.ca";
|
||||
realName = "Matt Nish-Lapidus";
|
||||
primary = true;
|
||||
mu.enable = true;
|
||||
mbsync = {
|
||||
enable = true;
|
||||
create = "maildir";
|
||||
};
|
||||
msmtp.enable = true;
|
||||
flavor = "fastmail.com";
|
||||
passwordCommand = "rbw get mu4e-fastmail";
|
||||
};
|
||||
|
||||
"admin@studyoftime.org" = {
|
||||
address = "admin@studyoftime.org";
|
||||
realName = "ISST Web Admin";
|
||||
mu.enable = true;
|
||||
mbsync = {
|
||||
enable = true;
|
||||
create = "maildir";
|
||||
};
|
||||
msmtp.enable = true;
|
||||
passwordCommand = "rbw get admin@studyoftime";
|
||||
imap.host = "imap.dreamhost.com";
|
||||
smtp.host = "imap.dreamhost.com";
|
||||
userName = "admin@studyoftime.org";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs = {
|
||||
home-manager.enable = true;
|
||||
|
||||
direnv = {
|
||||
enable = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
fish = {
|
||||
enable = true;
|
||||
shellAliases = {
|
||||
"ls" = "eza";
|
||||
".j" = "just -g";
|
||||
"em" = "emacsclient -n -r";
|
||||
"mkdir" = "mkdir -pv";
|
||||
};
|
||||
interactiveShellInit = ''
|
||||
bind --erase \ct
|
||||
'';
|
||||
plugins = [
|
||||
{
|
||||
name = "upto";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "Markcial";
|
||||
repo = "upto";
|
||||
rev = "2d1f35453fb55747d50da8c1cb1809840f99a646";
|
||||
sha256 = "sha256-Lv2XtP2x9dkIkUUjMBWVpAs/l55Ztu7gIjKYH6ZzK4s=";
|
||||
};
|
||||
}
|
||||
];
|
||||
};
|
||||
zoxide = {
|
||||
enable = true;
|
||||
};
|
||||
starship = {
|
||||
enable = true;
|
||||
};
|
||||
mu.enable = true;
|
||||
mbsync = {
|
||||
enable = true;
|
||||
};
|
||||
msmtp.enable = true;
|
||||
emacs = {
|
||||
enable = true;
|
||||
package = ((pkgs.emacsPackagesFor pkgs.emacs29-pgtk).emacsWithPackages (
|
||||
|
|
@ -521,120 +368,11 @@
|
|||
]
|
||||
));
|
||||
};
|
||||
ripgrep = {
|
||||
enable = true;
|
||||
};
|
||||
thefuck = {
|
||||
enable = true;
|
||||
};
|
||||
wezterm = {
|
||||
enable = true;
|
||||
package = inputs.wezterm.packages.${pkgs.system}.default;
|
||||
# extraConfig = lib.readFile ./dotfiles/dot_config/wezterm/wezterm.lua;
|
||||
};
|
||||
bat = {
|
||||
enable = true;
|
||||
};
|
||||
borgmatic = {
|
||||
enable = true;
|
||||
backups = {
|
||||
eddie = {
|
||||
location = {
|
||||
patterns = [
|
||||
"R /home/emenel"
|
||||
"- home/emenel/.cache"
|
||||
"- home/emenel/.nix*"
|
||||
"- home/emenel/.steam*"
|
||||
"- home/emenel/Dropbox"
|
||||
"- home/emenel/Sync"
|
||||
"- home/emenel/.dropbox*"
|
||||
"- home/emenel/.BitwigStudio"
|
||||
"- home/emenel/.local/share/bitwig"
|
||||
];
|
||||
repositories = [
|
||||
{
|
||||
"path" = "ssh://oyi3ydnz@oyi3ydnz.repo.borgbase.com/./repo";
|
||||
"label" = "eddie on borgbase";
|
||||
}
|
||||
];
|
||||
};
|
||||
retention = {
|
||||
keepDaily = 3;
|
||||
keepHourly = 3;
|
||||
keepMonthly = 2;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
eza = {
|
||||
enable = true;
|
||||
};
|
||||
fd = {
|
||||
enable = true;
|
||||
};
|
||||
fzf = {
|
||||
enable = true;
|
||||
enableFishIntegration = false;
|
||||
};
|
||||
broot = {
|
||||
enable = true;
|
||||
};
|
||||
git = {
|
||||
enable = true;
|
||||
lfs.enable = true;
|
||||
};
|
||||
htop.enable = true;
|
||||
|
||||
pandoc.enable = true;
|
||||
password-store.enable = true;
|
||||
|
||||
waybar = {
|
||||
enable = true;
|
||||
package = pkgs.waybar;
|
||||
};
|
||||
eww = {
|
||||
enable = true;
|
||||
configDir = ./dotfiles/dot_config/eww;
|
||||
};
|
||||
lazygit.enable = true;
|
||||
jq.enable = true;
|
||||
firefox.enable = true;
|
||||
rbw = {
|
||||
enable = true;
|
||||
package = nix-config.packages.x86_64-linux.rbw-latest;
|
||||
};
|
||||
};
|
||||
|
||||
dconf.settings = {
|
||||
"org/gnome/desktop/background" = {
|
||||
picture-options = "none";
|
||||
primary-color = "#000000";
|
||||
};
|
||||
|
||||
"org/gnome/desktop/interface" = {
|
||||
color-scheme = "prefer-dark";
|
||||
};
|
||||
|
||||
"org/gnome/shell/keybindings" = {
|
||||
shift-overview-up = ["disabled"];
|
||||
shift-overview-down = ["disabled"];
|
||||
switch-to-application-1 = ["disabled"];
|
||||
switch-to-application-2 = ["disabled"];
|
||||
switch-to-application-3 = ["disabled"];
|
||||
switch-to-application-4 = ["disabled"];
|
||||
switch-to-application-5 = ["disabled"];
|
||||
switch-to-application-6 = ["disabled"];
|
||||
switch-to-application-7 = ["disabled"];
|
||||
switch-to-application-8 = ["disabled"];
|
||||
switch-to-application-9 = ["disabled"];
|
||||
switch-to-application-10 = ["disabled"];
|
||||
};
|
||||
|
||||
"org/gnome/desktop/wm/keybindings" = {
|
||||
switch-to-workspace-up = ["disabled"];
|
||||
switch-to-workspace-down = ["disabled"];
|
||||
move-to-workspace-up = ["disabled"];
|
||||
move-to-workspace-down = ["disabled"];
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs.config.packageOverrides = pkgs: {
|
||||
|
|
@ -687,17 +425,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
# 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"
|
||||
|
|
@ -728,41 +455,19 @@
|
|||
# moving files!
|
||||
xdg.configFile."halloy/config.toml".source = ./dotfiles/dot_config/halloy/config.toml;
|
||||
xdg.configFile."waybar".source = ./dotfiles/dot_config/waybar;
|
||||
xdg.configFile."starship.toml".source = ./dotfiles/dot_config/starship.toml;
|
||||
xdg.configFile."niri/config.kdl".source = ./dotfiles/dot_config/niri/config.kdl;
|
||||
|
||||
xdg.configFile."wezterm".source = ./dotfiles/dot_config/wezterm;
|
||||
xdg.configFile."just/justfile".source = ./dotfiles/dot_config/just/justfile;
|
||||
xdg.configFile."git".source = ./dotfiles/dot_config/git;
|
||||
xdg.configFile."rbw".source = ./dotfiles/dot_config/rbw;
|
||||
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;
|
||||
home.file.".sbclrc".source = ./dotfiles/dot_sbclrc;
|
||||
home.file.".signature".source = ./dotfiles/dot_signature;
|
||||
home.file.".config/fish/functions" = {
|
||||
source = ./dotfiles/dot_config/fish/functions;
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
home.file.".config/fish/completions" = {
|
||||
source = ./dotfiles/dot_config/fish/completions;
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
xdg.configFile."emacs".enable = false;
|
||||
|
||||
# home.file.".msmtprc".source = ./dotfiles/dot_msmtprc;
|
||||
# home.file.".mbsyncrc".source = ./dotfiles/dot_mbsyncrc;
|
||||
# xdg.configFile."isyncrc".enable = false;
|
||||
|
||||
home.file.".local/bin" = {
|
||||
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" = {
|
||||
recursive = true;
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ config.enable_wayland = false;
|
|||
config.font_size = 14
|
||||
config.font = wezterm.font {
|
||||
family = 'JetBrains Mono',
|
||||
weight = 'Medium'
|
||||
-- weight = 'Normal'
|
||||
}
|
||||
|
||||
-- config.enable_scroll_bar = true
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
[flavor]
|
||||
dark = "monokai-vibrant"
|
||||
light = "monokai-vibrant"
|
||||
|
||||
[manager]
|
||||
hovered = { bg = "#cccccc", fg = "#000000" }
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue