Compare commits

..

No commits in common. "d9aa13a3169386cf3d4f190b62c2d5136982f37b" and "ae1820936e8de540003eee78a8b06f9f9644c6d4" have entirely different histories.

10 changed files with 337 additions and 230 deletions

View file

@ -483,7 +483,7 @@
},
"flake-utils_5": {
"inputs": {
"systems": "systems_12"
"systems": "systems_13"
},
"locked": {
"lastModified": 1710146030,
@ -501,7 +501,7 @@
},
"flake-utils_6": {
"inputs": {
"systems": "systems_15"
"systems": "systems_16"
},
"locked": {
"lastModified": 1710146030,
@ -634,6 +634,26 @@
}
},
"hyprcursor": {
"inputs": {
"hyprlang": "hyprlang",
"nixpkgs": "nixpkgs_6",
"systems": "systems_5"
},
"locked": {
"lastModified": 1713612213,
"narHash": "sha256-zJboXgWNpNhKyNF8H/3UYzWkx7w00TOCGKi3cwi+tsw=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "cab4746180f210a3c1dd3d53e45c510e309e90e1",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprcursor",
"type": "github"
}
},
"hyprcursor_2": {
"inputs": {
"hyprlang": [
"hyprland",
@ -664,9 +684,9 @@
},
"hypridle": {
"inputs": {
"hyprlang": "hyprlang",
"nixpkgs": "nixpkgs_6",
"systems": "systems_6"
"hyprlang": "hyprlang_2",
"nixpkgs": "nixpkgs_7",
"systems": "systems_7"
},
"locked": {
"lastModified": 1713472482,
@ -684,11 +704,11 @@
},
"hyprland": {
"inputs": {
"hyprcursor": "hyprcursor",
"hyprlang": "hyprlang_2",
"hyprcursor": "hyprcursor_2",
"hyprlang": "hyprlang_3",
"hyprwayland-scanner": "hyprwayland-scanner",
"nixpkgs": "nixpkgs_7",
"systems": "systems_7",
"nixpkgs": "nixpkgs_8",
"systems": "systems_8",
"xdph": "xdph"
},
"locked": {
@ -787,10 +807,13 @@
"hyprlang": {
"inputs": {
"nixpkgs": [
"hypridle",
"hyprcursor",
"nixpkgs"
],
"systems": "systems_5"
"systems": [
"hyprcursor",
"systems"
]
},
"locked": {
"lastModified": 1713121246,
@ -807,6 +830,28 @@
}
},
"hyprlang_2": {
"inputs": {
"nixpkgs": [
"hypridle",
"nixpkgs"
],
"systems": "systems_6"
},
"locked": {
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlang_3": {
"inputs": {
"nixpkgs": [
"hyprland",
@ -831,32 +876,13 @@
"type": "github"
}
},
"hyprlang_3": {
"hyprlang_4": {
"inputs": {
"nixpkgs": [
"hyprlock",
"nixpkgs"
],
"systems": "systems_8"
},
"locked": {
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlang_4": {
"inputs": {
"nixpkgs": "nixpkgs_9",
"systems": "systems_10"
"systems": "systems_9"
},
"locked": {
"lastModified": 1713121246,
@ -873,12 +899,31 @@
}
},
"hyprlang_5": {
"inputs": {
"nixpkgs": "nixpkgs_10",
"systems": "systems_11"
},
"locked": {
"lastModified": 1713121246,
"narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprlang_6": {
"inputs": {
"nixpkgs": [
"xdg-portal-hyprland",
"nixpkgs"
],
"systems": "systems_13"
"systems": "systems_14"
},
"locked": {
"lastModified": 1713121246,
@ -896,9 +941,9 @@
},
"hyprlock": {
"inputs": {
"hyprlang": "hyprlang_3",
"nixpkgs": "nixpkgs_8",
"systems": "systems_9"
"hyprlang": "hyprlang_4",
"nixpkgs": "nixpkgs_9",
"systems": "systems_10"
},
"locked": {
"lastModified": 1715510809,
@ -916,9 +961,9 @@
},
"hyprpaper": {
"inputs": {
"hyprlang": "hyprlang_4",
"nixpkgs": "nixpkgs_10",
"systems": "systems_11"
"hyprlang": "hyprlang_5",
"nixpkgs": "nixpkgs_11",
"systems": "systems_12"
},
"locked": {
"lastModified": 1714910693,
@ -936,7 +981,7 @@
},
"hyprpicker": {
"inputs": {
"nixpkgs": "nixpkgs_11"
"nixpkgs": "nixpkgs_12"
},
"locked": {
"lastModified": 1715417660,
@ -980,7 +1025,7 @@
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_12"
"nixpkgs": "nixpkgs_13"
},
"locked": {
"lastModified": 1715476621,
@ -1101,6 +1146,22 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1708475490,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0e74ca98a74bc7270d28838369593635a5db3260",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
@ -1116,7 +1177,7 @@
"type": "github"
}
},
"nixpkgs_11": {
"nixpkgs_12": {
"locked": {
"lastModified": 1683014792,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=",
@ -1132,7 +1193,7 @@
"type": "github"
}
},
"nixpkgs_12": {
"nixpkgs_13": {
"locked": {
"lastModified": 1715413075,
"narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
@ -1148,7 +1209,7 @@
"type": "github"
}
},
"nixpkgs_13": {
"nixpkgs_14": {
"locked": {
"lastModified": 1715447595,
"narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
@ -1164,7 +1225,7 @@
"type": "github"
}
},
"nixpkgs_14": {
"nixpkgs_15": {
"locked": {
"lastModified": 1710765496,
"narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=",
@ -1180,7 +1241,7 @@
"type": "github"
}
},
"nixpkgs_15": {
"nixpkgs_16": {
"locked": {
"lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
@ -1196,7 +1257,7 @@
"type": "github"
}
},
"nixpkgs_16": {
"nixpkgs_17": {
"locked": {
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
@ -1212,7 +1273,7 @@
"type": "github"
}
},
"nixpkgs_17": {
"nixpkgs_18": {
"locked": {
"lastModified": 1713805509,
"narHash": "sha256-YgSEan4CcrjivCNO5ZNzhg7/8ViLkZ4CB/GrGBVSudo=",
@ -1309,6 +1370,22 @@
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "cfd6b5fc90b15709b780a5a1619695a88505a176",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1715087517,
"narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
@ -1324,7 +1401,7 @@
"type": "github"
}
},
"nixpkgs_8": {
"nixpkgs_9": {
"locked": {
"lastModified": 1712963716,
"narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=",
@ -1340,29 +1417,13 @@
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1708475490,
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0e74ca98a74bc7270d28838369593635a5db3260",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1715607605,
"narHash": "sha256-uBqYAggCZskgOah3oIPSAomQpKsS7PG69Xh7xMc/HfQ=",
"lastModified": 1715571190,
"narHash": "sha256-LaqzJ6sGfi9NImRdcFNZLGUcnUDRCxi3eQjuJRO4JzQ=",
"owner": "nix-community",
"repo": "NUR",
"rev": "46c8a3892f815cb687c22de95ba600e4fdc46ab8",
"rev": "702d0cde0e6abc982602c1670a525d06e8e92a5e",
"type": "github"
},
"original": {
@ -1376,7 +1437,7 @@
"flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_5",
"gitignore": "gitignore",
"nixpkgs": "nixpkgs_14",
"nixpkgs": "nixpkgs_15",
"nixpkgs-stable": "nixpkgs-stable_2"
},
"locked": {
@ -1403,6 +1464,7 @@
"flake-parts": "flake-parts_2",
"helix": "helix",
"home-manager": "home-manager",
"hyprcursor": "hyprcursor",
"hypridle": "hypridle",
"hyprland": "hyprland",
"hyprland-plugins": "hyprland-plugins",
@ -1411,7 +1473,7 @@
"hyprpicker": "hyprpicker",
"nix-gaming": "nix-gaming",
"nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_13",
"nixpkgs": "nixpkgs_14",
"nur": "nur",
"pre-commit-hooks": "pre-commit-hooks",
"sops-nix": "sops-nix",
@ -1525,7 +1587,7 @@
"flake-compat": "flake-compat_6",
"gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_15"
"nixpkgs": "nixpkgs_16"
},
"locked": {
"lastModified": 1715516559,
@ -1587,21 +1649,6 @@
}
},
"systems_12": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_13": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@ -1616,6 +1663,21 @@
"type": "github"
}
},
"systems_13": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_14": {
"locked": {
"lastModified": 1689347949,
@ -1632,6 +1694,21 @@
}
},
"systems_15": {
"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_16": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@ -1787,9 +1864,9 @@
"xdg-portal-hyprland": {
"inputs": {
"hyprland-protocols": "hyprland-protocols_2",
"hyprlang": "hyprlang_5",
"nixpkgs": "nixpkgs_16",
"systems": "systems_14"
"hyprlang": "hyprlang_6",
"nixpkgs": "nixpkgs_17",
"systems": "systems_15"
},
"locked": {
"lastModified": 1714662532,
@ -1838,7 +1915,7 @@
"yazi": {
"inputs": {
"flake-utils": "flake-utils_6",
"nixpkgs": "nixpkgs_17",
"nixpkgs": "nixpkgs_18",
"rust-overlay": "rust-overlay_3"
},
"locked": {

View file

@ -60,6 +60,7 @@
hypridle.url = "github:hyprwm/hypridle";
hyprlock.url = "github:hyprwm/hyprlock";
hyprpicker.url = "github:hyprwm/hyprpicker";
hyprcursor.url = "github:hyprwm/hyprcursor";
hyprpaper.url = "github:hyprwm/hyprpaper";
xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland";
hyprland-plugins = {

View file

@ -12,6 +12,7 @@
slurp
satty
wl-clipboard
wlr-randr
];
sessionVariables = {
__GL_GSYNC_ALLOWED = "0";
@ -23,6 +24,8 @@
QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
GDK_BACKEND = "wayland";
MOZ_ENABLE_WAYLAND = "1";
WLR_BACKEND = "vulkan";
WLR_RENDERER = "vulkan";
XCURSOR_SIZE = "24";
NIXOS_OZONE_WL = "1";
EDITOR = "hx";

View file

@ -1,9 +1,7 @@
{inputs, ...}: {
imports = [inputs.hyprlock.homeManagerModules.default];
disabledModules = ["${inputs.home-manager}/modules/programs/hyprlock.nix"];
_: {
programs.hyprlock = {
enable = true;
settings = {
backgrounds = let
verticalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle.png";
horizontalWallpaper = "/home/notoh/Pictures/wallpapers/sparkle2.png";
@ -101,4 +99,5 @@
}
];
};
};
}

View file

@ -1,15 +1,12 @@
{
inputs,
pkgs,
lib,
config,
...
}: {
imports = [inputs.hypridle.homeManagerModules.default];
disabledModules = ["${inputs.home-manager}/modules/services/hypridle.nix"];
services.hypridle = {
enable = true;
settings = {
ignoreDbusInhibit = false;
lockCmd = lib.getExe config.programs.hyprlock.package;
beforeSleepCmd = "${pkgs.systemd}/bin/loginctl lock-session";
@ -24,4 +21,5 @@
}
];
};
};
}

View file

@ -1,14 +1,7 @@
{
inputs,
pkgs,
...
}: {
home.packages = [pkgs.hyprpaper];
imports = [inputs.hyprpaper.homeManagerModules.default];
disabledModules = ["${inputs.home-manager}/modules/services/hyprpaper.nix"];
_: {
services.hyprpaper = {
enable = true;
settings = {
ipc = true;
splash = false;
preloads = [
@ -22,4 +15,5 @@
"DP-3,~/Pictures/wallpapers/sparkle3.png"
];
};
};
}

View file

@ -0,0 +1,33 @@
{
disko.devices = {
disk = {
sda = {
device = "/dev/sda";
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 = [
(modulesPath + "/installer/scan/not-detected.nix")
./disko-config.nix
];
boot = {

View file

@ -11,6 +11,7 @@
atticModule = inputs.attic.nixosModules.atticd;
nurModule = inputs.nur.nixosModules.nur;
t480Module = inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480;
diskoModule = inputs.disko.nixosModules.default;
in {
tsuki = nixosSystem {
inherit specialArgs;
@ -39,6 +40,7 @@
sopsModule
hmModule
t480Module
diskoModule
{
home-manager = {
useGlobalPkgs = true;

View file

@ -4,10 +4,11 @@
inputs.nur.overlay
inputs.helix.overlays.default
inputs.yazi.overlays.default
inputs.hyprland.overlays.default
inputs.hypridle.overlays.default
inputs.hyprlock.overlays.default
inputs.hyprpaper.overlays.default
inputs.hyprpicker.overlays.default
inputs.hyprcursor.overlays.default
inputs.atuin.overlays.default
inputs.eww.overlays.default
];
@ -30,7 +31,6 @@
};
nix = {
channel.enable = false;
settings = {
extra-experimental-features = ["flakes" "nix-command"];
warn-dirty = false;
@ -38,7 +38,6 @@
builders-use-substitutes = true;
keep-outputs = true;
keep-derivations = true;
flake-registry = "/etc/nix/registry.json";
allowed-users = ["@wheel"];
trusted-users = ["root" "@wheel"];
substituters = [