From d90c80b61e248565032176c5cf80ccdbacce3a92 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Sun, 23 Feb 2025 17:03:37 -0500 Subject: [PATCH] adding compose key etc --- .dir-locals.el | 4 ++-- flake.lock | 36 +++++++++++++++++----------------- hosts/eddie/configuration.nix | 37 ++++++++++++++++++----------------- modules/home/music.nix | 4 ++-- modules/home/niri.nix | 5 ++++- 5 files changed, 45 insertions(+), 41 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 109c098..037908b 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -21,8 +21,8 @@ ((nix-mode . ((eglot-workspace-configuration - . (:nixd - ;; (:formatting (:command [ "alejandra" ])) + . '(:nixd + ;; (:formatting (:command [ "alejandra"])) ;; (:nixpkgs (:expr "import (builtins.getFlake \"/home/emenel/source/nixos-config\").inputs.nixpkgs { } ")) (:options (:nixos (:expr "(builtins.getFlake \"/home/emenel/source/nixos-config\").nixosConfigurations.eddie.options")))))))) diff --git a/flake.lock b/flake.lock index 1e294c5..1c89351 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1740302110, - "narHash": "sha256-rQY2wY+KTGIH2oZFyqdsODjqmOJqyn+0BNURADQHi/s=", + "lastModified": 1740333969, + "narHash": "sha256-zkLwCGw1PylyV0cGywnYF/duox1gC45BcV5XtkXD6zM=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "920cd4e86af18bd67a60013d80a79ff2cd7a176b", + "rev": "84420d1963cada13bc63be2e118082586690728a", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1740318342, - "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=", + "lastModified": 1740344845, + "narHash": "sha256-5D9LkYjXu+jbdgzpr+jL5HTcH7ONMz6FChH1Nwudn48=", "owner": "nix-community", "repo": "home-manager", - "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca", + "rev": "6a2af4ffb26f812c353415c7316dff0a8b52b525", "type": "github" }, "original": { @@ -611,11 +611,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1739813929, - "narHash": "sha256-MgSMknm/6L9NIhN78NoO+8y5iGEERLSUyx71f3mXF88=", + "lastModified": 1740330618, + "narHash": "sha256-83YE9x3TEKs2TvTmiQHursNXSuD8EF4pfBpaQ2x9/ec=", "owner": "isd-project", "repo": "isd", - "rev": "8021a51ddb46f068dbbeb341734892242300dc50", + "rev": "ab27080178ec86c31a2232fba0289cf028aae0fd", "type": "github" }, "original": { @@ -711,11 +711,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1740262899, - "narHash": "sha256-iVN73FYXdNHul0spp1XdvEoYre0lZiGKYx+Vv3YeIuE=", + "lastModified": 1740326457, + "narHash": "sha256-C1tiPRIXI6Z5vd3pz26/JQ/p+VaG2eKD6PNk8ZqFW1E=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "a5690658f971bf4746077e850b230c325108094a", + "rev": "23b0234ac1b03709a0cec40e84d293f083859dc9", "type": "github" }, "original": { @@ -956,11 +956,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1740126099, + "narHash": "sha256-ozoOtE2hGsqh4XkTJFsrTkNxkRgShxpQxDynaPZUGxk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "32fb99ba93fea2798be0e997ea331dd78167f814", "type": "github" }, "original": { @@ -1393,11 +1393,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1740325055, - "narHash": "sha256-zJL60juW5K8NmEYI2BFX3QxEF2LnqNr8xpP+Q57N7to=", + "lastModified": 1740328755, + "narHash": "sha256-HQLGiPAEiU8x41ePDFaMGN9BBZPLFf5aJnPhfzU30R8=", "owner": "sxyazi", "repo": "yazi", - "rev": "36ed32d2c3e6ff58f3cbf88ffefa5f3f0a433974", + "rev": "f11f77d7b97955b5a5c31e55ed231cbdca99f040", "type": "github" }, "original": { diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index f3bd292..bc058fd 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -95,22 +95,22 @@ # bright.cyan # bright.white - "282c34" - "353b45" - "3e4451" - "545862" - "565c64" - "abb2bf" - "b6bdca" - "c8ccd4" - "e06c75" - "d19a66" - "e5c07b" - "98c379" - "56b6c2" - "61afef" - "c678dd" - "be5046" + "282c34" + "e06c75" + "98c379" + "e5c07b" + "61afef" + "c678dd" + "56b6c2" + "abb2bf" + "545862" + "e06c75" + "98c379" + "e5c07b" + "61afef" + "c678dd" + "56b6c2" + "c8ccd4" ]; }; @@ -151,7 +151,7 @@ systemd-boot = { enable = true; configurationLimit = 8; - consoleMode = "max"; + # consoleMode = "max"; }; efi.canTouchEfiVariables = true; }; @@ -335,7 +335,8 @@ enable = true; settings = { default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions ${config.services.displayManager.sessionData.desktops}/share/xsessions:${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session --user-menu --window-padding 5 --asterisks --asterisks-char ^ --theme 'border=magenta;text=cyan;prompt=green;time=red;action=blue;button=yellow;container=silver;input=red'"; + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --sessions ${config.services.displayManager.sessionData.desktops}/share/xsessions:${config.services.displayManager.sessionData.desktops}/share/wayland-sessions --remember --remember-user-session --user-menu --window-padding 5 --asterisks --asterisks-char ^ --greeting 'welcome >:o' --theme 'button=yellow'"; + # --theme 'border=magenta;prompt=green;time=red;action=blue;button=yellow;container=black;input=red'"; user = "greeter"; }; }; diff --git a/modules/home/music.nix b/modules/home/music.nix index 705697c..3585ca6 100644 --- a/modules/home/music.nix +++ b/modules/home/music.nix @@ -20,10 +20,10 @@ bitwig-studio5-3 - (nix-config.pkgs-stable.yabridge.override { + (yabridge.override { wine = wineWowPackages.stagingFull; }) - (nix-config.pkgs-stable.yabridgectl.override { + (yabridgectl.override { wine = wineWowPackages.stagingFull; }) diff --git a/modules/home/niri.nix b/modules/home/niri.nix index f21e5df..1a6da9f 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -23,7 +23,10 @@ in { }; input = { - keyboard.xkb.layout = "us"; + keyboard.xkb = { + layout = "us"; + options = "compose:ralt"; + }; touchpad = { natural-scroll = true;