updated system

This commit is contained in:
Emmet
2025-03-22 09:45:20 -05:00
parent eade9c6bd8
commit 89b54b1aaa
4 changed files with 110 additions and 160 deletions

262
flake.lock generated
View File

@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737636397, "lastModified": 1742213273,
"narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=", "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "7fe006981fae53e931f513026fc754e322f13145", "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -126,11 +126,11 @@
"blocklist-hosts": { "blocklist-hosts": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1741901790, "lastModified": 1742575697,
"narHash": "sha256-34JVDJ6X1naRj+eFbuWSRxdfF5GX8FCTSFXNe78q1S8=", "narHash": "sha256-D8Ebr02/O4avw/+60o8oZYII9pGz1veb+Gox6XOdQdg=",
"owner": "StevenBlack", "owner": "StevenBlack",
"repo": "hosts", "repo": "hosts",
"rev": "9644218ede1bc706cb2d76ed18902caad1998901", "rev": "99c5f53e326ad3fb0525ed65f96925c2234940a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -185,11 +185,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1742030321, "lastModified": 1742576675,
"narHash": "sha256-O2DgfU9vxiwwk0zDiCtPYrEISBnX1b/DB3F3LG6iX8c=", "narHash": "sha256-2JbkmTzqfb5c/zk2xM6JKHZzgN1YsxblgqucbI0P4bU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "5ca8419dfc9f6c451aa9bfee0f37ff28c9582774", "rev": "610d71db8074a369a0498572ff75b444d284409d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -473,11 +473,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741955947, "lastModified": 1742588233,
"narHash": "sha256-2lbURKclgKqBNm7hVRtWh0A7NrdsibD0EaWhahUVhhY=", "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4e12151c9e014e2449e0beca2c0e9534b96a26b4", "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -524,11 +524,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737634937, "lastModified": 1742215578,
"narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=", "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e", "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -553,11 +553,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737634889, "lastModified": 1739049071,
"narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -582,11 +582,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1734906236, "lastModified": 1737634889,
"narHash": "sha256-vH/ysV2ONGQgYZPtcJKwc8jJivzyVxru2aaOxC20ZOE=", "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "6dea3fba08fd704dd624b6d4b261638fb4003c9c", "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -602,7 +602,7 @@
"hyprgraphics": "hyprgraphics", "hyprgraphics": "hyprgraphics",
"hyprland-protocols": "hyprland-protocols", "hyprland-protocols": "hyprland-protocols",
"hyprland-qtutils": "hyprland-qtutils", "hyprland-qtutils": "hyprland-qtutils",
"hyprlang": "hyprlang_2", "hyprlang": "hyprlang",
"hyprutils": [ "hyprutils": [
"hyprutils" "hyprutils"
], ],
@ -615,16 +615,16 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1738457237, "lastModified": 1742584793,
"narHash": "sha256-9mtM+lwnmXnv5TPmdij1rR5fLzzqSjkltcyEuRf8uIk=", "narHash": "sha256-Zhau0ocCNRDg/+MTIutjPkN1+pYjYzgyW3P7eqL/LkQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "882f7ad7d2bbfc7440d0ccaef93b1cdd78e8e3ff", "rev": "ccbdba7ee2ccb835306de89a6023134fa6b8006f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "hyprwm", "owner": "hyprwm",
"ref": "v0.47.2", "ref": "main",
"repo": "Hyprland", "repo": "Hyprland",
"type": "github" "type": "github"
} }
@ -641,11 +641,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737556638, "lastModified": 1738422629,
"narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -656,7 +656,11 @@
}, },
"hyprland-qt-support": { "hyprland-qt-support": {
"inputs": { "inputs": {
"hyprlang": "hyprlang", "hyprlang": [
"hyprland",
"hyprland-qtutils",
"hyprlang"
],
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprland",
"hyprland-qtutils", "hyprland-qtutils",
@ -685,6 +689,41 @@
"hyprland-qtutils": { "hyprland-qtutils": {
"inputs": { "inputs": {
"hyprland-qt-support": "hyprland-qt-support", "hyprland-qt-support": "hyprland-qt-support",
"hyprlang": [
"hyprland",
"hyprlang"
],
"hyprutils": [
"hyprland",
"hyprland-qtutils",
"hyprlang",
"hyprutils"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1739048983,
"narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": [ "hyprutils": [
"hyprland", "hyprland",
"hyprutils" "hyprutils"
@ -699,41 +738,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737811848, "lastModified": 1741191527,
"narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=", "narHash": "sha256-kM+11Nch47Xwfgtw2EpRitJuORy4miwoMuRi5tyMBDY=",
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprland-qtutils",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": "hyprutils",
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"systems"
]
},
"locked": {
"lastModified": 1737634606,
"narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "f41271d35cc0f370d300413d756c2677f386af9d", "rev": "72df3861f1197e41b078faa3e38eedd60e00018d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -745,15 +754,15 @@
"hyprlang_2": { "hyprlang_2": {
"inputs": { "inputs": {
"hyprutils": [ "hyprutils": [
"hyprland", "hyprlock",
"hyprutils" "hyprutils"
], ],
"nixpkgs": [ "nixpkgs": [
"hyprland", "hyprlock",
"nixpkgs" "nixpkgs"
], ],
"systems": [ "systems": [
"hyprland", "hyprlock",
"systems" "systems"
] ]
}, },
@ -771,39 +780,10 @@
"type": "github" "type": "github"
} }
}, },
"hyprlang_3": {
"inputs": {
"hyprutils": [
"hyprlock",
"hyprutils"
],
"nixpkgs": [
"hyprlock",
"nixpkgs"
],
"systems": [
"hyprlock",
"systems"
]
},
"locked": {
"lastModified": 1735393019,
"narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "55608efdaa387af7bfdc0eddb404c409958efa43",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlock": { "hyprlock": {
"inputs": { "inputs": {
"hyprgraphics": "hyprgraphics_2", "hyprgraphics": "hyprgraphics_2",
"hyprlang": "hyprlang_3", "hyprlang": "hyprlang_2",
"hyprutils": [ "hyprutils": [
"hyprutils" "hyprutils"
], ],
@ -814,52 +794,20 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1735497496, "lastModified": 1742460722,
"narHash": "sha256-lT6f/5NB73xj9cVesi2SNsL5jVciwZJp8QRohiv+3Hk=", "narHash": "sha256-u23NzXN2yez0nO2zEtEaChE/4jhtC8WvpM8OpwUsls8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3d63d9b129d5def270bc8a2471347e6f97274e2b", "rev": "f883e669d147ac189b64ce403300a5a3e4de2c66",
"revCount": 301, "revCount": 342,
"type": "git", "type": "git",
"url": "https://code.hyprland.org/hyprwm/hyprlock.git" "url": "https://code.hyprland.org/hyprwm/hyprlock.git"
}, },
"original": { "original": {
"rev": "3d63d9b129d5def270bc8a2471347e6f97274e2b",
"type": "git", "type": "git",
"url": "https://code.hyprland.org/hyprwm/hyprlock.git" "url": "https://code.hyprland.org/hyprwm/hyprlock.git"
} }
}, },
"hyprutils": { "hyprutils": {
"inputs": {
"nixpkgs": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"hyprlang",
"nixpkgs"
],
"systems": [
"hyprland",
"hyprland-qtutils",
"hyprland-qt-support",
"hyprlang",
"systems"
]
},
"locked": {
"lastModified": 1737632363,
"narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "006620eb29d54ea9086538891404c78563d1bae1",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"hyprutils_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -892,11 +840,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735493474, "lastModified": 1739870480,
"narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", "narHash": "sha256-SiDN5BGxa/1hAsqhgJsS03C3t2QrLgBT8u+ENJ0Qzwc=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", "rev": "206367a08dc5ac4ba7ad31bdca391d098082e64b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -993,11 +941,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1741862977, "lastModified": 1742512142,
"narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1009,11 +957,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1741862977, "lastModified": 1742512142,
"narHash": "sha256-prZ0M8vE/ghRGGZcflvxCu40ObKaB+ikn74/xQoNrGQ=", "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cdd2ef009676ac92b715ff26630164bb88fec4e0", "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1024,11 +972,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1741851582, "lastModified": 1742422364,
"narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1125,11 +1073,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737465171, "lastModified": 1742058297,
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1147,7 +1095,7 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hyprland": "hyprland", "hyprland": "hyprland",
"hyprlock": "hyprlock", "hyprlock": "hyprlock",
"hyprutils": "hyprutils_2", "hyprutils": "hyprutils",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
@ -1199,11 +1147,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1742005800, "lastModified": 1742524367,
"narHash": "sha256-6wuOGWkyW6R4A6Th9NMi6WK2jjddvZt7V2+rLPk6L3o=", "narHash": "sha256-KzTwk/5ETJavJZYV1DEWdCx05M4duFCxCpRbQSKWpng=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "028cd247a6375f83b94adc33d83676480fc9c294", "rev": "70bf752d176b2ce07417e346d85486acea9040ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1254,11 +1202,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1742040559, "lastModified": 1742591463,
"narHash": "sha256-Hb3aw00C1/5ORiTCASwMd8vcLAl/GNJfyjXZyl/EKpc=", "narHash": "sha256-CguaHULcm4RuIGN+i4u80dYZujFgZaeOTiShFxCwFhw=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "bcc674f1994396137438bac9d905971453d33b12", "rev": "113643f332e1f70d90991722f8c4e5a0ace6fd06",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1474,11 +1422,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1737634991, "lastModified": 1741934139,
"narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -86,7 +86,7 @@
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
hyprland = { hyprland = {
url = "github:hyprwm/Hyprland/v0.47.2?submodules=true"; url = "github:hyprwm/Hyprland/main?submodules=true";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.hyprutils.follows = "hyprutils"; inputs.hyprutils.follows = "hyprutils";
}; };
@ -100,7 +100,6 @@
hyprlock = { hyprlock = {
type = "git"; type = "git";
url = "https://code.hyprland.org/hyprwm/hyprlock.git"; url = "https://code.hyprland.org/hyprwm/hyprlock.git";
rev = "3d63d9b129d5def270bc8a2471347e6f97274e2b";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.hyprutils.follows = "hyprutils"; inputs.hyprutils.follows = "hyprutils";
}; };

View File

@ -10,7 +10,7 @@
# hardware # hardware
cachy.enable = true; cachy.enable = true;
bluetooth.enable = true; bluetooth.enable = true;
tlp.enable = true; tlp.enable = false;
printing.enable = true; printing.enable = true;
# software # software
@ -46,6 +46,8 @@
}; };
}; };
services.thermald.enable = true;
users.users.emmet.description = "Emmet"; users.users.emmet.description = "Emmet";
home-manager.users.emmet.userSettings = { home-manager.users.emmet.userSettings = {
name = "Emmet"; name = "Emmet";

View File

@ -81,6 +81,7 @@ in {
"--prefer-vk-device 1002:1638" # lspci -nn | grep VGA "--prefer-vk-device 1002:1638" # lspci -nn | grep VGA
]; ];
}; };
chaotic.hdr.enable = true;
systemSettings.bluetooth.enable = true; systemSettings.bluetooth.enable = true;
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;