cleanup
This commit is contained in:
parent
c7cb20b7be
commit
01f0129c2f
18 changed files with 110 additions and 261 deletions
|
@ -96,6 +96,26 @@
|
|||
|
||||
pandoc.enable = true;
|
||||
password-store.enable = true;
|
||||
|
||||
git = {
|
||||
enable = true;
|
||||
lfs = {
|
||||
enable = true;
|
||||
};
|
||||
userEmail = "matt@emenel.ca";
|
||||
userName = "Matt Nish-Lapidus";
|
||||
ignores = [
|
||||
".DS_Store"
|
||||
];
|
||||
extraConfig = {
|
||||
core = {
|
||||
editor = "$EDITOR";
|
||||
};
|
||||
init = {
|
||||
defaultBranch = "main";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
|
@ -130,11 +150,10 @@
|
|||
};
|
||||
};
|
||||
|
||||
# moving files!
|
||||
xdg.configFile."git".source = ./dotfiles/dot_config/git;
|
||||
|
||||
# email signature
|
||||
home.file.".signature".source = ./dotfiles/dot_signature;
|
||||
|
||||
#custom script executables
|
||||
home.file.".local/bin" = {
|
||||
source = ./dotfiles/dot_local/bin;
|
||||
recursive = true;
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
# This is Git's per-user configuration file.
|
||||
[user]
|
||||
# Please adapt and uncomment the following lines:
|
||||
name = Matt Nish-Lapidus
|
||||
email = matt@emenel.ca
|
||||
[core]
|
||||
editor = emacsclient -r
|
||||
excludesfile = /home/emenel/.config/git/ignore
|
||||
[filter "lfs"]
|
||||
clean = git-lfs clean -- %f
|
||||
smudge = git-lfs smudge -- %f
|
||||
process = git-lfs filter-process
|
||||
required = true
|
||||
[pull]
|
||||
rebase = false
|
||||
[init]
|
||||
defaultBranch = main
|
|
@ -1 +0,0 @@
|
|||
.DS_Store
|
|
@ -1,24 +0,0 @@
|
|||
(defcfg
|
||||
input (device-file "/dev/input/by-id/usb-Keebio_Quefrency_Rev._5-event-if02")
|
||||
output (uinput-sink "kmonad-quefrency")
|
||||
fallthrough true
|
||||
)
|
||||
|
||||
(defsrc
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = \ del
|
||||
tab q w e r t y u i o p [ ] bspc
|
||||
caps a s d f g h j k l ; ' ret
|
||||
lsft z x c v b n m , . / rsft
|
||||
lctl nlck lmet lalt spc ralt rmet)
|
||||
|
||||
(defalias
|
||||
supesc (tap-hold-next-release 200 esc lmet)
|
||||
sp-lsft (tap-hold-next-release 200 \( lsft)
|
||||
sp-rsft (tap-hold-next-release 200 \) lsft))
|
||||
|
||||
(deflayer qwerty
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = \ del
|
||||
tab q w e r t y u i o p [ ] bspc
|
||||
@supesc a s d f g h j k l ; ' ret
|
||||
@sp-lsft z x c v b n m , . / @sp-rsft
|
||||
lctl lctl lalt lmet spc rmet ralt)
|
|
@ -1,23 +0,0 @@
|
|||
(defcfg
|
||||
input (device-file "/dev/input/by-id/usb-Razer_Razer_Blade-if01-event-kbd")
|
||||
output (uinput-sink "kmonad-razer")
|
||||
fallthrough true)
|
||||
|
||||
(defsrc
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = bspc
|
||||
tab q w e r t y u i o p [ ] \
|
||||
caps a s d f g h j k l ; ' ret
|
||||
lsft z x c v b n m , . / rsft
|
||||
lctrl lmet lalt spc ralt rctrl)
|
||||
|
||||
(defalias
|
||||
supesc (tap-hold-next-release 200 esc lmet)
|
||||
sp-lsft (tap-hold-next-release 200 \( lsft)
|
||||
sp-rsft (tap-hold-next-release 200 \) lsft))
|
||||
|
||||
(deflayer qwerty
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = bspc
|
||||
tab q w e r t y u i o p [ ] \
|
||||
@supesc a s d f g h j k l ; ' ret
|
||||
@sp-lsft z x c v b n m , . / @sp-rsft
|
||||
lmet lalt lctrl spc rctrl ralt)
|
|
@ -1,35 +0,0 @@
|
|||
(defcfg
|
||||
input (device-file "/dev/input/by-id/usb-Keebio_Sinc_Rev._4-event-kbd")
|
||||
output (uinput-sink "kmonad-sinc")
|
||||
fallthrough true)
|
||||
|
||||
|
||||
(defsrc
|
||||
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 KeyPrint KeyInsert
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = \ del home
|
||||
tab q w e r t y u i o p [ ] bspc end
|
||||
caps a s d f g h j k l ; ' ret pgup
|
||||
lsft z x c v b n m , . / rsft up pgdn
|
||||
lctl slck lmet lalt spc ralt rmet rctrl left down right)
|
||||
|
||||
(defalias
|
||||
supesc (tap-hold-next-release 200 esc lmet)
|
||||
sp-lsft (tap-hold-next-release 200 \( lsft)
|
||||
sp-rsft (tap-hold-next-release 200 \) lsft)
|
||||
controls (layer-toggle controls))
|
||||
|
||||
(deflayer qwerty
|
||||
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 KeyPrint KeyInsert
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = \ del home
|
||||
tab q w e r t y u i o p [ ] bspc end
|
||||
@supesc a s d f g h j k l ; ' ret pgup
|
||||
@sp-lsft z x c v b n m , . / @sp-rsft up pgdn
|
||||
lmet @controls lalt lctrl spc rctrl ralt rmet left down right)
|
||||
|
||||
(deflayer controls
|
||||
esc KeyMute KeyVolumeDown KeyVolumeUp f4 f5 KeyPlayPause KeyPreviousSong KeyNextSong f9 f10 f11 f12 KeyPrint KeyInsert
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = \ del home
|
||||
tab q w e r t y u i o p [ ] bspc end
|
||||
@supesc a s d f g h j k l ; ' ret pgup
|
||||
@sp-lsft z x c v b n m , . / @sp-rsft pgup _
|
||||
lmet lmet lalt lctrl spc rctrl ralt rmet home pgdn end)
|
|
@ -1,36 +0,0 @@
|
|||
(defcfg
|
||||
input (device-file "/dev/input/by-id/usb-nullbits_SNAP-event-kbd")
|
||||
output (uinput-sink "kmonad-snap")
|
||||
fallthrough true)
|
||||
|
||||
(defsrc
|
||||
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 ins del
|
||||
f13 grv 1 2 3 4 5 6 7 8 9 0 - = bspc home
|
||||
f14 tab q w e r t y u i o p [ ] \ end
|
||||
f15 caps a s d f g h j k l ; ' ret pgup
|
||||
f16 lsft z x c v b n m , . / rsft pgdn
|
||||
f17 lctl slck lmet lalt spc ralt rmet rctrl)
|
||||
|
||||
(defalias
|
||||
supesc (tap-hold-next-release 200 esc lmet)
|
||||
sp-lsft (tap-hold-next-release 200 \( lsft)
|
||||
sp-rsft (tap-hold-next-release 200 \) lsft))
|
||||
|
||||
(deflayer qwerty
|
||||
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prnt del
|
||||
f13 grv 1 2 3 4 5 6 7 8 9 0 - = bspc home
|
||||
f14 tab q w e r t y u i o p [ ] \ end
|
||||
f15 @supesc a s d f g h j k l ; ' ret pgup
|
||||
f16 @sp-lsft z x c v b n m , . / @sp-rsft pgdn
|
||||
f17 lctrl lmet lalt lctrl spc rctrl ralt rmet)
|
||||
|
||||
;; (defalias
|
||||
;; toggle-scratch ())
|
||||
|
||||
(deflayer paperwm
|
||||
esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 prnt del
|
||||
f13 grv 1 2 3 4 5 6 7 8 9 0 - = bspc home
|
||||
f14 tab q w e r t y u i o p [ ] \ end
|
||||
f15 @supesc a s d f g h j k l ; ' ret pgup
|
||||
f16 @sp-lsft z x c v b n m , . / @sp-rsft pgdn
|
||||
f17 lctrl lmet lalt lctrl spc rctrl ralt rmet)
|
|
@ -1,58 +0,0 @@
|
|||
[[profile]]
|
||||
name = "desk-clam"
|
||||
exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""]
|
||||
[[profile.output]]
|
||||
search = "eDP-1"
|
||||
enable = false
|
||||
|
||||
[[profile.output]]
|
||||
search = ["m=BenQ PD2725U", "s=N2N00414019", "v=PNP(BNQ)"]
|
||||
enable = true
|
||||
mode = "3840x2160@59.997Hz"
|
||||
position = "0,0"
|
||||
scale = 1
|
||||
|
||||
|
||||
[[profile]]
|
||||
name = "desk-dual"
|
||||
exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""]
|
||||
[[profile.output]]
|
||||
search = "eDP-1"
|
||||
enable = true
|
||||
mode = "2560x1600@240Hz"
|
||||
position = "3840,0"
|
||||
adaptive_sync = true
|
||||
scale = 1
|
||||
|
||||
[[profile.output]]
|
||||
enable = true
|
||||
search = ["m=BenQ PD2725U", "s=N2N00414019", "v=PNP(BNQ)"]
|
||||
mode = "3840x2160@59.997Hz"
|
||||
position = "0,0"
|
||||
scale = 1
|
||||
|
||||
[[profile]]
|
||||
name = "laptop"
|
||||
exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\""]
|
||||
[[profile.output]]
|
||||
enable = true
|
||||
search = "eDP-1"
|
||||
mode = "2560x1600@240Hz"
|
||||
position = "0,0"
|
||||
adaptive_sync = true
|
||||
scale = 1
|
||||
|
||||
[[profile]]
|
||||
name = "laptop-mirror"
|
||||
exec = ["notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\"",
|
||||
"wl-present mirror eDP-1 & sleep .5; wl-present fullscreen-output HDMI-A-1; wl-present fullscreen"]
|
||||
[[profile.output]]
|
||||
enable = true
|
||||
search = ["m=TL140ADXP04-0", "s=", "v=Thermotrex Corporation"]
|
||||
mode = "2560x1600@240Hz"
|
||||
position = "0,0"
|
||||
adaptive_sync = true
|
||||
|
||||
[[profile.output]]
|
||||
enable = true
|
||||
search = "n/HDMI-[ABC]-[1-9]" # search for a matching name by regex
|
2
homes/emenel/dotfiles/dot_local/bin/mirror-laptop
Normal file
2
homes/emenel/dotfiles/dot_local/bin/mirror-laptop
Normal file
|
@ -0,0 +1,2 @@
|
|||
#!/bin/sh
|
||||
wl-present mirror eDP-1
|
|
@ -1,33 +0,0 @@
|
|||
# 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")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/91f25a2d-0d73-4d51-a798-e6c7bc88abee";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# 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
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
|
@ -202,6 +202,11 @@
|
|||
exec = "/home/emenel/.local/bin/wezapp isd";
|
||||
categories = [ "System" ];
|
||||
};
|
||||
mirror-laptop = {
|
||||
name = "mirror laptop to external display";
|
||||
exec = "/home/emene/.local/bin/mirror-laptop";
|
||||
categories = [ "System" ];
|
||||
};
|
||||
};
|
||||
|
||||
xdg.configFile."halloy/config.toml".source =
|
||||
|
|
|
@ -134,7 +134,6 @@
|
|||
enable = true;
|
||||
shellAliases = {
|
||||
"ls" = "eza";
|
||||
".j" = "just -g";
|
||||
"em" = "emacsclient -n -r";
|
||||
"mkdir" = "mkdir -pv";
|
||||
};
|
||||
|
@ -206,6 +205,7 @@
|
|||
};
|
||||
eza = {
|
||||
enable = true;
|
||||
git = true;
|
||||
};
|
||||
fd = {
|
||||
enable = true;
|
||||
|
@ -217,10 +217,6 @@
|
|||
broot = {
|
||||
enable = true;
|
||||
};
|
||||
git = {
|
||||
enable = true;
|
||||
lfs.enable = true;
|
||||
};
|
||||
htop.enable = true;
|
||||
lazygit.enable = true;
|
||||
jq.enable = true;
|
||||
|
@ -237,8 +233,7 @@
|
|||
recursive = true;
|
||||
source = ../../homes/emenel/dotfiles/dot_config/wezterm;
|
||||
};
|
||||
xdg.configFile."just/justfile".source = ../../homes/emenel/dotfiles/dot_config/just/justfile;
|
||||
xdg.configFile."git".source = ../../homes/emenel/dotfiles/dot_config/git;
|
||||
|
||||
xdg.configFile."rbw".source = ../../homes/emenel/dotfiles/dot_config/rbw;
|
||||
xdg.configFile."isd_tui/config.yaml".source = ../../homes/emenel/dotfiles/dot_config/isd_tui/config.yaml;
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
{
|
||||
let
|
||||
tomlFormat = pkgs.formats.toml {};
|
||||
in {
|
||||
home.packages = [ pkgs.shikane ];
|
||||
|
||||
systemd.user.services.shikane = {
|
||||
|
@ -17,5 +18,77 @@
|
|||
};
|
||||
};
|
||||
|
||||
xdg.configFile."shikane".source = ../../homes/emenel/dotfiles/dot_config/shikane;
|
||||
xdg.configFile."shikane/config.toml".source = tomlFormat.generate "shikane-config" {
|
||||
profile = [
|
||||
{
|
||||
name = "desk-clam";
|
||||
exec = [ "notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\"" ];
|
||||
output = [
|
||||
{
|
||||
search = "eDP-1";
|
||||
enable = false;
|
||||
}
|
||||
{
|
||||
search = [ "m=BenQ PD2725U" "s=N2N00414019" "v=PNP(BNQ)" ];
|
||||
enable = true;
|
||||
mode = "3840x2160@59.997Hz";
|
||||
position = "0,0";
|
||||
scale = 1;
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
name = "desk-dual";
|
||||
exec = [ "notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\"" ];
|
||||
output = [
|
||||
{
|
||||
search = "eDP-1";
|
||||
enable = true;
|
||||
mode = "2560x1600@240Hz";
|
||||
position = "3840,0";
|
||||
adaptive_sync = true;
|
||||
scale = 1;
|
||||
}
|
||||
{
|
||||
enable = true;
|
||||
search = [ "m=BenQ PD2725U" "s=N2N00414019" "v=PNP(BNQ)" ];
|
||||
mode = "3840x2160@59.997Hz";
|
||||
position = "0,0";
|
||||
scale = 1;
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
name = "laptop";
|
||||
exec = [ "notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\"" ];
|
||||
output = [
|
||||
{
|
||||
enable = true;
|
||||
search = "eDP-1";
|
||||
mode = "2560x1600@240Hz";
|
||||
position = "0,0";
|
||||
adaptive_sync = true;
|
||||
scale = 1;
|
||||
}
|
||||
];
|
||||
}
|
||||
{
|
||||
name = "laptop-mirror";
|
||||
exec = [ "notify-send shikane \"Profile $SHIKANE_PROFILE_NAME has been applied\"" "wl-present mirror eDP-1 & sleep .5; wl-present fullscreen-output HDMI-A-1; wl-present fullscreen" ];
|
||||
output = [
|
||||
{
|
||||
enable = true;
|
||||
search = [ "m=TL140ADXP04-0" "s=" "v=Thermotrex Corporation" ];
|
||||
mode = "2560x1600@240Hz";
|
||||
position = "0,0";
|
||||
adaptive_sync = true;
|
||||
}
|
||||
{
|
||||
enable = true;
|
||||
search = "n/HDMI-[ABC]-[1-9]";
|
||||
}
|
||||
];
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -79,7 +79,7 @@ in {
|
|||
|
||||
"memory" = {
|
||||
"interval" = 30;
|
||||
"format" = "{used =0.1f}G/{total =0.1f}G ";
|
||||
"format" = "{used:0.1f}G/{total:0.1f}G ";
|
||||
"on-click" = "$HOME/.local/bin/wezapp btop";
|
||||
};
|
||||
|
||||
|
@ -105,7 +105,7 @@ in {
|
|||
};
|
||||
|
||||
"clock" = {
|
||||
"format" = "{ =%a %d %b %Y %I =%M}";
|
||||
"format" = "{:%I:%M %a %d %b %Y}";
|
||||
"on-click" = "gnome-calendar";
|
||||
"tooltip" = false;
|
||||
};
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
lmet @controls lalt lctrl spc rctrl ralt rmet left down right)
|
||||
|
||||
(deflayer controls
|
||||
esc VolumeMute VolumeDown VolumeUp f4 f5 MediaPlayPause MediaTrackPrevious MediaTrackNext f9 f10 f11 f12 prtsc
|
||||
esc VolumeMute VolumeDown VolumeUp f4 MediaTrackPrevious MediaPlayPause MediaTrackNext f8 f9 f10 f11 f12 prtsc
|
||||
grv 1 2 3 4 5 6 7 8 9 0 - = \ del home
|
||||
tab q w e r t y u i o p [ ] bspc end
|
||||
@supesc a s d f g h j k l ; ' ret pgup
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
final: prev: {
|
||||
ulauncher = prev.ulauncher.overrideAttrs (old: {
|
||||
propagatedBuildInputs = with prev.python3Packages;
|
||||
old.propagatedBuildInputs
|
||||
++ [
|
||||
thefuzz
|
||||
tornado
|
||||
];
|
||||
});
|
||||
}
|
|
@ -1,8 +0,0 @@
|
|||
final: prev: {
|
||||
wineWowPackages.stagingFull = prev.wineWowPackages.stagingFull.overrideAttrs (old: {
|
||||
patches = old.patches ++ [ ../patches/wine-6006.patch ];
|
||||
waylandSupport = true;
|
||||
fontconfigSupport = true;
|
||||
vulkanSupport = true;
|
||||
});
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue