diff --git a/flake.lock b/flake.lock index 9941e26..03915a8 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ }, "crane": { "locked": { - "lastModified": 1730652660, - "narHash": "sha256-+XVYfmVXAiYA0FZT7ijHf555dxCe+AoAT5A6RU+6vSo=", + "lastModified": 1731098351, + "narHash": "sha256-HQkYvKvaLQqNa10KEFGgWHfMAbWBfFp+4cAgkut+NNE=", "owner": "ipetkov", "repo": "crane", - "rev": "a4ca93905455c07cb7e3aca95d4faf7601cba458", + "rev": "ef80ead953c1b28316cc3f8613904edc2eb90c28", "type": "github" }, "original": { @@ -241,11 +241,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1731811021, - "narHash": "sha256-MNBAEaFceE8IkNTn0YbxN6MmJsiBob7g/A1ATBTZ5CE=", + "lastModified": 1734833431, + "narHash": "sha256-X142+eukhjxdkJkeyN8IUGxUVZ2pO9lX3N9pMYNqOJQ=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e39c7cf39e1d2c31f8cce19ab3ecbb1e02d3bb65", + "rev": "3c24690ab6fe48f82675b13cd6addb9a8dadfb92", "type": "github" }, "original": { @@ -454,6 +454,27 @@ "type": "github" } }, + "flake-parts_5": { + "inputs": { + "nixpkgs-lib": [ + "nurpkgs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -645,11 +666,11 @@ ] }, "locked": { - "lastModified": 1731832479, - "narHash": "sha256-icDDuYwJ0avTMZTxe1qyU/Baht5JOqw4pb5mWpR+hT0=", + "lastModified": 1734893333, + "narHash": "sha256-0Ft7iTkl3UWAix72teY5nflYQD7GE0KvIiT+ox4wkB8=", "owner": "nix-community", "repo": "home-manager", - "rev": "5056a1cf0ce7c2a08ab50713b6c4af77975f6111", + "rev": "1f74238a4c8e534a1b6be72cb5153043071ffd17", "type": "github" }, "original": { @@ -720,11 +741,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1730739295, - "narHash": "sha256-aYeJ/P/9AuK6Kee63ZdsmDjEwhnksF+gIv/OyGtlBJE=", + "lastModified": 1734820165, + "narHash": "sha256-qkPmnVYb6w2KdipyigI9ipNR7A8dsFStBRH5sZ+rmqA=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "cef39a78679c266300874e7a7000b4da066228d4", + "rev": "26a59c1b037e43f82b0fada2a218aeb128bc5d21", "type": "github" }, "original": { @@ -916,18 +937,18 @@ "type": "github" } }, - "nixpkgs-24_05": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1734083684, + "narHash": "sha256-5fNndbndxSx5d+C/D0p/VF32xDiJCJzyOqorOYW4JEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "314e12ba369ccdb9b352a4db26ff419f7c49fa84", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, @@ -941,11 +962,11 @@ "parts": "parts" }, "locked": { - "lastModified": 1731812528, - "narHash": "sha256-L+JXK8RKnfa+nXmElk6RnpEsrAzWcG2ogKc81ni5gVk=", + "lastModified": 1734836163, + "narHash": "sha256-+AVkoHCfTKLmRfKpZsePAiQLLfvrmDmIpC9TEDWoUmE=", "owner": "fortuneteller2k", "repo": "nixpkgs-f2k", - "rev": "8755fba5e3fb74dbba55af8ce97bd29b109d866c", + "rev": "b43745d87335789b75b4b16ec7d81e63391ac663", "type": "github" }, "original": { @@ -979,14 +1000,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs-lib_2": { @@ -1067,11 +1088,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "lastModified": 1730741070, + "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", "type": "github" }, "original": { @@ -1083,16 +1104,16 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1731652201, - "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=", + "lastModified": 1734737257, + "narHash": "sha256-GIMyMt1pkkoXdCq9un859bX6YQZ/iYtukb9R5luazLM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d", + "rev": "1c6e20d41d6a9c1d737945962160e8571df55daa", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -1131,11 +1152,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1730642263, - "narHash": "sha256-UXqvGZOHUDeAo8Sv5A5oObiQgBPELVgHQi130TU0jMU=", + "lastModified": 1731919951, + "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "650fe87347086b30a6dbcc32b55987ce5a23c6ae", + "rev": "04386ac325a813047fc314d4b4d838a5b1e3c7fe", "type": "github" }, "original": { @@ -1147,11 +1168,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", "type": "github" }, "original": { @@ -1163,11 +1184,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -1194,6 +1215,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1734649271, + "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1731763621, "narHash": "sha256-ddcX4lQL0X05AYkrkV2LMFgGdRvgap7Ho8kgon3iWZk=", @@ -1258,12 +1295,17 @@ } }, "nurpkgs": { + "inputs": { + "flake-parts": "flake-parts_5", + "nixpkgs": "nixpkgs_7", + "treefmt-nix": "treefmt-nix_2" + }, "locked": { - "lastModified": 1731872711, - "narHash": "sha256-2vj0E55Ckfo8eiPqImADvBEHwtIoOx8ufiRnXElQf0w=", + "lastModified": 1734891997, + "narHash": "sha256-MXE+6AV6HJfUTwKAaNPR5+WsejO02Q5JNNhz0yMUyVw=", "owner": "nix-community", "repo": "NUR", - "rev": "25e6cfc7d6260864f5f5dfe2617b39a6afb6ea5e", + "rev": "b8deab92e4f1bc950ef7b2273b8b5c3a764c2e77", "type": "github" }, "original": { @@ -1301,11 +1343,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -1391,11 +1433,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1730302582, - "narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", + "lastModified": 1731363552, + "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", + "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "type": "github" }, "original": { @@ -1473,11 +1515,11 @@ ] }, "locked": { - "lastModified": 1730601085, - "narHash": "sha256-Sgax33jGuvVHTjl1P78IwzlhAGyOxtx5Q26inKja8S4=", + "lastModified": 1731897198, + "narHash": "sha256-Ou7vLETSKwmE/HRQz4cImXXJBr/k9gp4J4z/PF8LzTE=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8d1b40f8dfd7539aaa3de56e207e22b3cc451825", + "rev": "0be641045af6d8666c11c2c40e45ffc9667839b5", "type": "github" }, "original": { @@ -1497,11 +1539,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1731816193, - "narHash": "sha256-Y/u1O6GpvOYRbGOnwGo0Gofg5jjfaHNGP9G7yGFFfzg=", + "lastModified": 1734863027, + "narHash": "sha256-L2Yqu7PVbzlxp37kmTGTA3gOceu7VLRuebm1DHiKPg4=", "owner": "rycee", "repo": "nur-expressions", - "rev": "02c98c9ba4491db49ab759161fcc0ba9830d7aa0", + "rev": "5a5aea6627a4c360ba030ddadeda63d1ad294125", "type": "gitlab" }, "original": { @@ -1518,14 +1560,14 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": "nixpkgs-24_05" + "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1722877200, - "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", + "lastModified": 1734884447, + "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", + "rev": "63209b1def2c9fc891ad271f474a3464a5833294", "type": "gitlab" }, "original": { @@ -1537,14 +1579,14 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1731862312, - "narHash": "sha256-NVUTFxKrJp/hjehlF1IvkPnlRYg/O9HFVutbxOM8zNM=", + "lastModified": 1734546875, + "narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "472741cf3fee089241ac9ea705bb2b9e0bfa2978", + "rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d", "type": "github" }, "original": { @@ -1635,6 +1677,27 @@ "type": "github" } }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nurpkgs", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "inputs": { "systems": "systems" diff --git a/home/framework/programs/alacritty/default.nix b/home/framework/programs/alacritty/default.nix index 2f37518..c079a8f 100644 --- a/home/framework/programs/alacritty/default.nix +++ b/home/framework/programs/alacritty/default.nix @@ -29,39 +29,6 @@ background = "0x000000"; foreground = "0xeaeaea"; }; - - # normal = { - # black = "0x000000"; - # red = "0xd54e53"; - # green = "0xb9ca4a"; - # yellow = "0xe6c547"; - # blue = "0x7aa6da"; - # magenta = "0xc397d8"; - # cyan = "0x70c0ba"; - # white = "0xffffff"; - # }; - # - # bright = { - # black = "0x666666"; - # red = "0xff3334"; - # green = "0x9ec400"; - # yellow = "0xe7c547"; - # blue = "0x7aa6da"; - # magenta = "0xb77ee0"; - # cyan = "0x54ced6"; - # white = "0xffffff"; - # }; - # - # dim = { - # black = "0x333333"; - # red = "0xf2777a"; - # green = "0x99cc99"; - # yellow = "0xffcc66"; - # blue = "0x6699cc"; - # magenta = "0xcc99cc"; - # cyan = "0x66cccc"; - # white = "0xdddddd"; - # }; }; }; }; diff --git a/home/framework/programs/hyprland/default.nix b/home/framework/programs/hyprland/default.nix index 757aca5..1e996f8 100644 --- a/home/framework/programs/hyprland/default.nix +++ b/home/framework/programs/hyprland/default.nix @@ -1,4 +1,81 @@ {pkgs, ...}: { + services.hypridle = { + enable = true; + + settings = { + general = { + lock_cmd = "pidof hyprlock || hyprlock"; + }; + + listener = [ + { + timeout = 300; + on-timeout = "loginctl lock-session"; + } + { + timeout = 330; + on-timeout = "hyprctl dispatch dpms off"; + on-resume = "hyprctl dispatch dpms on"; + } + ]; + }; + }; + + programs.hyprlock = { + enable = true; + settings = { + background = { + monitor = ""; + path = "screenshot"; + + blur_passes = 1; + blur_size = 7; + noise = 1.17e-2; + }; + + label = [ + { + monitor = ""; + text = "$TIME"; + color = "rgba(242, 243, 244, 0.75)"; + font_size = 95; + position = "0, 300"; + halign = "center"; + valign = "center"; + } + { + monitor = ""; + text = ''cmd[update:1000] echo $(date +"%A, %B %d")''; + color = "rgba(242, 243, 244, 0.75)"; + font_size = 22; + position = "0, 200"; + halign = "center"; + valign = "center"; + } + ]; + + input-field = { + monitor = ""; + size = "200,50"; + outline_thickness = 2; + dots_size = 0.2; # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.35; # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = true; + outer_color = "rgba(0, 0, 0, 0)"; + inner_color = "rgba(0, 0, 0, 0.2)"; + font_color = "rgb(111, 45, 104)"; + fade_on_empty = false; + rounding = -1; + check_color = "rgb(30, 107, 204)"; + placeholder_text = ''Input Password...''; + hide_input = false; + position = "0, -100"; + halign = "center"; + valign = "center"; + }; + }; + }; + wayland.windowManager.hyprland = let locker = "${pkgs.swaylock}/bin/swaylock"; set-dpms = "${pkgs.hyprland}/bin/hyprctl dispatcher dpms"; @@ -28,8 +105,8 @@ exec-once = [ "${pkgs.waybar}/bin/waybar" "${pkgs.mako}/bin/mako" - idle-script - locked-dpms + # idle-script + # locked-dpms ]; input = { @@ -83,7 +160,7 @@ "$mod, return, exec, ${pkgs.alacritty}/bin/alacritty" "$mod, D, exec, ${pkgs.rofi-wayland}/bin/rofi -show drun" "$mod SHIFT, Q, killactive, " - "$mod, L, exec, ${locker}" + "$mod, L, exec, loginctl lock-session" "$mod, V, togglefloating, " "$mod, F, fullscreen, 1" "$mod, P, pseudo, # dwindle" diff --git a/nixos/framework/configuration.nix b/nixos/framework/configuration.nix index 3f42ed1..a80fed4 100644 --- a/nixos/framework/configuration.nix +++ b/nixos/framework/configuration.nix @@ -40,10 +40,11 @@ hardware.bluetooth.enable = true; security.pam.services.swaylock = {}; + security.pam.services.hyprlock = {}; fonts.packages = with pkgs; [ font-awesome - (nerdfonts.override {fonts = ["FiraMono"];}) + nerd-fonts.fira-mono mypkgs.comic-mono ];