update flakes

This commit is contained in:
EdenQwQ 2026-07-15 15:39:49 +08:00
parent c0c76980c3
commit 7d65fa454c
8 changed files with 25 additions and 19 deletions

14
flake.lock generated
View file

@ -1273,23 +1273,23 @@
"type": "github" "type": "github"
} }
}, },
"noctalia-shell": { "noctalia": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1781275887, "lastModified": 1782223387,
"narHash": "sha256-27bVKMTwXumghIcgmRpHUVoIai2M5NmE2tEytVDbvyo=", "narHash": "sha256-s8rdbLLxuFO55dQHJBbNtZ/kQf4cRsRGjLtDJxSmRuY=",
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "repo": "noctalia",
"rev": "8c7a9cf983bb1e69b990fdac68979ca1f8215ebb", "rev": "2b21b9839ff9466785a9b291c84d78bd738817c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "noctalia-dev", "owner": "noctalia-dev",
"repo": "noctalia-shell", "repo": "noctalia",
"type": "github" "type": "github"
} }
}, },
@ -1476,7 +1476,7 @@
"nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-stable": "nixpkgs-stable_2",
"nixpkgs-wayland": "nixpkgs-wayland", "nixpkgs-wayland": "nixpkgs-wayland",
"nixvim": "nixvim", "nixvim": "nixvim",
"noctalia-shell": "noctalia-shell", "noctalia": "noctalia",
"nur": "nur", "nur": "nur",
"quickshell": "quickshell_2", "quickshell": "quickshell_2",
"stylix": "stylix", "stylix": "stylix",

View file

@ -99,8 +99,8 @@
inputs.quickshell.follows = "quickshell"; inputs.quickshell.follows = "quickshell";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
noctalia-shell = { noctalia = {
url = "github:noctalia-dev/noctalia-shell"; url = "github:noctalia-dev/noctalia";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hexecute.url = "github:ThatOtherAndrew/Hexecute"; hexecute.url = "github:ThatOtherAndrew/Hexecute";

View file

@ -70,6 +70,10 @@ let
report report
showtext showtext
rPackages.ranger rPackages.ranger
Rfast
ropenblas
RANN
ggh4x
(buildRPackage { (buildRPackage {
name = "eegUtils"; name = "eegUtils";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -17,7 +17,7 @@
waybar = "pkill -USR1 .waybar-wrapped"; waybar = "pkill -USR1 .waybar-wrapped";
dms = "dms ipc call bar toggle"; dms = "dms ipc call bar toggle";
caelestia = "echo pass"; caelestia = "echo pass";
noctalia-shell = "noctalia msg bar-toggle"; noctalia = "noctalia msg bar-toggle";
} }
.${config.desktopShell}; .${config.desktopShell};
} }

View file

@ -7,5 +7,5 @@
./wallpaper.nix ./wallpaper.nix
./colorscheme.nix ./colorscheme.nix
]; ];
desktopShell = "noctalia-shell"; desktopShell = "noctalia";
} }

View file

@ -25,7 +25,7 @@ let
# inputs.mangowc.hmModules.mango # inputs.mangowc.hmModules.mango
inputs.dank-material-shell.homeModules.dank-material-shell inputs.dank-material-shell.homeModules.dank-material-shell
inputs.caelestia-shell.homeManagerModules.default inputs.caelestia-shell.homeManagerModules.default
inputs.noctalia-shell.homeModules.default inputs.noctalia.homeModules.default
inputs.waydeeper.homeManagerModules.default inputs.waydeeper.homeManagerModules.default
] ]
++ (builtins.attrValues self.homeManagerModules); ++ (builtins.attrValues self.homeManagerModules);

View file

@ -26,9 +26,9 @@
enable = config.desktopShell == "caelestia"; enable = config.desktopShell == "caelestia";
systemd.enable = config.desktopShell == "caelestia"; systemd.enable = config.desktopShell == "caelestia";
}; };
programs.noctalia.enable = config.desktopShell == "noctalia-shell"; programs.noctalia.enable = config.desktopShell == "noctalia";
home.packages = lib.mkIf (config.desktopShell == "noctalia-shell") [ home.packages = lib.mkIf (config.desktopShell == "noctalia") [
inputs.noctalia-shell.packages.${pkgs.stdenv.hostPlatform.system}.default inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
]; ];
}; };
} }

View file

@ -13,19 +13,20 @@
libdrm, libdrm,
systemd, systemd,
vulkan-loader, vulkan-loader,
pipewire,
}: }:
rustPlatform.buildRustPackage { rustPlatform.buildRustPackage {
pname = "halley"; pname = "halley";
version = "0.1.0"; version = "0.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "saltnpepper97"; owner = "saltnpepper97";
repo = "halley"; repo = "halley";
rev = "92ab43f71abf359456ca4f9da96c5b146e98b165"; rev = "dc3b901425e9aafe994b01566c20acc30484baed";
hash = "sha256-3OEY0OdQvMfSNhzvw+lXkTBmyzT+ZiPZhWBXS87wTuo="; hash = "sha256-vx4zEJzVWZeUY3KF8fSWbdY1aCQjTLIE3XnPAq/j7Ho=";
}; };
cargoHash = "sha256-Ze03sLTAWuxd6sghvsyghgwF9PjHcH5lIc99fwMdwp0="; cargoHash = "sha256-ZAeOsmVwWg4FSKKSg7IUYJT/SGyd/y52CeukOznN8hQ=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
@ -43,6 +44,7 @@ rustPlatform.buildRustPackage {
libdrm libdrm
systemd systemd
vulkan-loader vulkan-loader
pipewire
]; ];
doCheck = false; doCheck = false;