ryan77627/guix-dotfiles
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix-config.git synced 2024-11-07 07:36:09 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

wttr popup fix, firefox on nix, fontconfig fixes

Browse source
This commit is contained in:
Ryan 2024-10-28 22:55:28 -04:00
parent 1c3f633224
commit c23b60f866
Signed by: ryan77627
GPG key ID: 81B0E222A3E2308E
5 changed files with 234 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
home-config/home-configuration.scm
View file

@ -15,6 +15,7 @@
(gnu home services shells) (gnu home services shells)
(gnu home services desktop) (gnu home services desktop)
(gnu home services gnupg) (gnu home services gnupg)
(gnu home services fontutils)
(gnu home services) (gnu home services)
(ryan-services pipewire) (ryan-services pipewire)
(ryan-services spotify) (ryan-services spotify)
@ -134,7 +135,7 @@
"signal-desktop" "signal-desktop"
"sc-im" "sc-im"
"git-lfs")) "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 ;; Below is the list of Home services. To search for available
;; services, run 'guix home search KEYWORD' in a terminal. ;; services, run 'guix home search KEYWORD' in a terminal.
@ -169,12 +170,31 @@
(".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json")) (".mozilla/native-messaging-hosts/tridactyl.json" ,(local-file "tridactyl/tridactyl.json"))
;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol")) ;(".gnupg/sshcontrol" ,(local-file "gnupg/sshcontrol"))
;(".gnupg/gpg-agent.conf" ,(local-file "gnupg/gpg-agent.conf")) ;(".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")) (".gitconfig" ,(local-file "gitconfig"))
(".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t)) (".docker/cli-plugins" ,(local-file "docker/cli-plugins" #:recursive? #t))
(".nix-channels" ,(local-file "nix-channels")))) (".nix-channels" ,(local-file "nix-channels"))))
(service home-pipewire-service-type) (service home-pipewire-service-type)
(service home-spotifyd-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) (service home-dbus-service-type)
;;; trying some changes ;;; trying some changes
;(template-files "." ;(template-files "."

2
home-config/hypr/hyprland.conf
View file

@ -241,7 +241,7 @@ windowrulev2 = suppressevent fullscreen maximize, class:^(firefox)$, title:^(Fir
# Weather # Weather
windowrulev2 = float,class:^(ala-wttr)$ windowrulev2 = float,class:^(ala-wttr)$
windowrulev2 = size 740 712, class:^(ala-wttr)$ windowrulev2 = size 822 1026, class:^(ala-wttr)$
# Floating terminal # Floating terminal
windowrulev2 = float,class:^(float-foot)$ windowrulev2 = float,class:^(float-foot)$

276
home-config/nix-home-manager/flake.lock
View file

@ -2,29 +2,17 @@
"nodes": { "nodes": {
"aquamarine": { "aquamarine": {
"inputs": { "inputs": {
"hyprutils": [ "hyprutils": "hyprutils",
"hyprland", "hyprwayland-scanner": "hyprwayland-scanner",
"hyprutils" "nixpkgs": "nixpkgs",
], "systems": "systems"
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
}, },
"locked": { "locked": {
"lastModified": 1727261104, "lastModified": 1729527199,
"narHash": "sha256-rxDI7WrxIRV9it9mDCHcLa7xQykf1JloXnoXr5xQ8zI=", "narHash": "sha256-D5/YksfRga8Akd04ZtIkuYSIOjXVrAzQIQBSeplokzU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "b82fdaff917582a9d568969e15e61b398c71e990", "rev": "8d732fa8aff8b12ef2b1e2f00fc8153e41312b72",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -33,6 +21,22 @@
"type": "github" "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": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1659877975,
@ -48,6 +52,28 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -85,11 +111,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727532803, "lastModified": 1728669738,
"narHash": "sha256-ZaZ7h7PY8mQc4vtGmVqWLAq9CAO02gHMyNR5yY8zDmM=", "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "b98726e431d4d3ed58bd58bee1047cdb81cec69f", "rev": "0264e698149fcb857a66a53018157b41f8d97bb0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -104,25 +130,26 @@
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils_2",
"hyprwayland-scanner": "hyprwayland-scanner", "hyprwayland-scanner": "hyprwayland-scanner_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems", "pre-commit-hooks": "pre-commit-hooks",
"systems": "systems_2",
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1728478479, "lastModified": 1729553322,
"narHash": "sha256-AbfdIlK92oWpI39xlIaUekPeL9u95sXzxVsSqhIMfIc=", "narHash": "sha256-CjdhWsojvgZEr2t8eK6HaaWmLxirnaEckeXt/kveQNs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland", "repo": "hyprland",
"rev": "4520b30d498daca8079365bdb909a8dea38e8d55", "rev": "5e96d738e698f22969ca502d042d5751711c6d8a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"ref": "v0.44.1", "ref": "main",
"repo": "hyprland", "repo": "hyprland",
"type": "github" "type": "github"
} }
@ -139,38 +166,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727451107, "lastModified": 1728345020,
"narHash": "sha256-qV9savtHwmZUa0eJE294WYJjKPGB2+bJhwByFShsVyo=", "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "6b3261ee13a6d2b99de79a31d352f6996e35bde3", "rev": "a7c183800e74f337753de186522b9017a07a8cee",
"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",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -195,11 +195,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1725997860, "lastModified": 1728168612,
"narHash": "sha256-d/rZ/fHR5l1n7PeyLw0StWMNLXVU9c4HFyfskw568so=", "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "dfeb5811dd6485490cce18d6cc1e38a055eea876", "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -210,12 +210,12 @@
}, },
"hyprpicker-git": { "hyprpicker-git": {
"inputs": { "inputs": {
"hyprutils": "hyprutils_2", "hyprutils": "hyprutils_3",
"hyprwayland-scanner": "hyprwayland-scanner_2", "hyprwayland-scanner": "hyprwayland-scanner_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_2" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1727705155, "lastModified": 1727705155,
@ -236,19 +236,21 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"aquamarine",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"hyprland", "hyprland",
"aquamarine",
"systems" "systems"
] ]
}, },
"locked": { "locked": {
"lastModified": 1727300645, "lastModified": 1728941256,
"narHash": "sha256-OvAtVLaSRPnbXzOwlR1fVqCXR7i+ICRX3aPMCdIiv+c=", "narHash": "sha256-WRypmcZ2Bw94lLmcmxYokVOHPJSZ7T06V49QZ4tkZeQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "3f5293432b6dc6a99f26aca2eba3876d2660665c", "rev": "fd4be8b9ca932f7384e454bcd923c5451ef2aa85",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,6 +260,31 @@
} }
}, },
"hyprutils_2": { "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": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprpicker-git", "hyprpicker-git",
@ -283,6 +310,33 @@
} }
}, },
"hyprwayland-scanner": { "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": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
@ -307,7 +361,7 @@
"type": "github" "type": "github"
} }
}, },
"hyprwayland-scanner_2": { "hyprwayland-scanner_3": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"hyprpicker-git", "hyprpicker-git",
@ -355,6 +409,38 @@
} }
}, },
"nixpkgs": { "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": { "locked": {
"lastModified": 1729168305, "lastModified": 1729168305,
"narHash": "sha256-jmhxZnrlOyLEMUL2+JkVfkN0XWXI5uE6EB5kVZFR0fo=", "narHash": "sha256-jmhxZnrlOyLEMUL2+JkVfkN0XWXI5uE6EB5kVZFR0fo=",
@ -370,13 +456,37 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprpicker-git": "hyprpicker-git", "hyprpicker-git": "hyprpicker-git",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs_2"
} }
}, },
"systems": { "systems": {
@ -409,9 +519,27 @@
"type": "github" "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": { "xdph": {
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols_2", "hyprland-protocols": [
"hyprland",
"hyprland-protocols"
],
"hyprlang": [ "hyprlang": [
"hyprland", "hyprland",
"hyprlang" "hyprlang"
@ -434,11 +562,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727524473, "lastModified": 1728166987,
"narHash": "sha256-1DGktDtSWIJpnDbVoj/qpvJSH5zg6JbOfuh6xqZMap0=", "narHash": "sha256-w6dVTguAn9zJ+7aPOhBQgDz8bn6YZ7b56cY8Kg5HJRI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "7e500e679ede40e79cf2d89b5f5fa3e34923bd26", "rev": "fb9c8d665af0588bb087f97d0f673ddf0d501787",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
home-config/nix-home-manager/flake.nix
View file

@ -13,8 +13,9 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland = { hyprland = {
url = "github:hyprwm/hyprland/v0.44.1"; url = "github:hyprwm/hyprland/main";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.aquamarine.url = "github:hyprwm/aquamarine/main";
}; };
nixgl = { nixgl = {
url = "github:nix-community/nixGL/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a"; url = "github:nix-community/nixGL/310f8e49a149e4c9ea52f1adf70cdc768ec53f8a";

7
home-config/nix-home-manager/home.nix
View file

@ -20,6 +20,11 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
#targets.genericLinux.enable = true; #targets.genericLinux.enable = true;
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
fonts.fontconfig.defaultFonts = {
monospace = [ "DejaVu Sans Mono" ];
sansSerif = [ "DejaVu Sans" ];
serif = [ "DejaVu Serif" ];
};
# wayland.windowManager.hyprland.enable = true; # wayland.windowManager.hyprland.enable = true;
@ -53,6 +58,8 @@
libvdpau libvdpau
wpaperd wpaperd
hypridle hypridle
firefox
eza
# Wrapped programs for some env variables # Wrapped programs for some env variables
(pkgs.writeScriptBin "hyprlock" '' (pkgs.writeScriptBin "hyprlock" ''