diff --git a/flake.nix b/flake.nix index dd12a4b..c2700d2 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,7 @@ email = "folosp2@gmail.com"; groups = ["networkmanager" "wheel"]; browser = "firefox"; # any of firefox, none - + terminal = "ghostty"; }; in { nixosConfigurations = { diff --git a/user/ghostty.nix b/user/ghostty.nix new file mode 100644 index 0000000..f463452 --- /dev/null +++ b/user/ghostty.nix @@ -0,0 +1,3 @@ +{pkgs, ...}: { + home.packages = [pkgs.ghostty]; +} diff --git a/user/home.nix b/user/home.nix index fd4f781..77119ae 100644 --- a/user/home.nix +++ b/user/home.nix @@ -1,6 +1,7 @@ {systemSettings, userSettings, ...}: { imports = [ ./${userSettings.browser}.nix + ./${userSettings.terminal}.nix ./${systemSettings.desktop}.nix ./discord.nix ./git.nix diff --git a/user/hyprland.nix b/user/hyprland.nix index 0ee92e9..022dd82 100644 --- a/user/hyprland.nix +++ b/user/hyprland.nix @@ -1,5 +1,7 @@ -{pkgs, ...}: { - home.packages = [pkgs.alacritty pkgs.rofi-wayland]; # temporary +{pkgs, userSettings, ...}: { + home.packages = with pkgs; [ + rofi-wayland + ]; services.hyprpaper.enable = true; @@ -7,9 +9,8 @@ enable = true; systemd.enable = false; settings = { - exec-once = [ - "$HOME/pick_random_wallpapers.sh" + "$HOME/pick_random_wallpaper.sh" ]; monitor = [ @@ -22,14 +23,14 @@ bind = [ "$mod, B, exec, firefox" - "$mod SHIFT, Return, exec, alacritty" + "$mod SHIFT, Return, exec, ${userSettings.terminal}" "$mod, V, exec, code" "$mod SHIFT, Q, killactive" "$mod SHIFT, E, exit" "$mod, P, exec, rofi -show drun" "$mod, O, exec, $HOME/pick_random_wallpaper.sh" ] - ++ ( + ++ ( # i just took this from the hyprland wiki and it works so i guess?? # ok i think i understand this code now builtins.concatLists (builtins.genList (