diff --git a/flake.lock b/flake.lock index 469b56d..def3299 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1764714051, - "narHash": "sha256-AjcMlM3UoavFoLzr0YrcvsIxALShjyvwe+o7ikibpCM=", + "lastModified": 1762356719, + "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "a43bedcceced5c21ad36578ed823e6099af78214", + "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", "type": "github" }, "original": { @@ -104,11 +104,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1765467219, - "narHash": "sha256-DkcMg7kgNnn+FL9fxhsTaSa/Q0RkFanvTvcH65DIwa4=", + "lastModified": 1764881424, + "narHash": "sha256-i+CthE7tyFicVSDxa7LI/7RkWoD3W2/uNGrKGDpbEtw=", "owner": "StevenBlack", "repo": "hosts", - "rev": "88c487e3709e4c45f94264562c770a0ca5e65508", + "rev": "821e6fbca7e2d70a8f04987a2436752f006c7c14", "type": "github" }, "original": { @@ -126,11 +126,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765204341, - "narHash": "sha256-7xd45skcuLCu2DHxVvU+W/z+7CUOjyv+QPtT4PLZaIU=", + "lastModified": 1764851612, + "narHash": "sha256-fz35kxfZAmnzbWZu0BEseRRMUwS7y4qBEVFlPkpLuHA=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "aacb796ccd42be1555196c20013b9b674b71df75", + "rev": "8620477f6ea262f2e8d02ac19abf0c7abbbf7bf6", "type": "github" }, "original": { @@ -147,11 +147,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1765441709, - "narHash": "sha256-2LRXe8A779U0m1NTHAaCzNy7WngXFAQw4Gc5vBl33F8=", + "lastModified": 1764926139, + "narHash": "sha256-Indg7ZRhsjALhSt+IQZlA7h5KbW9GQtgB/2Q1MkSMZw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "27ced263ed6b7a6968f9f449d66aa299cb0f14a7", + "rev": "f9f62d4c6bfa3419f340d816293733ebe1360415", "type": "github" }, "original": { @@ -179,11 +179,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -292,11 +292,11 @@ ] }, "locked": { - "lastModified": 1764998300, - "narHash": "sha256-fZatn/KLfHLDXnF0wy7JxXqGaZmGDTVufT4o/AOlj44=", + "lastModified": 1764788330, + "narHash": "sha256-hE/gXK+Z0j654T0tsW+KcndRqsgZXe8HyWchjBJgQpw=", "owner": "nix-community", "repo": "home-manager", - "rev": "27a6182347ccae90a88231ae0dc5dfa7d15815bb", + "rev": "fca4cba863e76c26cfe48e5903c2ff4bac2b2d5d", "type": "github" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1765480374, - "narHash": "sha256-HlbvQAqLx7WqZFFQZ8nu5UUJAVlXiV/kqKbyueA8srw=", + "lastModified": 1764912896, + "narHash": "sha256-ftxQocr098v5ngqB3SXa9tW6aqovBSBOEdIRcLEj44c=", "owner": "nix-community", "repo": "home-manager", - "rev": "39cb677ed9e908e90478aa9fe5f3383dfc1a63f3", + "rev": "6bcb2395ab9ed05616052262da526cd7c5b4b123", "type": "github" }, "original": { @@ -371,11 +371,11 @@ ] }, "locked": { - "lastModified": 1763733840, - "narHash": "sha256-JnET78yl5RvpGuDQy3rCycOCkiKoLr5DN1fPhRNNMco=", + "lastModified": 1762462052, + "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "8f1bec691b2d198c60cccabca7a94add2df4ed1a", + "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", "type": "github" }, "original": { @@ -431,16 +431,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1764802770, - "narHash": "sha256-Rncrk4730flMTSczFG/MQFRgYcTaSdsJr3DGDlKEG48=", + "lastModified": 1762731096, + "narHash": "sha256-Kma5MxOipSBamO6DnwBeqJNjJ+VwEO73zh9h1hs/2Aw=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "386376400119dd46a767c9f8c8791fd22c7b6e61", + "rev": "967c3c7404d4fa00234e29c70df3e263386d2597", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.52.2", + "ref": "v0.52.1", "repo": "Hyprland", "type": "github" } @@ -464,7 +464,6 @@ "hyprland", "hyprutils" ], - "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "hyprland", "nixpkgs" @@ -475,11 +474,11 @@ ] }, "locked": { - "lastModified": 1764801417, - "narHash": "sha256-9RBShG2FNfBWz4Y+O/w86Iwmgu+JrNkhjsY4fsGpRtw=", + "lastModified": 1762465111, + "narHash": "sha256-dS13YZdWjgGGLBjpT4FHB6xf8I/WiAU+mgNWXsZgDUs=", "owner": "hyprwm", "repo": "hyprland-guiutils", - "rev": "fff53f22dc3a5926221a00028a85acb18fb65799", + "rev": "a415eba866a953f3096d661318f771aa0082eb98", "type": "github" }, "original": { @@ -529,11 +528,11 @@ ] }, "locked": { - "lastModified": 1764612430, - "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=", + "lastModified": 1758927902, + "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "0d00dc118981531aa731150b6ea551ef037acddd", + "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", "type": "github" }, "original": { @@ -619,11 +618,7 @@ "hyprland-guiutils", "hyprutils" ], - "hyprwayland-scanner": [ - "hyprland", - "hyprland-guiutils", - "hyprwayland-scanner" - ], + "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": [ "hyprland", "hyprland-guiutils", @@ -636,11 +631,11 @@ ] }, "locked": { - "lastModified": 1764592794, - "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=", + "lastModified": 1762463729, + "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", "owner": "hyprwm", "repo": "hyprtoolkit", - "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e", + "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", "type": "github" }, "original": { @@ -661,11 +656,11 @@ ] }, "locked": { - "lastModified": 1764637132, - "narHash": "sha256-vSyiKCzSY48kA3v39GFu6qgRfigjKCU/9k1KTK475gg=", + "lastModified": 1762387740, + "narHash": "sha256-gQ9zJ+pUI4o+Gh4Z6jhJll7jjCSwi8ZqJIhCE2oqwhQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "2f2413801beee37303913fc3c964bbe92252a963", + "rev": "926689ddb9c0a8787e58c02c765a62e32d63d1f7", "type": "github" }, "original": { @@ -704,20 +699,22 @@ "nixpkgs": [ "hyprland", "hyprland-guiutils", + "hyprtoolkit", "nixpkgs" ], "systems": [ "hyprland", "hyprland-guiutils", + "hyprtoolkit", "systems" ] }, "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -738,11 +735,11 @@ ] }, "locked": { - "lastModified": 1763640274, - "narHash": "sha256-Uan1Nl9i4TF/kyFoHnTq1bd/rsWh4GAK/9/jDqLbY5A=", + "lastModified": 1755184602, + "narHash": "sha256-RCBQN8xuADB0LEgaKbfRqwm6CdyopE1xIEhNc67FAbw=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "f6cf414ca0e16a4d30198fd670ec86df3c89f671", + "rev": "b3b0f1f40ae09d4447c20608e5a4faf8bf3c492d", "type": "github" }, "original": { @@ -785,11 +782,11 @@ ] }, "locked": { - "lastModified": 1764922999, - "narHash": "sha256-LSvUxKm6S6ZAd/otQSkAHd3+8KJhi8OwGJGSe0K//B8=", + "lastModified": 1764746434, + "narHash": "sha256-6ymFuw+Z1C90ezf8H0BP3c2JFZhJYwMq31px2StwWHU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9b9ead1b5591b68f4048e7205ba1397bc85ce6c4", + "rev": "b4c0b604148adacf119b89824ed26df8926ce42c", "type": "github" }, "original": { @@ -823,11 +820,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764950072, - "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f61125a668a320878494449750330ca58b78c557", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -839,11 +836,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1765363881, - "narHash": "sha256-3C3xWn8/2Zzr7sxVBmpc1H1QfxjNfta5IMFe3O9ZEPw=", + "lastModified": 1764560356, + "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d2b1213bf5ec5e62d96b003ab4b5cbc42abfc0d0", + "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", "type": "github" }, "original": { @@ -855,11 +852,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1765311797, - "narHash": "sha256-mSD5Ob7a+T2RNjvPvOA1dkJHGVrNVl8ZOrAwBjKBDQo=", + "lastModified": 1764831616, + "narHash": "sha256-OtzF5wBvO0jgW1WW1rQU9cMGx7zuvkF7CAVJ1ypzkxA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "09eb77e94fa25202af8f3e81ddc7353d9970ac1b", + "rev": "c97c47f2bac4fa59e2cbdeba289686ae615f8ed4", "type": "github" }, "original": { @@ -870,11 +867,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1765186076, - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", + "lastModified": 1764667669, + "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", + "rev": "418468ac9527e799809c900eda37cbff999199b6", "type": "github" }, "original": { @@ -973,11 +970,11 @@ ] }, "locked": { - "lastModified": 1763988335, - "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", + "lastModified": 1762441963, + "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", + "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", "type": "github" }, "original": { @@ -1010,11 +1007,11 @@ ] }, "locked": { - "lastModified": 1765075567, - "narHash": "sha256-KFDCdQcHJ0hE3Nt5Gm5enRIhmtEifAjpxgUQ3mzSJpA=", + "lastModified": 1764729618, + "narHash": "sha256-z4RA80HCWv2los1KD346c+PwNPzMl79qgl7bCVgz8X0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "769156779b41e8787a46ca3d7d76443aaf68be6f", + "rev": "52764074a85145d5001bf0aa30cb71936e9ad5b8", "type": "github" }, "original": { @@ -1028,11 +1025,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1765507345, - "narHash": "sha256-fq34mBLvAgv93EuZjGp7cVV633pxnph9AVuB/Ql5y5Q=", + "lastModified": 1764902447, + "narHash": "sha256-wNqkDBj+tjK619sTHPEA7uhjr7DHHEY8OsFou31dxy0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a9471b23bf656d69ceb2d5ddccdc5082d51fc0e3", + "rev": "d914a744a83098eeb28125d2848ad383b209223f", "type": "github" }, "original": { @@ -1080,11 +1077,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1765474444, - "narHash": "sha256-sDG+c73xEnIw1pFNRWffKDnTWiTuyZiEP+Iub0D3mWA=", + "lastModified": 1764860352, + "narHash": "sha256-bWrh2T6EPiiZC7jY0jK5cWRwkG0hltnPT1etfHIHiXM=", "owner": "nix-community", "repo": "stylix", - "rev": "dd14de4432a94e93e10d0159f1d411487e435e1e", + "rev": "61a01b75f0a7e58dac486ddf022c628a71528399", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 347bb4e..9ff3dd5 100644 --- a/flake.nix +++ b/flake.nix @@ -101,7 +101,7 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; hyprland = { - url = "github:hyprwm/Hyprland/v0.52.2?submodules=true"; + url = "github:hyprwm/Hyprland/v0.52.1?submodules=true"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/user/emacs/init.el b/modules/user/emacs/init.el index 9c01e2d..94d55c1 100644 --- a/modules/user/emacs/init.el +++ b/modules/user/emacs/init.el @@ -79,7 +79,6 @@ ;; Fira and glyphs (set-frame-font "FiraCode Nerd Font") - (add-to-list 'default-frame-alist '(font . "FiraCode Nerd Font")) (let ((alist '((33 . ".\\(?:\\(?:==\\|!!\\)\\|[!=]\\)") (35 . ".\\(?:###\\|##\\|_(\\|[#(?[_{]\\)") (36 . ".\\(?:>\\)") @@ -1096,5 +1095,7 @@ Made for `org-tab-first-hook' in evil-mode." (use-package rainbow-mode) +(set-frame-font "FiraCode Nerd Font") + (provide 'init) ;;; init.el ends here diff --git a/modules/user/hyprland/default.nix b/modules/user/hyprland/default.nix index d1bef76..26afcdf 100644 --- a/modules/user/hyprland/default.nix +++ b/modules/user/hyprland/default.nix @@ -27,12 +27,12 @@ in config = lib.mkIf cfg.enable { userSettings.alacritty.enable = true; - programs.alacritty.settings.window.opacity = lib.mkOverride 40 (if performance then 1.0 else 0.80); + programs.alacritty.settings.window.opacity = lib.mkOverride 40 (if performance then 1.0 else 0.85); userSettings.kitty.enable = true; programs.kitty.settings.background_opacity = lib.mkOverride 40 ( - if performance then "1.0" else "0.80" + if performance then "1.0" else "0.85" ); - userSettings.emacs.opacity = lib.mkOverride 40 (if performance then 100 else 80); + userSettings.emacs.opacity = lib.mkOverride 40 (if performance then 100 else 85); userSettings.dmenuScripts = { enable = true; dmenuCmd = "fuzzel -d"; @@ -120,6 +120,7 @@ in "alacritty --class scratch_numbat -e numbat" "alacritty --class scratch_btm -e btm" "element-desktop" + "zulip" "sleep 5 && hyprctl keyword bind SUPER,S,exec,${spawnBrowser}" ]; @@ -297,6 +298,7 @@ in ''SUPER,B,exec,if hyprctl clients | grep scratch_btm; then echo "scratch_yazi respawn not needed"; else alacritty --class scratch_btm -e btm; fi'' "SUPER,B,togglespecialworkspace,scratch_btm" ''SUPER,D,exec,if hyprctl clients | grep Element; then echo "scratch_chat respawn not needed"; else element-desktop; fi'' + ''SUPER,D,exec,if hyprctl clients | grep Zulip; then echo "scratch_chat respawn not needed"; else zulip; fi'' "SUPER,D,togglespecialworkspace,scratch_chat" ''SUPER,equal, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | grep float | awk '{print $2 + 0.5}')"'' ''SUPER,minus, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | grep float | awk '{print $2 - 0.5}')"'' @@ -359,6 +361,10 @@ in "size 85% 90%,class:^(Element)$" "workspace special:scratch_chat silent,class:^(Element)$" "center,class:^(Element)$" + "float,class:^(Zulip)$" + "size 85% 90%,class:^(Zulip)$" + "workspace special:scratch_chat silent,class:^(Zulip)$" + "center,class:^(Zulip)$" "float,class:^(discord)$" "size 85% 90%,class:^(discord)$" "workspace special:scratch_chat silent,class:^(discord)$" @@ -394,17 +400,18 @@ in "opacity 0.80,class:^(dev.zed.Zed)$" "opacity 0.80,class:^(org.pulseaudio.pavucontrol)$" "opacity 1.0,class:^(org.qutebrowser.qutebrowser),fullscreen:1" - "opacity 0.80,class:^(Element)$" - "opacity 0.80,class:^(discord)$" - "opacity 0.80,class:^(Logseq)$" + "opacity 0.85,class:^(Element)$" + "opacity 0.85,class:^(Zulip)$" + "opacity 0.85,class:^(discord)$" + "opacity 0.85,class:^(Logseq)$" "opacity 1.0,class:^(Brave-browser),fullscreen:1" "opacity 1.0,class:^(librewolf),fullscreen:1" - "opacity 0.80,title:^(My Local Dashboard Awesome Homepage - qutebrowser)$" - "opacity 0.80,title:\[.*\] - My Local Dashboard Awesome Homepage" - "opacity 0.80,class:^(org.keepassxc.KeePassXC)$" - "opacity 0.80,class:^(org.gnome.Nautilus)$" - "opacity 0.80,class:^(org.gnome.Nautilus)$" - "opacity 0.80,initialTitle:^(Notes)$,initialClass:^(Brave-browser)$" + "opacity 0.85,title:^(My Local Dashboard Awesome Homepage - qutebrowser)$" + "opacity 0.85,title:\[.*\] - My Local Dashboard Awesome Homepage" + "opacity 0.85,class:^(org.keepassxc.KeePassXC)$" + "opacity 0.85,class:^(org.gnome.Nautilus)$" + "opacity 0.85,class:^(org.gnome.Nautilus)$" + "opacity 0.85,initialTitle:^(Notes)$,initialClass:^(Brave-browser)$" ]; diff --git a/modules/user/office/default.nix b/modules/user/office/default.nix index bf86c77..68658e1 100644 --- a/modules/user/office/default.nix +++ b/modules/user/office/default.nix @@ -1,15 +1,8 @@ -{ - config, - lib, - pkgs, - pkgs-stable, - ... -}: +{ config, lib, pkgs, pkgs-stable, ... }: let cfg = config.userSettings.office; -in -{ +in { options = { userSettings.office = { enable = lib.mkEnableOption "Enable my office programs"; @@ -28,11 +21,10 @@ in gnome-maps seahorse element-desktop + zulip discord openvpn pomodoro-gtk - hunspell - hunspellDicts.en_US ]; services.syncthing.enable = true; services.nextcloud-client = {