diff --git a/home-manager/default.nix b/home-manager/default.nix
index e1d612f..eaa64fb 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -29,6 +29,8 @@ in
./yazi
];
+ catppuccin.cursors.enable = true;
+
home = {
username = username;
homeDirectory = dir.home;
diff --git a/home-manager/development/default.nix b/home-manager/development/default.nix
index 31a7d18..345a82b 100644
--- a/home-manager/development/default.nix
+++ b/home-manager/development/default.nix
@@ -4,4 +4,6 @@
./nixvim
./zed.nix
];
+ # TODO set Walyland vmOptions in Jetbrains products, Requires current installed version
+ # -Dawt.toolkit.name=WLToolKit
}
diff --git a/home-manager/development/nixvim/default.nix b/home-manager/development/nixvim/default.nix
index 260c54f..518ec13 100644
--- a/home-manager/development/nixvim/default.nix
+++ b/home-manager/development/nixvim/default.nix
@@ -2,6 +2,8 @@
{
catppuccin.nvim.enable = true;
+ home.sessionVariables.EDITOR = "nvim";
+
programs.nixvim = {
enable = true;
clipboard.providers.wl-copy.enable = true;
diff --git a/home-manager/development/zed.nix b/home-manager/development/zed.nix
index 0257b3a..edc74bd 100644
--- a/home-manager/development/zed.nix
+++ b/home-manager/development/zed.nix
@@ -1,6 +1,9 @@
+{ pkgs, ... }:
+
{
programs.zed-editor = {
enable = true;
+ package = pkgs.unstable.zed-editor;
extensions = [
"html"
"catppuccin"
diff --git a/home-manager/freetube.nix b/home-manager/freetube.nix
index cc63fae..4d231c6 100644
--- a/home-manager/freetube.nix
+++ b/home-manager/freetube.nix
@@ -9,6 +9,7 @@
currentLocale = "en-GB";
defaultTheatreMode = true;
defaultQuality = "1080";
+ displayVideoPlayButton = false;
region = "NO";
useSponsorBlock = true;
diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix
index 2961395..db6e2a3 100644
--- a/home-manager/hyprland/default.nix
+++ b/home-manager/hyprland/default.nix
@@ -1,4 +1,6 @@
# Home configurations for Hyprland. For system configs, see ./modules/hyprland
+{ outputs, ... }:
+
{
imports = [
./binds.nix
@@ -13,6 +15,9 @@
./swaync
];
+ # Adds pkgs.unstable in order to fetch packages from unstable repositories
+ nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
+
wayland.windowManager.hyprland = {
enable = true;
systemd.variables = [ "--all" ]; # Import environment into systemd
diff --git a/home-manager/hyprland/hypridle/default.nix b/home-manager/hyprland/hypridle/default.nix
index 111fea1..4cad515 100644
--- a/home-manager/hyprland/hypridle/default.nix
+++ b/home-manager/hyprland/hypridle/default.nix
@@ -1,7 +1,7 @@
let
# Time in seconds
lockAfter = 1200;
- screenOffAfter = 1500;
+ #screenOffAfter = 1500;
suspendAfter = 7200;
in
{
@@ -20,12 +20,12 @@ in
timeout = lockAfter;
on-timeout = "loginctl lock-session";
}
- # Turn off screens
- {
- timeout = screenOffAfter;
- on-timeout = "hyprctl dispatch dpms off";
- on-resume = "hyprctl dispatch dpms on";
- }
+ # Turn off screens TODO still buggy on DP-1
+ # {
+ # timeout = screenOffAfter;
+ # on-timeout = "hyprctl dispatch dpms off";
+ # on-resume = "hyprctl dispatch dpms on";
+ # }
# Suspend
{
timeout = suspendAfter;
diff --git a/home-manager/hyprland/hyprlock/default.nix b/home-manager/hyprland/hyprlock/default.nix
index 3d083bb..2ff5a52 100644
--- a/home-manager/hyprland/hyprlock/default.nix
+++ b/home-manager/hyprland/hyprlock/default.nix
@@ -10,7 +10,7 @@ in
background = [
{
- path = "${../../../wallpapers/tropic_island_night.jpg}";
+ path = "${../../../wallpapers/catppuccin_page_curl.png}";
}
];
@@ -57,7 +57,7 @@ in
image = {
path = "${../../face.png}";
size = 100;
- border_color = "${theme.mauveRgb}";
+ border_color = "${theme.blueRgb}";
position = "0, 75";
halign = "center";
valign = "center";
@@ -70,13 +70,13 @@ in
dots_size = 0.2;
dots_spacing = 0.2;
dots_center = true;
- outer_color = lib.mkDefault "${theme.mauveRgb}";
+ outer_color = lib.mkDefault "${theme.blueRgb}";
inner_color = lib.mkDefault "${theme.surface0Rgb}";
font_color = lib.mkDefault "${theme.textRgb}";
fade_on_empty = false;
- placeholder_text = " Logged in as $USER";
+ placeholder_text = " Logged in as $USER";
hide_input = false;
- check_color = lib.mkDefault "${theme.mauveRgb}";
+ check_color = lib.mkDefault "${theme.blueRgb}";
fail_color = lib.mkDefault "${theme.redRgb}";
fail_text = "$FAIL ($ATTEMPTS)";
capslock_color = lib.mkDefault "${theme.yellowRgb}";
diff --git a/home-manager/hyprland/hyprpaper.nix b/home-manager/hyprland/hyprpaper.nix
index 0abd59e..68f7ac5 100644
--- a/home-manager/hyprland/hyprpaper.nix
+++ b/home-manager/hyprland/hyprpaper.nix
@@ -27,7 +27,6 @@
wallpaper = [
"DP-1,${monitor1}"
"DP-3,${monitor2}"
- w
];
};
};
diff --git a/modules/development.nix b/modules/development.nix
index 404273f..6f2552e 100644
--- a/modules/development.nix
+++ b/modules/development.nix
@@ -5,8 +5,11 @@
# IDEs
jetbrains.rust-rover
jetbrains.webstorm
+ jetbrains.rider
vscodium # TODO set up extensions
# Tools
+ dotnet-sdk_9
+ dotnet-aspnetcore_9
git
rustup
nodejs
diff --git a/modules/security.nix b/modules/security.nix
index 897fc8d..f050539 100644
--- a/modules/security.nix
+++ b/modules/security.nix
@@ -8,16 +8,18 @@
programs.gnupg.agent.enable = true;
- security.pam = {
- services = {
- login.u2fAuth = false; # U2F and password
- sudo.u2fAuth = true; # U2F or password
- };
- u2f = {
- enable = true;
- settings = {
- cue = true; # Prompt: Please touch the device
- interactive = false; # Prompt: Insert your U2F device, then press ENTER.
+ security = {
+ pam = {
+ services = {
+ login.u2fAuth = false; # U2F and password
+ sudo.u2fAuth = true; # U2F or password
+ };
+ u2f = {
+ enable = true;
+ settings = {
+ cue = true; # Prompt: Please touch the device
+ interactive = false; # Prompt: Insert your U2F device, then press ENTER.
+ };
};
};
};
diff --git a/theme.nix b/theme.nix
index 0c5da53..2e80c6f 100644
--- a/theme.nix
+++ b/theme.nix
@@ -22,6 +22,7 @@ rec {
skyAlpha = "89dceb";
sapphireAlpha = "74c7ec";
blueAlpha = "89b4fa";
+ blueRgb = "rgb(${blueAlpha})";
lavenderAlpha = "b4befe";
textAlpha = "cdd6f4";
textRgb = "rgb(${textAlpha})";
diff --git a/wallpapers/catppuccin_page_curl.png b/wallpapers/catppuccin_page_curl.png
new file mode 100644
index 0000000..6418016
Binary files /dev/null and b/wallpapers/catppuccin_page_curl.png differ
diff --git a/wallpapers/tropic_island_night.jpg b/wallpapers/tropic_island_night.jpg
deleted file mode 100644
index c236b9a..0000000
Binary files a/wallpapers/tropic_island_night.jpg and /dev/null differ