diff --git a/hosts/muon/configuration.nix b/hosts/muon/configuration.nix index a1bc645..5950925 100644 --- a/hosts/muon/configuration.nix +++ b/hosts/muon/configuration.nix @@ -28,17 +28,11 @@ in { mods.desktop.wayland.enable = true; mods.theme.enable = true; mods.theme.wallpaper = ./wallpaper.png; - # programs.hyprland.enable = true; mods.unfree.steam.enable = true; mods.unfree.nvidia.enable = true; - - hardware = { - opengl.enable = true; - nvidia.modesetting.enable = true; - }; - + # Backup environment services.xserver.windowManager.qtile.enable = true; # Version of first install diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix index 69ddce1..de1fc5f 100644 --- a/modules/home/desktop/default.nix +++ b/modules/home/desktop/default.nix @@ -4,6 +4,7 @@ let in { imports = [ ./hyprland.nix + ./social.nix ]; config = lib.mkIf cfg.wayland.enable { diff --git a/modules/home/desktop/hyprland.nix b/modules/home/desktop/hyprland.nix index 226294c..70ed9bb 100644 --- a/modules/home/desktop/hyprland.nix +++ b/modules/home/desktop/hyprland.nix @@ -3,20 +3,26 @@ config = lib.mkIf config.mods.hyprland.enable { programs.waybar.enable = true; + programs.fuzzel.enable = true; wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; - # systemd.enable = true; + systemd.enable = true; settings = { exec-once = "${lib.getExe pkgs.waybar}"; + input = { + accel_profile = "flat"; + kb_options = "caps:escape"; }; + "$mod" = "SUPER"; bind = [ - "$mod, F, exec, qutebrowser" "$mod, Return, exec, alacritty" + "$mod, D, exec, fuzzel" + "$mod, F, exec, qutebrowser" "$mod SHIFT, Q, killactive," "$mod SHIFT, X, exit," diff --git a/modules/home/desktop/social.nix b/modules/home/desktop/social.nix new file mode 100644 index 0000000..eb36242 --- /dev/null +++ b/modules/home/desktop/social.nix @@ -0,0 +1,16 @@ +{ pkgs, lib, config, ... }: { + options.mods.social.enable = + lib.mkEnableOption "enables social media clients"; + + config = lib.mkIf config.mods.social.enable { + home.packages = with pkgs; lib.mkAfter [ + # Communication + kotatogram-desktop + signal-desktop + vesktop + + # Video + freetube + ]; + }; +} diff --git a/modules/home/terminal/tools.nix b/modules/home/terminal/tools.nix index 059b8bb..31abf3e 100644 --- a/modules/home/terminal/tools.nix +++ b/modules/home/terminal/tools.nix @@ -9,6 +9,7 @@ # file managing fd ripgrep + zoxide trash-cli # programs diff --git a/modules/nixos/core/default.nix b/modules/nixos/core/default.nix index 2c424f5..e5f1890 100644 --- a/modules/nixos/core/default.nix +++ b/modules/nixos/core/default.nix @@ -3,5 +3,6 @@ ./boot.nix ./network.nix ./user.nix + ./nix.nix ]; } diff --git a/modules/nixos/core/nix.nix b/modules/nixos/core/nix.nix new file mode 100644 index 0000000..9cc5f1d --- /dev/null +++ b/modules/nixos/core/nix.nix @@ -0,0 +1,16 @@ +{ pkgs, lib, ... }: { + nix.settings = { + substituters = [ + "https://cache.nixos.org" + "https://nix-community.cachix.org" + "https://nixpkgs-unfree.cachix.org" + "https://hyprland.cachix.org" + ]; + trusted-public-keys = [ + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" + "nixpkgs-unfree.cachix.org-1:hqvoInulhbV4nJ9yJOEr+4wxhDV4xq2d1DK7S6Nj6rs=" + "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + ]; + }; +} diff --git a/modules/nixos/theme/default.nix b/modules/nixos/theme/default.nix index a758dce..85413d7 100644 --- a/modules/nixos/theme/default.nix +++ b/modules/nixos/theme/default.nix @@ -18,5 +18,29 @@ in { config = lib.mkIf cfg.enable { stylix.base16Scheme = cfg.scheme; stylix.image = cfg.wallpaper; + + stylix.fonts = { + monospace = { + package = pkgs.mononoki; + name = "Mononoki Nerd Font"; + }; + emoji = { + package = pkgs.noto-fonts-emoji; + name = "OpenMoji Color"; + }; + }; + + # fonts = with pkgs; [ + # openmoji-color + # mononoki + # (nerdfonts.override { fonts = [ "Mononoki" ]; }) + # ]; + + # fontconfig = { + # hinting.autohint = true; + # defaultFonts = { + # emoji = [ "OpenMoji Color" ]; + # }; + # }; }; }