diff --git a/flake.lock b/flake.lock
index 2cca3fb..6b68155 100644
--- a/flake.lock
+++ b/flake.lock
@@ -57,11 +57,11 @@
]
},
"locked": {
- "lastModified": 1769428758,
- "narHash": "sha256-0G/GzF7lkWs/yl82bXuisSqPn6sf8YGTnbEdFOXvOfU=",
+ "lastModified": 1767024902,
+ "narHash": "sha256-sMdk6QkMDhIOnvULXKUM8WW8iyi551SWw2i6KQHbrrU=",
"owner": "hyprwm",
"repo": "aquamarine",
- "rev": "def5e74c97370f15949a67c62e61f1459fcb0e15",
+ "rev": "b8a0c5ba5a9fbd2c660be7dd98bdde0ff3798556",
"type": "github"
},
"original": {
@@ -109,11 +109,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1768920986,
- "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=",
+ "lastModified": 1746728054,
+ "narHash": "sha256-eDoSOhxGEm2PykZFa/x9QG5eTH0MJdiJ9aR00VAofXE=",
"owner": "nix-community",
"repo": "disko",
- "rev": "de5708739256238fb912c62f03988815db89ec9a",
+ "rev": "ff442f5d1425feb86344c028298548024f21256d",
"type": "github"
},
"original": {
@@ -323,11 +323,11 @@
]
},
"locked": {
- "lastModified": 1769776025,
- "narHash": "sha256-70a1kVC08AMTvPc7iqQsJbbD4Y1fukakMVudz4oY9SM=",
+ "lastModified": 1768018810,
+ "narHash": "sha256-WREj1ZQ2wSGtyPAhQJ3SX/7PJ29PNKv04h/7NgqUS+M=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "0fba737f8d5571d41467f3d99a878e11b8c0f0f0",
+ "rev": "7c5d9345ad7cc38832cd4007f5cd03daad64d75b",
"type": "github"
},
"original": {
@@ -341,11 +341,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
- "lastModified": 1768426687,
- "narHash": "sha256-CopNx3j//gZ2mE0ggEK9dZ474UcbDhpTw+KMor8mSxI=",
+ "lastModified": 1766066098,
+ "narHash": "sha256-d3HmUbmfTDIt9mXEHszqyo2byqQMoyJtUJCZ9U1IqHQ=",
"owner": "hyprwm",
"repo": "contrib",
- "rev": "541628cebe42792ddf5063c4abd6402c2f1bd68f",
+ "rev": "41dbcac8183bb1b3a4ade0d8276b2f2df6ae4690",
"type": "github"
},
"original": {
@@ -399,11 +399,11 @@
]
},
"locked": {
- "lastModified": 1769284023,
- "narHash": "sha256-xG34vwYJ79rA2wVC8KFuM8r36urJTG6/csXx7LiiSYU=",
+ "lastModified": 1766946335,
+ "narHash": "sha256-MRD+Jr2bY11MzNDfenENhiK6pvN+nHygxdHoHbZ1HtE=",
"owner": "hyprwm",
"repo": "hyprgraphics",
- "rev": "13c536659d46893596412d180449353a900a1d31",
+ "rev": "4af02a3925b454deb1c36603843da528b67ded6c",
"type": "github"
},
"original": {
@@ -431,17 +431,19 @@
"xdph": "xdph"
},
"locked": {
- "lastModified": 1769694617,
- "narHash": "sha256-h8+Wqc4x68mN2qOLX45HsO6Z4eQOfrdtSKiSzcBrCVg=",
- "owner": "hyprwm",
- "repo": "Hyprland",
- "rev": "c92fb5e85f4a5fd3a0f5ffb5892f6a61cfe1be2b",
- "type": "github"
+ "lastModified": 1768000181,
+ "narHash": "sha256-7p4kVQGlhlt6em/yDV787uSKs9C8WzkvtjwXHWZ34Ok=",
+ "ref": "refs/heads/main",
+ "rev": "81e7498ec27156ee97aabba6fe4993412d98d1ab",
+ "revCount": 6803,
+ "submodules": true,
+ "type": "git",
+ "url": "https://github.com/hyprwm/Hyprland"
},
"original": {
- "owner": "hyprwm",
- "repo": "Hyprland",
- "type": "github"
+ "submodules": true,
+ "type": "git",
+ "url": "https://github.com/hyprwm/Hyprland"
}
},
"hyprland-guiutils": {
@@ -507,11 +509,11 @@
]
},
"locked": {
- "lastModified": 1769285097,
- "narHash": "sha256-eVD4U3Oqzz0VU9ylJ5wo76xDcYKv2CpiiRXq4Is4QdA=",
+ "lastModified": 1767723101,
+ "narHash": "sha256-jObY8O7OI+91hoE137APsDxm0235/Yx+HhFIip187zM=",
"owner": "hyprwm",
"repo": "hyprland-plugins",
- "rev": "06c0749a0dac978d89b1a76ae6adc76a3c15dbfa",
+ "rev": "fef398ed5e4faf59bc43b915e46a75cfe8b16697",
"type": "github"
},
"original": {
@@ -561,11 +563,11 @@
]
},
"locked": {
- "lastModified": 1767983607,
- "narHash": "sha256-8C2co8NYfR4oMOUEsPROOJ9JHrv9/ktbJJ6X1WsTbXc=",
+ "lastModified": 1764612430,
+ "narHash": "sha256-54ltTSbI6W+qYGMchAgCR6QnC1kOdKXN6X6pJhOWxFg=",
"owner": "hyprwm",
"repo": "hyprlang",
- "rev": "d4037379e6057246b408bbcf796cf3e9838af5b2",
+ "rev": "0d00dc118981531aa731150b6ea551ef037acddd",
"type": "github"
},
"original": {
@@ -692,11 +694,11 @@
]
},
"locked": {
- "lastModified": 1769202094,
- "narHash": "sha256-gdJr/vWWLRW85ucatSjoBULPB2dqBJd/53CZmQ9t91Q=",
+ "lastModified": 1767473322,
+ "narHash": "sha256-RGOeG+wQHeJ6BKcsSB8r0ZU77g9mDvoQzoTKj2dFHwA=",
"owner": "hyprwm",
"repo": "hyprwire",
- "rev": "a45ca05050d22629b3c7969a926d37870d7dd75c",
+ "rev": "d5e7d6b49fe780353c1cf9a1cf39fa8970bd9d11",
"type": "github"
},
"original": {
@@ -784,11 +786,11 @@
]
},
"locked": {
- "lastModified": 1769188530,
- "narHash": "sha256-7IbDO2kdQ203SrMFrmitaClED16TJeB+T+f7dXqIZo0=",
- "rev": "72b01b4b39e9a54bcf75003d07a6f2bb3104737a",
+ "lastModified": 1766487857,
+ "narHash": "sha256-Inkx0g6Dvn/lAC2bQh/rNKvoP8NGpm/YqPDiagfAdKQ=",
+ "rev": "9e333811b45c7245b8744c0d9f292912513459b0",
"type": "tarball",
- "url": "https://git.madhouse-project.org/api/v1/repos/iocaine/nam-shub-of-enki/archive/72b01b4b39e9a54bcf75003d07a6f2bb3104737a.tar.gz?rev=72b01b4b39e9a54bcf75003d07a6f2bb3104737a"
+ "url": "https://git.madhouse-project.org/api/v1/repos/iocaine/nam-shub-of-enki/archive/9e333811b45c7245b8744c0d9f292912513459b0.tar.gz?rev=9e333811b45c7245b8744c0d9f292912513459b0"
},
"original": {
"type": "tarball",
@@ -805,11 +807,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1769188713,
- "narHash": "sha256-Amw9yroFzMRaaZa5bjMZHXtWNVrdbidx1c7JqscfkVg=",
- "rev": "528a816e0b4b5e3999b4d0c8ace7fd488a4366d8",
+ "lastModified": 1766487985,
+ "narHash": "sha256-1lf9iyBmFrDdoH1r5h56FvximUHs+PQktU/S5EFGlrI=",
+ "rev": "1e607be339fd1864328708dc80ec9b266a2bd7f5",
"type": "tarball",
- "url": "https://git.madhouse-project.org/api/v1/repos/iocaine/nixocaine/archive/528a816e0b4b5e3999b4d0c8ace7fd488a4366d8.tar.gz"
+ "url": "https://git.madhouse-project.org/api/v1/repos/iocaine/nixocaine/archive/1e607be339fd1864328708dc80ec9b266a2bd7f5.tar.gz"
},
"original": {
"type": "tarball",
@@ -818,11 +820,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1769302137,
- "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
+ "lastModified": 1767185284,
+ "narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
"owner": "nixos",
"repo": "nixos-hardware",
- "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
+ "rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
"type": "github"
},
"original": {
@@ -880,11 +882,11 @@
},
"nixpkgs_10": {
"locked": {
- "lastModified": 1769018530,
- "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+ "lastModified": 1767379071,
+ "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+ "rev": "fb7944c166a3b630f177938e478f0378e64ce108",
"type": "github"
},
"original": {
@@ -896,11 +898,11 @@
},
"nixpkgs_2": {
"locked": {
- "lastModified": 1768661221,
- "narHash": "sha256-MJwOjrIISfOpdI9x4C+5WFQXvHtOuj5mqLZ4TMEtk1M=",
+ "lastModified": 1746576598,
+ "narHash": "sha256-FshoQvr6Aor5SnORVvh/ZdJ1Sa2U4ZrIMwKBX5k2wu0=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3327b113f2ef698d380df83fbccefad7e83d7769",
+ "rev": "b3582c75c7f21ce0b429898980eddbbf05c68e55",
"type": "github"
},
"original": {
@@ -944,11 +946,11 @@
},
"nixpkgs_5": {
"locked": {
- "lastModified": 1769598131,
- "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=",
+ "lastModified": 1767799921,
+ "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211",
+ "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
"type": "github"
},
"original": {
@@ -992,11 +994,11 @@
},
"nixpkgs_8": {
"locked": {
- "lastModified": 1769461804,
- "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
+ "lastModified": 1767892417,
+ "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
+ "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
"type": "github"
},
"original": {
@@ -1008,11 +1010,11 @@
},
"nixpkgs_9": {
"locked": {
- "lastModified": 1769268028,
- "narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=",
+ "lastModified": 1767364772,
+ "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562",
+ "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
"type": "github"
},
"original": {
@@ -1068,11 +1070,11 @@
"nixpkgs": "nixpkgs_8"
},
"locked": {
- "lastModified": 1769768855,
- "narHash": "sha256-OuUk+skANEQBNDKLiXvZOcdv2vfWsrbxvwNPSw0iKjE=",
+ "lastModified": 1768038731,
+ "narHash": "sha256-1M1EhmredaBSkT/IsHWEVDXJjNyvsM6slDBiNfDj+HA=",
"owner": "nix-community",
"repo": "NUR",
- "rev": "cf3ece1c8c4108d7e5940ba7f1b01048407fff10",
+ "rev": "3cb7022a0e5b669bc765dcb9c280b6653730362c",
"type": "github"
},
"original": {
@@ -1108,7 +1110,7 @@
"oisd": {
"flake": false,
"locked": {
- "narHash": "sha256-vW0GHUShUrTXa6qwEcJNhD/m5kbSlpzOIMj1/Kv77uk=",
+ "narHash": "sha256-wEkqluvwxLyfwqhKKn0d4NohXzenTZjX3gJGxtDes74=",
"type": "file",
"url": "https://big.oisd.nl/domainswild"
},
@@ -1127,11 +1129,11 @@
]
},
"locked": {
- "lastModified": 1769069492,
- "narHash": "sha256-Efs3VUPelRduf3PpfPP2ovEB4CXT7vHf8W+xc49RL/U=",
+ "lastModified": 1767281941,
+ "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
"owner": "cachix",
"repo": "git-hooks.nix",
- "rev": "a1ef738813b15cf8ec759bdff5761b027e3e1d23",
+ "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
"type": "github"
},
"original": {
@@ -1204,11 +1206,11 @@
"nixpkgs": "nixpkgs_9"
},
"locked": {
- "lastModified": 1769469829,
- "narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=",
+ "lastModified": 1768032389,
+ "narHash": "sha256-BVpTd93G0XmAK1iXiBdhUA5Uvt+WmM1YL0mA4REcT68=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff",
+ "rev": "a8cfe238b93166f9f96c0df67a94e572554ee624",
"type": "github"
},
"original": {
@@ -1223,11 +1225,11 @@
"systems": "systems_6"
},
"locked": {
- "lastModified": 1769316930,
- "narHash": "sha256-4EOGHYLpIscwr+6drHE28Qj7NDjjowp2Vd8QkXjdBBE=",
+ "lastModified": 1767502559,
+ "narHash": "sha256-om0IPjW850vhhIrNZ5tiXjsYuqyoI44IdE+I9AwZ96I=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
- "rev": "b2ce438f386943ef611e196a178af2d79042903b",
+ "rev": "806c1fdeb7af3e013215d14f5d9f06685fa6650f",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index f996697..caffa19 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
alejandra.url = "github:kamadorueda/alejandra/3.0.0";
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
- hyprland.url = "github:hyprwm/Hyprland";
+ hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";
hyprland.inputs.nixpkgs.follows = "nixpkgs";
hyprland-plugins.url = "github:hyprwm/hyprland-plugins";
hyprland-plugins.inputs.hyprland.follows = "hyprland";
@@ -22,16 +22,15 @@
nixocaine.url = "https://git.madhouse-project.org/iocaine/nixocaine/archive/stable.tar.gz";
ai-robots-txt.url = "github:ai-robots-txt/ai.robots.txt";
ai-robots-txt.flake = false;
- nix-darwin.url = "github:nix-darwin/nix-darwin/master";
- nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
- nix-homebrew.url = "github:zhaofengli/nix-homebrew";
};
outputs =
{
self,
nixpkgs,
- nix-darwin,
+ sops-nix,
+ disko,
+ oisd,
...
}@inputs:
let
@@ -45,16 +44,6 @@
in
{
overlays.default = overlays.addition;
- darwinConfigurations = {
- azalea = nix-darwin.lib.darwinSystem {
- system = "aarch64-darwin";
- modules = [
- (import ./hosts/azalea)
- ];
- host = "azalea";
- inherit self inputs username;
- };
- };
nixosConfigurations = {
sakura = nixpkgs.lib.nixosSystem {
inherit system;
diff --git a/hosts/azalea/default.nix b/hosts/azalea/default.nix
deleted file mode 100644
index fab7d42..0000000
--- a/hosts/azalea/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ username, ... }:
-{
- imports = [
- #./hardware-configuration.nix
- #./../../modules/core
- #./../../modules/core/virtualization.nix
- #./../../modules/services/tailscale.nix
- #./../../modules/services/mpd.nix
- #./../../modules/services/smart-monitoring.nix
- #./../../modules/services/mullvad.nix
- #./../../modules/home/steam.nix
- #./../../modules/services/ollama.nix
- #./../../modules/services/automount.nix
- ];
-
- security.pam.enableSudoTouchIdAuth = true;
- system.primaryUser = username;
- homebrew = {
- enable = true;
- onActivation = {
- autoUpdate = true;
- cleanup = "uninstall";
- upgrade = true;
- };
- brewPrefix = "/opt/homebrew/bin";
- caskArgs = {
- no_quarantine = true;
- };
- casks = [
- # "steam"
- "libreoffice"
- "signal"
- "handbrake"
- "tailscale"
- "ungoogled-chromium"
- # "orca-slicer"
- "element"
- "raycast"
- "anki"
- ];
- };
-}
diff --git a/modules/home/hyprland/config.nix b/modules/home/hyprland/config.nix
index f91dedb..c517b8f 100644
--- a/modules/home/hyprland/config.nix
+++ b/modules/home/hyprland/config.nix
@@ -89,8 +89,6 @@
}
'';
- services.swayosd.enable = true;
-
wayland.windowManager.hyprland = {
settings = {
@@ -200,13 +198,6 @@
inactive_opacity = 0.75;
# fullscreen_opacity = 1.0;
- shadow = {
- enabled = true;
- render_power = 4;
- ignore_window = true;
- # offset = [ ];
- };
-
blur = {
enabled = true;
size = 7;
diff --git a/modules/home/waybar/default.nix b/modules/home/waybar/default.nix
index e1e507c..8dfb270 100644
--- a/modules/home/waybar/default.nix
+++ b/modules/home/waybar/default.nix
@@ -311,8 +311,8 @@
"format-discharging-warning": "BATT: {capacity}%",
"format-discharging-critical": "BATT: {capacity}%",
"format-charging": "BATT: {capacity}% @ {power:2.0f}W",
- "format-full": "BATT: {capacity}%",
- "format-not-charging": "BATT: !!! {capacity}%",
+ "format-full": "BATT: {capacity}%",
+ "format-not-charging": "BATT: {capacity}%",
// "format-icons": [" ", " ", " ", " ", " "], // use {icon}
},
diff --git a/roles/gui.nix b/roles/gui.nix
index 43eebda..5e323a8 100644
--- a/roles/gui.nix
+++ b/roles/gui.nix
@@ -81,7 +81,6 @@ in
lxqt.pavucontrol-qt
mpv
kdePackages.kdeconnect-kde
- libgnome-keyring
# Gaming
lunar-client