diff --git a/flake.lock b/flake.lock index 019f0440..446616a7 100644 --- a/flake.lock +++ b/flake.lock @@ -139,15 +139,15 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1663659192, - "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=", - "owner": "chriskempson", + "lastModified": 1716150083, + "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=", + "owner": "tinted-theming", "repo": "base16-vim", - "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d", + "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d", "type": "github" }, "original": { - "owner": "chriskempson", + "owner": "tinted-theming", "repo": "base16-vim", "type": "github" } @@ -180,11 +180,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1718242063, - "narHash": "sha256-n3AWItJ4a94GT0cray/eUV7tt3mulQ52L+lWJN9d1E8=", + "lastModified": 1718588625, + "narHash": "sha256-8ZbrJq1jcmyzJ4SDkvd8JOZD4/fNUHpL4cpqVe4w3CU=", "owner": "nix-community", "repo": "disko", - "rev": "832a9f2c81ff3485404bd63952eadc17bf7ccef2", + "rev": "8262659fc990cecdf6a8de74c3de7b6ec58c2276", "type": "github" }, "original": { @@ -297,6 +297,43 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "font-flake": { + "inputs": { + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1719113152, + "narHash": "sha256-JZ6Dk/+U0k7bFAF8oJOq4APN+k3aAjWlPg600vfCq1Y=", + "owner": "redyf", + "repo": "font-flake", + "rev": "63aa8e06266d1081d475b224a6ed4a53511ff118", + "type": "github" + }, + "original": { + "owner": "redyf", + "repo": "font-flake", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -411,11 +448,11 @@ ] }, "locked": { - "lastModified": 1718243258, - "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=", + "lastModified": 1718744742, + "narHash": "sha256-kOG10gJ3zLZNiom9NXJM4/mA4/lsmR3rp74YVw+iros=", "owner": "nix-community", "repo": "home-manager", - "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3", + "rev": "0dd1c1495af6e6424695670343236f0053bf4947", "type": "github" }, "original": { @@ -433,11 +470,11 @@ ] }, "locked": { - "lastModified": 1714981474, - "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -462,11 +499,11 @@ ] }, "locked": { - "lastModified": 1717181720, - "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", + "lastModified": 1718368322, + "narHash": "sha256-VfMg3RsnRLQzbq0hFIh1dCM09b5C/F/qPFUOgU/CRi0=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", + "rev": "dd3a853c8239d1c3f3f37de7d2b8ae4b4f3840df", "type": "github" }, "original": { @@ -491,11 +528,11 @@ ] }, "locked": { - "lastModified": 1717181720, - "narHash": "sha256-yv+QZWsusu/NWjydkxixHC2g+tIJ9v+xkE2EiVpJj6g=", + "lastModified": 1718368322, + "narHash": "sha256-VfMg3RsnRLQzbq0hFIh1dCM09b5C/F/qPFUOgU/CRi0=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "9e27a2c2ceb1e0b85bd55b0afefad196056fe87c", + "rev": "dd3a853c8239d1c3f3f37de7d2b8ae4b4f3840df", "type": "github" }, "original": { @@ -510,16 +547,16 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_5", - "systems": "systems_3", + "nixpkgs": "nixpkgs_6", + "systems": "systems_4", "xdph": "xdph" }, "locked": { - "lastModified": 1718292752, - "narHash": "sha256-NFioPAqyQIOuQMPcDezGCpngCP5ShrudUHfFCfN0d7o=", + "lastModified": 1718740381, + "narHash": "sha256-nRKxZfzSiG8EUmUmgsvPbEDR1GAPpVHZFbF7RJMzJTM=", "ref": "refs/heads/main", - "rev": "5de273a14427cb4a4cad9ac57a22b418bcd4248d", - "revCount": 4821, + "rev": "e0e3c4c6ae15af88ac5fd5ab959adfe45a2e1dca", + "revCount": 4861, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -544,11 +581,11 @@ ] }, "locked": { - "lastModified": 1714869498, - "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { @@ -584,31 +621,6 @@ "type": "github" } }, - "hyprland-protocols_3": { - "inputs": { - "nixpkgs": [ - "xdg-portal-hyprland", - "nixpkgs" - ], - "systems": [ - "xdg-portal-hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -667,28 +679,6 @@ "type": "github" } }, - "hyprlang_3": { - "inputs": { - "nixpkgs": [ - "xdg-portal-hyprland", - "nixpkgs" - ], - "systems": "systems_5" - }, - "locked": { - "lastModified": 1713121246, - "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -726,11 +716,11 @@ ] }, "locked": { - "lastModified": 1717881334, - "narHash": "sha256-a0inRgJhPL6v9v7RPM/rx1kbXdfe3xJA1c9z0ZkYnh4=", + "lastModified": 1718271409, + "narHash": "sha256-8KvVqtApNt4FWTdn1TqVvw00rpqyG9UuUPA2ilPVD1U=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0693f9398ab693d89c9a0aa3b3d062dd61b7a60e", + "rev": "8e10e0626fb26a14b859b3811b6ed7932400c86e", "type": "github" }, "original": { @@ -751,11 +741,11 @@ ] }, "locked": { - "lastModified": 1717784906, - "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", + "lastModified": 1718119275, + "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", + "rev": "1419520d5f7f38d35e05504da5c1b38212a38525", "type": "github" }, "original": { @@ -776,11 +766,11 @@ ] }, "locked": { - "lastModified": 1717784906, - "narHash": "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=", + "lastModified": 1718119275, + "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "0f30f9eca6e404130988554accbb64d1c9ec877d", + "rev": "1419520d5f7f38d35e05504da5c1b38212a38525", "type": "github" }, "original": { @@ -791,7 +781,7 @@ }, "matugen": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1711657889, @@ -846,11 +836,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", + "lastModified": 1718318537, + "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "type": "github" }, "original": { @@ -894,11 +884,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1718149104, - "narHash": "sha256-Ds1QpobBX2yoUDx9ZruqVGJ/uQPgcXoYuobBguyKEh8=", + "lastModified": 1718276985, + "narHash": "sha256-u1fA0DYQYdeG+5kDm1bOoGcHtX0rtC7qs2YA2N1X++I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e913ae340076bbb73d9f4d3d065c2bca7caafb16", + "rev": "3f84a279f1a6290ce154c5531378acc827836fbb", "type": "github" }, "original": { @@ -910,31 +900,30 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1717974879, - "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", + "lastModified": 1719109599, + "narHash": "sha256-SQDtUnsB0q36dRZBCQNbErEMz3xFtdOThVJoVbMkB7s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", + "rev": "4f217ce8924da1e9acde46062c1b06a7bb8b5dc2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_6": { "locked": { - "lastModified": 1691186842, - "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", - "owner": "nixos", + "lastModified": 1718318537, + "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", + "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -942,11 +931,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1718160348, - "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=", + "lastModified": 1691186842, + "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", + "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", "type": "github" }, "original": { @@ -958,32 +947,32 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1714912032, - "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", - "owner": "NixOS", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_9": { "locked": { - "lastModified": 1717974879, - "narHash": "sha256-GTO3C88+5DX171F/gVS3Qga/hOs/eRMxPFpiHq2t+D8=", + "lastModified": 1714912032, + "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7b821ba2e1e635ba5a76d299af62821cbcb09f3", + "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -1015,11 +1004,11 @@ }, "nur": { "locked": { - "lastModified": 1718310343, - "narHash": "sha256-jD2XqvofA5hdROv8OSTss/vjJi164Mjavgh2yJf2ej4=", + "lastModified": 1718755722, + "narHash": "sha256-BhHQGfL5CJ5Bm1jPVXStTETkN7CpYDkkvNEimQdXGGE=", "owner": "nix-community", "repo": "NUR", - "rev": "ca312c14ad9abbb8736b9f9fd6fa8b8f60b2f1b2", + "rev": "5c630785d3d86f5cfb1f015ae8792a44e137aa34", "type": "github" }, "original": { @@ -1033,14 +1022,14 @@ "Neve": "Neve", "ags": "ags", "disko": "disko", + "font-flake": "font-flake", "home-manager": "home-manager_2", "hyprland": "hyprland", "matugen": "matugen", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nur": "nur", "stylix": "stylix", - "waybar-hyprland": "waybar-hyprland", - "xdg-portal-hyprland": "xdg-portal-hyprland" + "waybar-hyprland": "waybar-hyprland" } }, "stylix": { @@ -1055,14 +1044,14 @@ "flake-compat": "flake-compat_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1718292734, - "narHash": "sha256-XAwxzCDfExqIj0PIjEpjt3eOzsosxOCLx6sQWHPSrSg=", + "lastModified": 1718634635, + "narHash": "sha256-REUyeY+gD/QuTwAhuJycheej0FWFGPTosI+jiG5TsQk=", "owner": "danth", "repo": "stylix", - "rev": "73c6955b4572346cc10f43a459949fe646efbde0", + "rev": "f13c946181730f98e1a5cd09714100490207b250", "type": "github" }, "original": { @@ -1103,16 +1092,16 @@ }, "systems_3": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1146,21 +1135,6 @@ "type": "github" } }, - "systems_6": { - "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" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -1189,16 +1163,16 @@ "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_9", - "systems": "systems_4", + "nixpkgs": "nixpkgs_10", + "systems": "systems_5", "xdph": "xdph_2" }, "locked": { - "lastModified": 1718292752, - "narHash": "sha256-O0czYVRia6RtorunzVPxK1et9rweJbTOmNYfA/jafg4=", + "lastModified": 1718740381, + "narHash": "sha256-zlK0jB/LXXxxckDw0HvM9JZpZMp6noJ0CpxCBcaoYe8=", "owner": "hyprwm", "repo": "hyprland", - "rev": "5de273a14427cb4a4cad9ac57a22b418bcd4248d", + "rev": "e0e3c4c6ae15af88ac5fd5ab959adfe45a2e1dca", "type": "github" }, "original": { @@ -1207,27 +1181,6 @@ "type": "github" } }, - "xdg-portal-hyprland": { - "inputs": { - "hyprland-protocols": "hyprland-protocols_3", - "hyprlang": "hyprlang_3", - "nixpkgs": "nixpkgs_10", - "systems": "systems_6" - }, - "locked": { - "lastModified": 1718272114, - "narHash": "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "24be4a26f0706e456fca1b61b8c79f7486a9e86d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -1245,11 +1198,11 @@ ] }, "locked": { - "lastModified": 1717918856, - "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", + "lastModified": 1718272114, + "narHash": "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "72907822c19afc0983c69d59d299204381623725", + "rev": "24be4a26f0706e456fca1b61b8c79f7486a9e86d", "type": "github" }, "original": { @@ -1275,11 +1228,11 @@ ] }, "locked": { - "lastModified": 1717918856, - "narHash": "sha256-I38bmPLqamvOfVSArd1hhZtkVRAYBK38fOHZCU1P9Qg=", + "lastModified": 1718272114, + "narHash": "sha256-KsX7sAwkEFpXiwyjt0HGTnnrUU58wW1jlzj5IA/LRz8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "72907822c19afc0983c69d59d299204381623725", + "rev": "24be4a26f0706e456fca1b61b8c79f7486a9e86d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2194411d..87a6f453 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,6 @@ description = "Redyf's Flake"; inputs = { - # Core nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager/master"; @@ -17,15 +16,7 @@ stylix.url = "github:danth/stylix"; ags.url = "github:Aylur/ags"; matugen.url = "github:InioX/matugen?ref=v2.2.0"; - xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; - - # git+ssh://git@git.example.com/User/repo.git - # fontflake.url = "git+ssh://git@github.com/redyf/font-flake.git"; - - # liga-martian-mono = { - # url = "github:redyf/LigaMartianMono"; - # flake = false; - # }; + font-flake.url = "github:redyf/font-flake"; # SFMono w/ patches # sf-mono-liga-src = { @@ -33,6 +24,7 @@ # flake = false; # }; + # git+ssh://git@git.example.com/User/repo.git if you're using private repos # berkeley = { # url = "git+ssh://git@github.com/redyf/berkeley.git"; # flake = false; @@ -51,6 +43,7 @@ home-manager, disko, stylix, + font-flake, ... } @ inputs: let supportedSystems = ["x86_64-linux" "x86_64-darwin" "aarch64-linux" "aarch64-darwin"]; diff --git a/home/redyf/apps/default.nix b/home/redyf/apps/default.nix index b4bbbebd..64e8ad09 100644 --- a/home/redyf/apps/default.nix +++ b/home/redyf/apps/default.nix @@ -1,11 +1,12 @@ _: { imports = [ - # ./artix-game-launcher + ./artix-game-launcher ./discord # ./davinci-resolve # ./emacs + # ./figma ./firefox - # ./insomnia + ./insomnia ./misc ./obs # ./vscode diff --git a/home/redyf/apps/figma/default.nix b/home/redyf/apps/figma/default.nix new file mode 100644 index 00000000..0351ded2 --- /dev/null +++ b/home/redyf/apps/figma/default.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + figma-linux + ]; +} diff --git a/home/redyf/apps/misc/default.nix b/home/redyf/apps/misc/default.nix index 92a33eaf..02a344a5 100644 --- a/home/redyf/apps/misc/default.nix +++ b/home/redyf/apps/misc/default.nix @@ -1,5 +1,4 @@ {pkgs, ...}: { - # Requires https://github.com/caarlos0/timer to be installed. spd-say should ship with your distro (Thanks Bashbunni!) home.packages = with pkgs; [ # Anime/Manga # ani-cli # A cli tool to browse and play anime @@ -15,25 +14,16 @@ obsidian # Other stuff - gh ollama playerctl # spotify # brave # Rice - bemenu # cmatrix - nitrogen # Wallpaper utility for X11 - nwg-look # Change GTK theme - # Screenshot + extra utils - grim # Screenshot tool for hyprland - slurp # Works with grim to screenshot on wayland - wl-clipboard # Enables copy/paste on wayland + # Extra utils vlc - - # System Utils mpv glib unzip # Unzip files using the terminal @@ -41,6 +31,6 @@ tree-sitter # A parser generator tool and an incremental parsing library appimage-run # Run appimage files in the terminal polkit_gnome - cinnamon.nemo + pcmanfm ]; } diff --git a/home/redyf/cli-apps/neovim/default.nix b/home/redyf/cli-apps/neovim/default.nix index dcab1945..a074f283 100644 --- a/home/redyf/cli-apps/neovim/default.nix +++ b/home/redyf/cli-apps/neovim/default.nix @@ -2,7 +2,6 @@ home = { packages = with pkgs; [ neovim - lazygit stylua sumneko-lua-language-server ripgrep diff --git a/home/redyf/cli-apps/neve/default.nix b/home/redyf/cli-apps/neve/default.nix index e41cc868..af961deb 100644 --- a/home/redyf/cli-apps/neve/default.nix +++ b/home/redyf/cli-apps/neve/default.nix @@ -5,7 +5,6 @@ }: { home.packages = with pkgs; [ inputs.Neve.packages.${system}.default - lazygit stylua sumneko-lua-language-server ripgrep diff --git a/home/redyf/desktop/awesomewm.nix b/home/redyf/desktop/awesomewm.nix index 1fc695cd..350b06b2 100644 --- a/home/redyf/desktop/awesomewm.nix +++ b/home/redyf/desktop/awesomewm.nix @@ -11,6 +11,7 @@ dunst dmenu flameshot + nitrogen # Wallpaper utility for X11 ]; }; services = { diff --git a/home/redyf/desktop/hyprland/default.nix b/home/redyf/desktop/hyprland/default.nix index c13a60e6..00d180e8 100644 --- a/home/redyf/desktop/hyprland/default.nix +++ b/home/redyf/desktop/hyprland/default.nix @@ -17,9 +17,12 @@ gnomeSchema = "org.gnome.desktop.interface"; in { home.packages = with pkgs; [ - grim - slurp - swappy + grim # Screenshot tool for hyprland + slurp # Works with grim to screenshot on wayland + swappy # Wayland native snapshot editing tool, inspired by Snappy on macOS + wl-clipboard # Enables copy/paste on wayland + bemenu + nwg-look # Change GTK theme (writeShellScriptBin "screenshot" '' grim -g "$(slurp)" - | wl-copy @@ -44,10 +47,6 @@ in { swww kill swww init - # Mako (Notifications) - pkill mako - mako & - # Cursor gsettings set org.gnome.desktop.interface cursor-theme macOS-BigSur hyprctl setcursor macOS-BigSur 32 # "Catppuccin-Mocha-Mauve-Cursors" @@ -187,7 +186,7 @@ in { mfact = 0.5; orientation = "right"; special_scale_factor = 0.8; - new_is_master = true; + new_status = "master"; no_gaps_when_only = false; }; diff --git a/home/redyf/home.nix b/home/redyf/home.nix index 4ebc9f55..1e5f3db2 100644 --- a/home/redyf/home.nix +++ b/home/redyf/home.nix @@ -30,44 +30,6 @@ config = { allowUnfree = true; }; - overlays = with inputs; [ - ( - final: prev: { - sf-mono-liga-bin = prev.stdenvNoCC.mkDerivation { - pname = "sf-mono-liga-bin"; - version = "dev"; - src = sf-mono-liga-src; - dontConfigure = true; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -R $src/*.otf $out/share/fonts/opentype/ - ''; - }; - - monolisa-script = prev.stdenvNoCC.mkDerivation { - pname = "monolisa"; - version = "dev"; - src = monolisa-script; - dontConfigure = true; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -R $src/*.ttf $out/share/fonts/opentype/ - ''; - }; - - berkeley = prev.stdenvNoCC.mkDerivation { - pname = "berkeley-mono"; - version = "dev"; - src = berkeley; - dontConfigure = true; - installPhase = '' - mkdir -p $out/share/fonts/opentype - cp -R $src/*.otf $out/share/fonts/opentype/ - ''; - }; - } - ) - ]; }; # Add support for .local/bin diff --git a/home/redyf/system/nix/default.nix b/home/redyf/system/nix/default.nix index 2b605850..95cbeed7 100644 --- a/home/redyf/system/nix/default.nix +++ b/home/redyf/system/nix/default.nix @@ -3,8 +3,6 @@ nil statix alejandra - nurl nix-init - nix-prefetch-git ]; } diff --git a/home/redyf/tools/git/default.nix b/home/redyf/tools/git/default.nix index 0620cb75..74595e31 100644 --- a/home/redyf/tools/git/default.nix +++ b/home/redyf/tools/git/default.nix @@ -1,4 +1,4 @@ -_: { +{pkgs, ...}: { programs.git = { enable = true; userName = "Redyf"; @@ -9,4 +9,8 @@ _: { pull.rebase = false; }; }; + home.packages = with pkgs; [ + gh + lazygit + ]; } diff --git a/home/redyf/tools/http/default.nix b/home/redyf/tools/http/default.nix index ec80233e..2c1b7dfb 100644 --- a/home/redyf/tools/http/default.nix +++ b/home/redyf/tools/http/default.nix @@ -1,3 +1,3 @@ {pkgs, ...}: { - home.packages = with pkgs; [curl httpie openssl]; + home.packages = with pkgs; [curl openssl]; } diff --git a/hosts/redyf/configuration.nix b/hosts/redyf/configuration.nix index 999cde7a..1a47d9b5 100644 --- a/hosts/redyf/configuration.nix +++ b/hosts/redyf/configuration.nix @@ -77,7 +77,7 @@ in { sessionVariables = { NIXOS_OZONE_WL = "1"; # Hint electron apps to use wayland WLR_NO_HARDWARE_CURSORS = "1"; # Fix cursor rendering issue on wlr nvidia. - DEFAULT_BROWSER = "${pkgs.brave}/bin/brave"; # Set default browser + DEFAULT_BROWSER = "${pkgs.firefox}/bin/firefox"; # Set default browser }; shellAliases = {nvidia-settings = "nvidia-settings --config='$XDG_CONFIG_HOME'/nvidia/settings";}; }; @@ -133,6 +133,7 @@ in { hyprland = { enable = true; package = inputs.hyprland.packages.${pkgs.system}.hyprland; + portalPackage = with pkgs; xdg-desktop-portal-hyprland; }; noisetorch.enable = true; nh = { @@ -157,8 +158,8 @@ in { base16Scheme = "${pkgs.base16-schemes}/share/themes/${theme}.yaml"; fonts = { monospace = { - package = with pkgs; nerdfonts.override {fonts = ["MartianMono"];}; - name = "MartianMono Nerd Font"; + package = with pkgs; nerdfonts.override {fonts = ["IBMPlexMono"];}; + name = "BlexMono Nerd Font Bold"; }; sansSerif = { package = pkgs.dejavu_fonts;