diff --git a/home/default.nix b/home/default.nix index 4ff3d57..c35a77c 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,7 +5,7 @@ pkgs, ... }: -rec { +{ imports = [ ./firefox ./fish @@ -15,11 +15,11 @@ rec { ./thunderbird ./git ./vscodium + ./themes/catppuccin.nix ]; dconf = { enable = true; - settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; settings."org/virt-manager/virt-manager/connections" = { autoconnect = [ "qemu:///system" ]; uris = [ "qemu:///system" ]; @@ -28,30 +28,6 @@ rec { services.blueman-applet.enable = true; - qt.platformTheme.name = "gtk"; - - gtk = { - enable = true; - theme = { - name = "Catppuccin-Frappe-Compact-Lavender-Dark"; - package = pkgs.catppuccin-gtk.override { - accents = [ "lavender" ]; - size = "compact"; - variant = "frappe"; - }; - }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-folders.override { - accent = "lavender"; - flavor = "frappe"; - }; - }; - cursorTheme = with home.pointerCursor; { - inherit name package size; - }; - }; - programs.direnv = { enable = true; nix-direnv.enable = true; @@ -62,14 +38,6 @@ rec { inherit username; inherit homeDirectory; - pointerCursor = { - gtk.enable = true; - x11.enable = true; - name = "catppuccin-frappe-lavender-cursors"; - package = pkgs.catppuccin-cursors.frappeLavender; - size = 32; - }; - packages = let pk = with pkgs; [ diff --git a/home/firefox/default.nix b/home/firefox/default.nix index 094c91f..af69801 100644 --- a/home/firefox/default.nix +++ b/home/firefox/default.nix @@ -25,7 +25,7 @@ lib.mkIf osConfig.programs.firefox.enable { definedAliases = [ "@nixpkg" ]; }; "NixOS Wiki" = { - urls = [ { template = "https://wiki.nixos.org/index.php?search={searchTerms}"; } ]; + urls = [ { template = "https://wiki.nixos.org/w/index.php?search={searchTerms}"; } ]; icon = nixicon; definedAliases = [ "@nixwiki" ]; }; diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 54f74b9..32c4c45 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -138,7 +138,9 @@ lib.mkIf osConfig.programs.hyprland.enable { "$mod, X, fullscreen, 1" "$mod, F, fullscreen, 0" "$mod, N, exec, ${pkgs.swaynotificationcenter}/bin/swaync-client -t" - + "$mod, U, exec, ${pkgs.hyprpicker}/bin/hyprpicker -r -z & ${pkgs.hyprshot}/bin/hyprshot -o ~/Pictures/screenshots -m region" + "$mod CTRL, U, exec, ${pkgs.hyprpicker}/bin/hyprpicker -r -z & ${pkgs.hyprshot}/bin/hyprshot -o ~/Pictures/screenshots -m window" + "$mod SHIFT, U, exec, ${pkgs.hyprshot}/bin/hyprshot -o ~/Pictures/screenshots -m active -m output" ] ++ ( # workspaces diff --git a/home/themes/catppuccin.nix b/home/themes/catppuccin.nix new file mode 100644 index 0000000..737af4e --- /dev/null +++ b/home/themes/catppuccin.nix @@ -0,0 +1,39 @@ +{ pkgs, ... }: +rec { + qt.platformTheme.name = "gtk"; + + dconf = { + enable = true; + settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; + }; + + gtk = { + enable = true; + theme = { + name = "Catppuccin-Frappe-Compact-Lavender-Dark"; + package = pkgs.catppuccin-gtk.override { + accents = [ "lavender" ]; + size = "compact"; + variant = "frappe"; + }; + }; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.catppuccin-papirus-folders.override { + accent = "lavender"; + flavor = "frappe"; + }; + }; + cursorTheme = with home.pointerCursor; { + inherit name package size; + }; + }; + + home.pointerCursor = { + gtk.enable = true; + x11.enable = true; + name = "catppuccin-frappe-lavender-cursors"; + package = pkgs.catppuccin-cursors.frappeLavender; + size = 32; + }; +} diff --git a/hosts/brontes/configuration.nix b/hosts/brontes/configuration.nix index 131fa09..87975d6 100644 --- a/hosts/brontes/configuration.nix +++ b/hosts/brontes/configuration.nix @@ -40,6 +40,7 @@ ]; }; + services.dbus.enable = true; services.pipewire = { enable = true; alsa.enable = true; @@ -54,6 +55,7 @@ hyprland.enable = true; }; + security.polkit.enable = true; users = { defaultUserShell = pkgs.fish; users.${username} = { diff --git a/hosts/brontes/home.nix b/hosts/brontes/home.nix index 3485294..c3001a4 100644 --- a/hosts/brontes/home.nix +++ b/hosts/brontes/home.nix @@ -5,7 +5,7 @@ ... }: { - home-manager.users.${username} = rec { + home-manager.users.${username} = { imports = [ ../../home/firefox ../../home/fish @@ -18,51 +18,19 @@ ../../home/hyprland ../../home/hyprlock ../../home/hypridle + ../../home/themes/catppuccin.nix ]; programs.direnv = { enable = true; nix-direnv.enable = true; }; - dconf = { - enable = true; - settings."org/gnome/desktop/interface".color-scheme = "prefer-dark"; - }; - qt.platformTheme.name = "gtk"; - gtk = { - enable = true; - theme = { - name = "Catppuccin-Frappe-Compact-Lavender-Dark"; - package = pkgs.catppuccin-gtk.override { - accents = [ "lavender" ]; - size = "compact"; - variant = "frappe"; - }; - }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.catppuccin-papirus-folders.override { - accent = "lavender"; - flavor = "frappe"; - }; - }; - cursorTheme = with home.pointerCursor; { - inherit name package size; - }; - }; services.blueman-applet.enable = true; home = { stateVersion = config.system.stateVersion; inherit username; - pointerCursor = { - gtk.enable = true; - x11.enable = true; - name = "catppuccin-frappe-lavender-cursors"; - package = pkgs.catppuccin-cursors.frappeLavender; - size = 32; - }; packages = let