diff --git a/flake.lock b/flake.lock
index 65d4949..ff5d572 100644
--- a/flake.lock
+++ b/flake.lock
@@ -503,7 +503,7 @@
"flake-parts": "flake-parts_2",
"gnome-shell": "gnome-shell",
"nixpkgs": [
- "nixpkgs"
+ "nixpkgs-unstable"
],
"nur": "nur",
"systems": "systems_2",
diff --git a/flake.nix b/flake.nix
index 1497c0f..c8a571a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,7 +40,7 @@
};
stylix = {
url = "github:nix-community/stylix";
- inputs.nixpkgs.follows = "nixpkgs";
+ inputs.nixpkgs.follows = "nixpkgs-unstable";
};
copyparty.url = "github:9001/copyparty";
};
diff --git a/hosts/nixos/yveltal/configuration.nix b/hosts/nixos/yveltal/configuration.nix
index b398174..ffae220 100644
--- a/hosts/nixos/yveltal/configuration.nix
+++ b/hosts/nixos/yveltal/configuration.nix
@@ -19,7 +19,7 @@
ssh.enable = true;
sops.enable = true;
yubikey.enable = true;
- tailscale.enable = false;
+ tailscale.enable = true;
syncthing.enable = true;
};
diff --git a/users/blake/assets/wallpapers/test.jpg b/users/blake/assets/wallpapers/test.jpg
new file mode 100644
index 0000000..258013c
Binary files /dev/null and b/users/blake/assets/wallpapers/test.jpg differ
diff --git a/users/blake/dots/hypr/default.nix b/users/blake/dots/hypr/default.nix
index 141e6b2..a325ba2 100644
--- a/users/blake/dots/hypr/default.nix
+++ b/users/blake/dots/hypr/default.nix
@@ -21,6 +21,7 @@ in {
wayland.windowManager.hyprland = {
enable = true;
+ systemd.enable = true;
systemd.variables = ["--all"];
settings = {
# --- displays ---
@@ -57,8 +58,8 @@ in {
gaps_in = 2;
gaps_out = 5;
border_size = 3;
- "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
- "col.inactive_border" = "rgba(595959aa)";
+ "col.active_border" = lib.mkDefault "rgba(33ccffee) rgba(00ff99ee) 45deg";
+ "col.inactive_border" = lib.mkDefault "rgba(595959aa)";
layout = "dwindle";
allow_tearing = false;
};
@@ -217,8 +218,8 @@ in {
services.hyprpaper = {
enable = true;
settings = {
- preload = ["~/.nix/users/blake/assets/wallpapers/antartica.png"];
- wallpaper = [",~/.nix/users/blake/assets/wallpapers/antartica.png"];
+ preload = lib.mkDefault ["~/.nix/users/blake/assets/wallpapers/antartica.png"];
+ wallpaper = lib.mkDefault [",~/.nix/users/blake/assets/wallpapers/antartica.png"];
ipc = "off";
splash = false;
};
@@ -233,12 +234,12 @@ in {
hide_cursor = true;
};
- background = [
+ background = lib.mkDefault [
{
monitor = "";
- path = "~/.nix/users/blake/assets/wallpapers/antartica.png";
+ path = lib.mkDefault "~/.nix/users/blake/assets/wallpapers/antartica.png";
blur_passes = 1;
- color = "rgb(0047ab)";
+ color = lib.mkDefault "rgb(0047ab)";
}
];
@@ -281,7 +282,7 @@ in {
monitor = "";
path = "~/.nix/users/blake/assets/pfps/pikacig.jpg";
size = 350;
- border_color = "rgb(0047ab)";
+ border_color = lib.mkDefault "rgb(0047ab)";
rounding = -1;
position = "0, 85";
halign = "center";
@@ -290,7 +291,7 @@ in {
}
];
- input-field = [
+ input-field = lib.mkDefault [
{
monitor = "";
size = "400, 70";
@@ -298,14 +299,14 @@ in {
dots_size = 0.2;
dots_spacing = 0.2;
dots_center = true;
- outer_color = "$accent";
- inner_color = "$surface0";
- font_color = "$text";
+ outer_color = lib.mkDefault "$accent";
+ inner_color = lib.mkDefault "$surface0";
+ font_color = lib.mkDefault "$text";
fade_on_empty = false;
placeholder_text = "# Logged in as $USER";
hide_input = false;
- check_color = "rgb(0047ab)";
- fail_color = "rgb(ff0000)";
+ check_color = lib.mkDefault "rgb(0047ab)";
+ fail_color = lib.mkDefault "rgb(ff0000)";
fail_text = "$FAIL ($ATTEMPTS)";
capslock_color = "rgb(ff0000)";
position = "0, -185";
@@ -366,19 +367,19 @@ in {
};
};
- home.pointerCursor = {
- dotIcons.enable = false;
- enable = true;
- gtk.enable = true;
- x11.enable = true;
- package = pkgs.posy-cursors;
- name = "Posy_Cursor_Black";
- size = 48;
- hyprcursor = {
- enable = true;
- size = 64;
- };
- };
+ # home.pointerCursor = {
+ # dotIcons.enable = false;
+ # enable = true;
+ # gtk.enable = true;
+ # x11.enable = true;
+ # package = pkgs.posy-cursors;
+ # name = "Posy_Cursor_Black";
+ # size = 48;
+ # hyprcursor = {
+ # enable = true;
+ # size = 64;
+ # };
+ # };
#xdg.configFile."hypr/hyprland.conf" = {
# source = config.lib.file.mkOutOfStoreSymlink "/home/blake/.nix/users/blake/dots/hypr/hyprland.conf";
diff --git a/users/blake/dots/kitty/default.nix b/users/blake/dots/kitty/default.nix
index 01d500f..3663e1f 100644
--- a/users/blake/dots/kitty/default.nix
+++ b/users/blake/dots/kitty/default.nix
@@ -27,7 +27,7 @@ in {
cursor_beam_thickness = 2.5;
foreground = "#dddddd";
background = "#2F1730";
- background_opacity = 0.9;
+ #background_opacity = 0.9;
selection_foreground = "none";
selection_background = "none";
term = "xterm-256color";
diff --git a/users/blake/dots/stylix/default.nix b/users/blake/dots/stylix/default.nix
index 5a7cbf7..9695846 100644
--- a/users/blake/dots/stylix/default.nix
+++ b/users/blake/dots/stylix/default.nix
@@ -7,7 +7,7 @@
}: let
program = "stylix";
cfg = config.dots.${program};
- #sec = sops.secrets;
+ wallpaper = ../../assets/wallpapers/test.jpg;
in {
imports = [inputs.stylix.homeManagerModules.default];
@@ -17,5 +17,57 @@ in {
};
config = lib.mkIf cfg.enable {
+ stylix = {
+ enable = true;
+ autoEnable = false;
+ image = wallpaper;
+ polarity = "dark";
+ cursor = {
+ package = pkgs.posy-cursors;
+ name = "Posy_Cursor_Black";
+ size = 128;
+ };
+ fonts = {
+ sizes = {
+ applications = 12;
+ terminal = 12;
+ desktop = 10;
+ popups = 10;
+ };
+ serif = {
+ package = pkgs.nerd-fonts.ubuntu;
+ name = "UbuntuNerdFont Regular";
+ };
+ sansSerif = {
+ package = pkgs.nerd-fonts.ubuntu;
+ name = "UbuntuNerdFont Regular";
+ };
+ monospace = {
+ package = pkgs.nerd-fonts.ubuntu-mono;
+ name = "UbuntuMonoNerdFont Regular";
+ };
+ emoji = {
+ package = pkgs.noto-fonts-color-emoji;
+ name = "Noto Color Emoji";
+ };
+ };
+ opacity = {
+ applications = 1.0;
+ terminal = 0.9;
+ desktop = 1.0;
+ popups = 0.9;
+ };
+
+ targets = {
+ kitty.enable = true;
+ btop.enable = true;
+ hyprland.enable = true;
+ hyprpaper.enable = true;
+ hyprlock.enable = true;
+ hyprlock.useWallpaper = true;
+ nvf.enable = true;
+ nvf.transparentBackground = true;
+ };
+ };
};
}
diff --git a/users/blake/home.nix b/users/blake/home.nix
index 5a7b127..e93f38b 100644
--- a/users/blake/home.nix
+++ b/users/blake/home.nix
@@ -21,6 +21,7 @@ in
{
imports = [
inputs.sops-nix.homeManagerModules.sops
+ #inputs.stylix.homeManagerModules.default
./dots
./dots/nvf
./dots/lf
diff --git a/users/blake/hosts/yveltal.nix b/users/blake/hosts/yveltal.nix
index 5684480..26ef4f3 100644
--- a/users/blake/hosts/yveltal.nix
+++ b/users/blake/hosts/yveltal.nix
@@ -16,6 +16,7 @@
kitty.enable = true;
librewolf.enable = true;
firefox.enable = true;
+ stylix.enable = true;
waybar.enable = true;
dunst.enable = true;
hypr.enable = true;