diff --git a/flake.lock b/flake.lock index edec307..8fb6c3d 100644 --- a/flake.lock +++ b/flake.lock @@ -1273,23 +1273,23 @@ "type": "github" } }, - "noctalia-shell": { + "noctalia": { "inputs": { "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1781275887, - "narHash": "sha256-27bVKMTwXumghIcgmRpHUVoIai2M5NmE2tEytVDbvyo=", + "lastModified": 1782223387, + "narHash": "sha256-s8rdbLLxuFO55dQHJBbNtZ/kQf4cRsRGjLtDJxSmRuY=", "owner": "noctalia-dev", - "repo": "noctalia-shell", - "rev": "8c7a9cf983bb1e69b990fdac68979ca1f8215ebb", + "repo": "noctalia", + "rev": "2b21b9839ff9466785a9b291c84d78bd738817c3", "type": "github" }, "original": { "owner": "noctalia-dev", - "repo": "noctalia-shell", + "repo": "noctalia", "type": "github" } }, @@ -1476,7 +1476,7 @@ "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-wayland": "nixpkgs-wayland", "nixvim": "nixvim", - "noctalia-shell": "noctalia-shell", + "noctalia": "noctalia", "nur": "nur", "quickshell": "quickshell_2", "stylix": "stylix", diff --git a/flake.nix b/flake.nix index 0258214..e11a803 100644 --- a/flake.nix +++ b/flake.nix @@ -99,8 +99,8 @@ inputs.quickshell.follows = "quickshell"; inputs.nixpkgs.follows = "nixpkgs"; }; - noctalia-shell = { - url = "github:noctalia-dev/noctalia-shell"; + noctalia = { + url = "github:noctalia-dev/noctalia"; inputs.nixpkgs.follows = "nixpkgs"; }; hexecute.url = "github:ThatOtherAndrew/Hexecute"; diff --git a/home/programs/coding/R.nix b/home/programs/coding/R.nix index 3583da1..da74425 100644 --- a/home/programs/coding/R.nix +++ b/home/programs/coding/R.nix @@ -70,6 +70,10 @@ let report showtext rPackages.ranger + Rfast + ropenblas + RANN + ggh4x (buildRPackage { name = "eegUtils"; src = fetchFromGitHub { diff --git a/home/programs/desktop/swhkd.nix b/home/programs/desktop/swhkd.nix index c7d47bc..4617e01 100644 --- a/home/programs/desktop/swhkd.nix +++ b/home/programs/desktop/swhkd.nix @@ -17,7 +17,7 @@ waybar = "pkill -USR1 .waybar-wrapped"; dms = "dms ipc call bar toggle"; caelestia = "echo pass"; - noctalia-shell = "noctalia msg bar-toggle"; + noctalia = "noctalia msg bar-toggle"; } .${config.desktopShell}; } diff --git a/home/tweaks/default.nix b/home/tweaks/default.nix index 1afb122..590ff03 100644 --- a/home/tweaks/default.nix +++ b/home/tweaks/default.nix @@ -7,5 +7,5 @@ ./wallpaper.nix ./colorscheme.nix ]; - desktopShell = "noctalia-shell"; + desktopShell = "noctalia"; } diff --git a/hosts/default.nix b/hosts/default.nix index 0c258ce..2e0a041 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -25,7 +25,7 @@ let # inputs.mangowc.hmModules.mango inputs.dank-material-shell.homeModules.dank-material-shell inputs.caelestia-shell.homeManagerModules.default - inputs.noctalia-shell.homeModules.default + inputs.noctalia.homeModules.default inputs.waydeeper.homeManagerModules.default ] ++ (builtins.attrValues self.homeManagerModules); diff --git a/modules/home-manager/desktop-shell.nix b/modules/home-manager/desktop-shell.nix index e4d65fa..2780513 100644 --- a/modules/home-manager/desktop-shell.nix +++ b/modules/home-manager/desktop-shell.nix @@ -26,9 +26,9 @@ enable = config.desktopShell == "caelestia"; systemd.enable = config.desktopShell == "caelestia"; }; - programs.noctalia.enable = config.desktopShell == "noctalia-shell"; - home.packages = lib.mkIf (config.desktopShell == "noctalia-shell") [ - inputs.noctalia-shell.packages.${pkgs.stdenv.hostPlatform.system}.default + programs.noctalia.enable = config.desktopShell == "noctalia"; + home.packages = lib.mkIf (config.desktopShell == "noctalia") [ + inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default ]; }; } diff --git a/pkgs/halley.nix b/pkgs/halley.nix index 6660b03..85aa4d9 100644 --- a/pkgs/halley.nix +++ b/pkgs/halley.nix @@ -13,19 +13,20 @@ libdrm, systemd, vulkan-loader, + pipewire, }: rustPlatform.buildRustPackage { pname = "halley"; - version = "0.1.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "saltnpepper97"; repo = "halley"; - rev = "92ab43f71abf359456ca4f9da96c5b146e98b165"; - hash = "sha256-3OEY0OdQvMfSNhzvw+lXkTBmyzT+ZiPZhWBXS87wTuo="; + rev = "dc3b901425e9aafe994b01566c20acc30484baed"; + hash = "sha256-vx4zEJzVWZeUY3KF8fSWbdY1aCQjTLIE3XnPAq/j7Ho="; }; - cargoHash = "sha256-Ze03sLTAWuxd6sghvsyghgwF9PjHcH5lIc99fwMdwp0="; + cargoHash = "sha256-ZAeOsmVwWg4FSKKSg7IUYJT/SGyd/y52CeukOznN8hQ="; nativeBuildInputs = [ pkg-config @@ -43,6 +44,7 @@ rustPlatform.buildRustPackage { libdrm systemd vulkan-loader + pipewire ]; doCheck = false;