Compare commits

..

No commits in common. "f8ef5a4cdb9ea095db8ff36fc435f9fc3cd6e6c3" and "4d89115a0c75c438f6b521b711ce71e1a5d497fb" have entirely different histories.

6 changed files with 229 additions and 22 deletions

View file

@ -523,7 +523,25 @@
}, },
"flake-utils_6": { "flake-utils_6": {
"inputs": { "inputs": {
"systems": "systems_16" "systems": "systems_14"
},
"locked": {
"lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_7": {
"inputs": {
"systems": "systems_17"
}, },
"locked": { "locked": {
"lastModified": 1694529238, "lastModified": 1694529238,
@ -539,6 +557,23 @@
"type": "github" "type": "github"
} }
}, },
"freetype2": {
"flake": false,
"locked": {
"lastModified": 1675923892,
"narHash": "sha256-dOm8VKYdclTLLkqWMLv7DQI0Qyjit7S4SOCszKEkG3o=",
"owner": "wez",
"repo": "freetype2",
"rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11",
"type": "github"
},
"original": {
"owner": "wez",
"repo": "freetype2",
"rev": "de8b92dd7ec634e9e2b25ef534c54a3537555c11",
"type": "github"
}
},
"fromYaml": { "fromYaml": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -593,6 +628,23 @@
"type": "github" "type": "github"
} }
}, },
"harfbuzz": {
"flake": false,
"locked": {
"lastModified": 1677798343,
"narHash": "sha256-Lsd0Vrkrv67CMyV0ZveShfjUvqh/jDhI8rAK9ps+SZQ=",
"owner": "harfbuzz",
"repo": "harfbuzz",
"rev": "60841e26187576bff477c1a09ee2ffe544844abc",
"type": "github"
},
"original": {
"owner": "harfbuzz",
"repo": "harfbuzz",
"rev": "60841e26187576bff477c1a09ee2ffe544844abc",
"type": "github"
}
},
"helix": { "helix": {
"inputs": { "inputs": {
"crane": "crane_2", "crane": "crane_2",
@ -942,7 +994,7 @@
"xdg-portal-hyprland", "xdg-portal-hyprland",
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_14" "systems": "systems_15"
}, },
"locked": { "locked": {
"lastModified": 1713121246, "lastModified": 1713121246,
@ -1016,6 +1068,23 @@
"type": "github" "type": "github"
} }
}, },
"libpng": {
"flake": false,
"locked": {
"lastModified": 1549245649,
"narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=",
"owner": "glennrp",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"type": "github"
},
"original": {
"owner": "glennrp",
"repo": "libpng",
"rev": "8439534daa1d3a5705ba92e653eda9251246dd61",
"type": "github"
}
},
"nix-gaming": { "nix-gaming": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_3",
@ -1248,6 +1317,22 @@
} }
}, },
"nixpkgs_16": { "nixpkgs_16": {
"locked": {
"lastModified": 1705403940,
"narHash": "sha256-bl7E3w35Bleiexg01WsN0RuAQEL23HaQeNBC2zjt+9w=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f0326542989e1bdac955ad6269b334a8da4b0c95",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_17": {
"locked": { "locked": {
"lastModified": 1712963716, "lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
@ -1263,7 +1348,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_17": { "nixpkgs_18": {
"locked": { "locked": {
"lastModified": 1701174899, "lastModified": 1701174899,
"narHash": "sha256-1W+FMe8mWsJKXoBc+QgKmEeRj33kTFnPq7XCjU+bfnA=", "narHash": "sha256-1W+FMe8mWsJKXoBc+QgKmEeRj33kTFnPq7XCjU+bfnA=",
@ -1469,6 +1554,7 @@
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix", "stylix": "stylix",
"wezterm": "wezterm",
"xdg-portal-hyprland": "xdg-portal-hyprland", "xdg-portal-hyprland": "xdg-portal-hyprland",
"yazi": "yazi" "yazi": "yazi"
} }
@ -1521,6 +1607,31 @@
} }
}, },
"rust-overlay_3": { "rust-overlay_3": {
"inputs": {
"flake-utils": [
"wezterm",
"flake-utils"
],
"nixpkgs": [
"wezterm",
"nixpkgs"
]
},
"locked": {
"lastModified": 1705457855,
"narHash": "sha256-5cCHQtP/PEHK1YNTQyZN9v8ehpLTjc723ZSKAP3Tva8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a854609265af0e9f48c92e497679edf8fab9e690",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_4": {
"inputs": { "inputs": {
"flake-utils": [ "flake-utils": [
"yazi", "yazi",
@ -1671,16 +1782,16 @@
}, },
"systems_14": { "systems_14": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1681028828,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default-linux", "repo": "default",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "nix-systems",
"repo": "default-linux", "repo": "default",
"type": "github" "type": "github"
} }
}, },
@ -1700,6 +1811,21 @@
} }
}, },
"systems_16": { "systems_16": {
"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"
}
},
"systems_17": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1852,6 +1978,33 @@
"type": "github" "type": "github"
} }
}, },
"wezterm": {
"inputs": {
"flake-utils": "flake-utils_6",
"freetype2": "freetype2",
"harfbuzz": "harfbuzz",
"libpng": "libpng",
"nixpkgs": "nixpkgs_16",
"rust-overlay": "rust-overlay_3",
"zlib": "zlib"
},
"locked": {
"dir": "nix",
"lastModified": 1707245719,
"narHash": "sha256-+1jfdBwyp6q6gW9FOft90w39zThLvhHvN/yymlv2OVs=",
"owner": "notohh",
"repo": "wezterm",
"rev": "4bdd59cc81a63f253e0dd201acc39013288b6cda",
"type": "github"
},
"original": {
"dir": "nix",
"owner": "notohh",
"ref": "nix-add-overlay",
"repo": "wezterm",
"type": "github"
}
},
"wlroots": { "wlroots": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1873,8 +2026,8 @@
"inputs": { "inputs": {
"hyprland-protocols": "hyprland-protocols_2", "hyprland-protocols": "hyprland-protocols_2",
"hyprlang": "hyprlang_6", "hyprlang": "hyprlang_6",
"nixpkgs": "nixpkgs_16", "nixpkgs": "nixpkgs_17",
"systems": "systems_15" "systems": "systems_16"
}, },
"locked": { "locked": {
"lastModified": 1713214484, "lastModified": 1713214484,
@ -1925,9 +2078,9 @@
}, },
"yazi": { "yazi": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_7",
"nixpkgs": "nixpkgs_17", "nixpkgs": "nixpkgs_18",
"rust-overlay": "rust-overlay_3" "rust-overlay": "rust-overlay_4"
}, },
"locked": { "locked": {
"lastModified": 1713309288, "lastModified": 1713309288,
@ -1942,6 +2095,23 @@
"repo": "yazi", "repo": "yazi",
"type": "github" "type": "github"
} }
},
"zlib": {
"flake": false,
"locked": {
"lastModified": 1484501380,
"narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=",
"owner": "madler",
"repo": "zlib",
"rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
"type": "github"
},
"original": {
"owner": "madler",
"repo": "zlib",
"rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -73,6 +73,7 @@
yazi.url = "github:sxyazi/yazi"; yazi.url = "github:sxyazi/yazi";
helix.url = "github:helix-editor/helix"; helix.url = "github:helix-editor/helix";
pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
wezterm.url = "github:notohh/wezterm?dir=nix&ref=nix-add-overlay";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
atuin.url = "github:atuinsh/atuin"; atuin.url = "github:atuinsh/atuin";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";

View file

@ -0,0 +1,33 @@
{
disko.devices = {
disk = {
nvme0n1 = {
device = "/dev/nvme0n1";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
end = "500M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
};
};
root = {
name = "root";
end = "-0";
content = {
type = "filesystem";
format = "bcachefs";
mountpoint = "/";
};
};
};
};
};
};
};
}

