update flakes & fix

Former-commit-id: 9f1b464ce4
This commit is contained in:
Hadi
2024-11-16 11:57:00 +01:00
parent d7553fbce8
commit 7dc0964759
3 changed files with 91 additions and 62 deletions

112
flake.lock generated
View File

@@ -63,11 +63,11 @@
]
},
"locked": {
"lastModified": 1730968822,
"narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=",
"lastModified": 1731496216,
"narHash": "sha256-nlQrNN+tmJ+iP6Ck/czwZI0Hxz3oNvUyGkVruxJwgwA=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14",
"rev": "3b00e96f90cb0040de6d88ad99bf5f4d443f0c59",
"type": "github"
},
"original": {
@@ -354,11 +354,11 @@
]
},
"locked": {
"lastModified": 1730814269,
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
"lastModified": 1731363552,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "d70155fdc00df4628446352fc58adc640cd705c2",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"type": "github"
},
"original": {
@@ -435,11 +435,11 @@
]
},
"locked": {
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"lastModified": 1731604581,
"narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
"type": "github"
},
"original": {
@@ -456,11 +456,11 @@
]
},
"locked": {
"lastModified": 1730837930,
"narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"lastModified": 1731535640,
"narHash": "sha256-2EckCJn4wxran/TsRiCOFcmVpep2m9EBKl99NBh2GnM=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"rev": "35b055009afd0107b69c286fca34d2ad98940d57",
"type": "github"
},
"original": {
@@ -533,11 +533,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1730969692,
"narHash": "sha256-yHY98IWTLDz57TrseUxdh5QnpngcNCjNXTJ2XCeNhtk=",
"lastModified": 1731712919,
"narHash": "sha256-sWM0V0enjbxuODQQ5Jau98EYBEzyDMrR6a1uKjYB1HE=",
"ref": "refs/heads/main",
"rev": "e58e97b0a38b8ccc87a4304c9e4e2b37c9966875",
"revCount": 5425,
"rev": "7affc34ab43c5d5cbf670759b839a9e990d8bbea",
"revCount": 5457,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland"
@@ -608,11 +608,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1731058281,
"narHash": "sha256-Z1pfuBWnFGeR2bx51sNUbH31zLzFxLGc+Kxm85VyE48=",
"lastModified": 1731664774,
"narHash": "sha256-Do6AzcTlJrULDpgEJVyCkX1Js+8R18g1m0cPf0FJ77g=",
"owner": "Jas-SinghFSU",
"repo": "HyprPanel",
"rev": "3cc3fa5d42b69354a26f9b15b63c0e51280a1f19",
"rev": "0c6a19ab8900c0e27eb3b8dd0b96cde9a67981e9",
"type": "github"
},
"original": {
@@ -674,11 +674,11 @@
]
},
"locked": {
"lastModified": 1730968903,
"narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=",
"lastModified": 1731518387,
"narHash": "sha256-aZZw1ZvTMLkcA6udlvkA3hrCkuipoWLy8s/JNnIclxY=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9",
"rev": "315fba5d21d87ddb756d4bebdb49f99d86b0ffe8",
"type": "github"
},
"original": {
@@ -773,11 +773,11 @@
]
},
"locked": {
"lastModified": 1730779758,
"narHash": "sha256-5WI9AnsBwhLzVRnQm3Qn9oAbROnuLDQTpaXeyZCK8qw=",
"lastModified": 1731454423,
"narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "0e3f3f017c14467085f15d42343a3aaaacd89bcb",
"rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
"type": "github"
},
"original": {
@@ -788,11 +788,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1730919458,
"narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=",
"lastModified": 1731740897,
"narHash": "sha256-teFd31vsE/0Z0WR6XVeKhKPw6Eyb2gXGpG0tjpMfBDM=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "e1cc1f6483393634aee94514186d21a4871e78d7",
"rev": "c2c275fbb2e656948ba6e1f67b8ddd430f158c5f",
"type": "github"
},
"original": {
@@ -852,11 +852,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"lastModified": 1731139594,
"narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
"type": "github"
},
"original": {
@@ -916,11 +916,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1730785428,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"lastModified": 1731319897,
"narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"rev": "dc460ec76cbff0e66e269457d7b728432263166c",
"type": "github"
},
"original": {
@@ -961,11 +961,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1731009822,
"narHash": "sha256-VwGfFYHjizs7yQwh8JRlDUVkHLPc34jdqkQ2vyv6ddY=",
"lastModified": 1731707185,
"narHash": "sha256-IfA3x0eL4Be/7hvdvGSnT8fgiXz7GL3PtjGw3BH68gM=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "aabbd60633947baba11db44df84f402edc241440",
"rev": "be455f7f2714ce3479ae5bb662a03bd450f45793",
"type": "github"
},
"original": {
@@ -1000,11 +1000,11 @@
]
},
"locked": {
"lastModified": 1730760712,
"narHash": "sha256-F4H98tjNgySlSLItuOqHYo9LF85rFoS/Vr0uOrq7BM4=",
"lastModified": 1731347683,
"narHash": "sha256-BcSWCEUBShuB32LPif+EG0XGXyUi2jyjCSpGE1rbOws=",
"owner": "NuschtOS",
"repo": "search",
"rev": "aa5214c81b904a19f7a54f7a8f288f7902586eee",
"rev": "135d202e032be70c93b6d7d53592ef4799d6efde",
"type": "github"
},
"original": {
@@ -1057,11 +1057,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1730814269,
"narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=",
"lastModified": 1731363552,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "d70155fdc00df4628446352fc58adc640cd705c2",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
"type": "github"
},
"original": {
@@ -1144,11 +1144,11 @@
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
"lastModified": 1731047660,
"narHash": "sha256-iyp51lPWEQz4c5VH9bVbAuBcFP4crETU2QJYh5V0NYA=",
"lastModified": 1731748189,
"narHash": "sha256-Zd/Uukvpcu26M6YGhpbsgqm6LUSLz+Q8mDZ5LOEGdiE=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "60e1bce1999f126e3b16ef45f89f72f0c3f8d16f",
"rev": "d2bd7f433b28db6bc7ae03d5eca43564da0af054",
"type": "github"
},
"original": {
@@ -1165,11 +1165,11 @@
]
},
"locked": {
"lastModified": 1731039348,
"narHash": "sha256-dOfJAal/YoibiyFvW8QKGy5w5YGVlJp0to98GPMLcaM=",
"lastModified": 1731730585,
"narHash": "sha256-nyetM6Y0dMy2XH1KPlBLhh8jj0CnK1bkO0E6jg+iqQY=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "26b8b1dbcd22c452c1b52828eb0e283b37da2974",
"rev": "bec1abb9826ddb6f13c621c1092b1396e8cf1b10",
"type": "github"
},
"original": {
@@ -1195,17 +1195,16 @@
"tinted-tmux": "tinted-tmux"
},
"locked": {
"lastModified": 1731050777,
"narHash": "sha256-tGvmW0qih+dCAH9L4BEMYMiHcBoJVZtESbC9WH0EEuw=",
"lastModified": 1731657386,
"narHash": "sha256-Mm/JL8tFUS1SOmmZDPcswExUxzw0VpHcEyZI1h58CGA=",
"owner": "danth",
"repo": "stylix",
"rev": "9cad2b044a6de7502235b66d78a9df6efcf0ddcf",
"rev": "5ab1207b2fdeb5a022f2dd7cccf6be760f1b150f",
"type": "github"
},
"original": {
"owner": "danth",
"repo": "stylix",
"rev": "9cad2b044a6de7502235b66d78a9df6efcf0ddcf",
"type": "github"
}
},
@@ -1332,16 +1331,17 @@
"tinted-foot": {
"flake": false,
"locked": {
"lastModified": 1696725948,
"narHash": "sha256-65bz2bUL/yzZ1c8/GQASnoiGwaF8DczlxJtzik1c0AU=",
"lastModified": 1726913040,
"narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "eedbcfa30de0a4baa03e99f5e3ceb5535c2755ce",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "tinted-foot",
"rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
"type": "github"
}
},

