From 70c134d90d09d6fc5bc3262900ba53741a6e849c Mon Sep 17 00:00:00 2001 From: Liam Malone Date: Mon, 27 May 2024 12:38:57 +0100 Subject: [PATCH] updates --- flake.lock | 46 ++++++++++++------------- hosts/default/home.nix | 4 ++- modules/desktop/hyprland.nix | 35 ++++++++++++++++--- modules/old_configs/waybar/config.jsonc | 3 +- 4 files changed, 58 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index b853807..6147a89 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ "zls": "zls" }, "locked": { - "lastModified": 1716408918, - "narHash": "sha256-OGcTrigpdkXOesNmoKJZ/3m6gEvfoqFStPbI8ZFbZZs=", + "lastModified": 1716781819, + "narHash": "sha256-46PtcRxZuImy1l3D8rjhI0c5A1vjBv6mya2tmqLJ2I0=", "ref": "refs/heads/main", - "rev": "51b6bf46bf4f2302591ae854097e140ee2fcbe1a", - "revCount": 6175, + "rev": "ded7c0abacb3d3b42559befc799c5f5d5891bd27", + "revCount": 6197, "type": "git", "url": "ssh://git@github.com/mitchellh/ghostty.git" }, @@ -130,11 +130,11 @@ ] }, "locked": { - "lastModified": 1716457508, - "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=", + "lastModified": 1716736760, + "narHash": "sha256-h3RmnNknKYtVA+EvUSra6QAwfZjC2q1G8YA7W0gat8Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05", + "rev": "5d151429e1e79107acf6d06dcc5ace4e642ec239", "type": "github" }, "original": { @@ -159,11 +159,11 @@ ] }, "locked": { - "lastModified": 1716327911, - "narHash": "sha256-PI+wygItS/TKzi4gEAROvKTUzTx9GT+PGBttS/IOA/Q=", + "lastModified": 1716576411, + "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "27ca640abeef2d425b5dbecf804f5eb622cef56d", + "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", "type": "github" }, "original": { @@ -204,11 +204,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1716465152, - "narHash": "sha256-5kspSEWu9qNNhGmTorSAIA7ociJpy0UpeDh/uZ9nwnY=", + "lastModified": 1716801877, + "narHash": "sha256-vfMb7opO2xva0jt/UwMGlyjK4DB73SWxus4Oryww+C8=", "ref": "refs/heads/main", - "rev": "df80fbf70650dfb0d96381a1d86d30811cf516f4", - "revCount": 4730, + "rev": "db5d39a66f1285f78321d953eac398feaedfc63d", + "revCount": 4744, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -305,11 +305,11 @@ ] }, "locked": { - "lastModified": 1715791527, - "narHash": "sha256-HhQ4zvGHrRjR63ltySSeg+x+0jb0lepiutWdnFhLRoo=", + "lastModified": 1716473782, + "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "969cb076e5b76f2e823aeca1937a3e1f159812ee", + "rev": "87d5d984109c839482b88b4795db073eb9ed446f", "type": "github" }, "original": { @@ -349,11 +349,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1716461934, - "narHash": "sha256-5j/GfBVkgqGTlEA7s/6CBn0pKK6ohXQi38lkKeno/mA=", + "lastModified": 1716742013, + "narHash": "sha256-seOWIKi6jXE1BIQ6FLXUMe0h54cLwAxCCiL8bXFx60Q=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "972c1c27e6b057e5e891b6ae9f5b2c83bac1e087", + "rev": "768cd3ea525bbd1ed2dde5928b0843129274b50d", "type": "github" }, "original": { @@ -449,11 +449,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1716509168, + "narHash": "sha256-4zSIhSRRIoEBwjbPm3YiGtbd8HDWzFxJjw5DYSDy1n8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "bfb7a882678e518398ce9a31a881538679f6f092", "type": "github" }, "original": { diff --git a/hosts/default/home.nix b/hosts/default/home.nix index d154adb..5abe990 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -35,9 +35,11 @@ emacs-all-the-icons-fonts # emacsPackages.pdf-tools exfatprogs + fastfetch filezilla firefox floorp + genymotion gnome.gnome-keyring gnome.gnome-sound-recorder gnome.gvfs @@ -51,8 +53,8 @@ libtool libreoffice mpv - fastfetch networkmanagerapplet + nwg-look openvpn pamixer pavucontrol diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 5636abd..f0e8e51 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -45,6 +45,8 @@ env = [ "HYPRCURSOR_THEME,${config.gtk.cursorTheme.name}" "HYPRCURSOR_SIZE,24" + "XCURSOR_THEME,${config.gtk.cursorTheme.name}" + "XCURSOR_SIZE,24" "WLR_NO_HARDWARE_CURSORS,1" "XDG_CURRENT_DESKTOP,Hyprland" "XDG_SESSION_TYPE,wayland" @@ -79,6 +81,10 @@ layout = "dwindle"; }; + debug = { + disable_logs = false; + }; + misc = { disable_hyprland_logo = false; disable_splash_rendering = false; @@ -170,7 +176,7 @@ # used for screenshots "$screenshotarea" = "hyprctl keyword animation 'fadeOut,0,0,default'; grimblast --notify copy area; hyprctl keyword animation 'fadeOut,1,4,default'"; # for locking screen - "$lock" = "${pkgs.systemd}/bin/loginctl lock-session;${pkgs.hyprlock}/bin/hyprlock"; + "$lock" = "hyprlock"; bind = [ # "$mainMod, grave, hyprexpo:expo, toggle" # can be: toggle, off/disable or on/enable @@ -346,7 +352,6 @@ disable_loading_bar = true; hide_cursor = true; no_fade_in = false; - grace = 10; }; background = [ { @@ -357,11 +362,16 @@ ]; input-field = [ { - # size = "200, 50"; + monitor = ""; + size = "300, 50"; outline_thickness = 3; + dots_size = 0.33; + dots_spacing = 0.15; + dots_center = false; outer_color = "#fe0b00"; inner_color = "#0c0c0c"; font_color = "#efefef"; + fade_on_empty = true; check_color = "#0eff0d"; fail_color = "#ff009e"; capslock_color = "#bb00ee"; @@ -371,11 +381,28 @@ ]; label = [ { + monitor = ""; text = "$TIME"; text_align = "center"; - color = ""; + color = "#ffffee"; font_size = 28; font_family = builtins.head osConfig.fonts.fontconfig.defaultFonts.sansSerif; + + position = "0, 80"; + halign = "center"; + valign = "center"; + } + { + monitor = ""; + text = "cmd[update:1000] echo \" $(date +'%A, %b %d %Y')\""; + text_align = "center"; + color = "#ffffee"; + font_size = 18; + font_family = builtins.head osConfig.fonts.fontconfig.defaultFonts.sansSerif; + + position = "80, 80"; + halign = "left"; + valign = "bottom"; } ]; }; diff --git a/modules/old_configs/waybar/config.jsonc b/modules/old_configs/waybar/config.jsonc index 855cd45..ad23b2e 100644 --- a/modules/old_configs/waybar/config.jsonc +++ b/modules/old_configs/waybar/config.jsonc @@ -128,12 +128,11 @@ }, "wlr/taskbar": { "format": "{icon}", - "icon-size": 20, + "icon-size": 24, "all-outputs": true, "on-click": "activate", "ignore-list": [ "Alacritty", - "com.mitchellh.ghostty", "contour", ] },