From 44a2f3ee01e023914dcb1f5bf2cf4e9d42a45bb9 Mon Sep 17 00:00:00 2001 From: martyTF Date: Thu, 18 Dec 2025 11:07:40 +0100 Subject: [PATCH] we be walkin --- configuration.nix | 7 +++- flake.nix | 48 +++++++++++------------ marty-latitude.nix | 42 ++++++++++++-------- marty-pc.nix | 3 ++ marty-server.nix | 3 ++ modules/home.nix | 11 +++++- modules/window_manager/launcher.nix | 3 +- modules/window_manager/window_manager.nix | 3 +- 8 files changed, 71 insertions(+), 49 deletions(-) diff --git a/configuration.nix b/configuration.nix index 2c5e41f..4fec599 100644 --- a/configuration.nix +++ b/configuration.nix @@ -18,9 +18,12 @@ # Include the results of the hardware scan. ./imports.nix ]; - programs.walker.enable = true; + # programs.walker.enable = true; - environment.pathsToLink = [ "/share/applications" "/share/xdg-desktop-portal" ]; + environment.pathsToLink = [ + "/share/applications" + "/share/xdg-desktop-portal" + ]; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave diff --git a/flake.nix b/flake.nix index 6e0ee24..6e0a573 100644 --- a/flake.nix +++ b/flake.nix @@ -15,41 +15,39 @@ }; outputs = - { + inputs@{ self, nixpkgs, home-manager, walker, ... - }@inputs: + }: let pkgs = nixpkgs.legacyPackages.x86_64-linux; in { nixosConfigurations = { - # 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-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 + ]; + }; + 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 - # ]; - # }; + ]; + }; marty-latitude = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; }; @@ -58,8 +56,6 @@ ./configuration.nix ./user/marty.nix home-manager.nixosModules.home-manager - walker.nixosModules.default - ]; }; }; diff --git a/marty-latitude.nix b/marty-latitude.nix index 6c6b5ec..1c21454 100644 --- a/marty-latitude.nix +++ b/marty-latitude.nix @@ -14,6 +14,7 @@ }; home-manager = { + extraSpecialArgs = { inherit inputs; }; useGlobalPkgs = true; useUserPackages = true; @@ -23,29 +24,38 @@ }; # PREVIOUSLY HARDWARE-CONFIGURATION.NIX - imports = - [ (modulesPath + "/installer/scan/not-detected.nix") - ]; + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.availableKernelModules = [ + "xhci_pci" + "ahci" + "usb_storage" + "sd_mod" + "rtsx_pci_sdmmc" + ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems."/" = - { device = "/dev/disk/by-uuid/867e1bdf-87c8-4f74-9a9e-c2d897644518"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/867e1bdf-87c8-4f74-9a9e-c2d897644518"; + fsType = "ext4"; + }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/D9F7-437B"; - fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; - }; - - swapDevices = - [ { device = "/dev/disk/by-uuid/8dff6670-2f63-44e3-a2e5-1966ebbd4fbf"; } + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/D9F7-437B"; + fsType = "vfat"; + options = [ + "fmask=0077" + "dmask=0077" ]; + }; + + swapDevices = [ + { device = "/dev/disk/by-uuid/8dff6670-2f63-44e3-a2e5-1966ebbd4fbf"; } + ]; # 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 diff --git a/marty-pc.nix b/marty-pc.nix index 780241d..416c854 100644 --- a/marty-pc.nix +++ b/marty-pc.nix @@ -3,6 +3,8 @@ lib, pkgs, modulesPath, + home-manager, + inputs, ... }: @@ -20,6 +22,7 @@ }; home-manager = { + extraSpecialArgs = { inherit inputs; }; useGlobalPkgs = true; useUserPackages = true; users = { diff --git a/marty-server.nix b/marty-server.nix index e8c85a1..2152fdd 100644 --- a/marty-server.nix +++ b/marty-server.nix @@ -3,6 +3,8 @@ lib, pkgs, modulesPath, + home-manager, + inputs, ... }: @@ -20,6 +22,7 @@ }; home-manager = { + extraSpecialArgs = { inherit inputs; }; useGlobalPkgs = true; useUserPackages = true; users = { diff --git a/modules/home.nix b/modules/home.nix index 1fbc7e0..ab34a71 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -1,4 +1,9 @@ -{ config, pkgs, inputs, ... }: +{ + config, + pkgs, + inputs, + ... +}: { # Home Manager needs a bit of information about you and the paths it should @@ -77,7 +82,9 @@ }; imports = [ - ./window_manager + ./window_manager + inputs.walker.homeManagerModules.default + ]; # 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 6506119..46a2757 100644 --- a/modules/window_manager/launcher.nix +++ b/modules/window_manager/launcher.nix @@ -6,7 +6,8 @@ }: { - programs.rofi = { + programs.walker = { enable = true; + runAsService = true; }; } diff --git a/modules/window_manager/window_manager.nix b/modules/window_manager/window_manager.nix index 1b0fdbc..dfe17a4 100644 --- a/modules/window_manager/window_manager.nix +++ b/modules/window_manager/window_manager.nix @@ -21,7 +21,7 @@ xdg.portal = { enable = true; configPackages = [ pkgs.xdg-desktop-portal-hyprland ]; - extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; + extraPortals = [ pkgs.xdg-desktop-portal-hyprland ]; }; programs = { kitty = { @@ -35,7 +35,6 @@ enable = true; settings = { exec-once = [ - "elephant" ]; "$mod" = "SUPER"; bind = [