diff --git a/configs/common.nix b/configs/common.nix index 701989b..778a7df 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -14,6 +14,7 @@ in { ../programs/fish.nix ../programs/git.nix + ../programs/rust.nix ../programs/starship ]; diff --git a/configs/desktop.nix b/configs/desktop.nix index 49a5dc3..aa8ddb8 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -5,7 +5,16 @@ catppuccin, ... }: { - imports = [../programs]; + imports = [ + ../programs/alacritty.nix + ../programs/gnome.nix + ../programs/vscode.nix + + # the world if hyprland + # ../programs/hyprland.nix + # ../programs/fuzzel.nix + # ../programs/waybar + ]; boot = { extraModulePackages = with config.boot.kernelPackages; [v4l2loopback]; @@ -146,8 +155,6 @@ }; }; - displayManager.defaultSession = "hyprland"; - printing.enable = true; pipewire = { @@ -170,11 +177,7 @@ virtualisation.libvirtd.enable = true; xdg = { - portal = { - enable = true; - extraPortals = with pkgs; [xdg-desktop-portal-gtk]; - }; - + portal.enable = true; mime.enable = true; icons.enable = true; }; diff --git a/programs/default.nix b/programs/default.nix deleted file mode 100644 index 2b8e737..0000000 --- a/programs/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{lib, ...}: { - imports = lib.pipe ./. [ - builtins.readDir - (lib.filterAttrs (n: _: n != "default.nix")) - (lib.mapAttrsToList (n: _: ./${n})) - ]; -} diff --git a/programs/gnome.nix b/programs/gnome.nix new file mode 100644 index 0000000..efbb300 --- /dev/null +++ b/programs/gnome.nix @@ -0,0 +1,28 @@ +{pkgs, ...}: { + services = { + xserver.desktopManager.gnome.enable = true; + displayManager.defaultSession = "gnome"; + }; + + environment = { + gnome.excludePackages = + (with pkgs; [ + gnome-tour + ]) + ++ (with pkgs.gnome; [ + cheese # webcam tool + gnome-terminal + epiphany # web browser + geary # email reader + totem # video player + tali # poker game + iagno # go game + hitori # sudoku game + atomix # puzzle game + ]); + + sessionVariables = { + NIXOS_OZONE_WL = "1"; + }; + }; +} diff --git a/programs/hyprland.nix b/programs/hyprland.nix index f965de9..5a712ae 100644 --- a/programs/hyprland.nix +++ b/programs/hyprland.nix @@ -5,6 +5,10 @@ }: { programs.hyprland.enable = true; + services.displayManager.defaultSession = "hyprland"; + + xdg.portal.extraPortals = with pkgs; [xdg-desktop-portal-gtk]; + hm = { home.packages = with pkgs; [ hyprpaper