diff --git a/flake.lock b/flake.lock index 8652cff..174406a 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ ] }, "locked": { - "lastModified": 1760662441, - "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=", + "lastModified": 1760973044, + "narHash": "sha256-Ij3H0qkzZ66X9934kH0JYoI3b/F2vamrDD9abT5Pi70=", "owner": "nix-community", "repo": "home-manager", - "rev": "722792af097dff5790f1a66d271a47759f477755", + "rev": "c3a5e5f0df6f53aa4b51adc0107796cc407c641c", "type": "github" }, "original": { @@ -89,11 +89,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -113,11 +113,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1760616351, - "narHash": "sha256-z6+MKQBXfeZTdUK+PXbmBydaUuJK+k3iFnTanRvdkXg=", + "lastModified": 1760960598, + "narHash": "sha256-UP1v+sEkHuvD2+qyhxbkQpBR+dl9U0ljml3/dMI2jeU=", "owner": "nix-community", "repo": "nixvim", - "rev": "5275e258bf89e4947409ba36e362031ca491c67c", + "rev": "e3b77e803b2350b72f4d72c8f175ab0fbfe5a642", "type": "github" }, "original": { diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 6302452..798d116 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -7,7 +7,6 @@ ../../modules/nixos/localization.nix ../../modules/nixos/ai/default.nix ../../modules/nixos/desktops/gnome.nix - ../../modules/nixos/desktops/hyprland.nix ../../modules/nixos/desktops/river.nix ]; diff --git a/modules/home/alacritty.nix b/modules/home/alacritty.nix new file mode 100644 index 0000000..a7844cc --- /dev/null +++ b/modules/home/alacritty.nix @@ -0,0 +1,11 @@ +{ pkgs, lib, ... }: +{ + programs.alacritty = { + enable = true; + settings = { + window = { + opacity = 0.95; + }; + }; + }; +} diff --git a/modules/home/hyprland.nix b/modules/home/hyprland.nix deleted file mode 100644 index bb660a4..0000000 --- a/modules/home/hyprland.nix +++ /dev/null @@ -1,130 +0,0 @@ -{ pkgs, lib, ... }: -let -startupScript = pkgs.pkgs.writeShellScriptBin "start" '' -#${pkgs.quickshell}/bin/quickshell & -${pkgs.swww}/bin/swww init & - -sleep 1 -''; -in -{ -# home.file = { -# ".config/quickshell/shell.qml".source = quickshell/shell.qml; -# }; - - - wayland.windowManager.hyprland = { - enable = true; - - settings = { - exec-once = ''${startupScript}/bin/start''; - decoration = { - #shadow_offset = "0.5"; - #"col.shadow" = "rgba(00000099)"; - }; - - monitor = [ - "DP-2, preferred, auto-right, auto" - "DP-3, preferred, auto-left, auto" - ",preferred,auto,auto" - ]; - - "$mod" = "SUPER"; - "$terminal" = "alacritty"; - "$browser" = "firefox"; - "$menu" = "rofi -show drun"; - - general = { - gaps_in = 5; - gaps_out = 20; - border_size = 2; - resize_on_border = true; - layout = "master"; - }; - - bindm = [ - "$mod, mouse:272, movewindow" - "$mod, mouse:273, resizewindow" - "$mod ALT, mouse:272, resizewindow" - ]; - - bind = [ - "$mod, return, exec, $terminal" - "$mod, W, exec, $browser" - "$mod, Q, killactive," - "$mod, M, exit," - "$mod, E, exec, $fileManager" - "$mod, V, togglefloating," - "$mod, R, exec, $menu" - "$mod, P, pseudo, # dwindle" - "$mod, J, togglesplit, # dwindle" - "$mod, left, movefocus, l" - "$mod, right, movefocus, r" - "$mod, up, movefocus, u" - "$mod, down, movefocus, d" - "$mod, F, fullscreen" - - "$mod, 1, workspace, 1" - "$mod, 2, workspace, 2" - "$mod, 3, workspace, 3" - "$mod, 4, workspace, 4" - "$mod, 5, workspace, 5" - "$mod, 6, workspace, 6" - "$mod, 7, workspace, 7" - "$mod, 8, workspace, 8" - "$mod, 9, workspace, 9" - "$mod, 0, workspace, 10" - - "$mod SHIFT, 1, movetoworkspace, 1" - "$mod SHIFT, 2, movetoworkspace, 2" - "$mod SHIFT, 3, movetoworkspace, 3" - "$mod SHIFT, 4, movetoworkspace, 4" - "$mod SHIFT, 5, movetoworkspace, 5" - "$mod SHIFT, 6, movetoworkspace, 6" - "$mod SHIFT, 7, movetoworkspace, 7" - "$mod SHIFT, 8, movetoworkspace, 8" - "$mod SHIFT, 9, movetoworkspace, 9" - "$mod SHIFT, 0, movetoworkspace, 10" - - "$mod, S, togglespecialworkspace, magic" - "$mod SHIFT, S, movetoworkspace, special:magic" - - "$mod, mouse_down, workspace, e+1" - "$mod, mouse_up, workspace, e-1" - ]; - - animations = { - enabled = true; - # NAME, X0, Y0, X1, Y1 - bezier = [ - "easeOutQuint, 0.23, 1, 0.32, 1" - "easeInOutCubic, 0.65, 0.05, 0.36, 1" - "linear, 0, 0, 1, 1" - "almostLinear, 0.5, 0.5, 0.75, 1" - "quick, 0.15, 0, 0.1, 1" - ]; - - # NAME, ONOFF, SPEED, CURVE, [STYLE] - animation = [ - "global, 1, 10, default" - "border, 1, 5.39, easeOutQuint" - "windows, 1, 4.79, easeOutQuint" - "windowsIn, 1, 4.1, easeOutQuint, popin 87%" - "windowsOut, 1, 1.49, linear, popin 87%" - "fadeIn, 1, 1.73, almostLinear" - "fadeOut, 1, 1.46, almostLinear" - "fade, 1, 3.03, quick" - "layers, 1, 3.81, easeOutQuint" - "layersIn, 1, 4, easeOutQuint, fade" - "layersOut, 1, 1.5, linear, fade" - "fadeLayersIn, 1, 1.79, almostLinear" - "fadeLayersOut, 1, 1.39, almostLinear" - "workspaces, 1, 1.94, almostLinear, fade" - "workspacesIn, 1, 1.21, almostLinear, fade" - "workspacesOut, 1, 1.94, almostLinear, fade" - "zoomFactor, 1, 7, quick" - ]; - }; - }; - }; -} diff --git a/modules/home/river.nix b/modules/home/river.nix index 44a1682..fc0df17 100644 --- a/modules/home/river.nix +++ b/modules/home/river.nix @@ -142,6 +142,8 @@ riverctl default-layout rivertile rivertile -view-padding 6 -outer-padding 6 & ${pkgs.wlr-randr}/bin/wlr-randr --output DP-3 --pos -1440,0 +${pkgs.swww}/bin/swww-daemon & +${pkgs.swww}/bin/swww restore ''; }; } diff --git a/modules/nixos/desktops/hyprland.nix b/modules/nixos/desktops/hyprland.nix deleted file mode 100644 index b65aada..0000000 --- a/modules/nixos/desktops/hyprland.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ config, pkgs, inputs, ... }: -{ - imports = [ ./wm_apps.nix ]; - - programs.hyprland.enable = true; -} diff --git a/modules/nixos/desktops/wm_apps.nix b/modules/nixos/desktops/wm_apps.nix index e81582a..7420e32 100644 --- a/modules/nixos/desktops/wm_apps.nix +++ b/modules/nixos/desktops/wm_apps.nix @@ -9,5 +9,6 @@ libnotify dunst rofi + swww ]; } diff --git a/users/lily/home.nix b/users/lily/home.nix index 02403e2..c9559f6 100644 --- a/users/lily/home.nix +++ b/users/lily/home.nix @@ -3,9 +3,9 @@ { imports = [ ../../modules/home/vim.nix - ../../modules/home/hyprland.nix ../../modules/home/river.nix ../../modules/home/games.nix + ../../modules/home/alacritty.nix ]; # Home Manager needs a bit of information about you and the paths it should @@ -68,8 +68,10 @@ bash.enable = true; git = { enable = true; - userName = "Lily Anderson"; - userEmail = "lilylanderson@zoho.com"; + settings.user = { + name = "Lily Anderson"; + email = "lilylanderson@zoho.com"; + }; lfs.enable = true; }; };