diff --git a/flake.nix b/flake.nix
index f055529..b4b983e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -57,10 +57,10 @@
in
nixpkgs.lib.nixosSystem {
specialArgs = {
+ DE = "hyprland";
username = "eriim";
hostName = "arkhitekton";
hyprlandConfig = "desktop";
- DE = "hyprland";
inherit system;
} // attrs;
modules = [
@@ -69,7 +69,25 @@
./modules/steam
./modules/virt
];
- }; # principium
+ }; # arkhitekton
+
+ terminus =
+ let
+ system = "x86_64-linux";
+ in
+ nixpkgs.lib.nixosSystem {
+ specialArgs = {
+ username = "eriim";
+ hostName = "terminus";
+ hyprlandConfig = "laptop";
+ DE = "hyprland";
+ inherit system;
+ } // attrs;
+ modules = [
+ ./.
+ ./modules/virt/podman.nix
+ ];
+ }; # terminus
live-image =
let
@@ -98,7 +116,7 @@
inherit system;
} // attrs;
modules = [ ./wsl.nix ];
- }; # winix-wsl
+ }; # winix
vm-temp =
let
@@ -114,23 +132,6 @@
modules = [ ./minimal.nix ];
}; # virtualis
- terminus =
- let
- system = "x86_64-linux";
- in
- nixpkgs.lib.nixosSystem {
- specialArgs = {
- username = "eriim";
- hostName = "terminus";
- hyprlandConfig = "laptop";
- DE = "hyprland";
- inherit system;
- } // attrs;
- modules = [
- ./.
- ./modules/virt/podman.nix
- ];
- }; # terminus
}; # configurations
devShells = forAllSystems (
diff --git a/hosts/arkhitekton/hardware-configuration.nix b/hosts/arkhitekton/hardware-configuration.nix
index f0b289c..0e0b92c 100644
--- a/hosts/arkhitekton/hardware-configuration.nix
+++ b/hosts/arkhitekton/hardware-configuration.nix
@@ -4,7 +4,6 @@
{
config,
lib,
- pkgs,
modulesPath,
...
}:
diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
index 714c574..44f0754 100644
--- a/modules/hyprland/default.nix
+++ b/modules/hyprland/default.nix
@@ -19,11 +19,13 @@
];
home-manager.users.${username} = _: {
- gtk.enable = true;
- gtk.cursorTheme.name = "Adwaita";
- gtk.cursorTheme.package = pkgs.adwaita-icon-theme;
- gtk.theme.name = "adw-gtk3-dark";
- gtk.theme.package = pkgs.adw-gtk3;
+ gtk = {
+ enable = true;
+ cursorTheme.name = "Adwaita";
+ cursorTheme.package = pkgs.adwaita-icon-theme;
+ theme.name = "adw-gtk3-dark";
+ theme.package = pkgs.adw-gtk3;
+ };
};
environment = {
@@ -46,7 +48,7 @@
programs.hyprland.enable = true;
programs.dconf.enable = true;
-
+
services.gnome = {
gnome-keyring.enable = true;
};
diff --git a/modules/hyprland/hyprlock/default.nix b/modules/hyprland/hyprlock/default.nix
index 47ed1f4..8d9d685 100644
--- a/modules/hyprland/hyprlock/default.nix
+++ b/modules/hyprland/hyprlock/default.nix
@@ -4,79 +4,79 @@
home-manager.users.${username} = _: {
home.file = {
".config/hypr/hyprlock.conf".text = ''
- background {
- monitor =
- path = /home/${username}/.config/backgrounds/nyc-macro.png # supports png, jpg, webp (no animations, though)
- color = rgba(25, 20, 20, 1.0)
+ background {
+ monitor =
+ path = /home/${username}/.config/backgrounds/nyc-macro.png # supports png, jpg, webp (no animations, though)
+ color = rgba(25, 20, 20, 1.0)
- # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
- blur_passes = 0 # 0 disables blurring
- blur_size = 7
- noise = 0.0117
- contrast = 0.8916
- brightness = 0.8172
- vibrancy = 0.1696
- vibrancy_darkness = 0.0
- }
+ # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
+ blur_passes = 0 # 0 disables blurring
+ blur_size = 7
+ noise = 0.0117
+ contrast = 0.8916
+ brightness = 0.8172
+ vibrancy = 0.1696
+ vibrancy_darkness = 0.0
+ }
- shape {
- monitor =
- size = 360, 60
- color = rgba(17, 17, 17, 1.0)
- rounding = -1
- border_size = 8
- border_color = rgba(0, 207, 230, 1.0)
- rotate = 0
- xray = false # if true, make a "hole" in the background (rectangle of specified size, no rotation)
+ shape {
+ monitor =
+ size = 360, 60
+ color = rgba(17, 17, 17, 1.0)
+ rounding = -1
+ border_size = 8
+ border_color = rgba(0, 207, 230, 1.0)
+ rotate = 0
+ xray = false # if true, make a "hole" in the background (rectangle of specified size, no rotation)
- position = 0, 80
- halign = center
- valign = center
- }
+ position = 0, 80
+ halign = center
+ valign = center
+ }
- input-field {
- monitor =
- size = 200, 50
- outline_thickness = 3
- dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
- dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
- dots_center = false
- dots_rounding = -1 # -1 default circle, -2 follow input-field rounding
- outer_color = rgb(151515)
- inner_color = rgb(200, 200, 200)
- font_color = rgb(10, 10, 10)
- fade_on_empty = true
- fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
- placeholder_text = Input Password... # Text rendered in the input box when it's empty.
- hide_input = false
- rounding = -1 # -1 means complete rounding (circle/oval)
- check_color = rgb(204, 136, 34)
- fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color
- fail_text = $FAIL ($ATTEMPTS) # can be set to empty
- fail_transition = 300 # transition time in ms between normal outer_color and fail_color
- capslock_color = -1
- numlock_color = -1
- bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above)
- invert_numlock = false # change color if numlock is off
- swap_font_color = false # see below
+ input-field {
+ monitor =
+ size = 200, 50
+ outline_thickness = 3
+ dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
+ dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
+ dots_center = false
+ dots_rounding = -1 # -1 default circle, -2 follow input-field rounding
+ outer_color = rgb(151515)
+ inner_color = rgb(200, 200, 200)
+ font_color = rgb(10, 10, 10)
+ fade_on_empty = true
+ fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
+ placeholder_text = Input Password... # Text rendered in the input box when it's empty.
+ hide_input = false
+ rounding = -1 # -1 means complete rounding (circle/oval)
+ check_color = rgb(204, 136, 34)
+ fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color
+ fail_text = $FAIL ($ATTEMPTS) # can be set to empty
+ fail_transition = 300 # transition time in ms between normal outer_color and fail_color
+ capslock_color = -1
+ numlock_color = -1
+ bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above)
+ invert_numlock = false # change color if numlock is off
+ swap_font_color = false # see below
- position = 0, -20
- halign = center
- valign = center
- }
+ position = 0, -20
+ halign = center
+ valign = center
+ }
- label {
- monitor =
- text = Hi there, $USER
- text_align = center # center/right or any value for default left. multi-line text alignment inside label container
- color = rgba(0, 128, 0, 1)
- font_size = 20
- font_family = Monaspace Neon
- rotate = 0 # degrees, counter-clockwise
- position = 0, 80
- halign = center
- valign = center
- }
+ label {
+ monitor =
+ text = Hi there, $USER
+ text_align = center # center/right or any value for default left. multi-line text alignment inside label container
+ color = rgba(0, 128, 0, 1)
+ font_size = 20
+ font_family = Monaspace Neon
+ rotate = 0 # degrees, counter-clockwise
+ position = 0, 80
+ halign = center
+ valign = center
+ }
'';