From 01f0129c2f25c9d02fc6fe007aae35510300bfe8 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Fri, 21 Feb 2025 13:07:22 -0500 Subject: [PATCH] cleanup --- homes/emenel/default.nix | 25 +++++- homes/emenel/dotfiles/dot_config/git/config | 17 ---- homes/emenel/dotfiles/dot_config/git/ignore | 1 - .../emenel/dotfiles/dot_config/just/justfile | 0 .../dotfiles/dot_config/kmonad/quefrency.kbd | 24 ------ .../dotfiles/dot_config/kmonad/razer.kbd | 23 ------ .../dotfiles/dot_config/kmonad/sinc.kbd | 35 -------- .../dotfiles/dot_config/kmonad/snap.kbd | 36 --------- .../dotfiles/dot_config/shikane/config.toml | 58 -------------- .../dotfiles/dot_local/bin/mirror-laptop | 2 + hosts/thegibson/hardware-configuration.nix | 33 -------- modules/home/desktop.nix | 5 ++ modules/home/shell-conf.nix | 9 +-- modules/home/shikane.nix | 79 ++++++++++++++++++- modules/home/waybar.nix | 4 +- modules/system/kanata.nix | 2 +- overlays-inactive/ulauncher.nix | 10 --- overlays-inactive/wineWow.nix | 8 -- 18 files changed, 110 insertions(+), 261 deletions(-) delete mode 100644 homes/emenel/dotfiles/dot_config/git/config delete mode 100644 homes/emenel/dotfiles/dot_config/git/ignore delete mode 100644 homes/emenel/dotfiles/dot_config/just/justfile delete mode 100644 homes/emenel/dotfiles/dot_config/kmonad/quefrency.kbd delete mode 100644 homes/emenel/dotfiles/dot_config/kmonad/razer.kbd delete mode 100644 homes/emenel/dotfiles/dot_config/kmonad/sinc.kbd delete mode 100644 homes/emenel/dotfiles/dot_config/kmonad/snap.kbd delete mode 100644 homes/emenel/dotfiles/dot_config/shikane/config.toml create mode 100644 homes/emenel/dotfiles/dot_local/bin/mirror-laptop delete mode 100644 hosts/thegibson/hardware-configuration.nix delete mode 100644 overlays-inactive/ulauncher.nix delete mode 100644 overlays-inactive/wineWow.nix diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index 64cc4d7..7b78e4c 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -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; diff --git a/homes/emenel/dotfiles/dot_config/git/config b/homes/emenel/dotfiles/dot_config/git/config deleted file mode 100644 index bd0f8f6..0000000 --- a/homes/emenel/dotfiles/dot_config/git/config +++ /dev/null @@ -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 diff --git a/homes/emenel/dotfiles/dot_config/git/ignore b/homes/emenel/dotfiles/dot_config/git/ignore deleted file mode 100644 index e43b0f9..0000000 --- a/homes/emenel/dotfiles/dot_config/git/ignore +++ /dev/null @@ -1 +0,0 @@ -.DS_Store diff --git a/homes/emenel/dotfiles/dot_config/just/justfile b/homes/emenel/dotfiles/dot_config/just/justfile deleted file mode 100644 index e69de29..0000000 diff --git a/homes/emenel/dotfiles/dot_config/kmonad/quefrency.kbd b/homes/emenel/dotfiles/dot_config/kmonad/quefrency.kbd deleted file mode 100644 index cede77a..0000000 --- a/homes/emenel/dotfiles/dot_config/kmonad/quefrency.kbd +++ /dev/null @@ -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) diff --git a/homes/emenel/dotfiles/dot_config/kmonad/razer.kbd b/homes/emenel/dotfiles/dot_config/kmonad/razer.kbd deleted file mode 100644 index 301e79d..0000000 --- a/homes/emenel/dotfiles/dot_config/kmonad/razer.kbd +++ /dev/null @@ -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) diff --git a/homes/emenel/dotfiles/dot_config/kmonad/sinc.kbd b/homes/emenel/dotfiles/dot_config/kmonad/sinc.kbd deleted file mode 100644 index efa073e..0000000 --- a/homes/emenel/dotfiles/dot_config/kmonad/sinc.kbd +++ /dev/null @@ -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) diff --git a/homes/emenel/dotfiles/dot_config/kmonad/snap.kbd b/homes/emenel/dotfiles/dot_config/kmonad/snap.kbd deleted file mode 100644 index d5c208b..0000000 --- a/homes/emenel/dotfiles/dot_config/kmonad/snap.kbd +++ /dev/null @@ -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) diff --git a/homes/emenel/dotfiles/dot_config/shikane/config.toml b/homes/emenel/dotfiles/dot_config/shikane/config.toml deleted file mode 100644 index c90e6e6..0000000 --- a/homes/emenel/dotfiles/dot_config/shikane/config.toml +++ /dev/null @@ -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 diff --git a/homes/emenel/dotfiles/dot_local/bin/mirror-laptop b/homes/emenel/dotfiles/dot_local/bin/mirror-laptop new file mode 100644 index 0000000..4751175 --- /dev/null +++ b/homes/emenel/dotfiles/dot_local/bin/mirror-laptop @@ -0,0 +1,2 @@ +#!/bin/sh +wl-present mirror eDP-1 diff --git a/hosts/thegibson/hardware-configuration.nix b/hosts/thegibson/hardware-configuration.nix deleted file mode 100644 index d23663a..0000000 --- a/hosts/thegibson/hardware-configuration.nix +++ /dev/null @@ -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..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; -} diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index 86f8ebc..f82b0fc 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -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 = diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index 6b36f43..b33fee7 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -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; diff --git a/modules/home/shikane.nix b/modules/home/shikane.nix index 726bc45..c918fee 100644 --- a/modules/home/shikane.nix +++ b/modules/home/shikane.nix @@ -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]"; + } + ]; + } + ]; + }; } diff --git a/modules/home/waybar.nix b/modules/home/waybar.nix index 916a8d2..2967457 100644 --- a/modules/home/waybar.nix +++ b/modules/home/waybar.nix @@ -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; }; diff --git a/modules/system/kanata.nix b/modules/system/kanata.nix index 32c9914..555ca91 100644 --- a/modules/system/kanata.nix +++ b/modules/system/kanata.nix @@ -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 diff --git a/overlays-inactive/ulauncher.nix b/overlays-inactive/ulauncher.nix deleted file mode 100644 index ea97172..0000000 --- a/overlays-inactive/ulauncher.nix +++ /dev/null @@ -1,10 +0,0 @@ -final: prev: { - ulauncher = prev.ulauncher.overrideAttrs (old: { - propagatedBuildInputs = with prev.python3Packages; - old.propagatedBuildInputs - ++ [ - thefuzz - tornado - ]; - }); -} diff --git a/overlays-inactive/wineWow.nix b/overlays-inactive/wineWow.nix deleted file mode 100644 index b491859..0000000 --- a/overlays-inactive/wineWow.nix +++ /dev/null @@ -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; - }); -}