This commit is contained in:
2026-06-20 14:14:40 +01:00
parent 2b7d77972b
commit ca0486baff
5 changed files with 279 additions and 267 deletions
+7 -4
View File
@@ -6,16 +6,19 @@
__findFile, __findFile,
lib, lib,
... ...
}: { }:
{
den.aspects.desktop = { den.aspects.desktop = {
includes = [ includes = [
modules.nix modules.nix
]; ];
nixos = { nixos =
{
pkgs, pkgs,
config, config,
... ...
}: { }:
{
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.device = "nodev"; boot.loader.grub.device = "nodev";
boot.loader.grub.devices = [ boot.loader.grub.devices = [
@@ -27,7 +30,7 @@
boot.loader.grub.efiInstallAsRemovable = true; boot.loader.grub.efiInstallAsRemovable = true;
networking.hostName = "doloroo-main"; # Define your hostname. networking.hostName = "doloroo-main"; # Define your hostname.
boot.kernelPackages = pkgs.linuxPackages_latest; # boot.kernelPackages = pkgs.linuxPackages_latest;
boot.initrd.verbose = false; boot.initrd.verbose = false;
boot.kernelParams = [ boot.kernelParams = [
+30 -10
View File
@@ -1,15 +1,18 @@
{modules, ...}: { { modules, ... }:
{
modules.hyprland = { modules.hyprland = {
provides = { provides = {
doloro-settings = { doloro-settings = {
includes = [ includes = [
modules.dunst modules.dunst
]; ];
homeManager = { homeManager =
{
pkgs, pkgs,
home, home,
... ...
}: { }:
{
home.packages = [ home.packages = [
pkgs.hyprcursor pkgs.hyprcursor
pkgs.wlogout pkgs.wlogout
@@ -25,6 +28,22 @@
package = pkgs.rose-pine-hyprcursor; package = pkgs.rose-pine-hyprcursor;
hyprcursor.enable = true; hyprcursor.enable = true;
}; };
services.hyprpaper = {
enable = true;
settings = {
splash = true;
wallpaper = [
{
monitor = "HDMI-A-1";
path = "/home/doloro/Wallpaper.jpg";
}
{
monitor = "DP-2";
path = "/home/doloro/Wallpaper.jpg";
}
];
};
};
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
env = [ env = [
"XCURSOR_THEME,BreezeX-RosePine-Linux" "XCURSOR_THEME,BreezeX-RosePine-Linux"
@@ -109,8 +128,7 @@
# vfr = true; # vfr = true;
}; };
"$mainMod" = "SUPER"; "$mainMod" = "SUPER";
bind = bind = [
[
( (
let let
config = pkgs.writeTextFile { config = pkgs.writeTextFile {
@@ -131,7 +149,8 @@
script = pkgs.writeShellScript "mreow" '' script = pkgs.writeShellScript "mreow" ''
exec $(tofi-drun -c ${config}) exec $(tofi-drun -c ${config})
''; '';
in "$mainMod, R, exec, ${script}" in
"$mainMod, R, exec, ${script}"
) )
"$mainMod, C, killactive" "$mainMod, C, killactive"
"$mainMod, M, exec, uwsm stop" "$mainMod, M, exec, uwsm stop"
@@ -163,14 +182,15 @@
] ]
++ (builtins.concatLists ( ++ (builtins.concatLists (
builtins.genList ( builtins.genList (
i: let i:
let
ws = i + 1; ws = i + 1;
in [ in
[
"$mainMod, ${toString ws}, workspace, ${toString ws}" "$mainMod, ${toString ws}, workspace, ${toString ws}"
"$mainMod SHIFT, ${toString ws}, movetoworkspace, ${toString ws}" "$mainMod SHIFT, ${toString ws}, movetoworkspace, ${toString ws}"
] ]
) ) 9
9
)); ));
bindm = [ bindm = [
"$mainMod, mouse:272, movewindow" "$mainMod, mouse:272, movewindow"
+2 -2
View File
@@ -10,7 +10,7 @@
flake-file.inputs = { flake-file.inputs = {
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
# inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
modules = { modules = {
@@ -74,7 +74,7 @@
cmp_luasnip.enable = true; cmp_luasnip.enable = true;
fidget.enable = true; fidget.enable = true;
mini-comment.enable = true; mini-comment.enable = true;
cord.enable = true; # cord.enable = true;
todo-comments.enable = true; todo-comments.enable = true;
transparent.enable = true; transparent.enable = true;
which-key.enable = true; which-key.enable = true;
Generated
+43 -57
View File
@@ -120,11 +120,11 @@
"cachyos-kernel": { "cachyos-kernel": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1781018471, "lastModified": 1781455283,
"narHash": "sha256-jQHNMqg2+Iey/WnF+RNvEs+HG3HFVdCX5W/7wne3UIM=", "narHash": "sha256-/71qSmWc0vIyGsvtADG8/uHnC/NvXPEY6TXRoDMufeo=",
"owner": "CachyOS", "owner": "CachyOS",
"repo": "linux-cachyos", "repo": "linux-cachyos",
"rev": "39d9d125940996ed2eb32425ffec7f2de6ac7fba", "rev": "3bd5b77999c4180ed01bdd0669bfabc5171b090a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -517,11 +517,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1781365335, "lastModified": 1781615165,
"narHash": "sha256-zqDBhXMzfbdlO7F2bGHe7MOtB3xngd/+4ieMHDC+ZXo=", "narHash": "sha256-CFF4fNNfr2GZSx1xJhBNBi7VMj8OtOqZGOV+fiBSbzw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5b6f5733726a1b2ccafb5dec6ac4ca7299fad66c", "rev": "34dd288e65012954cf7170658e0e6a61255b0327",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -605,11 +605,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1781437668, "lastModified": 1781551294,
"narHash": "sha256-UjNWFgYMIzUyvYwFEZPERVx8MnKexbO5Jpzi08i1LLo=", "narHash": "sha256-6cHkPGrQmd8RI/YdEgHmY3ebnPHHq07DxOxST70jYhI=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "c123867ebed53a3a429cadc8af79639d5af9304a", "rev": "88262e1f860adc56f528ef68b2909ee33a27186b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -929,11 +929,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1781234038, "lastModified": 1781610921,
"narHash": "sha256-jo4a47qDgsx1F1i0MtHZl12FfzqKJOES25vbm0ZUxeI=", "narHash": "sha256-PXyfDFGyW+UYteu3uHJgp49sFHRU16iocf5K2ltqn3M=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "eb5789cba8d37802d330df5a13c691622c83121f", "rev": "e5857dc58304b3d5bbac6340820f7d4450688538",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -962,11 +962,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1780938415, "lastModified": 1781588278,
"narHash": "sha256-QHyIMGSbCQW8d5qbOrMsm6gem10bO3Au2YLa3alJfHo=", "narHash": "sha256-Fw/Zo0hwgn9ulgY5duQy51WHtqpNoLjNDZYLdEI1SS4=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "6f1a2c5f0e8274223d4204b1f8d6f7f91538967e", "rev": "fdb6d85fc78355762bcf3cf71fe4037681a766f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -984,11 +984,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1781292859, "lastModified": 1781463250,
"narHash": "sha256-etlzg6/H1NuHGTnrxxhvdmhDYQls/AMHk1IrBbNc0WM=", "narHash": "sha256-gYE/0gtSedmA21UWRZ2DA+iXhySh1JGKOssuqejV7cQ=",
"owner": "xddxdd", "owner": "xddxdd",
"repo": "nix-cachyos-kernel", "repo": "nix-cachyos-kernel",
"rev": "c57a7ab46f5e9b4eb32ed74ba6e7cd5bcd3a6e64", "rev": "4039d20f1495f2c521e7d12723a0c45348b118e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1133,11 +1133,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1780952837, "lastModified": 1781509190,
"narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=", "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe", "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1164,22 +1164,6 @@
} }
}, },
"nixpkgs_11": { "nixpkgs_11": {
"locked": {
"lastModified": 1780336545,
"narHash": "sha256-vhVhuXzFrIOfcssC/9hDHx7MHzDKjF3keHuREOQqQiQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4df1b885d76a54e1aa1a318f8d16fd6005b6401f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1774709303, "lastModified": 1774709303,
"narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=",
@@ -1195,7 +1179,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_13": { "nixpkgs_12": {
"locked": { "locked": {
"lastModified": 1745279238, "lastModified": 1745279238,
"narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=",
@@ -1211,7 +1195,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_14": { "nixpkgs_13": {
"locked": { "locked": {
"lastModified": 1781074563, "lastModified": 1781074563,
"narHash": "sha256-d34lhgOet4IqYMnCxbIvwFBMOyTV6PT4TyNEOP0/ZhU=", "narHash": "sha256-d34lhgOet4IqYMnCxbIvwFBMOyTV6PT4TyNEOP0/ZhU=",
@@ -1287,11 +1271,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1781246015, "lastModified": 1781421111,
"narHash": "sha256-C3D5TBgght7LBaqm5oGNRf6CynGl5lGED4jcDw2ZOOk=", "narHash": "sha256-2xSTHlKBF5h/tgAeHyQPR/g48qk9ACz7dED3jc3pGKA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7bd229cbe77d7746d64a1e8c1a6f6cc08f606fc4", "rev": "7fe8f446d9475534dc54591ccb5c87c1ce6eaf8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1349,15 +1333,17 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_4",
"nixpkgs": "nixpkgs_11", "nixpkgs": [
"nixpkgs"
],
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1781388258, "lastModified": 1781713417,
"narHash": "sha256-Kx1zxra9sZ215H3OiWUfkulu8N2v3iu19wqlzpD/Ac0=", "narHash": "sha256-Kaj44jTNmnaFhKrcADx8nXmUYPa7l2HYfb7m6lEPy7Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "e3c908fdf6dff268b04ffb6758bcfc7c018489b9", "rev": "caee4e5d4161778815f522d9ea1c9e3dc42462b7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -1393,14 +1379,14 @@
}, },
"omp-nix": { "omp-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_12" "nixpkgs": "nixpkgs_11"
}, },
"locked": { "locked": {
"lastModified": 1781370169, "lastModified": 1781618766,
"narHash": "sha256-8YdyF3+nfzquZdChx555IFW+X34QYxNShJbK2NPruFw=", "narHash": "sha256-4PFt9cI8ZeBTwd0vOmf6NGES+AwkEcigjbWq3TgjtdY=",
"ref": "main", "ref": "main",
"rev": "261e7137ce1b84bad5eb51a8302050b0710f2af2", "rev": "cb27b28f71d5c86d950b055fa12037beab343423",
"revCount": 166, "revCount": 187,
"type": "git", "type": "git",
"url": "https://git.molez.org/mandlm/omp-nix" "url": "https://git.molez.org/mandlm/omp-nix"
}, },
@@ -1437,7 +1423,7 @@
"inputs": { "inputs": {
"libcamera-src": "libcamera-src", "libcamera-src": "libcamera-src",
"libpisp-src": "libpisp-src", "libpisp-src": "libpisp-src",
"nixpkgs": "nixpkgs_13", "nixpkgs": "nixpkgs_12",
"rpi-bluez-firmware-src": "rpi-bluez-firmware-src", "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
"rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src", "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
"rpi-firmware-src": "rpi-firmware-src", "rpi-firmware-src": "rpi-firmware-src",
@@ -1595,7 +1581,7 @@
}, },
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_14", "nixpkgs": "nixpkgs_13",
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
@@ -1841,11 +1827,11 @@
}, },
"x1e-kernel": { "x1e-kernel": {
"locked": { "locked": {
"lastModified": 1780078420, "lastModified": 1781581349,
"narHash": "sha256-ZQ2gZRcE227EhG8YrEHnWkSbw5Wgd5IckLmpEV2SkN8=", "narHash": "sha256-KCKvmmFhLVrUQ10qUfPPam7nTvriMrlVPHeo2Ey0CO8=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "931cf9966ba3a213946329ce95b07635a34cd839", "rev": "30c7f18e474fe8b6584600946c1fe9f688def838",
"revCount": 6, "revCount": 7,
"type": "git", "type": "git",
"url": "https://git.scug.io/nikkuss/x1e-nixos.git" "url": "https://git.scug.io/nikkuss/x1e-nixos.git"
}, },
+4 -1
View File
@@ -33,7 +33,10 @@
nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main"; nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main";
nixos-wsl.url = "github:nix-community/NixOS-WSL"; nixos-wsl.url = "github:nix-community/NixOS-WSL";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixvim.url = "github:nix-community/nixvim"; nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main"; omp-nix.url = "git+https://git.molez.org/mandlm/omp-nix?ref=main";
raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix"; raspberry-pi-nix.url = "github:cmyk/raspberry-pi-nix";
sops-nix = { sops-nix = {