From 53a862291c88ba1e35979949b65790f77ea6221a Mon Sep 17 00:00:00 2001 From: cnst Date: Tue, 25 Jun 2024 20:00:45 +0200 Subject: [PATCH] woohov2 --- flake.lock | 12 ++--- home/cnst/home.nix | 8 ---- home/modules/{xdg => appearance}/default.nix | 14 +++--- .../{gtk/default.nix => appearance/gtk.nix} | 5 --- home/modules/default.nix | 3 +- home/modules/hypr/default.nix | 44 ++++++++++++++++++- home/modules/mako/default.nix | 26 +++++++++++ home/pkgs/cnst.nix | 5 --- hosts/common/default.nix | 1 + hosts/services/cnix.nix | 1 + 10 files changed, 84 insertions(+), 35 deletions(-) rename home/modules/{xdg => appearance}/default.nix (81%) rename home/modules/{gtk/default.nix => appearance/gtk.nix} (79%) create mode 100644 home/modules/mako/default.nix diff --git a/flake.lock b/flake.lock index 5bce9645..bc39e778 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ ] }, "locked": { - "lastModified": 1719253381, - "narHash": "sha256-ZRK+P5OSzXVOLRsVIvtC/M7dMQ5JdLQ9tlCPURBy7zY=", + "lastModified": 1719325051, + "narHash": "sha256-spZNPBy/DQNmW9XXfJaVzyH1JkeNsmdVNe9UkjMETxA=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "c57cfcd3ca865b3ac291ece6b5914785fd8518b2", + "rev": "75c19b1374bf9115855506c740200e13e5a4ec56", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "hardware": { "locked": { - "lastModified": 1719145664, - "narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", + "lastModified": 1719322773, + "narHash": "sha256-BqPxtFwXrpJQDh65NOIHX99pz2rtIMshG9Mt2xnnc5c=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", + "rev": "caabc425565bbd5c8640630b0bf6974961a49242", "type": "github" }, "original": { diff --git a/home/cnst/home.nix b/home/cnst/home.nix index cdc6d287..816a43fb 100644 --- a/home/cnst/home.nix +++ b/home/cnst/home.nix @@ -32,14 +32,6 @@ homeDirectory = "/home/cnst"; }; - home.sessionVariables = { - MOZ_ENABLE_WAYLAND = 1; - NIXOS_OZONE_WL = 1; - SDL_VIDEODRIVER = "wayland"; - QT_QPA_PLATFORM = "wayland"; - QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; - }; - programs.home-manager.enable = true; # Nicely reload system units when changing configs diff --git a/home/modules/xdg/default.nix b/home/modules/appearance/default.nix similarity index 81% rename from home/modules/xdg/default.nix rename to home/modules/appearance/default.nix index 63b833e1..9957fc93 100644 --- a/home/modules/xdg/default.nix +++ b/home/modules/appearance/default.nix @@ -1,5 +1,6 @@ { pkgs, config, ... }: { + imports = [ ./gtk.nix ]; xdg = { userDirs = { enable = true; @@ -15,14 +16,13 @@ }; portal = { enable = true; - xdgOpenUsePortal = true; extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - config = { - common.default = [ "gtk" ]; - hyprland.default = [ - "gtk" - "hyprland" - ]; + }; + }; + dconf = { + settings = { + "org/gnome/desktop/interface" = { + color-scheme = "prefer-dark"; }; }; }; diff --git a/home/modules/gtk/default.nix b/home/modules/appearance/gtk.nix similarity index 79% rename from home/modules/gtk/default.nix rename to home/modules/appearance/gtk.nix index a6d24606..753998a8 100644 --- a/home/modules/gtk/default.nix +++ b/home/modules/appearance/gtk.nix @@ -19,10 +19,5 @@ name = "FiraCode Nerd Font Light"; size = 11; }; - cursorTheme = { - name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; - size = 24; - }; }; } diff --git a/home/modules/default.nix b/home/modules/default.nix index 9a03df0d..1524ea48 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -2,10 +2,9 @@ imports = [ ./firefox ./git - ./gtk ./hypr ./neovim ./shell - ./xdg + ./appearance ]; } diff --git a/home/modules/hypr/default.nix b/home/modules/hypr/default.nix index f736dcd2..40345e55 100644 --- a/home/modules/hypr/default.nix +++ b/home/modules/hypr/default.nix @@ -1,5 +1,39 @@ -{ pkgs, ... }: { + lib, + config, + pkgs, + ... +}: +{ + imports = [ ../mako ]; + + xdg.portal = + let + hyprland = config.wayland.windowManager.hyprland.package; + xdph = pkgs.xdg-desktop-portal-hyprland.override { inherit hyprland; }; + in + { + extraPortals = [ xdph ]; + configPackages = [ hyprland ]; + }; + + home.packages = with pkgs; [ + grimblast + slurp + hyprpicker + swaybg + tofi + ]; + + home.sessionVariables = { + MOZ_ENABLE_WAYLAND = 1; + NIXOS_OZONE_WL = 1; + SDL_VIDEODRIVER = "wayland"; + QT_QPA_PLATFORM = "wayland"; + QT_WAYLAND_DISABLE_WINDOWDECORATION = "1"; + LIBSEAT_BACKEND = "logind"; + }; + wayland.windowManager.hyprland = { enable = true; package = pkgs.hyprland; @@ -7,6 +41,12 @@ extraConfig = '' ${builtins.readFile ./hyprland.conf} ''; - systemd.enable = true; + systemd = { + enable = true; + extraCommands = [ + "systemctl --user stop graphical-session.target" + "systemctl --user start hyprland-session.target" + ]; + }; }; } diff --git a/home/modules/mako/default.nix b/home/modules/mako/default.nix new file mode 100644 index 00000000..49330173 --- /dev/null +++ b/home/modules/mako/default.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: +{ + home.packages = [ pkgs.libnotify ]; + + services.mako = { + enable = true; + iconPath = "$HOME/.nix-profile/share/icons/Gruvbox-Plus-Dark"; + font = "FiraCode Nerd Font Medium 12"; + padding = "10"; + margin = "10"; + anchor = "bottom-right"; + width = 400; + height = 150; + borderSize = 2; + defaultTimeout = 12000; + backgroundColor = "#3c3836dd"; + borderColor = "#689d6add"; + textColor = "#d5c4a1dd"; + layer = "overlay"; + extraConfig = '' + max-history=50 + outer-margin=25 + icon-location=right + ''; + }; +} diff --git a/home/pkgs/cnst.nix b/home/pkgs/cnst.nix index 03be947b..1f662b79 100644 --- a/home/pkgs/cnst.nix +++ b/home/pkgs/cnst.nix @@ -4,7 +4,6 @@ # Desktop alacritty wl-clipboard - dunst keepassxc ranger webcord @@ -12,23 +11,19 @@ xfce.thunar-volman xfce.thunar-archive-plugin gnome.file-roller - swaybg wireguard-tools wpa_supplicant ntfs3g kdePackages.polkit-kde-agent-1 networkmanagerapplet - blueman htop btop - tofi pamixer virt-manager qbittorrent fastfetch waybar nwg-look - mullvad-vpn thefuck calcurse gnome.adwaita-icon-theme diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 75815eb0..c96aa546 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -66,6 +66,7 @@ pkgs.python312Packages.oauth2 pkgs.python312Packages.httplib2 pkgs.python312Packages.pip + pkgs.python312Packages.dbus-python pkgs.killall pkgs.tree-sitter pkgs.lazygit diff --git a/hosts/services/cnix.nix b/hosts/services/cnix.nix index e9ac0556..eacc57c5 100644 --- a/hosts/services/cnix.nix +++ b/hosts/services/cnix.nix @@ -4,6 +4,7 @@ udisks2.enable = true; gvfs.enable = true; blueman.enable = true; + gnome.gnome-keyring.enable = true; mullvad-vpn = { enable = true; package = pkgs.mullvad-vpn;