diff --git a/config/hyprlock.conf b/config/hyprlock.conf
deleted file mode 100644
index 6650228..0000000
--- a/config/hyprlock.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-source = $HOME/.config/hypr/mocha.conf
-
-$accent = $mauve
-$accentAlpha = $mauveAlpha
-
-general {
- disable_loading_bar = true
- hide_cursor = true
-}
-
-background {
- monitor =
- path = /home/shinya/.dotfiles/config/backgrounds/aurora_borealis.png
- color = rgba(25, 20, 20, 1.0)
-
- # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
- blur_passes = 0 # 0 disables blurring
- blur_size = 3
- noise = 0.0117
- contrast = 0.8916
- brightness = 0.8172
- vibrancy = 0.1696
- vibrancy_darkness = 0.0
-}
-
-image {
- monitor =
- #path = ~/.face.icon
- size = 100
- border_color = $accent
-
- position = 0, 75
- halign = center
- valign = center
-}
-
-input-field {
- monitor =
- size = 200, 50
- outline_thickness = 0
- dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
- dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
- dots_center = false
- dots_rounding = -1 # -1 default circle, -2 follow input-field rounding
- outer_color = $accent
- inner_color = $surface0
- font_color = $text
- fade_on_empty = true
- fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
- placeholder_text = Logged in as $USER
- hide_input = false
- rounding = -1 # -1 means complete rounding (circle/oval)
- check_color = $accent
- fail_color = $red # if authentication failed, changes outer_color and fail message color
- fail_text = $FAIL ($ATTEMPTS) # can be set to empty
- fail_transition = 300 # transition time in ms between normal outer_color and fail_color
- capslock_color = $yellow
- numlock_color = -1
- bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above)
- invert_numlock = false # change color if numlock is off
- swap_font_color = false # see below
-
- position = 0, -20
- halign = center
- valign = center
-}
-
-label {
- monitor =
- text = $TIME $LAYOUT[!, cz, ru]
- color = $text
- font_size = 40
- font_family = JetBrainsMono Nerd Font
-
- position = 0, 80
- halign = center
- valign = center
-}
diff --git a/config/mocha.conf b/config/mocha.conf
deleted file mode 100644
index 8ccb56a..0000000
--- a/config/mocha.conf
+++ /dev/null
@@ -1,78 +0,0 @@
-
-$rosewater = rgb(f5e0dc)
-$rosewaterAlpha = f5e0dc
-
-$flamingo = rgb(f2cdcd)
-$flamingoAlpha = f2cdcd
-
-$pink = rgb(f5c2e7)
-$pinkAlpha = f5c2e7
-
-$mauve = rgb(cba6f7)
-$mauveAlpha = cba6f7
-
-$red = rgb(f38ba8)
-$redAlpha = f38ba8
-
-$maroon = rgb(eba0ac)
-$maroonAlpha = eba0ac
-
-$peach = rgb(fab387)
-$peachAlpha = fab387
-
-$yellow = rgb(f9e2af)
-$yellowAlpha = f9e2af
-
-$green = rgb(a6e3a1)
-$greenAlpha = a6e3a1
-
-$teal = rgb(94e2d5)
-$tealAlpha = 94e2d5
-
-$sky = rgb(89dceb)
-$skyAlpha = 89dceb
-
-$sapphire = rgb(74c7ec)
-$sapphireAlpha = 74c7ec
-
-$blue = rgb(89b4fa)
-$blueAlpha = 89b4fa
-
-$lavender = rgb(b4befe)
-$lavenderAlpha = b4befe
-
-$text = rgb(cdd6f4)
-$textAlpha = cdd6f4
-
-$subtext1 = rgb(bac2de)
-$subtext1Alpha = bac2de
-
-$subtext0 = rgb(a6adc8)
-$subtext0Alpha = a6adc8
-
-$overlay2 = rgb(9399b2)
-$overlay2Alpha = 9399b2
-
-$overlay1 = rgb(7f849c)
-$overlay1Alpha = 7f849c
-
-$overlay0 = rgb(6c7086)
-$overlay0Alpha = 6c7086
-
-$surface2 = rgb(585b70)
-$surface2Alpha = 585b70
-
-$surface1 = rgb(45475a)
-$surface1Alpha = 45475a
-
-$surface0 = rgb(313244)
-$surface0Alpha = 313244
-
-$base = rgb(1e1e2e)
-$baseAlpha = 1e1e2e
-
-$mantle = rgb(181825)
-$mantleAlpha = 181825
-
-$crust = rgb(11111b)
-$crustAlpha = 11111b
diff --git a/kogami/home.nix b/kogami/home.nix
index 2d5f922..46c90b7 100644
--- a/kogami/home.nix
+++ b/kogami/home.nix
@@ -68,17 +68,6 @@
fzf.enable = true;
};
- home.file = {
- ".config/hypr/mocha.conf".source = ../config/mocha.conf;
- ".config/hypr/hypridle.conf".source = ../config/hypridle.conf;
- ".prettierrc".text = ''
- {
- "tabWidth": 4,
- "useTabs": true
- }
- '';
- };
-
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
}
diff --git a/nixos/home/desktop/hyprland/dependencies.nix b/nixos/home/desktop/hyprland/dependencies.nix
index bbe2bf1..d924c67 100644
--- a/nixos/home/desktop/hyprland/dependencies.nix
+++ b/nixos/home/desktop/hyprland/dependencies.nix
@@ -6,6 +6,7 @@
# Keyboard image for keyboard switch layout
home.file = {
".local/share/icons/kogami/keyboard.svg".source = ../../../../config/icons/keyboard.svg;
+ ".config/hypr/hypridle.conf".source = ./hypridle.conf;
};
home.packages =
diff --git a/config/hypridle.conf b/nixos/home/desktop/hyprland/hypridle.conf
similarity index 100%
rename from config/hypridle.conf
rename to nixos/home/desktop/hyprland/hypridle.conf
diff --git a/nixos/home/packages/packages.nix b/nixos/home/packages/packages.nix
index 2118709..d066288 100644
--- a/nixos/home/packages/packages.nix
+++ b/nixos/home/packages/packages.nix
@@ -1,6 +1,7 @@
{
pkgs,
lib,
+ config,
userSettings,
...
}: {
@@ -101,7 +102,6 @@
bat.enable = lib.mkDefault true;
btop.enable = lib.mkDefault true;
fzf.enable = lib.mkDefault true;
- neovim.enable = lib.mkDefault true;
};
home.packages = with pkgs; [
@@ -109,4 +109,13 @@
nh
nixd
];
+
+ home.file = {
+ ".prettierrc".text = ''
+ {
+ "tabWidth": 4,
+ "useTabs": true
+ }
+ '';
+ };
}