summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Schanzenbacher <ryan@rschanz.org>2024-12-29 21:45:59 -0500
committerRyan Schanzenbacher <ryan@rschanz.org>2024-12-29 21:45:59 -0500
commita5218684078c94399d3368078db9b0ff3283dcdf (patch)
treeebb56029c4e4efb692d79a7f96bc390bd446cf9a
parenta04498c0b18d6fdf7e600dd9c8b5e7db781c21f3 (diff)
Adding updates from however long ago
-rw-r--r--channels.scm6
-rw-r--r--home-config/home-configuration.scm2
-rw-r--r--home-config/hypr/hyprland.conf2
-rw-r--r--home-config/nix-home-manager/flake.lock24
-rw-r--r--home-config/nix-home-manager/flake.nix6
-rw-r--r--home-config/nix-home-manager/home.nix15
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 @@
3 (url "https://git.savannah.gnu.org/git/guix.git") 3 (url "https://git.savannah.gnu.org/git/guix.git")
4 (branch "master") 4 (branch "master")
5 (commit 5 (commit
6 "308877be17b2c2c92d972e105e8cc6a782ab4c82") 6 "18463019a24a7c5acc9c2f3ddf3c0ba04a36db96")
7 (introduction 7 (introduction
8 (make-channel-introduction 8 (make-channel-introduction
9 "9edb3f66fd807b096b48283debdcddccfea34bad" 9 "9edb3f66fd807b096b48283debdcddccfea34bad"
@@ -14,7 +14,7 @@
14 (url "https://gitlab.com/nonguix/nonguix") 14 (url "https://gitlab.com/nonguix/nonguix")
15 (branch "master") 15 (branch "master")
16 (commit 16 (commit
17 "ea84538b887df3aa3bdd61d5e4c284f1548e5520") 17 "f44a49d3092d509c5e09cc27ada40a8c4d99c02d")
18 (introduction 18 (introduction
19 (make-channel-introduction 19 (make-channel-introduction
20 "897c1a470da759236cc11798f4e0a5f7d4d59fbc" 20 "897c1a470da759236cc11798f4e0a5f7d4d59fbc"
@@ -25,7 +25,7 @@
25 (url "https://codeberg.org/hako/rosenthal.git") 25 (url "https://codeberg.org/hako/rosenthal.git")
26 (branch "trunk") 26 (branch "trunk")
27 (commit 27 (commit
28 "1deb97ada4d7d8c2d501738fcc1532a605de51a7") 28 "5cb609ce31f9351b9f3a9e94b2a51e48603ef68f")
29 (introduction 29 (introduction
30 (make-channel-introduction 30 (make-channel-introduction
31 "7677db76330121a901604dfbad19077893865f35" 31 "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 @@
135 "signal-desktop" 135 "signal-desktop"
136 "sc-im" 136 "sc-im"
137 "git-lfs")) 137 "git-lfs"))
138 (list my-neovim wl-mirror calcurse-fixed ))) 138 (list my-neovim calcurse-fixed )))
139 139
140 ;; Below is the list of Home services. To search for available 140 ;; Below is the list of Home services. To search for available
141 ;; services, run 'guix home search KEYWORD' in a terminal. 141 ;; 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 {
46 46
47 touchpad { 47 touchpad {
48 natural_scroll = no 48 natural_scroll = no
49 middle_button_emulation = true
50 clickfinger_behavior = true
49 } 51 }
50 52
51 sensitivity = 0 # -1.0 - 1.0, 0 means no modification. 53 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 @@
93 ] 93 ]
94 }, 94 },
95 "locked": { 95 "locked": {
96 "lastModified": 1731604581, 96 "lastModified": 1733342204,
97 "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", 97 "narHash": "sha256-MVgFAzk10tWV0SW3hV24/xeAxmkQ7peJYUUOi6cvVPM=",
98 "owner": "nix-community", 98 "owner": "nix-community",
99 "repo": "home-manager", 99 "repo": "home-manager",
100 "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", 100 "rev": "1cd17a2f76f7711b06d5d59f1746cef602974498",
101 "type": "github" 101 "type": "github"
102 }, 102 },
103 "original": { 103 "original": {
104 "owner": "nix-community", 104 "owner": "nix-community",
105 "repo": "home-manager", 105 "repo": "home-manager",
106 "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", 106 "rev": "1cd17a2f76f7711b06d5d59f1746cef602974498",
107 "type": "github" 107 "type": "github"
108 } 108 }
109 }, 109 },
@@ -152,16 +152,16 @@
152 "xdph": "xdph" 152 "xdph": "xdph"
153 }, 153 },
154 "locked": { 154 "locked": {
155 "lastModified": 1731162467, 155 "lastModified": 1732052838,
156 "narHash": "sha256-b0w2XOVCuEdBIiTpKaaeSesKux1Q51YWEWdKbljDXPE=", 156 "narHash": "sha256-ENsVNUEvJp7/7f6x7MVqtiVkFKkGy0Ux/ZqQM3Sb4CQ=",
157 "owner": "hyprwm", 157 "owner": "hyprwm",
158 "repo": "hyprland", 158 "repo": "hyprland",
159 "rev": "a425fbebe4cf4238e48a42f724ef2208959d66cf", 159 "rev": "12f9a0d0b93f691d4d9923716557154d74777b0a",
160 "type": "github" 160 "type": "github"
161 }, 161 },
162 "original": { 162 "original": {
163 "owner": "hyprwm", 163 "owner": "hyprwm",
164 "ref": "v0.45.0", 164 "ref": "v0.45.2",
165 "repo": "hyprland", 165 "repo": "hyprland",
166 "type": "github" 166 "type": "github"
167 } 167 }
@@ -368,17 +368,17 @@
368 }, 368 },
369 "nixpkgs": { 369 "nixpkgs": {
370 "locked": { 370 "locked": {
371 "lastModified": 1731603729, 371 "lastModified": 1733212471,
372 "narHash": "sha256-ChqaWsSIi+8zprudu16K3MskXr7iORzMGmYutWHCmKQ=", 372 "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
373 "owner": "nixos", 373 "owner": "nixos",
374 "repo": "nixpkgs", 374 "repo": "nixpkgs",
375 "rev": "f49e820fbc9450736bb6ba982a2ff0a8d014ad1e", 375 "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
376 "type": "github" 376 "type": "github"
377 }, 377 },
378 "original": { 378 "original": {
379 "owner": "nixos", 379 "owner": "nixos",
380 "repo": "nixpkgs", 380 "repo": "nixpkgs",
381 "rev": "f49e820fbc9450736bb6ba982a2ff0a8d014ad1e", 381 "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
382 "type": "github" 382 "type": "github"
383 } 383 }
384 }, 384 },
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 @@
3 3
4 inputs = { 4 inputs = {
5 # Specify the source of Home Manager and Nixpkgs. 5 # Specify the source of Home Manager and Nixpkgs.
6 nixpkgs.url = "github:nixos/nixpkgs/f49e820fbc9450736bb6ba982a2ff0a8d014ad1e"; 6 nixpkgs.url = "github:nixos/nixpkgs/55d15ad12a74eb7d4646254e13638ad0c4128776";
7 home-manager = { 7 home-manager = {
8 url = "github:nix-community/home-manager/1d0862ee2d7c6f6cd720d6f32213fa425004be10"; 8 url = "github:nix-community/home-manager/1cd17a2f76f7711b06d5d59f1746cef602974498";
9 inputs.nixpkgs.follows = "nixpkgs"; 9 inputs.nixpkgs.follows = "nixpkgs";
10 }; 10 };
11 hyprpicker-git = { 11 hyprpicker-git = {
@@ -13,7 +13,7 @@
13 inputs.nixpkgs.follows = "nixpkgs"; 13 inputs.nixpkgs.follows = "nixpkgs";
14 }; 14 };
15 hyprland = { 15 hyprland = {
16 url = "github:hyprwm/hyprland/v0.45.0"; 16 url = "github:hyprwm/hyprland/v0.45.2";
17 inputs.nixpkgs.follows = "nixpkgs"; 17 inputs.nixpkgs.follows = "nixpkgs";
18 }; 18 };
19 nixgl = { 19 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 @@
105 # Bitwarden 105 # Bitwarden
106 "{446900e4-71c2-419f-a6a7-df9c091e268b}" = { 106 "{446900e4-71c2-419f-a6a7-df9c091e268b}" = {
107 install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi"; 107 install_url = "https://addons.mozilla.org/firefox/downloads/latest/bitwarden-password-manager/latest.xpi";
108 installation_mode = "force_installed"; 108 installation_mode = "normal_installed";
109 }; 109 };
110 # SponsorBlock 110 # SponsorBlock
111 "sponsorBlocker@ajay.app" = { 111 "sponsorBlocker@ajay.app" = {
@@ -214,16 +214,18 @@
214 }; 214 };
215 }; 215 };
216 userChrome = " 216 userChrome = "
217 #main-window #titlebar { 217 #main-window .toolbar-items {
218 overflow: hidden; 218 overflow: hidden;
219 transition: height 0.3s 0.3s !important; 219 transition: height 0.3s 0.3s !important;
220 } 220 }
221 /* Default state: Set initial height to enable animation */ 221 /* Default state: Set initial height to enable animation */
222 #main-window #titlebar { height: 3em !important; } 222 #main-window .toolbar-items { height: 3em !important; }
223 #main-window[uidensity=\"touch\"] #titlebar { height: 3.35em !important; } 223 #main-window .titlebar-button { height: 3em !important; }
224 #main-window[uidensity=\"compact\"] #titlebar { height: 2.7em !important; } 224 #main-window[uidensity=\"touch\"] .toolbar-items { height: 3.35em !important; }
225 #main-window[uidensity=\"compact\"] .toolbar-items { height: 2.7em !important; }
225 /* Hidden state: Hide native tabs strip */ 226 /* Hidden state: Hide native tabs strip */
226 #main-window[titlepreface*=\"​\"] #titlebar { height: 0 !important; } 227 #main-window[titlepreface*=\"​\"] .toolbar-items { height: 0 !important; }
228 #main-window[titlepreface*=\"​\"] .titlebar-button { height: 0 !important; }
227 /* Hidden state: Fix z-index of active pinned tabs */ 229 /* Hidden state: Fix z-index of active pinned tabs */
228 #main-window[titlepreface*=\"​\"] #tabbrowser-tabs { z-index: 0 !important; } 230 #main-window[titlepreface*=\"​\"] #tabbrowser-tabs { z-index: 0 !important; }
229 231
@@ -374,6 +376,7 @@
374 hypridle 376 hypridle
375 #latest.firefox-nightly-bin 377 #latest.firefox-nightly-bin
376 eza 378 eza
379 wl-mirror
377 380
378 # Wrapped programs for some env variables 381 # Wrapped programs for some env variables
379 (pkgs.writeScriptBin "hyprlock" '' 382 (pkgs.writeScriptBin "hyprlock" ''