diff --git a/assets/desktop.png b/.gitea/assets/desktop.png
similarity index 100%
rename from assets/desktop.png
rename to .gitea/assets/desktop.png
diff --git a/README.md b/README.md
index cb9fcc2..e27012c 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
My NixOS configurations with dotfiles for my desktop
-
+
## Uses
diff --git a/wallpapers/catppuccin_high.png b/assets/catppuccin_high.png
similarity index 100%
rename from wallpapers/catppuccin_high.png
rename to assets/catppuccin_high.png
diff --git a/wallpapers/catppuccin_page_curl.png b/assets/catppuccin_page_curl.png
similarity index 100%
rename from wallpapers/catppuccin_page_curl.png
rename to assets/catppuccin_page_curl.png
diff --git a/wallpapers/downtown.gif b/assets/downtown.gif
similarity index 100%
rename from wallpapers/downtown.gif
rename to assets/downtown.gif
diff --git a/wallpapers/ekg_v2.png b/assets/ekg_v2.png
similarity index 100%
rename from wallpapers/ekg_v2.png
rename to assets/ekg_v2.png
diff --git a/home-manager/face.png b/assets/face.png
similarity index 100%
rename from home-manager/face.png
rename to assets/face.png
diff --git a/wallpapers/nixos_waves.png b/assets/nixos_waves.png
similarity index 100%
rename from wallpapers/nixos_waves.png
rename to assets/nixos_waves.png
diff --git a/common.nix b/common.nix
index fc40656..db69804 100644
--- a/common.nix
+++ b/common.nix
@@ -34,6 +34,8 @@ rec {
# (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
system.version = "24.11";
+ secret.weatherApiKey = lib: loadSecret lib ./home-manager/secrets/weather-api-key;
+
loadSecret =
lib: filePath: lib.strings.trim (lib.strings.removeSuffix "\n" (builtins.readFile filePath));
}
diff --git a/home-manager/default.nix b/home-manager/default.nix
index 820457f..ed462ca 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -31,13 +31,7 @@ in
./zen
];
- dconf = {
- enable = true;
- settings = {
- # Prefer dark mode for all GTK apps
- "org/gnome/desktop/interface".color-scheme = "prefer-dark";
- };
- };
+ dconf.enable = true;
home = {
username = username;
diff --git a/home-manager/gtk.nix b/home-manager/gtk.nix
index 9a179e6..ac7876a 100644
--- a/home-manager/gtk.nix
+++ b/home-manager/gtk.nix
@@ -7,5 +7,10 @@
icon.enable = true;
};
+ dconf.settings = {
+ # Prefer dark mode for all GTK apps
+ "org/gnome/desktop/interface".color-scheme = "prefer-dark";
+ };
+
gtk.enable = true;
}
diff --git a/home-manager/hyprland/hyprlock/default.nix b/home-manager/hyprland/hyprlock/default.nix
index 3a22ec8..dbe7778 100644
--- a/home-manager/hyprland/hyprlock/default.nix
+++ b/home-manager/hyprland/hyprlock/default.nix
@@ -1,8 +1,6 @@
-{ lib, theme, ... }:
+{ theme, ... }:
{
- # TODO use catppuccin package
-
programs.hyprlock = {
enable = true;
settings = {
@@ -10,7 +8,7 @@
background = [
{
- path = "${../../../wallpapers/catppuccin_page_curl.png}";
+ path = "${theme.wallpaper.lockscreen}";
}
];
@@ -55,7 +53,7 @@
# USER AVATAR
image = {
- path = "${../../face.png}";
+ path = builtins.toString theme.avatar.image;
size = 100;
border_color = "${theme.blueRgb}";
position = "0, 75";
@@ -70,16 +68,16 @@
dots_size = 0.2;
dots_spacing = 0.2;
dots_center = true;
- outer_color = lib.mkDefault "${theme.blueRgb}";
- inner_color = lib.mkDefault "${theme.surface0Rgb}";
- font_color = lib.mkDefault "${theme.textRgb}";
+ outer_color = "${theme.blueRgb}";
+ inner_color = "${theme.surface0Rgb}";
+ font_color = "${theme.textRgb}";
fade_on_empty = false;
placeholder_text = " Logged in as $USER";
hide_input = false;
- check_color = lib.mkDefault "${theme.blueRgb}";
- fail_color = lib.mkDefault "${theme.redRgb}";
+ check_color = "${theme.blueRgb}";
+ fail_color = "${theme.redRgb}";
fail_text = "$FAIL ($ATTEMPTS)";
- capslock_color = lib.mkDefault "${theme.yellowRgb}";
+ capslock_color = "${theme.yellowRgb}";
position = "0, -47"; # TODO change to use % at 25.05
halign = "center";
valign = "center";
diff --git a/home-manager/hyprland/hyprpanel/default.nix b/home-manager/hyprland/hyprpanel/default.nix
index 9719794..75fe6d0 100644
--- a/home-manager/hyprland/hyprpanel/default.nix
+++ b/home-manager/hyprland/hyprpanel/default.nix
@@ -79,13 +79,13 @@
weather = {
unit = "metric";
location = "Bergen, Norway";
- key = common.loadSecret lib ../../secrets/weather-api-key;
+ key = common.secret.weatherApiKey lib;
};
};
dashboard = {
directories.enabled = false;
- powermenu.avatar.image = "${../../face.png}";
+ powermenu.avatar.image = "${theme.avatar.image}";
shortcuts.left = {
shortcut1 = {
command = common.default.browser;
diff --git a/home-manager/hyprland/hyprpaper.nix b/home-manager/hyprland/hyprpaper.nix
index 0c4eee1..ee98dcb 100644
--- a/home-manager/hyprland/hyprpaper.nix
+++ b/home-manager/hyprland/hyprpaper.nix
@@ -1,18 +1,20 @@
# Wallpapers
-{ pkgs, common, ... }:
+{
+ pkgs,
+ common,
+ theme,
+ ...
+}:
{
- home.packages = with pkgs; [
- hyprpaper
- ];
+ home.packages = with pkgs; [ hyprpaper ];
services.hyprpaper = {
enable = true;
settings =
let
- wallpaperDir = ../../wallpapers;
- monitor1 = "${wallpaperDir}/nixos_waves.png";
- monitor2 = "${wallpaperDir}/ekg_v2.png";
+ monitor1 = builtins.toString theme.wallpaper.monitor1;
+ monitor2 = builtins.toString theme.wallpaper.monitor2;
in
{
ipc = "on";
diff --git a/home-manager/rofi/default.nix b/home-manager/rofi/default.nix
index e703144..3e64236 100644
--- a/home-manager/rofi/default.nix
+++ b/home-manager/rofi/default.nix
@@ -15,7 +15,6 @@
".config/rofimoji.rc".source = ./rofimoji.rc;
};
- # TODO use catppuccin package
# TODO Use programs.rofi. Theme is not applied correctly
# programs.rofi = {
# enable = true;
diff --git a/modules/sddm.nix b/modules/sddm.nix
index f481f12..0b2446d 100644
--- a/modules/sddm.nix
+++ b/modules/sddm.nix
@@ -8,7 +8,7 @@ in
flavor = flavor;
font = theme.nerdFont;
fontSize = "9";
- background = "${../wallpapers/catppuccin_high.png}";
+ background = builtins.toString ../assets/catppuccin_high.png;
loginBackground = true;
})
];
diff --git a/theme.nix b/theme.nix
index 2e80c6f..8114d9d 100644
--- a/theme.nix
+++ b/theme.nix
@@ -5,6 +5,15 @@ rec {
nerdFont = "JetBrainsMono";
+ wallpaper = {
+ lockscreen = ./assets/catppuccin_page_curl.png;
+ monitor1 = ./assets/nixos_waves.png;
+ monitor2 = ./assets/ekg_v2.png;
+ };
+
+ avatar.image = ./assets/face.png;
+
+ # Colours
rosewaterAlpha = "f5e0dc";
flamingoAlpha = "f2cdcd";
pinkAlpha = "f5c2e7";