repo: sync configs

8 files changed, 54 insertions, 9 deletions

diff --git a/form/configuration.nix b/form/configuration.nix
index 2bea6da..c6fa5b1 100644
--- a/form/configuration.nix
+++ b/form/configuration.nix
@@ -27,5 +27,9 @@
     hardware.opengl.extraPackages = with pkgs; [
       vaapiVdpau
     ];
+
+    nixos = {
+      osu.enable = true;
+    };
   };
 }
diff --git a/modules/colors/mountain.nix b/modules/colors/mountain.nix
index 881a1f4..4269f11 100644
--- a/modules/colors/mountain.nix
+++ b/modules/colors/mountain.nix
@@ -17,8 +17,8 @@ in
       base00 = "#0f0f0f";
       base01 = "#191919";
       base02 = "#262626";
-      base03 = "#4c4c4c";
-      base04 = "#ac8a8c";
+      base03 = "#393939";
+      base04 = "#4c4c4c";
       base05 = "#cacaca";
       base06 = "#e7e7e7";
       base07 = "#f0f0f0";
@@ -30,6 +30,22 @@ in
       base0D = "#8f8aac";
       base0E = "#ac8aac";
       base0F = "#ac8a8c";
+      # base00 = "#0f0f0f";
+      # base01 = "#191919";
+      # base02 = "#262626";
+      # base03 = "#4c4c4c";
+      # base04 = "#ac8a8c";
+      # base05 = "#cacaca";
+      # base06 = "#e7e7e7";
+      # base07 = "#f0f0f0";
+      # base08 = "#ac8a8c";
+      # base09 = "#ceb188";
+      # base0A = "#aca98a";
+      # base0B = "#8aac8b";
+      # base0C = "#8aabac";
+      # base0D = "#8f8aac";
+      # base0E = "#ac8aac";
+      # base0F = "#ac8a8c";
     };
   };
 }
diff --git a/modules/global.nix b/modules/global.nix
index eec259e..ac810c0 100644
--- a/modules/global.nix
+++ b/modules/global.nix
@@ -114,6 +114,7 @@ in
       packages = with pkgs; [
         eza
         fanwood
+        jq
         ripgrep
         elan
         dmenu
@@ -121,6 +122,8 @@ in
         tamzen
         roboto
         cozette
+        inter
+        material-icons
       ] ++ (builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts))
         ++ (lib.optional cfg.notNixOS nixgl.auto.nixGLDefault)
         ++ (lib.optionals cfg.wayland 
diff --git a/modules/i3status.nix b/modules/i3status.nix
index b19d180..16b73c4 100644
--- a/modules/i3status.nix
+++ b/modules/i3status.nix
@@ -65,8 +65,7 @@ in
         "tztime local" = {
           position = 10;
           settings = {
-            format = "◴ %-I:%M %P";
-            
+            format = "󰥔 %-I:%M %P";
           };
         };
       };
diff --git a/modules/neovim/nvim/lua/config/fzf.lua b/modules/neovim/nvim/lua/config/fzf.lua
index f994361..ce5d047 100644
--- a/modules/neovim/nvim/lua/config/fzf.lua
+++ b/modules/neovim/nvim/lua/config/fzf.lua
@@ -88,7 +88,8 @@ require("fzf-lua").setup({
     -- ["--tmux"] = "",
     ["--style"] = "minimal",
     ["--ansi"] = true,
-    -- ["--no-bold"] = "",
+    ["--no-bold"] = "",
+    ["--bind"] = "ctrl-n:down,ctrl-e:up",
   },
   hls = {
     border = "FloatBorder",
diff --git a/modules/tofi.nix b/modules/tofi.nix
index 62c821d..7b36cb1 100644
--- a/modules/tofi.nix
+++ b/modules/tofi.nix
@@ -16,8 +16,9 @@ in
       settings = {
         # font = "ComicShannsMono Nerd Font Mono 10";
         # font = "GoMono Nerd Font Propo";
-        font = "Fanwood Text";
+        font = "${pkgs.inter}/share/fonts/tuetype/InterVariable.ttf";
         "font-size" = 24;
+        hint-font = false;
 
         # width = "60%";
         # height = "50%";
diff --git a/nixos/bluetooth.nix b/nixos/bluetooth.nix
new file mode 100644
index 0000000..ebe6b88
--- /dev/null
+++ b/nixos/bluetooth.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.nixos.bluetooth;
+  inherit (lib) types mkOption;
+in
+{
+  options.nixos.bluetooth = {
+    enable = mkOption {
+      type = types.bool;
+      default = true;
+      description = "enable bluetooth support";
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    hardware.bluetooth.enable = true;
+    services.blueman.enable = true;
+  };
+}
diff --git a/nixos/default.nix b/nixos/default.nix
index 1997948..e075465 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -4,6 +4,8 @@ let
 in
 {
   imports = [
+    ./bluetooth.nix
+    ./osu.nix
     # ./kmonad.nix
   ];
 
@@ -91,6 +93,7 @@ in
       man-pages-posix
       cage
       zsh
+      discord-ptb
     ]; # TODO
 
 
@@ -115,6 +118,8 @@ in
     programs.foot.enable = true;
     programs.foot.enableZshIntegration = false; # TODO: https://github.com/NixOS/nixpkgs/pull/409627
     programs.sway.enable = true;
+    programs.sway.package = pkgs.sway;
+
     programs.steam = {
       enable = true;
     };
@@ -171,9 +176,6 @@ in
         "f0f0f0"
       ];
     };
-
     system.stateVersion = "24.11";
   };
-
-
 }