View File

@@ -35,8 +35,7 @@
hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
hyprpolkitagent.url = "github:hyprwm/hyprpolkitagent";
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
# FIXME: This is a temporary fix until the PR is merged
stylix.url = "github:danth/stylix/9cad2b044a6de7502235b66d78a9df6efcf0ddcf";
stylix.url = "github:danth/stylix";
apple-fonts.url = "github:Lyndeno/apple-fonts.nix";
pia = {
url = "github:Fuwn/pia.nix";
@@ -52,7 +51,37 @@
system = "x86_64-linux";
modules = [
{
nixpkgs.overlays = [ inputs.hyprpanel.overlay ];
nixpkgs.overlays = [
inputs.hyprpanel.overlay
# FIXME: Temp fix
(final: prev: {
matugen = final.rustPlatform.buildRustPackage rec {
pname = "matugen";
version = "2.4.0";
src = final.fetchFromGitHub {
owner = "InioX";
repo = "matugen";
rev = "refs/tags/v${version}";
hash =
"sha256-l623fIVhVCU/ylbBmohAtQNbK0YrWlEny0sC/vBJ+dU=";
};
cargoHash =
"sha256-FwQhhwlldDskDzmIOxhwRuUv8NxXCxd3ZmOwqcuWz64=";
meta = {
description = "Material you color generation tool";
homepage = "https://github.com/InioX/matugen";
changelog =
"https://github.com/InioX/matugen/blob/${src.rev}/CHANGELOG.md";
license = final.lib.licenses.gpl2Only;
maintainers = with final.lib.maintainers; [ lampros ];
mainProgram = "matugen";
};
};
})
];
_module.args = { inherit inputs; };
}
inputs.nixos-hardware.nixosModules.omen-16-n0005ne # CHANGEME: check https://github.com/NixOS/nixos-hardware

View File

@@ -1,5 +1,5 @@
# Hyprlock is a lockscreen for Hyprland
{ config, ... }:
{ config, lib, ... }:
let
foreground = "rgba(216, 222, 233, 0.70)";
imageStr = toString config.stylix.image;
@@ -66,7 +66,7 @@ in {
];
# INPUT FIELD
input-field = [{
input-field = lib.mkForce {
monitor = "";
size = "300, 60";
outline_thickness = 2;
@@ -83,7 +83,7 @@ in {
position = "0, -250";
halign = "center";
valign = "center";
}];
};
};
};
}