Refactor to flake-parts

flake.lock

@@ -83,10 +83,7 @@
     },
     "flake-parts": {
       "inputs": {
-        "nixpkgs-lib": [
+        "nixpkgs-lib": "nixpkgs-lib"
-          "nixvim",
-          "nixpkgs"
-        ]
       },
       "locked": {
         "lastModified": 1751413152,
@@ -263,6 +260,21 @@
         "type": "github"
       }
     },
+    "nixpkgs-lib": {
+      "locked": {
+        "lastModified": 1751159883,
+        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixpkgs.lib",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1751274312,
@@ -297,7 +309,9 @@
     },
     "nixvim": {
       "inputs": {
-        "flake-parts": "flake-parts",
+        "flake-parts": [
+          "flake-parts"
+        ],
         "nixpkgs": [
           "nixpkgs"
         ],
@@ -366,6 +380,7 @@
       "inputs": {
         "agenix": "agenix",
         "disko": "disko",
+        "flake-parts": "flake-parts",
         "home-manager": "home-manager_2",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",

flake.nix

@@ -6,6 +6,8 @@
     disko.inputs.nixpkgs.follows = "nixpkgs";
     disko.url = "github:nix-community/disko";
 
+    flake-parts.url = "github:hercules-ci/flake-parts";
+
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     home-manager.url = "github:nix-community/home-manager/master";
 
@@ -13,6 +15,7 @@
 
     nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
 
+    nixvim.inputs.flake-parts.follows = "flake-parts";
     nixvim.inputs.nixpkgs.follows = "nixpkgs";
     nixvim.url = "github:nix-community/nixvim";
 
@@ -24,57 +27,27 @@
   };
 
   outputs =
-    { nixpkgs, self, ... }@inputs:
+    inputs@{
+      flake-parts,
+      nixpkgs,
+      self,
+      ...
+    }:
+    flake-parts.lib.mkFlake { inherit inputs; } {
+      flake =
         let
           inherit (self) outputs;
 
-      system = "x86_64-linux";
-      pkgs = import nixpkgs { inherit system; };
-
-      username = "opdavies";
-
           specialArgs = {
-        inherit
+            inherit inputs outputs self;
-          inputs
-          outputs
-          self
-          system
-          username
-          ;
-      };
 
-      inherit (pkgs) mkShell;
+            system = "x86_64-linux";
-
+            username = "opdavies";
-      nixvim = inputs.nixvim.legacyPackages.${system}.makeNixvimWithModule {
-        inherit pkgs;
-
-        module = import ./modules/home-manager/coding/neovim/config;
           };
         in
         {
-      devShells.${system}.default = pkgs.mkShell {
-        packages = with pkgs; [
-          just
-          lua-language-server
-          lua54Packages.luacheck
-          nixd
-        ];
-      };
-
-      packages.${system} = {
-        inherit nixvim;
-
-        default = mkShell { buildInputs = with pkgs; [ just ]; };
-      };
-
-      formatter.${system} = pkgs.nixfmt-rfc-style;
-
-      overlays = import ./overlays { inherit inputs; };
-
           homeManagerModules.default = import ./modules/home-manager;
 
-      nixosModules.default = import ./modules/nixos;
-
           nixosConfigurations = {
             lemp11 = nixpkgs.lib.nixosSystem {
               modules = [
@@ -121,8 +94,6 @@
             };
 
             PW05CH3L = nixpkgs.lib.nixosSystem {
-          inherit system;
-
               modules = [
                 ./hosts/PW05CH3L/configuration.nix
               ];
@@ -133,5 +104,41 @@
               };
             };
           };
+
+          nixosModules.default = import ./modules/nixos;
+
+          overlays = import ./overlays { inherit inputs; };
+        };
+
+      perSystem =
+        { pkgs, system, ... }:
+        let
+          # TODO: refactor to use inputs' or similar.
+          nixvim = inputs.nixvim.legacyPackages.${system}.makeNixvimWithModule {
+            inherit pkgs;
+
+            module = import ./modules/home-manager/coding/neovim/config;
+          };
+        in
+        {
+          devShells.default = pkgs.mkShell {
+            packages = with pkgs; [
+              just
+              lua-language-server
+              lua54Packages.luacheck
+              nixd
+            ];
+          };
+
+          formatter = pkgs.nixfmt-rfc-style;
+
+          packages = {
+            inherit nixvim;
+
+            default = pkgs.mkShell { buildInputs = with pkgs; [ just ]; };
+          };
+        };
+
+      systems = [ "x86_64-linux" ];
     };
 }

modules/home-manager/cli/sxhkd.nix

@@ -19,10 +19,11 @@ in
 
       keybindings = {
         "{_, shift +, super +}XF86MonBrightness{Down,Up}" = "${getExe pkgs.brightnessctl} set {5%-,10%-,10%,+5%,+10%,100%} --quiet";
-        "super + x; {1, 2, 3, 4}" = "st {notes, newsboat, nmtui, bluetuith}";
+        "super + BackSpace" = "/home/opdavies/sysact";
         "super + shift + b" = "/etc/profiles/per-user/opdavies/bin/bookmarkthis";
         "super + shift + i" = "${pkgs.xdotool}/bin/xdotool type $(cat ~/.local/share/snippets.txt | grep -v '^#' | grep -v '^$' | sort | dmenu -i -l 50 | cut -d' ' -f1)";
         "super + shift + p" = "${getExe pkgs.passmenu-otp} -i";
+        "super + x; {1, 2, 3, 4}" = "st {notes, newsboat, nmtui, bluetuith}";
         "@F3" = "${getExe pkgs.displayselect}";
         "@F9" = "/home/opdavies/.local/bin/mounter";
         "@F10" = "/home/opdavies/.local/bin/unmounter";

modules/home-manager/cli/tmux-sessionizer.nix

@@ -58,6 +58,7 @@ in
 
     xdg.configFile."tmux-sessionizer/tmux-sessionizer.conf".text = ''
       TS_SEARCH_PATHS=(${builtins.concatStringsSep " " cfg.searchPaths})
+      TS_SESSION_COMMANDS=(nvim .)
     '';
   };
 }