From 8f3cc80e6a9070137dbdf648650767fd654be951 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Mon, 4 Mar 2024 22:37:10 +0530 Subject: [PATCH] [feat] Only add swayosd on linux --- config/nix/common/home.nix | 5 ++--- config/nix/flake.lock | 18 +++++++++--------- config/nix/linux/default.nix | 1 + config/nix/linux/hyprland.nix | 18 +++++++----------- config/nix/nixos/configuration.nix | 14 ++++++++++++++ 5 files changed, 33 insertions(+), 23 deletions(-) diff --git a/config/nix/common/home.nix b/config/nix/common/home.nix index f6a310f7..2427b1bc 100644 --- a/config/nix/common/home.nix +++ b/config/nix/common/home.nix @@ -12,9 +12,6 @@ in ] ++ (if device.isLinux then [ ../linux ] else [ ]) ++ (if !lazy then [ ./nvim ] else [ ]); - - services.swayosd.enable = true; - home.packages = with pkgs; [ file @@ -50,6 +47,8 @@ in (nerdfonts.override { fonts = [ "Hasklig" ]; }) mpv ] ++ (if device.isLinux then [ + gnome.nautilus + nextcloud-client sbctl gparted gptfdisk diff --git a/config/nix/flake.lock b/config/nix/flake.lock index 3f778235..80c3654f 100644 --- a/config/nix/flake.lock +++ b/config/nix/flake.lock @@ -553,11 +553,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1709332019, - "narHash": "sha256-kJAoPvpVRO3WR1dCZQKJpUMYoyA/6u9iUDX9gGEkjGI=", + "lastModified": 1709547316, + "narHash": "sha256-Dp/e31K3q1LWXReK03Y70SSV/GUYq52VNzA4oXSRHA0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "eeb45682dd4b2a921a3cab286f13101c9750d6bb", + "rev": "7fbb67b44ff61627d474bc0e2a6096b75f7b3a28", "type": "github" }, "original": { @@ -640,11 +640,11 @@ ] }, "locked": { - "lastModified": 1709529951, - "narHash": "sha256-KVqN0Dvf4bg87XYQCHdd1kuJkjA23y5wlTTSOnilLIU=", + "lastModified": 1709554374, + "narHash": "sha256-1yYgwxBzia+QrOaQaZ6YKqGFfiQcSBwYLzd9XRsRLQY=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e7d7a7f0c5a184c67b6bff56f95436d83d05fba5", + "rev": "daa03606dfb5296a22e842acb02b46c1c4e9f5e7", "type": "github" }, "original": { @@ -934,11 +934,11 @@ }, "nur": { "locked": { - "lastModified": 1709545122, - "narHash": "sha256-ohYVgoGdhfwt96E4Dz/d39Xqm7FJDZaRJFS1Jow/Xn0=", + "lastModified": 1709547795, + "narHash": "sha256-W679g8klWtISDiY1y+tmhU3FtNG0gg7rbi6bwDEOroQ=", "owner": "nix-community", "repo": "nur", - "rev": "a21779b3182ee5566a6bb5d9e851dfd8c79852da", + "rev": "65f9bf8bfd08ea9106ca14d192391b4f7ab4cd57", "type": "github" }, "original": { diff --git a/config/nix/linux/default.nix b/config/nix/linux/default.nix index 522b2efd..de2769dd 100644 --- a/config/nix/linux/default.nix +++ b/config/nix/linux/default.nix @@ -9,6 +9,7 @@ ]; services.kdeconnect.enable = true; + services.swayosd.enable = true; systemd.user.services.spotify-player = { Install = { WantedBy = [ "graphical-session.target" ]; }; diff --git a/config/nix/linux/hyprland.nix b/config/nix/linux/hyprland.nix index 257874f6..02cb8625 100644 --- a/config/nix/linux/hyprland.nix +++ b/config/nix/linux/hyprland.nix @@ -4,14 +4,6 @@ settings = { source = - # let - # catppuccin = pkgs.fetchFromGitHub { - # owner = "catppuccin"; - # repo = "hyprland"; - # rev = "main"; - # sha256 = "sha256-9BhZq9J1LmHfAPBqOr64chiAEzS+YV6zqe9ma95V3no"; - # }; - # in "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf"; monitor = [ ",preferred,auto,auto" @@ -104,7 +96,11 @@ # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more - windowrule = [ "float, title:^(Steam)$" "float, title:^(Archetype.*)$" ]; + windowrulev2 = [ + "float, title:^(Steam)$" + "float, title:^(Archetype.*)$" + "float, class:(.*nextcloud.*)" + ]; "misc:vfr" = true; @@ -115,11 +111,11 @@ "QT_QPA_PLATFORM,wayland" ]; exec-once = [ - "${pkgs.swayosd}/bin/swayosd-server" + "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1" + # "${pkgs.swayosd}/bin/swayosd-server" # "${pkgs.swww}/bin/swww init; swww img ~/.local/share/dotfiles/images/wallpaper.jpg" "${pkgs.ironbar}/bin/ironbar" "${pkgs.nextcloud-client}/bin/nextcloud --background" - "${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1" ]; "$mainMod" = "SUPER"; diff --git a/config/nix/nixos/configuration.nix b/config/nix/nixos/configuration.nix index a63e3d03..7b1d6832 100644 --- a/config/nix/nixos/configuration.nix +++ b/config/nix/nixos/configuration.nix @@ -8,8 +8,14 @@ ]; security.polkit.enable = true; + security.pam.services.greetd.enableGnomeKeyring = true; + + services.mullvad-vpn.enable = true; services.resolved.enable = true; + services.devmon.enable = true; + services.gvfs.enable = true; + services.udisks2.enable = true; nix.settings.auto-optimise-store = true; nix.gc.automatic = true; @@ -20,6 +26,14 @@ enable = true; pkiBundle = "/etc/secureboot"; }; + boot.plymouth.enable = true; + boot.plymouth.theme = "catppuccin-mocha"; + boot.plymouth.themePackages = with pkgs; [ + (catppuccin-plymouth.override + { + variant = "mocha"; + }) + ]; services.greetd = let