switching to helix once again

flake.nix

@@ -1,22 +1,18 @@
 {
   description = "My NixOS config flake";
   outputs = inputs:
-    inputs.flake-parts.lib.mkFlake {inherit inputs;} (
+    inputs.flake-parts.lib.mkFlake {inherit inputs;} ({withSystem, ...}: {
-      {withSystem, ...}: {
+      systems = ["x86_64-linux"];
-        systems = [
+      imports = [
-          "x86_64-linux"
+        inputs.treefmt-nix.flakeModule
-        ];
+        ./parts/shell.nix
-        imports = [
+        ./parts/fmt.nix
-          inputs.treefmt-nix.flakeModule
+      ];
-          ./parts/shell.nix
-          ./parts/fmt.nix
-        ];
 
-        flake = {
+      flake = {
-          nixosConfigurations = import ./hosts {inherit inputs withSystem;};
+        nixosConfigurations = import ./hosts {inherit inputs withSystem;};
-        };
+      };
-      }
+    });
-    );
   inputs = {
     # what am I doing to this config help
     flake-parts.url = "github:hercules-ci/flake-parts";
@@ -31,7 +27,6 @@
     nixpak = {
       url = "github:nixpak/nixpak";
       inputs.nixpkgs.follows = "nixpkgs";
-
     };
 
     home-manager = {
@@ -77,9 +72,8 @@
       url = "github:notashelf/nvf";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-   
-    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
 
+    neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
 
     emacs-overlay.url = "github:nix-community/emacs-overlay";
 

hosts/vali/temperance/programs.nix

@@ -75,8 +75,10 @@ in {
     pidgin
     playerctl
     polkit
+    prismlauncher
     python3
     qbittorrent
+    r2modman
     ripgrep
     rnote
     scc

modules/default.nix

@@ -11,5 +11,6 @@ _: {
     ./styling
     ./options
     ./system/nix/module.nix
+    ./system
   ];
 }

modules/editors/helix.nix

@@ -24,7 +24,6 @@ in {
           };
           keys.normal = {
             C-g = [":new" ":insert-output lazygit" ":buffer-close!" ":redraw"];
-            C-t = [":new" ":insert-output fish" ":buffer-close!" ":redraw"];
             esc = ["collapse_selection" "keep_primary_selection"];
             A-H = "goto_previous_buffer";
             A-L = "goto_next_buffer";
@@ -35,7 +34,8 @@ in {
           {
             name = "nix";
             auto-format = true;
-            formatter.command = "${pkgs.nixfmt-classic}/bin/nixfmt";
+            formatter.command = "${pkgs.alejandra}/bin/alejandra";
+            language-servers = ["${pkgs.nil}/bin/nil"];
           }
         ];
       };

modules/system/default.nix

@@ -0,0 +1,5 @@
+_: {
+  imports = [
+    ./keyboard.nix
+  ];
+}

modules/system/keyboard.nix

@@ -0,0 +1,8 @@
+{
+  services.xserver = {
+    layout = "de,us";
+    xkbVariant = ",cmk_ed_dh";
+    xkbModel = ",pc105awide";
+    xkbOptions = ",misc:extend,lv5:caps_switch_lock,compose:menu";
+  };
+}

modules/wms/wayland/hypr/land.nix

@@ -20,11 +20,11 @@
     ;
 in {
   config = lib.mkIf cfg.enable {
-    programs.hyprland = {
+    #  programs.hyprland = {
-      enable = true;
+    #    enable = true;
-      inherit (cfg) package;
+    #    inherit (cfg) package;
-      portalPackage = inputs'.hyprland.packages.xdg-desktop-portal-hyprland;
+    #    portalPackage = inputs'.hyprland.packages.xdg-desktop-portal-hyprland;
-    };
+    #  };
     # xdg Portal
     xdg.portal = {
       enable = true;
@@ -124,16 +124,16 @@ in {
           ];
           # Input settings
           input = {
-            kb_layout = "de";
+            kb_layout = "de,us";
-            kb_variant = "";
+            kb_variant = ",cmk_ed_dh";
-            kb_model = "";
+            kb_model = ",pc105awide";
-            kb_options = "";
+            kb_options = "grp:alt_shift_toggle,misc:extend,lv5:caps_switch_lock,compose:menu";
-            kb_rules = "";
+            kb_rules = ",evdev";
 
             follow_mouse = true;
 
             repeat_rate = 50;
-            repeat_delay = 250;
+            repeat_delay = 200;
 
             touchpad = {
               disable_while_typing = true;