framework changes

nixos/framework/configuration.nix

@@ -2,6 +2,7 @@
   config,
   pkgs,
   lib,
+  mypkgs,
   ...
 }: {
   imports = [./hardware-configuration.nix];
@@ -34,8 +35,17 @@
     extraPackages = [pkgs.vaapiVdpau];
   };
 
+  hardware.bluetooth.enable = true;
+  
+
   security.pam.services.swaylock = {};
 
+  fonts.packages = with pkgs; [
+    font-awesome
+    (nerdfonts.override {fonts = ["FiraMono"];})
+    mypkgs.comic-mono
+  ];
+
   services = {
     illum.enable = true;
     fwupd.enable = true;
@@ -101,6 +111,8 @@
     pulse.enable = true;
   };
 
+  services.blueman.enable = true;
+
   users.users.patrick = {
     isNormalUser = true;
     extraGroups = ["wheel"];

nixos/framework/home.nix

@@ -1,21 +1,15 @@
 {pkgs, ...}: {
   home.packages = with pkgs; [
-    helix
     firefox-devedition
-    git
+    git # TODO: use programs.git
     pinentry
     acpi
-    sops
     moonlight-qt
-    discord
     vesktop
     telegram-desktop
     obs-studio
   ];
 
-  programs.bash.enable = true;
-  programs.swaylock.enable = true;
-
   wayland.windowManager.hyprland = let
     locker = "${pkgs.swaylock}/bin/swaylock";
     set-dpms = "${pkgs.hyprland}/bin/hyprctl dispatcher dpms";
@@ -116,7 +110,8 @@
         "$mod, mouse:273, resizewindow"
       ];
 
-      "device:razer-razer-blackwidow-chroma" = {
+      device = {
+        name = "razer-razer-blackwidow-chroma";
         kb_layout = "de";
       };
 
@@ -127,67 +122,100 @@
     };
   };
 
-  programs.waybar = {
-    enable = true;
+  programs = {
+    swaylock.enable = true;
+    zoxide.enable = true;
 
-    settings.mainbar = {
-      layer = "top";
-      position = "top";
-      height = 30;
-
-      modules-left = ["hyprland/workspaces"];
-      modules-right = ["pulseaudio" "network" "cpu" "memory" "temperature" "battery" "clock" "tray"];
+    bash = {
+      enable = true;
+      enableVteIntegration = true;
+      enableCompletion = true;
     };
-  };
 
-  programs.starship.enable = true;
+    starship = {
+      enable = true;
 
-  programs.helix = {
-    enable = true;
-    defaultEditor = true;
+      settings = {
+        add_newline = false;
+      };
+    };
 
-    settings = {
-      theme = "onedark";
+    eza = {
+      enable = true;
 
-      editor = {
-        line-number = "relative";
-        true-color = true;
-        gutters = ["diagnostics" "spacer" "line-numbers" "spacer" "diff"];
-        cursorline = true;
-        completion-trigger-len = 2;
+      icons = true;
+      git = true;
+    };
 
-        cursor-shape = {
-          insert = "bar";
-          normal = "block";
-          select = "underline";
-        };
+    atuin = {
+      enable = true;
 
-        lsp = {
-          display-messages = true;
-          display-inlay-hints = true;
-        };
+      settings = {
+        enter_accept = true;
+      };
+    };
 
-        statusline = {
-          left = ["mode" "spinner"];
-          center = ["file-name"];
-          right = ["diagnostics" "selections" "position" "file-encoding" "file-line-ending" "file-type" "version-control"];
+    waybar = {
+      enable = true;
 
-          mode = {
-            normal = "NORMAL";
-            insert = "INSERT";
-            select = "SELECT";
+      settings.mainbar = {
+        layer = "top";
+        position = "top";
+        height = 30;
+
+        modules-left = ["hyprland/workspaces"];
+        modules-right = ["pulseaudio" "network" "cpu" "memory" "temperature" "battery" "clock" "tray"];
+      };
+    };
+
+    helix = {
+      enable = true;
+      defaultEditor = true;
+
+      settings = {
+        theme = "onedark";
+
+        editor = {
+          line-number = "relative";
+          true-color = true;
+          gutters = ["diagnostics" "spacer" "line-numbers" "spacer" "diff"];
+          cursorline = true;
+          completion-trigger-len = 2;
+
+          cursor-shape = {
+            insert = "bar";
+            normal = "block";
+            select = "underline";
+          };
+
+          lsp = {
+            display-messages = true;
+            display-inlay-hints = true;
+          };
+
+          statusline = {
+            left = ["mode" "spinner"];
+            center = ["file-name"];
+            right = ["diagnostics" "selections" "position" "file-encoding" "file-line-ending" "file-type" "version-control"];
+
+            mode = {
+              normal = "NORMAL";
+              insert = "INSERT";
+              select = "SELECT";
+            };
           };
         };
       };
     };
-  };
 
-  programs.thunderbird = {
-    enable = true;
-    profiles = {
-      main = {
-        isDefault = true;
-        withExternalGnupg = true;
+    thunderbird = {
+      enable = true;
+
+      profiles = {
+        main = {
+          isDefault = true;
+          withExternalGnupg = true;
+        };
       };
     };
   };
@@ -198,10 +226,12 @@
       realName = "Patrick Michl";
       address = "me@fuckwit.dev";
       userName = "me@fuckwit.dev";
+
       gpg = {
         key = "5FA64909521A5C85992F26E0F819AEFF941BB849";
         signByDefault = true;
       };
+
       imap = {
         host = "mail.fuckwit.dev";
         port = 143;
@@ -209,6 +239,7 @@
           useStartTls = true;
         };
       };
+
       smtp = {
         host = "mail.fuckwit.dev";
         port = 587;
@@ -216,6 +247,7 @@
           useStartTls = true;
         };
       };
+
       thunderbird = {
         enable = true;
         profiles = ["main"];