From a5218684078c94399d3368078db9b0ff3283dcdf Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Sun, 29 Dec 2024 21:45:59 -0500 Subject: [PATCH] Adding updates from however long ago --- channels.scm | 6 +++--- home-config/home-configuration.scm | 2 +- home-config/hypr/hyprland.conf | 2 ++ home-config/nix-home-manager/flake.lock | 24 ++++++++++++------------ home-config/nix-home-manager/flake.nix | 6 +++--- home-config/nix-home-manager/home.nix | 15 +++++++++------ 6 files changed, 30 insertions(+), 25 deletions(-) diff --git a/channels.scm b/channels.scm index 0beaf44..4f557ad 100644 --- a/channels.scm +++ b/channels.scm @@ -3,7 +3,7 @@ (url "https://git.savannah.gnu.org/git/guix.git") (branch "master") (commit - "308877be17b2c2c92d972e105e8cc6a782ab4c82") + "18463019a24a7c5acc9c2f3ddf3c0ba04a36db96") (introduction (make-channel-introduction "9edb3f66fd807b096b48283debdcddccfea34bad" @@ -14,7 +14,7 @@ (url "https://gitlab.com/nonguix/nonguix") (branch "master") (commit - "ea84538b887df3aa3bdd61d5e4c284f1548e5520") + "f44a49d3092d509c5e09cc27ada40a8c4d99c02d") (introduction (make-channel-introduction "897c1a470da759236cc11798f4e0a5f7d4d59fbc" @@ -25,7 +25,7 @@ (url "https://codeberg.org/hako/rosenthal.git") (branch "trunk") (commit - "1deb97ada4d7d8c2d501738fcc1532a605de51a7") + "5cb609ce31f9351b9f3a9e94b2a51e48603ef68f") (introduction (make-channel-introduction "7677db76330121a901604dfbad19077893865f35" diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index d2b9c24..93ec9e1 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -135,7 +135,7 @@ "signal-desktop" "sc-im" "git-lfs")) - (list my-neovim wl-mirror calcurse-fixed ))) + (list my-neovim calcurse-fixed ))) ;; Below is the list of Home services. To search for available ;; services, run 'guix home search KEYWORD' in a terminal. diff --git a/home-config/hypr/hyprland.conf b/home-config/hypr/hyprland.conf index 97cb767..cba6999 100644 --- a/home-config/hypr/hyprland.conf +++ b/home-config/hypr/hyprland.conf @@ -46,6 +46,8 @@ input { touchpad { natural_scroll = no + middle_button_emulation = true + clickfinger_behavior = true } sensitivity = 0 # -1.0 - 1.0, 0 means no modification. diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock index 12fae6f..868a298 100644 --- a/home-config/nix-home-manager/flake.lock +++ b/home-config/nix-home-manager/flake.lock @@ -93,17 +93,17 @@ ] }, "locked": { - "lastModified": 1731604581, - "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", + "lastModified": 1733342204, + "narHash": "sha256-MVgFAzk10tWV0SW3hV24/xeAxmkQ7peJYUUOi6cvVPM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "1cd17a2f76f7711b06d5d59f1746cef602974498", "type": "github" }, "original": { "owner": "nix-community", "repo": "home-manager", - "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", + "rev": "1cd17a2f76f7711b06d5d59f1746cef602974498", "type": "github" } }, @@ -152,16 +152,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1731162467, - "narHash": "sha256-b0w2XOVCuEdBIiTpKaaeSesKux1Q51YWEWdKbljDXPE=", + "lastModified": 1732052838, + "narHash": "sha256-ENsVNUEvJp7/7f6x7MVqtiVkFKkGy0Ux/ZqQM3Sb4CQ=", "owner": "hyprwm", "repo": "hyprland", - "rev": "a425fbebe4cf4238e48a42f724ef2208959d66cf", + "rev": "12f9a0d0b93f691d4d9923716557154d74777b0a", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.45.0", + "ref": "v0.45.2", "repo": "hyprland", "type": "github" } @@ -368,17 +368,17 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731603729, - "narHash": "sha256-ChqaWsSIi+8zprudu16K3MskXr7iORzMGmYutWHCmKQ=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f49e820fbc9450736bb6ba982a2ff0a8d014ad1e", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "f49e820fbc9450736bb6ba982a2ff0a8d014ad1e", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" } }, diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix index 26bc72e..1878a4e 100644 --- a/home-config/nix-home-manager/flake.nix +++ b/home-config/nix-home-manager/flake.nix @@ -3,9 +3,9 @@ inputs = { # Specify the source of Home Manager and Nixpkgs. - nixpkgs.url = "github:nixos/nixpkgs/f49e820fbc9450736bb6ba982a2ff0a8d014ad1e"; + nixpkgs.url = "github:nixos/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776"; home-manager = { - url = "github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10"; + url = "github:nix-community/home-manager/1cd17a2f76f7711b06d5d59f1746cef602974498"; inputs.nixpkgs.follows = "nixpkgs"; }; hyprpicker-git = { @@ -13,7 +13,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprland = { - url = "github:hyprwm/hyprland/v0.45.0"; + url = "github:hyprwm/hyprland/v0.45.2"; inputs.nixpkgs.follows = "nixpkgs"; }; nixgl = { diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 41c7c83..5e85304 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -105,7 +105,7 @@ # Bitwarden "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; - installation_mode = "force_installed"; + installation_mode = "normal_installed"; }; # SponsorBlock "sponsorBlocker@ajay.app" = { @@ -214,16 +214,18 @@ }; }; userChrome = " - #main-window #titlebar { + #main-window .toolbar-items { overflow: hidden; transition: height 0.3s 0.3s !important; } /* Default state: Set initial height to enable animation */ - #main-window #titlebar { height: 3em !important; } - #main-window[uidensity=\"touch\"] #titlebar { height: 3.35em !important; } - #main-window[uidensity=\"compact\"] #titlebar { height: 2.7em !important; } + #main-window .toolbar-items { height: 3em !important; } + #main-window .titlebar-button { height: 3em !important; } + #main-window[uidensity=\"touch\"] .toolbar-items { height: 3.35em !important; } + #main-window[uidensity=\"compact\"] .toolbar-items { height: 2.7em !important; } /* Hidden state: Hide native tabs strip */ - #main-window[titlepreface*=\"​\"] #titlebar { height: 0 !important; } + #main-window[titlepreface*=\"​\"] .toolbar-items { height: 0 !important; } + #main-window[titlepreface*=\"​\"] .titlebar-button { height: 0 !important; } /* Hidden state: Fix z-index of active pinned tabs */ #main-window[titlepreface*=\"​\"] #tabbrowser-tabs { z-index: 0 !important; } @@ -374,6 +376,7 @@ hypridle #latest.firefox-nightly-bin eza + wl-mirror # Wrapped programs for some env variables (pkgs.writeScriptBin "hyprlock" ''