View file

@ -6,6 +6,7 @@
}: { }: {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
# ./disko-config.nix
]; ];
boot = { boot = {
@ -28,19 +29,20 @@
}; };
fileSystems = { fileSystems = {
"/" = {
device = "/dev/disk/by-uuid/a423d32f-ac5d-4ea2-82fb-f94b05afce29";
fsType = "ext4";
};
"/boot/efi" = {
device = "/dev/disk/by-uuid/FEAF-138A";
fsType = "vfat";
};
"/nas/restic" = { "/nas/restic" = {
device = "192.168.1.199:/mnt/Sutoreji/nix-restic-data/tsuki"; device = "192.168.1.199:/mnt/Sutoreji/nix-restic-data/tsuki";
fsType = "nfs"; fsType = "nfs";
}; };
"/nas/ISOS" = {
device = "192.168.1.199:/mnt/Sutoreji/ISOS";
fsType = "nfs";
};
"/nas/osu-backups" = {
device = "192.168.1.199:/mnt/Sutoreji/osu-backups";
fsType = "nfs";
};
}; };
networking.useDHCP = lib.mkDefault true; networking.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

View file

@ -1,7 +1,7 @@
{...}: { {...}: {
imports = [ imports = [
./restic.nix ./restic.nix
# ./atticd.nix ./atticd.nix
./hydroxide.nix ./hydroxide.nix
]; ];
} }

View file

@ -4,6 +4,7 @@
inputs.nur.overlay inputs.nur.overlay
inputs.helix.overlays.default inputs.helix.overlays.default
inputs.yazi.overlays.default inputs.yazi.overlays.default
inputs.wezterm.overlays.default
inputs.hyprland.overlays.default inputs.hyprland.overlays.default
inputs.hypridle.overlays.default inputs.hypridle.overlays.default
inputs.hyprlock.overlays.default inputs.hyprlock.overlays.default