From 8ca48214cdb1f9bd687b4a472e2d55b73a58da3f Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Mon, 30 Sep 2024 20:46:21 -0400 Subject: [PATCH] working on keyboards and stuff --- dotfiles/dot_config/kmonad/quefrency.kbd | 20 +++++--------- flake.lock | 6 ++--- home/home.nix | 33 ++++++++++++++++++++++++ system/eddie/configuration.nix | 2 ++ 4 files changed, 44 insertions(+), 17 deletions(-) diff --git a/dotfiles/dot_config/kmonad/quefrency.kbd b/dotfiles/dot_config/kmonad/quefrency.kbd index f18177f..2aaf88c 100644 --- a/dotfiles/dot_config/kmonad/quefrency.kbd +++ b/dotfiles/dot_config/kmonad/quefrency.kbd @@ -5,11 +5,11 @@ ) (defsrc - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] \ + 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 slck + lctl nlck lmet lalt spc ralt rmet ) (defalias @@ -19,17 +19,9 @@ hypr C-A-M-S) (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 [ ] \ + grv 1 2 3 4 5 6 7 8 9 0 - = \ del + tab q w e r t y u i o p [ ] bspc @ctrlesc a s d f g h j k l ; ' ret @sp-lsft z x c v b n m , . / @sp-rsft - @hypr lctl lalt lmet spc rmet ralt @hypr -) - -(deflayer fkeys - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 bspc - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + lctl lctl lalt lmet spc rmet ralt ) diff --git a/flake.lock b/flake.lock index 3019b69..a74ea69 100644 --- a/flake.lock +++ b/flake.lock @@ -98,11 +98,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727348695, - "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { diff --git a/home/home.nix b/home/home.nix index 67da846..bd64b09 100644 --- a/home/home.nix +++ b/home/home.nix @@ -75,6 +75,8 @@ icloudpd jetbrains-mono + nixd + fishPlugins.foreign-env fishPlugins.z fishPlugins.fzf @@ -88,8 +90,11 @@ tailscale protonplus + solaar + logitech-udev-rules gnomeExtensions.just-perfection gnomeExtensions.dash-to-dock + gnomeExtensions.solaar-extension gnome-software gnome-tweaks gnome-photos @@ -206,6 +211,9 @@ }; dconf.settings = { + "org/gnome/desktop/default-applications.terminal" = { + exec = "wezterm"; + }; "org/gnome/desktop/background" = { picture-options = "none"; primary-color = "#222222"; @@ -227,6 +235,31 @@ }; }; + # wayland.windowManager.sway = { + # enable = true; + # config = rec { + # modifier = "Mod4"; + # # Use kitty as default terminal + # terminal = "wezterm"; + # startup = [ + # # Launch Firefox on start + # {command = "firefox";} + # ]; + # }; + # }; + + # # kanshi systemd service + # systemd.user.services.kanshi = { + # environment = { + # WAYLAND_DISPLAY="wayland-1"; + # DISPLAY = ":0"; + # }; + # serviceConfig = { + # Type = "simple"; + # ExecStart = ''${pkgs.kanshi}/bin/kanshi -c kanshi_config_file''; + # }; + # }; + nixpkgs.config.packageOverrides = pkgs: { renoise = pkgs.renoise.override { releasePath = /home/emenel/temp/rns_344_linux_x86_64.tar.gz; diff --git a/system/eddie/configuration.nix b/system/eddie/configuration.nix index 26e4f50..8689fd2 100644 --- a/system/eddie/configuration.nix +++ b/system/eddie/configuration.nix @@ -89,6 +89,8 @@ DEVPATH=="/devices/virtual/misc/cpu_dma_latency", OWNER="root", GROUP="audio", MODE="0660" ''; + security.polkit.enable = true; + services.xserver.videoDrivers = [ "nvidia" ]; networking.hostName = "eddie";