feat: use device.is "name" instead of device.hasGui for most items
This commit is contained in:
@@ -3,7 +3,7 @@
|
|||||||
device,
|
device,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
lib.optionalAttrs device.hasGui {
|
lib.optionalAttrs (device.is "ryu") {
|
||||||
imports = [
|
imports = [
|
||||||
# ./audacity.nix
|
# ./audacity.nix
|
||||||
./blueman.nix
|
./blueman.nix
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
programs.foot = {
|
programs.foot = {
|
||||||
enable = device.hasGui && pkgs.stdenv.isLinux;
|
enable = device.is "ryu";
|
||||||
server.enable = true;
|
server.enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
main = {
|
main = {
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
programs = {
|
programs = {
|
||||||
_1password-shell-plugins = {
|
_1password-shell-plugins = {
|
||||||
# enable 1Password shell plugins for bash, zsh, and fish shell
|
# enable 1Password shell plugins for bash, zsh, and fish shell
|
||||||
enable = device.hasGui;
|
enable = device.is "ryu";
|
||||||
# the specified packages as well as 1Password CLI will be
|
# the specified packages as well as 1Password CLI will be
|
||||||
# automatically installed and configured to use shell plugins
|
# automatically installed and configured to use shell plugins
|
||||||
# plugins = with pkgs; [awscli2 cachix cargo];
|
# plugins = with pkgs; [awscli2 cachix cargo];
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
pkgs,
|
pkgs,
|
||||||
lib,
|
lib,
|
||||||
device,
|
device,
|
||||||
|
config,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
@@ -36,12 +37,11 @@
|
|||||||
${pkgs.pfetch-rs}/bin/pfetch
|
${pkgs.pfetch-rs}/bin/pfetch
|
||||||
${pkgs.nb}/bin/nb todo undone
|
${pkgs.nb}/bin/nb todo undone
|
||||||
${lib.optionalString (device.isLinux && !device.isNix) "source /etc/profile.d/nix-daemon.fish"}
|
${lib.optionalString (device.isLinux && !device.isNix) "source /etc/profile.d/nix-daemon.fish"}
|
||||||
${lib.optionalString (device.isNix && device.hasGui)
|
${lib.optionalString (device.is "ryu") ''
|
||||||
''
|
if not set -q HYPRLAND_INSTANCE_SIGNATURE
|
||||||
if not set -q HYPRLAND_INSTANCE_SIGNATURE
|
set -x HYPRLAND_INSTANCE_SIGNATURE (hyprctl instances | head -1 | cut -d ' ' -f2 | tr -d :)
|
||||||
set -x HYPRLAND_INSTANCE_SIGNATURE (hyprctl instances | head -1 | cut -d ' ' -f2 | tr -d :)
|
end
|
||||||
end
|
''}
|
||||||
''}
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
programs.eww = {
|
programs.eww = {
|
||||||
enable = device.hasGui && pkgs.stdenv.isLinux;
|
enable = device.is "ryu";
|
||||||
enableFishIntegration = true;
|
enableFishIntegration = true;
|
||||||
configDir = activate_linux;
|
configDir = activate_linux;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
gtk = {
|
gtk = {
|
||||||
enable = device.hasGui && pkgs.stdenv.isLinux;
|
enable = device.is "ryu";
|
||||||
theme = {
|
theme = {
|
||||||
name = "catppuccin-mocha-mauve-standard+normal";
|
name = "catppuccin-mocha-mauve-standard+normal";
|
||||||
package = pkgs.catppuccinThemes.gtk;
|
package = pkgs.catppuccinThemes.gtk;
|
||||||
@@ -33,11 +33,8 @@
|
|||||||
gtk3.extraConfig = {gtk-application-prefer-dark-theme = 1;};
|
gtk3.extraConfig = {gtk-application-prefer-dark-theme = 1;};
|
||||||
gtk4.extraConfig = {gtk-application-prefer-dark-theme = 1;};
|
gtk4.extraConfig = {gtk-application-prefer-dark-theme = 1;};
|
||||||
};
|
};
|
||||||
home.packages =
|
home.packages = lib.optionals (device.is "ryu") [
|
||||||
lib.optionals
|
# pkgs.catppuccinThemes.gtk
|
||||||
(device.hasGui
|
pkgs.catppuccinThemes.papirus-folders
|
||||||
&& pkgs.stdenv.isLinux) [
|
];
|
||||||
# pkgs.catppuccinThemes.gtk
|
|
||||||
pkgs.catppuccinThemes.papirus-folders
|
|
||||||
];
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
# services.hyprpolkitagent.enable = true;
|
# services.hyprpolkitagent.enable = true;
|
||||||
services.hypridle = {
|
services.hypridle = {
|
||||||
enable = device.hasGui && pkgs.stdenv.isLinux;
|
enable = device.is "ryu";
|
||||||
settings = {
|
settings = {
|
||||||
general = {
|
general = {
|
||||||
after_sleep_cmd = "hyprctl dispatch dpms on";
|
after_sleep_cmd = "hyprctl dispatch dpms on";
|
||||||
@@ -27,12 +27,12 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
services.hyprsunset = {
|
services.hyprsunset = {
|
||||||
enable = device.hasGui && pkgs.stdenv.isLinux;
|
enable = device.is "ryu";
|
||||||
};
|
};
|
||||||
programs.hyprpaper = let
|
programs.hyprpaper = let
|
||||||
wallpapers = import ../../utils/wallhaven.nix {inherit pkgs;};
|
wallpapers = import ../../utils/wallhaven.nix {inherit pkgs;};
|
||||||
in {
|
in {
|
||||||
enable = device.hasGui && pkgs.stdenv.isLinux;
|
enable = device.is "ryu";
|
||||||
# enable = true;
|
# enable = true;
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
systemd.target = "hyprland-session.target";
|
systemd.target = "hyprland-session.target";
|
||||||
@@ -44,10 +44,10 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
programs.hyprlock = {
|
programs.hyprlock = {
|
||||||
enable = device.hasGui && pkgs.stdenv.isLinux;
|
enable = device.is "ryu";
|
||||||
};
|
};
|
||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = device.hasGui && pkgs.stdenv.isLinux;
|
enable = device.is "ryu";
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
}: {
|
}: {
|
||||||
imports = [inputs.ironbar.homeManagerModules.default];
|
imports = [inputs.ironbar.homeManagerModules.default];
|
||||||
programs.ironbar = {
|
programs.ironbar = {
|
||||||
enable = device.hasGui && pkgs.stdenv.isLinux;
|
enable = device.is "ryu";
|
||||||
package = inputs.ironbar.packages.${pkgs.system}.default;
|
package = inputs.ironbar.packages.${pkgs.system}.default;
|
||||||
systemd = true;
|
systemd = true;
|
||||||
config.monitors = {
|
config.monitors = {
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
virtualisation.oci-containers.backend = "docker";
|
virtualisation.oci-containers.backend = "docker";
|
||||||
users.extraUsers.servius.extraGroups = ["docker"];
|
users.extraUsers.servius.extraGroups = ["docker"];
|
||||||
networking.firewall.enable = false;
|
networking.firewall.enable = false;
|
||||||
|
services.openssh.enable = true;
|
||||||
|
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
security.sudo.wheelNeedsPassword = false;
|
security.sudo.wheelNeedsPassword = false;
|
||||||
@@ -66,6 +67,5 @@
|
|||||||
};
|
};
|
||||||
users.groups.media = {};
|
users.groups.media = {};
|
||||||
system.stateVersion = "25.05";
|
system.stateVersion = "25.05";
|
||||||
services.openssh.enable = true;
|
|
||||||
time.timeZone = "Asia/Kolkata";
|
time.timeZone = "Asia/Kolkata";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
}
|
}
|
||||||
(auth) {
|
(auth) {
|
||||||
forward_auth https://auth.darksailor.dev {
|
forward_auth https://auth.darksailor.dev {
|
||||||
header_up X-Forwarded-Host {upstream_hostport}
|
# header_up X-Forwarded-Host {upstream_hostport}
|
||||||
uri /api/authz/forward-auth
|
uri /api/authz/forward-auth
|
||||||
copy_headers Remote-User Remote-Groups Remote-Email Remote-Name
|
copy_headers Remote-User Remote-Groups Remote-Email Remote-Name
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user