diff --git a/home/home.nix b/home/home.nix index 4398f14..3badbae 100644 --- a/home/home.nix +++ b/home/home.nix @@ -52,6 +52,7 @@ in { # Backup vscode firefox + tor-browser ]; stateVersion = variable.stateVersion; diff --git a/home/system/hyprland/default.nix b/home/system/hyprland/default.nix index 4a29fa4..b08e3d9 100644 --- a/home/system/hyprland/default.nix +++ b/home/system/hyprland/default.nix @@ -177,6 +177,7 @@ in { animations = { enabled = true; + # animations from end-4 dotfiles bezier = [ "linear, 0, 0, 1, 1" "md3_standard, 0.2, 0, 0, 1" @@ -185,18 +186,49 @@ in { "overshot, 0.05, 0.9, 0.1, 1.1" "crazyshot, 0.1, 1.5, 0.76, 0.92 " "hyprnostretch, 0.05, 0.9, 0.1, 1.0" - "fluent_decel, 0.1, 1, 0, 1" + "menu_decel, 0.1, 1, 0, 1" + "menu_accel, 0.38, 0.04, 1, 0.07" "easeInOutCirc, 0.85, 0, 0.15, 1" "easeOutCirc, 0, 0.55, 0.45, 1" "easeOutExpo, 0.16, 1, 0.3, 1" + "softAcDecel, 0.26, 0.26, 0.15, 1" + "md2, 0.4, 0, 0.2, 1" + # old + # "linear, 0, 0, 1, 1" + # "md3_standard, 0.2, 0, 0, 1" + # "md3_decel, 0.05, 0.7, 0.1, 1" + # "md3_accel, 0.3, 0, 0.8, 0.15" + # "overshot, 0.05, 0.9, 0.1, 1.1" + # "crazyshot, 0.1, 1.5, 0.76, 0.92 " + # "hyprnostretch, 0.05, 0.9, 0.1, 1.0" + # "fluent_decel, 0.1, 1, 0, 1" + # "easeInOutCirc, 0.85, 0, 0.15, 1" + # "easeOutCirc, 0, 0.55, 0.45, 1" + # "easeOutExpo, 0.16, 1, 0.3, 1" ]; animation = [ "windows, 1, 3, md3_decel, popin 60%" + "windowsIn, 1, 3, md3_decel, popin 60%" + "windowsOut, 1, 3, md3_accel, popin 60%" "border, 1, 10, default" - "fade, 1, 2.5, md3_decel" - "workspaces, 1, 3.5, easeOutExpo, slide" + "fade, 1, 3, md3_decel" + # animation = layers, 1, 2, md3_decel, slide + "layersIn, 1, 3, menu_decel, slide" + "layersOut, 1, 1.6, menu_accel" + "fadeLayersIn, 1, 2, menu_decel" + "fadeLayersOut, 1, 4.5, menu_accel" + "workspaces, 1, 7, menu_decel, slide" + # animation = workspaces, 1, 2.5, softAcDecel, slide + # animation = workspaces, 1, 7, menu_decel, slidefade 15% + # animation = specialWorkspace, 1, 3, md3_decel, slidefadevert 15% "specialWorkspace, 1, 3, md3_decel, slidevert" + # old + # "windows, 1, 3, md3_decel, popin 60%" + # "border, 1, 10, default" + # "fade, 1, 2.5, md3_decel" + # "workspaces, 1, 3.5, easeOutExpo, slide" + # "specialWorkspace, 1, 3, md3_decel, slidevert" ]; }; diff --git a/home/themes/config/template.nix b/home/themes/config/template.nix index e98ed45..65520a5 100644 --- a/home/themes/config/template.nix +++ b/home/themes/config/template.nix @@ -14,6 +14,11 @@ with lib; { }; }; + animation-speed = mkOption { + type = types.str; + description = "Options: slow/medium/fast"; + }; + neofetch = mkOption { type = types.str; description = "Options: neofetch/nerdfetch/none"; diff --git a/home/themes/nixy.nix b/home/themes/nixy.nix index 51a0c90..01f0ae1 100644 --- a/home/themes/nixy.nix +++ b/home/themes/nixy.nix @@ -24,19 +24,32 @@ fg = "FCFCFC"; alt-bg = "101012"; alt-fg = "ECECEC"; + primary-ansi-16 = "magenta"; primary-bg = "a158ff"; primary-fg = "000000"; + secondary-bg = "4928B8"; secondary-fg = "000000"; + + # Black color0 = "000000"; + # Red color1 = "f7768e"; + # Green color2 = "73daca"; + # Yellow color3 = "e0af68"; + # Blue color4 = "7aa2f7"; - color5 = "9978F8"; + # Magenta + color5 = "a158ff"; + # Cyan color6 = "7dcfff"; + # White color7 = "E4E5E7"; + + # Bright color8 = "515878"; color9 = "f7869e"; color10 = "83eada"; diff --git a/home/themes/wip.nix b/home/themes/wip.nix index 7c7d7b2..767c0f2 100644 --- a/home/themes/wip.nix +++ b/home/themes/wip.nix @@ -24,26 +24,39 @@ fg = "FCFCFC"; alt-bg = "101012"; alt-fg = "ECECEC"; + primary-ansi-16 = "cyan"; - primary-bg = "BBCDE5"; + primary-bg = "bbcde5"; primary-fg = "000000"; + secondary-bg = "4928B8"; secondary-fg = "000000"; + + # Black color0 = "000000"; + # Red color1 = "f7768e"; + # Green color2 = "73daca"; + # Yellow color3 = "e0af68"; + # Blue color4 = "7aa2f7"; + # Magenta color5 = "9978F8"; - color6 = "7dcfff"; + # Cyan + color6 = "bbcde5"; + # White color7 = "E4E5E7"; + + # Bright color8 = "515878"; color9 = "f7869e"; color10 = "83eada"; color11 = "f0bf78"; color12 = "8ab2f7"; color13 = "A988F8"; - color14 = "8ddfff"; + color14 = "ccdef6"; color15 = "f4f5f7"; }; }; diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 56e30e4..82b32d8 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -48,17 +48,6 @@ in { extraGroups = [ "networkmanager" "wheel" ]; }; - # Auto Update & Clean - # system.autoUpgrade = { - # enable = true; - # dates = "04:00"; - # flake = "${config.users.users.${variable.username}.home}/.config/nixos"; - # flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ]; - # allowReboot = false; - # }; - - ############## - services = { xserver = { xkb.layout = "fr"; @@ -122,6 +111,15 @@ in { }; }; + # Auto Update + # system.autoUpgrade = { + # enable = true; + # dates = "04:00"; + # flake = "${config.users.users.${variable.username}.home}/.config/nixos"; + # flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ]; + # allowReboot = false; + # }; + services.dbus.enable = true; system.stateVersion = variable.stateVersion; diff --git a/nixos/nvidia.nix b/nixos/nvidia.nix index 6b6557b..05642f3 100644 --- a/nixos/nvidia.nix +++ b/nixos/nvidia.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: { +{ hardware.opengl = { enable = true; driSupport = true; diff --git a/nixos/prime.nix b/nixos/prime.nix index 1e4e507..350adcc 100644 --- a/nixos/prime.nix +++ b/nixos/prime.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: { +{ hardware.nvidia.prime = { offload = { enable = true;