From 0db960aec4074a7a01c7e27b679a3043c9891cef Mon Sep 17 00:00:00 2001 From: marty Date: Thu, 18 Dec 2025 09:35:29 +0000 Subject: [PATCH] walker be workin now --- configuration.nix | 1 + flake.nix | 43 +++++++++++++---------- marty-latitude.nix | 2 ++ modules/home.nix | 6 ++-- modules/window_manager/launcher.nix | 1 - modules/window_manager/window_manager.nix | 7 ++-- 6 files changed, 36 insertions(+), 24 deletions(-) diff --git a/configuration.nix b/configuration.nix index ab1c3b3..2c5e41f 100644 --- a/configuration.nix +++ b/configuration.nix @@ -18,6 +18,7 @@ # Include the results of the hardware scan. ./imports.nix ]; + programs.walker.enable = true; environment.pathsToLink = [ "/share/applications" "/share/xdg-desktop-portal" ]; # This value determines the NixOS release from which the default diff --git a/flake.nix b/flake.nix index 4d97454..6e0ee24 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,7 @@ self, nixpkgs, home-manager, + walker, ... }@inputs: let @@ -26,26 +27,29 @@ in { nixosConfigurations = { - marty-pc = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./marty-pc.nix - ./configuration.nix - ./user/marty.nix - home-manager.nixosModules.home-manager - # inputs.walker.homeManagerModules.default - ]; - }; - marty-server = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = [ - ./marty-server.nix - ./configuration.nix - ./user/marty.nix - home-manager.nixosModules.home-manager + # marty-pc = nixpkgs.lib.nixosSystem { + # system = "x86_64-linux"; + # specialArgs = { inherit inputs; }; + # modules = [ + # ./marty-pc.nix + # ./configuration.nix + # ./user/marty.nix + # home-manager.nixosModules.home-manager + # walker.homeManagerModules.default + # ]; + # }; + # marty-server = nixpkgs.lib.nixosSystem { + # system = "x86_64-linux"; + # specialArgs = { inherit inputs; }; + # modules = [ + # ./marty-server.nix + # ./configuration.nix + # ./user/marty.nix + # home-manager.nixosModules.home-manager + # walker.homeManagerModules.default - ]; - }; + # ]; + # }; marty-latitude = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; @@ -54,6 +58,7 @@ ./configuration.nix ./user/marty.nix home-manager.nixosModules.home-manager + walker.nixosModules.default ]; }; diff --git a/marty-latitude.nix b/marty-latitude.nix index 3eb30a2..6c6b5ec 100644 --- a/marty-latitude.nix +++ b/marty-latitude.nix @@ -4,6 +4,7 @@ pkgs, modulesPath, home-manager, + inputs, ... }: @@ -15,6 +16,7 @@ home-manager = { useGlobalPkgs = true; useUserPackages = true; + users = { marty = import ./modules/home.nix; }; diff --git a/modules/home.nix b/modules/home.nix index d645cef..1fbc7e0 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -1,7 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, inputs, ... }: { - imports = [ ./window_manager ]; # Home Manager needs a bit of information about you and the paths it should # manage. home.username = "marty"; @@ -77,6 +76,9 @@ EDITOR = "codium"; }; + imports = [ + ./window_manager + ]; # Let Home Manager install and manage itself. programs.home-manager.enable = true; } diff --git a/modules/window_manager/launcher.nix b/modules/window_manager/launcher.nix index eeb3b4e..6506119 100644 --- a/modules/window_manager/launcher.nix +++ b/modules/window_manager/launcher.nix @@ -6,7 +6,6 @@ }: { - home.packages = [ pkgs.cmatrix ]; programs.rofi = { enable = true; }; diff --git a/modules/window_manager/window_manager.nix b/modules/window_manager/window_manager.nix index fc6de68..1b0fdbc 100644 --- a/modules/window_manager/window_manager.nix +++ b/modules/window_manager/window_manager.nix @@ -34,10 +34,13 @@ wayland.windowManager.hyprland = { enable = true; settings = { + exec-once = [ + "elephant" + ]; "$mod" = "SUPER"; bind = [ - "$mod, D, exec, rofi -show drun" - "$mod, Enter, exec, kitty" + "$mod, D, exec, walker" + "$mod, return, exec, kitty" ]; }; };