servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[feat] Only add swayosd on linux

Browse Source
This commit is contained in:
uttarayan21
2024-03-04 22:37:10 +05:30
parent 7c4ad7fcc7
commit 8f3cc80e6a
5 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/nix/common/home.nix
View File

@@ -12,9 +12,6 @@ in
] ++ (if device.isLinux then [ ../linux ] else [ ]) ] ++ (if device.isLinux then [ ../linux ] else [ ])
++ (if !lazy then [ ./nvim ] else [ ]); ++ (if !lazy then [ ./nvim ] else [ ]);
services.swayosd.enable = true;
home.packages = with pkgs; home.packages = with pkgs;
[ [
file file
@@ -50,6 +47,8 @@ in
(nerdfonts.override { fonts = [ "Hasklig" ]; }) (nerdfonts.override { fonts = [ "Hasklig" ]; })
mpv mpv
] ++ (if device.isLinux then [ ] ++ (if device.isLinux then [
gnome.nautilus
nextcloud-client
sbctl sbctl
gparted gparted
gptfdisk gptfdisk

18
config/nix/flake.lock generated
View File

@@ -553,11 +553,11 @@
"rust-overlay": "rust-overlay_4" "rust-overlay": "rust-overlay_4"
}, },
"locked": { "locked": {
"lastModified": 1709332019, "lastModified": 1709547316,
"narHash": "sha256-kJAoPvpVRO3WR1dCZQKJpUMYoyA/6u9iUDX9gGEkjGI=", "narHash": "sha256-Dp/e31K3q1LWXReK03Y70SSV/GUYq52VNzA4oXSRHA0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "lanzaboote", "repo": "lanzaboote",
"rev": "eeb45682dd4b2a921a3cab286f13101c9750d6bb", "rev": "7fbb67b44ff61627d474bc0e2a6096b75f7b3a28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -640,11 +640,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1709529951, "lastModified": 1709554374,
"narHash": "sha256-KVqN0Dvf4bg87XYQCHdd1kuJkjA23y5wlTTSOnilLIU=", "narHash": "sha256-1yYgwxBzia+QrOaQaZ6YKqGFfiQcSBwYLzd9XRsRLQY=",
"owner": "LnL7", "owner": "LnL7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "e7d7a7f0c5a184c67b6bff56f95436d83d05fba5", "rev": "daa03606dfb5296a22e842acb02b46c1c4e9f5e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -934,11 +934,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1709545122, "lastModified": 1709547795,
"narHash": "sha256-ohYVgoGdhfwt96E4Dz/d39Xqm7FJDZaRJFS1Jow/Xn0=", "narHash": "sha256-W679g8klWtISDiY1y+tmhU3FtNG0gg7rbi6bwDEOroQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "a21779b3182ee5566a6bb5d9e851dfd8c79852da", "rev": "65f9bf8bfd08ea9106ca14d192391b4f7ab4cd57",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
config/nix/linux/default.nix
View File

@@ -9,6 +9,7 @@
]; ];
services.kdeconnect.enable = true; services.kdeconnect.enable = true;
services.swayosd.enable = true;
systemd.user.services.spotify-player = { systemd.user.services.spotify-player = {
Install = { WantedBy = [ "graphical-session.target" ]; }; Install = { WantedBy = [ "graphical-session.target" ]; };

18
config/nix/linux/hyprland.nix
View File

@@ -4,14 +4,6 @@
settings = { settings = {
source = source =
# let
# catppuccin = pkgs.fetchFromGitHub {
# owner = "catppuccin";
# repo = "hyprland";
# rev = "main";
# sha256 = "sha256-9BhZq9J1LmHfAPBqOr64chiAEzS+YV6zqe9ma95V3no";
# };
# in
"${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf"; "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf";
monitor = [ monitor = [
",preferred,auto,auto" ",preferred,auto,auto"
@@ -104,7 +96,11 @@
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # 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; "misc:vfr" = true;
@@ -115,11 +111,11 @@
"QT_QPA_PLATFORM,wayland" "QT_QPA_PLATFORM,wayland"
]; ];
exec-once = [ 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.swww}/bin/swww init; swww img ~/.local/share/dotfiles/images/wallpaper.jpg"
"${pkgs.ironbar}/bin/ironbar" "${pkgs.ironbar}/bin/ironbar"
"${pkgs.nextcloud-client}/bin/nextcloud --background" "${pkgs.nextcloud-client}/bin/nextcloud --background"
"${pkgs.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1"
]; ];
"$mainMod" = "SUPER"; "$mainMod" = "SUPER";

14
config/nix/nixos/configuration.nix
View File

@@ -8,8 +8,14 @@
]; ];
security.polkit.enable = true; security.polkit.enable = true;
security.pam.services.greetd.enableGnomeKeyring = true;
services.mullvad-vpn.enable = true; services.mullvad-vpn.enable = true;
services.resolved.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.settings.auto-optimise-store = true;
nix.gc.automatic = true; nix.gc.automatic = true;
@@ -20,6 +26,14 @@
enable = true; enable = true;
pkiBundle = "/etc/secureboot"; pkiBundle = "/etc/secureboot";
}; };
boot.plymouth.enable = true;
boot.plymouth.theme = "catppuccin-mocha";
boot.plymouth.themePackages = with pkgs; [
(catppuccin-plymouth.override
{
variant = "mocha";
})
];
services.greetd = services.greetd =
let let