From c23b60f866a687aa6ae3618265f47ae63c9c5b64 Mon Sep 17 00:00:00 2001 From: Ryan Schanzenbacher Date: Mon, 28 Oct 2024 22:55:28 -0400 Subject: [PATCH] wttr popup fix, firefox on nix, fontconfig fixes --- home-config/home-configuration.scm | 24 ++- home-config/hypr/hyprland.conf | 2 +- home-config/nix-home-manager/flake.lock | 276 +++++++++++++++++------- home-config/nix-home-manager/flake.nix | 3 +- home-config/nix-home-manager/home.nix | 7 + 5 files changed, 234 insertions(+), 78 deletions(-) diff --git a/home-config/home-configuration.scm b/home-config/home-configuration.scm index b9e95d0..683f6aa 100644 --- a/home-config/home-configuration.scm +++ b/home-config/home-configuration.scm @@ -15,6 +15,7 @@ (gnu home services shells) (gnu home services desktop) (gnu home services gnupg) + (gnu home services fontutils) (gnu home services) (ryan-services pipewire) (ryan-services spotify) @@ -134,7 +135,7 @@ "signal-desktop" "sc-im" "git-lfs")) - (list my-neovim wl-mirror firefox-wrapped calcurse-fixed ))) + (list my-neovim wl-mirror calcurse-fixed ))) ;; Below is the list of Home services. To search for available ;; services, run 'guix home search KEYWORD' in a terminal. @@ -169,12 +170,31 @@ (".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json")) ;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol")) ;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf")) - (".fonts" ,(local-file "fonts" #:recursive? #t)) + (".local/share/fonts" ,(local-file "fonts" #:recursive? #t)) (".gitconfig" ,(local-file "gitconfig")) (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t)) (".nix-channels" ,(local-file "nix-channels")))) (service home-pipewire-service-type) (service home-spotifyd-service-type) + ; font things for nix to play nice + (simple-service 'additional-fonts-service + home-fontconfig-service-type + (list "~/.nix-profile/share/fonts" + '(match (@ (target "pattern")) + (edit (@ (name "family") (mode "prepend")) + (string "DejaVu Sans"))) + '(alias + (family "serif") + (prefer + (family "DejaVu Serif"))) + '(alias + (family "sans") + (prefer + (family "DejaVu Sans"))) + '(alias + (family "monospace") + (prefer + (family "DejaVu Sans Mono"))))) (service home-dbus-service-type) ;;; trying some changes ;(template-files "." diff --git a/home-config/hypr/hyprland.conf b/home-config/hypr/hyprland.conf index c3e5049..12e97c5 100644 --- a/home-config/hypr/hyprland.conf +++ b/home-config/hypr/hyprland.conf @@ -241,7 +241,7 @@ windowrulev2 = suppressevent fullscreen maximize, class:^(firefox)$, title:^(Fir # Weather windowrulev2 = float,class:^(ala-wttr)$ -windowrulev2 = size 740 712, class:^(ala-wttr)$ +windowrulev2 = size 822 1026, class:^(ala-wttr)$ # Floating terminal windowrulev2 = float,class:^(float-foot)$ diff --git a/home-config/nix-home-manager/flake.lock b/home-config/nix-home-manager/flake.lock index f899e74..d350b50 100644 --- a/home-config/nix-home-manager/flake.lock +++ b/home-config/nix-home-manager/flake.lock @@ -2,29 +2,17 @@ "nodes": { "aquamarine": { "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] + "hyprutils": "hyprutils", + "hyprwayland-scanner": "hyprwayland-scanner", + "nixpkgs": "nixpkgs", + "systems": "systems" }, "locked": { - "lastModified": 1727261104, - "narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=", + "lastModified": 1729527199, + "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "b82fdaff917582a9d568969e15e61b398c71e990", + "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72", "type": "github" }, "original": { @@ -33,6 +21,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -48,6 +52,28 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "hyprland", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -85,11 +111,11 @@ ] }, "locked": { - "lastModified": 1727532803, - "narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=", + "lastModified": 1728669738, + "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f", + "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", "type": "github" }, "original": { @@ -104,25 +130,26 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", + "hyprutils": "hyprutils_2", + "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": [ "nixpkgs" ], - "systems": "systems", + "pre-commit-hooks": "pre-commit-hooks", + "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1728478479, - "narHash": "sha256-AbfdIlK92oWpI39xlIaUekPeL9u95sXzxVsSqhIMfIc=", + "lastModified": 1729553322, + "narHash": "sha256-CjdhWsojvgZEr2t8eK6HaaWmLxirnaEckeXt/kveQNs=", "owner": "hyprwm", "repo": "hyprland", - "rev": "4520b30d498daca8079365bdb909a8dea38e8d55", + "rev": "5e96d738e698f22969ca502d042d5751711c6d8a", "type": "github" }, "original": { "owner": "hyprwm", - "ref": "v0.44.1", + "ref": "main", "repo": "hyprland", "type": "github" } @@ -139,38 +166,11 @@ ] }, "locked": { - "lastModified": 1727451107, - "narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=", + "lastModified": 1728345020, + "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprland-protocols_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "xdph", - "nixpkgs" - ], - "systems": [ - "hyprland", - "xdph", - "systems" - ] - }, - "locked": { - "lastModified": 1721326555, - "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", + "rev": "a7c183800e74f337753de186522b9017a07a8cee", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1725997860, - "narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", + "lastModified": 1728168612, + "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", + "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", "type": "github" }, "original": { @@ -210,12 +210,12 @@ }, "hyprpicker-git": { "inputs": { - "hyprutils": "hyprutils_2", - "hyprwayland-scanner": "hyprwayland-scanner_2", + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_3", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1727705155, @@ -236,19 +236,21 @@ "inputs": { "nixpkgs": [ "hyprland", + "aquamarine", "nixpkgs" ], "systems": [ "hyprland", + "aquamarine", "systems" ] }, "locked": { - "lastModified": 1727300645, - "narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", + "lastModified": 1728941256, + "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", + "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", "type": "github" }, "original": { @@ -258,6 +260,31 @@ } }, "hyprutils_2": { + "inputs": { + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1728941256, + "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, + "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprpicker-git", @@ -283,6 +310,33 @@ } }, "hyprwayland-scanner": { + "inputs": { + "nixpkgs": [ + "hyprland", + "aquamarine", + "nixpkgs" + ], + "systems": [ + "hyprland", + "aquamarine", + "systems" + ] + }, + "locked": { + "lastModified": 1726874836, + "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, + "hyprwayland-scanner_2": { "inputs": { "nixpkgs": [ "hyprland", @@ -307,7 +361,7 @@ "type": "github" } }, - "hyprwayland-scanner_2": { + "hyprwayland-scanner_3": { "inputs": { "nixpkgs": [ "hyprpicker-git", @@ -355,6 +409,38 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1729413321, + "narHash": "sha256-I4tuhRpZFa6Fu6dcH9Dlo5LlH17peT79vx1y1SpeKt0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1997e4aa514312c1af7e2bda7fad1644e778ff26", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1720386169, + "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1729168305, "narHash": "sha256-jmhxZnrlOyLEMUL2+JkVfkN0XWXI5uE6EB5kVZFR0fo=", @@ -370,13 +456,37 @@ "type": "github" } }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat", + "gitignore": "gitignore", + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1728778939, + "narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "ff68f91754be6f3427e4986d7949e6273659be1d", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "hyprland": "hyprland", "hyprpicker-git": "hyprpicker-git", "nixgl": "nixgl", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" } }, "systems": { @@ -409,9 +519,27 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, "xdph": { "inputs": { - "hyprland-protocols": "hyprland-protocols_2", + "hyprland-protocols": [ + "hyprland", + "hyprland-protocols" + ], "hyprlang": [ "hyprland", "hyprlang" @@ -434,11 +562,11 @@ ] }, "locked": { - "lastModified": 1727524473, - "narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=", + "lastModified": 1728166987, + "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26", + "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787", "type": "github" }, "original": { diff --git a/home-config/nix-home-manager/flake.nix b/home-config/nix-home-manager/flake.nix index 7ba72b4..419cf50 100644 --- a/home-config/nix-home-manager/flake.nix +++ b/home-config/nix-home-manager/flake.nix @@ -13,8 +13,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprland = { - url = "github:hyprwm/hyprland/v0.44.1"; + url = "github:hyprwm/hyprland/main"; inputs.nixpkgs.follows = "nixpkgs"; + inputs.aquamarine.url = "github:hyprwm/aquamarine/main"; }; nixgl = { url = "github:nix-community/nixGL/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a"; diff --git a/home-config/nix-home-manager/home.nix b/home-config/nix-home-manager/home.nix index 210523d..031e76a 100644 --- a/home-config/nix-home-manager/home.nix +++ b/home-config/nix-home-manager/home.nix @@ -20,6 +20,11 @@ nixpkgs.config.allowUnfree = true; #targets.genericLinux.enable = true; fonts.fontconfig.enable = true; + fonts.fontconfig.defaultFonts = { + monospace = [ "DejaVu Sans Mono" ]; + sansSerif = [ "DejaVu Sans" ]; + serif = [ "DejaVu Serif" ]; + }; # wayland.windowManager.hyprland.enable = true; @@ -53,6 +58,8 @@ libvdpau wpaperd hypridle + firefox + eza # Wrapped programs for some env variables (pkgs.writeScriptBin "hyprlock" ''