From ba3b827e73c890fa5a1edc6481c78b57d79acac3 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Tue, 30 Jul 2024 19:24:53 +0200
Subject: [PATCH] switching to helix once again

---
 flake.nix                          | 30 ++++++++++++------------------
 hosts/vali/temperance/programs.nix |  2 ++
 modules/default.nix                |  1 +
 modules/editors/helix.nix          |  4 ++--
 modules/system/default.nix         |  5 +++++
 modules/system/keyboard.nix        |  8 ++++++++
 modules/wms/wayland/hypr/land.nix  | 22 +++++++++++-----------
 7 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 modules/system/default.nix
 create mode 100644 modules/system/keyboard.nix

diff --git a/flake.nix b/flake.nix
index 051775b..1d3af08 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,22 +1,18 @@
 {
   description = "My NixOS config flake";
   outputs = inputs:
-    inputs.flake-parts.lib.mkFlake {inherit inputs;} (
-      {withSystem, ...}: {
-        systems = [
-          "x86_64-linux"
-        ];
-        imports = [
-          inputs.treefmt-nix.flakeModule
-          ./parts/shell.nix
-          ./parts/fmt.nix
-        ];
+    inputs.flake-parts.lib.mkFlake {inherit inputs;} ({withSystem, ...}: {
+      systems = ["x86_64-linux"];
+      imports = [
+        inputs.treefmt-nix.flakeModule
+        ./parts/shell.nix
+        ./parts/fmt.nix
+      ];
 
-        flake = {
-          nixosConfigurations = import ./hosts {inherit inputs withSystem;};
-        };
-      }
-    );
+      flake = {
+        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";
 
diff --git a/hosts/vali/temperance/programs.nix b/hosts/vali/temperance/programs.nix
index 1aad419..a7f5264 100644
--- a/hosts/vali/temperance/programs.nix
+++ b/hosts/vali/temperance/programs.nix
@@ -75,8 +75,10 @@ in {
     pidgin
     playerctl
     polkit
+    prismlauncher
     python3
     qbittorrent
+    r2modman
     ripgrep
     rnote
     scc
diff --git a/modules/default.nix b/modules/default.nix
index a2550a8..a513665 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -11,5 +11,6 @@ _: {
     ./styling
     ./options
     ./system/nix/module.nix
+    ./system
   ];
 }
diff --git a/modules/editors/helix.nix b/modules/editors/helix.nix
index 64d15ec..bce9ec5 100644
--- a/modules/editors/helix.nix
+++ b/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"];
           }
         ];
       };
diff --git a/modules/system/default.nix b/modules/system/default.nix
new file mode 100644
index 0000000..3d12813
--- /dev/null
+++ b/modules/system/default.nix
@@ -0,0 +1,5 @@
+_: {
+  imports = [
+    ./keyboard.nix
+  ];
+}
diff --git a/modules/system/keyboard.nix b/modules/system/keyboard.nix
new file mode 100644
index 0000000..10d7f69
--- /dev/null
+++ b/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";
+  };
+}
diff --git a/modules/wms/wayland/hypr/land.nix b/modules/wms/wayland/hypr/land.nix
index 92bdb84..f7b4fc5 100644
--- a/modules/wms/wayland/hypr/land.nix
+++ b/modules/wms/wayland/hypr/land.nix
@@ -20,11 +20,11 @@
     ;
 in {
   config = lib.mkIf cfg.enable {
-    programs.hyprland = {
-      enable = true;
-      inherit (cfg) package;
-      portalPackage = inputs'.hyprland.packages.xdg-desktop-portal-hyprland;
-    };
+    #  programs.hyprland = {
+    #    enable = true;
+    #    inherit (cfg) package;
+    #    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_variant = "";
-            kb_model = "";
-            kb_options = "";
-            kb_rules = "";
+            kb_layout = "de,us";
+            kb_variant = ",cmk_ed_dh";
+            kb_model = ",pc105awide";
+            kb_options = "grp:alt_shift_toggle,misc:extend,lv5:caps_switch_lock,compose:menu";
+            kb_rules = ",evdev";
 
             follow_mouse = true;
 
             repeat_rate = 50;
-            repeat_delay = 250;
+            repeat_delay = 200;
 
             touchpad = {
               disable_while_typing = true;